From f27dd9483ad27ed7b3072dfe84c725a758784480 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Wed, 27 Dec 2023 16:04:32 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=BF=87=E6=BB=A4=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=8A=B6=E6=80=81=E9=80=89=E6=8B=A9=E5=A4=9A?=
 =?UTF-8?q?=E4=B8=AA=E9=80=89=E9=A1=B9=E6=97=A0=E6=B3=95=E8=A2=AB=E9=80=89?=
 =?UTF-8?q?=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/frontend/src/components/dataease/DeOutWidget.vue     | 8 --------
 core/frontend/src/components/deDrag/index.vue             | 2 ++
 core/frontend/src/components/widget/deWidget/DeSelect.vue | 8 ++++++--
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/core/frontend/src/components/dataease/DeOutWidget.vue b/core/frontend/src/components/dataease/DeOutWidget.vue
index 92d7aa40a8..068d0feee9 100644
--- a/core/frontend/src/components/dataease/DeOutWidget.vue
+++ b/core/frontend/src/components/dataease/DeOutWidget.vue
@@ -45,7 +45,6 @@
           </div> -->
           <div class="first-element">
             <div
-              v-clickoutside="lostFocus"
               :class="element.component === 'de-select-grid' ? 'first-element-grid-container': ''"
               :style="deSelectGridBg"
               class="first-element-container"
@@ -78,14 +77,10 @@
 
 <script>
 import inputStyleMixin from '@/components/widget/deWidget/inputStyleMixin'
-import clickoutside from 'element-ui/src/utils/clickoutside.js'
 import { mapState } from 'vuex'
 
 export default {
   name: 'DeOutWidget',
-  directives: {
-    clickoutside
-  },
   mixins: [inputStyleMixin],
   props: {
     canvasId: {
@@ -201,9 +196,6 @@ export default {
     this.$set(this.element.style, 'innerBgColor', innerBgColor || '')
   },
   methods: {
-    lostFocus() {
-      this.$refs['deOutWidget'].selectOnScroll?.()
-    },
     filterLoaded(p) {
       this.$emit('filter-loaded', p)
     },
diff --git a/core/frontend/src/components/deDrag/index.vue b/core/frontend/src/components/deDrag/index.vue
index f32dc985a3..6b55c8f8c9 100644
--- a/core/frontend/src/components/deDrag/index.vue
+++ b/core/frontend/src/components/deDrag/index.vue
@@ -116,6 +116,7 @@ import EditBar from '@/components/canvas/components/editor/EditBar'
 import MobileCheckBar from '@/components/canvas/components/editor/MobileCheckBar'
 import { hexColorToRGBA } from '@/views/chart/chart/util'
 import { imgUrlTrans } from '@/components/canvas/utils/utils'
+import bus from '@/utils/bus'
 
 let eventsFor = events.mouse
 
@@ -717,6 +718,7 @@ export default {
     active(val) {
       this.enabled = val
       if (val) {
+        bus.$emit('select-pop-change', this.element.id)
         this.$emit('activated')
       } else {
         this.$emit('deactivated')
diff --git a/core/frontend/src/components/widget/deWidget/DeSelect.vue b/core/frontend/src/components/widget/deWidget/DeSelect.vue
index 80de849556..d90f88d193 100644
--- a/core/frontend/src/components/widget/deWidget/DeSelect.vue
+++ b/core/frontend/src/components/widget/deWidget/DeSelect.vue
@@ -267,17 +267,21 @@ export default {
 
   mounted() {
     bus.$on('onScroll', this.onScroll)
+    bus.$on('select-pop-change', this.popChange)
     if (this.inDraw) {
       bus.$on('reset-default-value', this.resetDefaultValue)
     }
   },
   beforeDestroy() {
+    bus.$off('select-pop-change', this.popChange)
     bus.$off('onScroll', this.onScroll)
     bus.$off('reset-default-value', this.resetDefaultValue)
   },
   methods: {
-    selectOnScroll() {
-      this.onScroll()
+    popChange(id) {
+      if (id !== this.element.id) {
+        this.onScroll()
+      }
     },
     clearDefault(optionList) {
       const emptyOption = !optionList?.length