From df2627bd9f302909d287a076875b373c807a1229 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 4 Dec 2023 15:08:16 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E5=BF=AB=E6=8D=B7=E9=94=AE=E5=8F=8D=E5=A4=8D=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E6=A1=8C=E9=9D=A2=E5=BA=94=E7=94=A8=E5=AF=BC=E8=87=B4=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F=E7=BB=84=E4=BB=B6=E7=A7=BB?=
 =?UTF-8?q?=E5=8A=A8=E5=A4=B1=E6=95=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/custom-component/picture/Component.vue             | 7 ++++++-
 core/core-frontend/src/utils/DeShortcutKey.ts              | 7 +++++++
 core/core-frontend/src/views/data-visualization/index.vue  | 4 +++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/core/core-frontend/src/custom-component/picture/Component.vue b/core/core-frontend/src/custom-component/picture/Component.vue
index c66942658d..025e37216c 100644
--- a/core/core-frontend/src/custom-component/picture/Component.vue
+++ b/core/core-frontend/src/custom-component/picture/Component.vue
@@ -1,6 +1,11 @@
 <template>
   <div class="pic-main">
-    <img v-if="propValue['url']" :style="imageAdapter" :src="imgUrlTrans(propValue['url'])" />
+    <img
+      draggable="false"
+      v-if="propValue['url']"
+      :style="imageAdapter"
+      :src="imgUrlTrans(propValue['url'])"
+    />
     <div v-else class="pic-upload">
       <span
         ><el-button @click="uploadImg" text style="color: #646a73" icon="Plus"
diff --git a/core/core-frontend/src/utils/DeShortcutKey.ts b/core/core-frontend/src/utils/DeShortcutKey.ts
index ebad9f89a8..19d4611046 100644
--- a/core/core-frontend/src/utils/DeShortcutKey.ts
+++ b/core/core-frontend/src/utils/DeShortcutKey.ts
@@ -142,6 +142,13 @@ export function listenGlobalKeyDown() {
   }
 }
 
+export function releaseAttachKey() {
+  isCtrlOrCommandDown = false
+  composeStore.setIsCtrlOrCmdDownStatus(false)
+  isShiftDown = false
+  composeStore.setIsShiftDownStatus(false)
+}
+
 //当前不支持同时ctrl + shift操作
 function releaseKeyCheck() {
   if (isCtrlOrCommandDown && isShiftDown) {
diff --git a/core/core-frontend/src/views/data-visualization/index.vue b/core/core-frontend/src/views/data-visualization/index.vue
index 42559535e0..08bbf38f94 100644
--- a/core/core-frontend/src/views/data-visualization/index.vue
+++ b/core/core-frontend/src/views/data-visualization/index.vue
@@ -19,7 +19,7 @@ import { getDatasetTree } from '@/api/dataset'
 import { Tree } from '@/views/visualized/data/dataset/form/CreatDsGroup.vue'
 import { findDragComponent, findNewComponent, initCanvasData } from '@/utils/canvasUtils'
 import CanvasCore from '@/components/data-visualization/canvas/CanvasCore.vue'
-import { listenGlobalKeyDown } from '@/utils/DeShortcutKey'
+import { listenGlobalKeyDown, releaseAttachKey } from '@/utils/DeShortcutKey'
 import { adaptCurThemeCommonStyle } from '@/utils/canvasStyle'
 import { changeComponentSizeWithScale } from '@/utils/changeComponentsSizeWithScale'
 import { useEmitt } from '@/hooks/web/useEmitt'
@@ -175,6 +175,7 @@ watch(
 )
 
 onMounted(() => {
+  window.addEventListener('blur', releaseAttachKey)
   if (editMode.value === 'edit') {
     window.addEventListener('storage', eventCheck)
   }
@@ -224,6 +225,7 @@ onMounted(() => {
 
 onUnmounted(() => {
   window.removeEventListener('storage', eventCheck)
+  window.removeEventListener('blur', releaseAttachKey)
 })
 
 const previewStatus = computed(() => editMode.value === 'preview')