fix: 不能正常显示系统消息
This commit is contained in:
@@ -25,7 +25,8 @@ import SelectPreference from '../preference/SelectPreference.tsx'
|
|||||||
import TextFieldPreference from '../preference/TextFieldPreference.tsx'
|
import TextFieldPreference from '../preference/TextFieldPreference.tsx'
|
||||||
import Preference from '../preference/Preference.tsx'
|
import Preference from '../preference/Preference.tsx'
|
||||||
import GroupSettings from "../../api/client_data/GroupSettings.ts"
|
import GroupSettings from "../../api/client_data/GroupSettings.ts"
|
||||||
import PreferenceUpdater from "../preference/PreferenceUpdater.ts";
|
import PreferenceUpdater from "../preference/PreferenceUpdater.ts"
|
||||||
|
import SystemMessage from "./SystemMessage.tsx"
|
||||||
|
|
||||||
interface Args extends React.HTMLAttributes<HTMLElement> {
|
interface Args extends React.HTMLAttributes<HTMLElement> {
|
||||||
target: string
|
target: string
|
||||||
@@ -323,7 +324,7 @@ export default function ChatFragment({ target, showReturnButton, onReturnButtonC
|
|||||||
const lastDate = date
|
const lastDate = date
|
||||||
date = new Date(msg.time)
|
date = new Date(msg.time)
|
||||||
|
|
||||||
const msgElement = <Element_Message
|
const msgElement = msg.user_id == null ? <SystemMessage>{msg.text}</SystemMessage> :<Element_Message
|
||||||
rawData={msg.text}
|
rawData={msg.text}
|
||||||
renderHTML={rendeText}
|
renderHTML={rendeText}
|
||||||
message={msg}
|
message={msg}
|
||||||
@@ -336,6 +337,7 @@ export default function ChatFragment({ target, showReturnButton, onReturnButtonC
|
|||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
{
|
{
|
||||||
|
msg.user_id != null &&
|
||||||
(date.getMinutes() != lastDate.getMinutes() || date.getDate() != lastDate.getDate() || date.getMonth() != lastDate.getMonth() || date.getFullYear() != lastDate.getFullYear())
|
(date.getMinutes() != lastDate.getMinutes() || date.getDate() != lastDate.getDate() || date.getMonth() != lastDate.getMonth() || date.getFullYear() != lastDate.getFullYear())
|
||||||
&& <mdui-tooltip content={`${date.getFullYear()}年${date.getMonth() + 1}月${date.getDate()}日 ${date.getHours()}:${date.getMinutes()}:${date.getSeconds()}`}>
|
&& <mdui-tooltip content={`${date.getFullYear()}年${date.getMonth() + 1}月${date.getDate()}日 ${date.getHours()}:${date.getMinutes()}:${date.getSeconds()}`}>
|
||||||
<div style={{
|
<div style={{
|
||||||
|
|||||||
@@ -1,8 +1,5 @@
|
|||||||
/**
|
|
||||||
* 一条系统提示消息
|
export default function SystemMessage({ children }: React.HTMLAttributes<HTMLElement>) {
|
||||||
* @returns { React.JSX.Element }
|
|
||||||
*/
|
|
||||||
export default function SystemMessage({ children } = {}) {
|
|
||||||
return (
|
return (
|
||||||
<div style={{
|
<div style={{
|
||||||
width: '100%',
|
width: '100%',
|
||||||
Reference in New Issue
Block a user