Merge pull request 'fix: bug 修复' (#20) from yink into dev
Reviewed-on: https://gitea-inner.fontree.cn/scout666/chat-pc/pulls/20
This commit is contained in:
commit
e806848228
@ -993,6 +993,7 @@ html[theme-mode='dark'] {
|
|||||||
outline: none;
|
outline: none;
|
||||||
.tiptap.ProseMirror{
|
.tiptap.ProseMirror{
|
||||||
height: 100%;
|
height: 100%;
|
||||||
|
white-space: pre-wrap;
|
||||||
}
|
}
|
||||||
.image-upload-loading {
|
.image-upload-loading {
|
||||||
position: relative;
|
position: relative;
|
||||||
|
@ -52,14 +52,14 @@ export function throttle(fn, delay, call = function () {}) {
|
|||||||
* @param {String} text 复制内容
|
* @param {String} text 复制内容
|
||||||
* @param {Function} callback 复制成功回调方法
|
* @param {Function} callback 复制成功回调方法
|
||||||
*/
|
*/
|
||||||
export function clipboard(text, callback) {
|
export async function clipboard(text, callback) {
|
||||||
// 在wujie环境下使用主应用的clipboard
|
// 在wujie环境下使用主应用的clipboard
|
||||||
const clipboardObj = window.__POWERED_BY_WUJIE__
|
const clipboardObj = window.__POWERED_BY_WUJIE__
|
||||||
? window.parent.navigator.clipboard
|
? window.parent.navigator.clipboard
|
||||||
: navigator.clipboard
|
: navigator.clipboard
|
||||||
try {
|
try {
|
||||||
clipboardObj
|
clipboardObj
|
||||||
?.writeText(text)
|
.writeText(text)
|
||||||
.then(() => {
|
.then(() => {
|
||||||
callback && callback()
|
callback && callback()
|
||||||
})
|
})
|
||||||
@ -68,7 +68,7 @@ export function clipboard(text, callback) {
|
|||||||
})
|
})
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.error(e)
|
console.error(e)
|
||||||
toClipboard(text)
|
await toClipboard(text)
|
||||||
callback && callback()
|
callback && callback()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user