From 38f134f7af3698931b83488ddd5e9f80c4b3cc60 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Thu, 31 Oct 2024 10:00:15 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B7=91=E9=A9=AC=E7=81=AF=E9=A2=84=E8=A7=88?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=8F=AF=E7=BC=96=E8=BE=91=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data-visualization/canvas/ComponentWrapper.vue   | 12 ++++++------
 .../components/data-visualization/canvas/Shape.vue   |  2 +-
 .../src/custom-component/scroll-text/Component.vue   |  9 +++++----
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/core/core-frontend/src/components/data-visualization/canvas/ComponentWrapper.vue b/core/core-frontend/src/components/data-visualization/canvas/ComponentWrapper.vue
index 9d2cd4d504..855b2eade8 100644
--- a/core/core-frontend/src/components/data-visualization/canvas/ComponentWrapper.vue
+++ b/core/core-frontend/src/components/data-visualization/canvas/ComponentWrapper.vue
@@ -378,12 +378,6 @@ const showActive = computed(() => props.popActive || (dvMainStore.mobileInPc &&
       :id="viewDemoInnerId"
       :style="componentBackgroundStyle"
     >
-      <!--边框背景-->
-      <Board
-        v-if="svgInnerEnable"
-        :style="{ color: config.commonBackground.innerImageColor }"
-        :name="commonBackgroundSvgInner"
-      ></Board>
       <div
         class="wrapper-inner-adaptor"
         :style="slotStyle"
@@ -413,6 +407,12 @@ const showActive = computed(() => props.popActive || (dvMainStore.mobileInPc &&
           @onPointClick="onPointClick"
         />
       </div>
+      <!--边框背景-->
+      <Board
+        v-if="svgInnerEnable"
+        :style="{ color: config.commonBackground.innerImageColor, pointerEvents: 'none' }"
+        :name="commonBackgroundSvgInner"
+      ></Board>
     </div>
   </div>
 </template>
diff --git a/core/core-frontend/src/components/data-visualization/canvas/Shape.vue b/core/core-frontend/src/components/data-visualization/canvas/Shape.vue
index 55ff26fe9b..6c1eab82a4 100644
--- a/core/core-frontend/src/components/data-visualization/canvas/Shape.vue
+++ b/core/core-frontend/src/components/data-visualization/canvas/Shape.vue
@@ -53,7 +53,7 @@
         <!--边框背景-->
         <Board
           v-if="svgInnerEnable"
-          :style="{ color: element.commonBackground.innerImageColor }"
+          :style="{ color: element.commonBackground.innerImageColor, pointerEvents: 'none' }"
           :name="commonBackgroundSvgInner"
         ></Board>
       </div>
diff --git a/core/core-frontend/src/custom-component/scroll-text/Component.vue b/core/core-frontend/src/custom-component/scroll-text/Component.vue
index 11dbdf3829..ee4d676e14 100644
--- a/core/core-frontend/src/custom-component/scroll-text/Component.vue
+++ b/core/core-frontend/src/custom-component/scroll-text/Component.vue
@@ -109,10 +109,11 @@ const marqueeTxt = computed(
 )
 
 const setEdit = () => {
-  if (element.value['isLock']) return
-  canEdit.value = true
-  // 全选
-  selectText(text.value)
+  if (['canvas', 'canvasDataV', 'edit'].includes(showPosition.value) && !element.value['isLock']) {
+    canEdit.value = true
+    // 全选
+    selectText(text.value)
+  }
 }
 const selectText = element => {
   const selection = window.getSelection()