Compare commits

..

No commits in common. "3b6d998ce1552392e0e0b5b9d5279004c145c94c" and "45eec2ff22afc795e51a39f5bf0dbdbe35be6aba" have entirely different histories.

3 changed files with 7 additions and 12 deletions

View File

@ -68,11 +68,6 @@ export function clipboard(text, callback) {
} }
export async function clipboardImage(src, callback) { export async function clipboardImage(src, callback) {
// 在wujie环境下使用主应用的clipboard
const clipboardObj = window.__POWERED_BY_WUJIE__
? window.parent.navigator.clipboard
: navigator.clipboard
const { state } = await navigator.permissions.query({ const { state } = await navigator.permissions.query({
name: 'clipboard-write' name: 'clipboard-write'
}) })
@ -85,7 +80,7 @@ export async function clipboardImage(src, callback) {
// navigator.clipboard.write 仅支持 png 图片 // navigator.clipboard.write 仅支持 png 图片
if (blob.type == 'image/png') { if (blob.type == 'image/png') {
await clipboardObj.write([ await navigator.clipboard.write([
new ClipboardItem({ new ClipboardItem({
[blob.type]: blob [blob.type]: blob
}) })
@ -104,13 +99,13 @@ export async function clipboardImage(src, callback) {
canvas.width = img.width canvas.width = img.width
canvas.height = img.height canvas.height = img.height
ctx.drawImage(img, 0, 0, canvas.width, canvas.height) ctx.drawImage(img, 0, 0)
canvas.toBlob( canvas.toBlob(
(blob) => { (blob) => {
const data = [new ClipboardItem({ [blob.type]: blob })] const data = [new ClipboardItem({ [blob.type]: blob })]
clipboardObj navigator.clipboard
.write(data) .write(data)
.then(() => { .then(() => {
callback() callback()

View File

@ -182,7 +182,7 @@ const onCopyText = (data: ITalkRecord) => {
return clipboard(htmlDecode(data.extra.content), () => useMessage.success('复制成功')) return clipboard(htmlDecode(data.extra.content), () => useMessage.success('复制成功'))
} }
} }
console.log('data.extra?.url',data.extra?.url)
if (data.extra?.url) { if (data.extra?.url) {
return clipboardImage(data.extra.url, () => { return clipboardImage(data.extra.url, () => {
useMessage.success('复制成功') useMessage.success('复制成功')

View File

@ -46,9 +46,9 @@ export default defineConfig(({ mode }) => {
vueJsx({}), vueJsx({}),
compressPlugin(), compressPlugin(),
UnoCSS(), UnoCSS(),
// vueDevTools({ vueDevTools({
// launchEditor: 'trae', launchEditor: 'trae',
// }) })
], ],
define: { define: {
__APP_ENV__: env.APP_ENV __APP_ENV__: env.APP_ENV