From 05f3ba9f4c69bb234eb4467e03c7a1d932b1c94f Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Thu, 25 Jul 2024 13:47:16 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F):?=
 =?UTF-8?q?=20=E9=9A=90=E8=97=8F=E5=8C=BA=E5=9F=9F=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=80=89=E4=B8=AD=E8=BE=B9=E6=A1=86=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data-visualization/canvas/ComponentWrapper.vue     | 10 +++++-----
 .../src/custom-component/pop-area/Component.vue        |  7 +++++++
 2 files changed, 12 insertions(+), 5 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 a74bb9eaca..7c6523ce9f 100644
--- a/core/core-frontend/src/components/data-visualization/canvas/ComponentWrapper.vue
+++ b/core/core-frontend/src/components/data-visualization/canvas/ComponentWrapper.vue
@@ -19,6 +19,10 @@ const props = defineProps({
     type: Boolean,
     default: false
   },
+  popActive: {
+    type: Boolean,
+    default: false
+  },
   canvasStyleData: {
     type: Object,
     required: true
@@ -192,10 +196,6 @@ const onPointClick = param => {
   emits('onPointClick', param)
 }
 
-const innerOutActive = computed(() => {
-  return config.value.category === 'hidden' && showPosition.value === 'popEdit'
-})
-
 const deepScale = computed(() => scale.value / 100)
 </script>
 
@@ -232,7 +232,7 @@ const deepScale = computed(() => scale.value / 100)
         :style="{ color: config.commonBackground.innerImageColor }"
         :name="commonBackgroundSvgInner"
       ></Board>
-      <div class="wrapper-inner-adaptor" :class="{ 'pop-wrapper-inner': innerOutActive }">
+      <div class="wrapper-inner-adaptor" :class="{ 'pop-wrapper-inner': popActive }">
         <component
           :is="findComponent(config['component'])"
           :view="viewInfo"
diff --git a/core/core-frontend/src/custom-component/pop-area/Component.vue b/core/core-frontend/src/custom-component/pop-area/Component.vue
index 5db861ed88..2bcc706465 100644
--- a/core/core-frontend/src/custom-component/pop-area/Component.vue
+++ b/core/core-frontend/src/custom-component/pop-area/Component.vue
@@ -18,6 +18,7 @@
           :config="item"
           :index="index"
           :dv-info="dvInfo"
+          :pop-active="curActive(item)"
           :show-position="showPosition"
           :style="customPopStyle"
           :scale="innerScale"
@@ -49,6 +50,7 @@ import { snapshotStoreWithOut } from '@/store/modules/data-visualization/snapsho
 import eventBus from '@/utils/eventBus'
 import ComponentWrapper from '@/components/data-visualization/canvas/ComponentWrapper.vue'
 import { ElMessage } from 'element-plus-secondary'
+import { storeToRefs } from 'pinia'
 const dvMainStore = dvMainStoreWithOut()
 const snapshotStore = snapshotStoreWithOut()
 const areaActive = ref(false)
@@ -91,6 +93,7 @@ const props = defineProps({
 })
 
 const { canvasStyleData, popComponentData, canvasViewInfo, scale, canvasState } = toRefs(props)
+const { curComponent } = storeToRefs(dvMainStore)
 const baseStyle = computed(() => {
   return {
     fontSize: 30 * props.scale + 'px',
@@ -102,6 +105,10 @@ const innerScale = computed(() =>
   props.showPosition === 'preview' ? props.scale : props.scale * 100
 )
 
+const curActive = item => {
+  return curComponent.value?.id === item.id && props.showPosition === 'popEdit'
+}
+
 const handleDragOver = e => {
   areaActive.value = true
   e.preventDefault()