From 8d49a66435fd84827809701bf62692a2bc21fdc7 Mon Sep 17 00:00:00 2001
From: ShawnPhang <palxiao@vip.qq.com>
Date: Thu, 14 Mar 2024 00:50:30 +0800
Subject: [PATCH] fix: copy&paste bug

---
 .../modules/settings/valueSelect.vue          |  7 +-
 src/mixins/methods/dealWithCtrl.ts            | 17 ++--
 src/mixins/methods/handlePaste.ts             | 84 +++++++++++--------
 src/store/modules/design/actions.ts           |  2 +-
 src/store/modules/design/index.ts             |  1 -
 vite.config.ts                                |  1 +
 6 files changed, 62 insertions(+), 50 deletions(-)

diff --git a/src/components/modules/settings/valueSelect.vue b/src/components/modules/settings/valueSelect.vue
index 9eb6089..73ffd29 100644
--- a/src/components/modules/settings/valueSelect.vue
+++ b/src/components/modules/settings/valueSelect.vue
@@ -65,7 +65,7 @@ import { computed, onMounted, reactive, ref, watch } from 'vue';
 
 type TProps = {
   label?: string
-  modelValue?: Record<string, any>
+  modelValue?: Record<string, any> | string | number
   suffix?: string
   data: Record<string, any>
   disable?: boolean
@@ -189,9 +189,8 @@ function down() {
 </style>
 
 <style lang="less" scoped>
-// Color variables (appears count calculates by raw css)
-@color0: #e1e1e1; // Appears 2 times
-@color1: #d1d1d1; // Appears 2 times
+@color0: #e1e1e1;
+@color1: #d1d1d1;
 
 .value-select {
   // height: 60px;
diff --git a/src/mixins/methods/dealWithCtrl.ts b/src/mixins/methods/dealWithCtrl.ts
index de69185..e7a1df0 100644
--- a/src/mixins/methods/dealWithCtrl.ts
+++ b/src/mixins/methods/dealWithCtrl.ts
@@ -50,7 +50,7 @@ function checkGroupChild(pid: number | string, key: any) {
   return itHas
 }
 /**
- * 复制
+ * 复制元素
  */
 function copy() {
   if (store.getters.dActiveElement.uuid === '-1') {
@@ -64,13 +64,14 @@ function copy() {
  * 粘贴
  */
 function paste() {
-  handlePaste()
-  if (store.getters.dCopyElement.length === 0) {
-    return
-  } else if (store.getters.dActiveElement.isContainer && checkGroupChild(store.getters.dActiveElement.uuid, 'editable')) {
-    return
-  }
-  !store.getters.dActiveElement.editable && store.dispatch('pasteWidget')
+  handlePaste().then(() => {
+    if (store.getters.dCopyElement.length === 0) {
+      return
+    } else if (store.getters.dActiveElement.isContainer && checkGroupChild(store.getters.dActiveElement.uuid, 'editable')) {
+      return
+    }
+    !store.getters.dActiveElement.editable && store.dispatch('pasteWidget')
+  })
 }
 /**
  * 撤销
diff --git a/src/mixins/methods/handlePaste.ts b/src/mixins/methods/handlePaste.ts
index 732001f..037e264 100644
--- a/src/mixins/methods/handlePaste.ts
+++ b/src/mixins/methods/handlePaste.ts
@@ -20,41 +20,53 @@ import wImage from '@/components/modules/widgets/wImage/wImage.vue'
 import wText from '@/components/modules/widgets/wText/wText.vue'
 
 export default () => {
-  navigator.clipboard
-    .read()
-    .then(async (dataTransfer: any) => {
-      for (let i = 0; i < dataTransfer.length; i++) {
-        const item = dataTransfer[i]
-        if (item.types.toString().indexOf('image') !== -1) {
-          const imageBlob = await item.getType(item.types[0])
-          const file = new File([imageBlob], 'screenshot.png', { type: 'image/png' })
-          // 上传图片
-          const qnOptions = { bucket: 'xp-design', prePath: 'user' }
-          const result: any = await Qiniu.upload(file, qnOptions)
-          const { width, height }: any = await getImage(file)
-          const url = _config.IMG_URL + result.key
-          await api.material.addMyPhoto({ width, height, url })
-          // 添加图片到画布中
-          store.commit('setShowMoveable', false) // 清理掉上一次的选择
-          const setting = JSON.parse(JSON.stringify(wImage.setting))
-          setting.width = width
-          setting.height = height
-          setting.imgUrl = url
-          const { width: pW, height: pH } = store.getters.dPage
-          setting.left = pW / 2 - width / 2
-          setting.top = pH / 2 - height / 2
-          store.dispatch('addWidget', setting)
-          break
-        } else if (item.types.toString().indexOf('text') !== -1) {
-          store.commit('setShowMoveable', false) // 清理掉上一次的选择
-          const setting = JSON.parse(JSON.stringify(wText.setting))
-          setting.text = await navigator.clipboard.readText()
-          store.dispatch('addWidget', setting)
-          break
+  return new Promise<void>((resolve) => {
+    navigator.clipboard
+      .read()
+      .then(async (dataTransfer: any) => {
+        if (store.getters.dActiveElement.editable) {
+          return
         }
-      }
-    })
-    .catch((error) => {
-      console.error('无法读取剪贴板内容：', error)
-    })
+        for (let i = 0; i < dataTransfer.length; i++) {
+          const item = dataTransfer[i]
+          if (item.types.toString().indexOf('image') !== -1) {
+            const imageBlob = await item.getType(item.types[0])
+            const file = new File([imageBlob], 'screenshot.png', { type: 'image/png' })
+            // 上传图片
+            const qnOptions = { bucket: 'xp-design', prePath: 'user' }
+            const result: any = await Qiniu.upload(file, qnOptions)
+            const { width, height }: any = await getImage(file)
+            const url = _config.IMG_URL + result.key
+            await api.material.addMyPhoto({ width, height, url })
+            // 添加图片到画布中
+            store.commit('setShowMoveable', false) // 清理掉上一次的选择
+            const setting = JSON.parse(JSON.stringify(wImage.setting))
+            setting.width = width
+            setting.height = height
+            setting.imgUrl = url
+            const { width: pW, height: pH } = store.getters.dPage
+            setting.left = pW / 2 - width / 2
+            setting.top = pH / 2 - height / 2
+            store.dispatch('addWidget', setting)
+            // 清空剪贴板，防止多次上传图片
+            navigator.clipboard.write([
+              new ClipboardItem({
+                'text/plain': new Blob([''], {type: 'text/plain'})
+              })
+            ])
+            break
+          } else if (item.types.toString().indexOf('text') !== -1) {
+            store.commit('setShowMoveable', false) // 清理掉上一次的选择
+            const setting = JSON.parse(JSON.stringify(wText.setting))
+            setting.text = await navigator.clipboard.readText()
+            store.dispatch('addWidget', setting)
+            break
+          }
+        }
+      })
+      .catch((error) => {
+        // 剪贴板内容为空
+        resolve()
+      })
+  })
 }
diff --git a/src/store/modules/design/actions.ts b/src/store/modules/design/actions.ts
index 21096f2..8c215a5 100644
--- a/src/store/modules/design/actions.ts
+++ b/src/store/modules/design/actions.ts
@@ -237,7 +237,7 @@ export default {
     if (activeElement.type === 'page') {
       return
     }
-
+    navigator.clipboard.writeText('') // 清空系统剪贴板内容
     const container = []
     const selectWidgets = store.state.dSelectWidgets
     if (selectWidgets.length === 0) {
diff --git a/src/store/modules/design/index.ts b/src/store/modules/design/index.ts
index 7e9b5e8..9bcef04 100644
--- a/src/store/modules/design/index.ts
+++ b/src/store/modules/design/index.ts
@@ -29,7 +29,6 @@ const all = {
     dDraging: false, // 是否正在抓取组件
     dResizeing: false, // 是否正在调整组件宽高
     dShowRefLine: true, // 是否显示参考线
-
     dResizeWH: {
       // 初始化调整大小时组件的宽高
       width: 0,
diff --git a/vite.config.ts b/vite.config.ts
index d3c3dc8..4e66735 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -58,6 +58,7 @@ export default defineConfig({
   },
   server: {
     hmr: { overlay: false },
+    host: '127.0.0.1'
     // proxy: {
     //   '/api': {
     //     target: '',