修改了消息原始数据的显示方式
This commit is contained in:
@@ -34,7 +34,6 @@
|
|||||||
"socket.io-client": "npm:socket.io-client@4.8.1",
|
"socket.io-client": "npm:socket.io-client@4.8.1",
|
||||||
"marked": "npm:marked@16.3.0",
|
"marked": "npm:marked@16.3.0",
|
||||||
"dompurify": "npm:dompurify@3.2.7",
|
"dompurify": "npm:dompurify@3.2.7",
|
||||||
"pinch-zoom-element": "npm:pinch-zoom-element@1.1.1",
|
"pinch-zoom-element": "npm:pinch-zoom-element@1.1.1"
|
||||||
"react-json-view": "npm:react-json-view@1.21.3"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,7 +9,6 @@ import useAsyncEffect from "../useAsyncEffect.ts"
|
|||||||
import useEventListener from "../useEventListener.ts"
|
import useEventListener from "../useEventListener.ts"
|
||||||
import React from "react"
|
import React from "react"
|
||||||
import isMobileUI from "../isMobileUI.ts"
|
import isMobileUI from "../isMobileUI.ts"
|
||||||
import ReactJson from 'react-json-view'
|
|
||||||
import User from "../../api/client_data/User.ts"
|
import User from "../../api/client_data/User.ts"
|
||||||
import getUrlForFileByHash from "../../getUrlForFileByHash.ts"
|
import getUrlForFileByHash from "../../getUrlForFileByHash.ts"
|
||||||
import escapeHTML from "../../escapeHtml.ts"
|
import escapeHTML from "../../escapeHtml.ts"
|
||||||
@@ -86,11 +85,7 @@ export default function Message({ userId, rawData, renderHTML, message, openUser
|
|||||||
}, [userId])
|
}, [userId])
|
||||||
|
|
||||||
const dropDownRef = React.useRef<Dropdown>(null)
|
const dropDownRef = React.useRef<Dropdown>(null)
|
||||||
const messageJsonDialogRef = React.useRef<Dialog>(null)
|
useEventListener(dropDownRef, 'closed', () => {
|
||||||
useEventListener(messageJsonDialogRef, 'click', (e) => {
|
|
||||||
e.stopPropagation()
|
|
||||||
})
|
|
||||||
useEventListener(dropDownRef, 'closed', (e) => {
|
|
||||||
setDropDownOpen(false)
|
setDropDownOpen(false)
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -180,12 +175,6 @@ export default function Message({ userId, rawData, renderHTML, message, openUser
|
|||||||
// paddingTop: isUsingFullDisplay ? undefined : "14px",
|
// paddingTop: isUsingFullDisplay ? undefined : "14px",
|
||||||
// backgroundColor: isUsingFullDisplay ? "inherit" : undefined
|
// backgroundColor: isUsingFullDisplay ? "inherit" : undefined
|
||||||
}}>
|
}}>
|
||||||
<mdui-dialog close-on-overlay-click close-on-esc ref={messageJsonDialogRef}>
|
|
||||||
{
|
|
||||||
// @ts-ignore 这是可以正常工作的
|
|
||||||
<ReactJson src={message} />
|
|
||||||
}
|
|
||||||
</mdui-dialog>
|
|
||||||
<mdui-dropdown trigger="manual" ref={dropDownRef} open={isDropDownOpen}>
|
<mdui-dropdown trigger="manual" ref={dropDownRef} open={isDropDownOpen}>
|
||||||
<span
|
<span
|
||||||
slot="trigger"
|
slot="trigger"
|
||||||
@@ -204,7 +193,23 @@ export default function Message({ userId, rawData, renderHTML, message, openUser
|
|||||||
}}>
|
}}>
|
||||||
<mdui-menu-item icon="content_copy" onClick={() => copyToClipboard($(dropDownRef.current as HTMLElement).find('#msg').text().trim())}>复制文字</mdui-menu-item>
|
<mdui-menu-item icon="content_copy" onClick={() => copyToClipboard($(dropDownRef.current as HTMLElement).find('#msg').text().trim())}>复制文字</mdui-menu-item>
|
||||||
<mdui-menu-item icon="content_copy" onClick={() => copyToClipboard(rawData)}>复制原文</mdui-menu-item>
|
<mdui-menu-item icon="content_copy" onClick={() => copyToClipboard(rawData)}>复制原文</mdui-menu-item>
|
||||||
<mdui-menu-item icon="info" onClick={() => messageJsonDialogRef.current!.open = true}>JSON</mdui-menu-item>
|
<mdui-menu-item icon="info" onClick={() => dialog({
|
||||||
|
headline: "原始数据",
|
||||||
|
body: `<span style="word-break: break-word;">${Object.keys(message)
|
||||||
|
// @ts-ignore 懒
|
||||||
|
.map((k) => `${k} = ${message[k]}`)
|
||||||
|
.join('<br><br>')}<span>`,
|
||||||
|
closeOnEsc: true,
|
||||||
|
closeOnOverlayClick: true,
|
||||||
|
actions: [
|
||||||
|
{
|
||||||
|
text: "关闭",
|
||||||
|
onClick: () => {
|
||||||
|
return true
|
||||||
|
},
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}).addEventListener('click', (e) => e.stopPropagation())}>原始数据</mdui-menu-item>
|
||||||
</mdui-menu>
|
</mdui-menu>
|
||||||
</mdui-dropdown>
|
</mdui-dropdown>
|
||||||
</mdui-card>
|
</mdui-card>
|
||||||
|
|||||||
Reference in New Issue
Block a user