From 1d640d4fa940d6ad355ecaa046f03d7345330037 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Thu, 30 Jun 2022 11:28:26 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=8E=92=E5=BA=8F=E5=AF=BC=E8=87=B4=E4=BB=AA?=
 =?UTF-8?q?=E8=A1=A8=E6=9D=BF=E4=B8=80=E7=9B=B4=E8=AF=B7=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/widget/DeWidget/DeSelectGrid.vue | 3 ++-
 frontend/src/components/widget/DeWidget/DeSelectTree.vue | 6 ++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/widget/DeWidget/DeSelectGrid.vue b/frontend/src/components/widget/DeWidget/DeSelectGrid.vue
index 5a66ed6150..623e92189c 100644
--- a/frontend/src/components/widget/DeWidget/DeSelectGrid.vue
+++ b/frontend/src/components/widget/DeWidget/DeSelectGrid.vue
@@ -40,6 +40,7 @@
 import { multFieldValues, linkMultFieldValues } from '@/api/dataset/dataset'
 import { getLinkToken, getToken } from '@/utils/auth'
 import bus from '@/utils/bus'
+import { isSameVueObj } from '@/utils'
 import { attrsMap, styleAttrs, textSelectGridWidget } from '@/components/widget/DeWidget/serviceNameFn.js'
 
 export default {
@@ -144,7 +145,7 @@ export default {
       }) || (this.element.options.value = '')
     },
     'element.options.attrs.multiple': function(value, old) {
-      if (typeof old === 'undefined' || value === old) return
+      if (typeof old === 'undefined' || value === old || isSameVueObj(value, old)) return
       if (!this.inDraw) {
         this.value = value ? [] : null
         this.element.options.value = ''
diff --git a/frontend/src/components/widget/DeWidget/DeSelectTree.vue b/frontend/src/components/widget/DeWidget/DeSelectTree.vue
index 6907204013..9b65c5dc8a 100644
--- a/frontend/src/components/widget/DeWidget/DeSelectTree.vue
+++ b/frontend/src/components/widget/DeWidget/DeSelectTree.vue
@@ -24,6 +24,7 @@
 <script>
 import { mappingFieldValues, linkMappingFieldValues } from '@/api/dataset/dataset'
 import bus from '@/utils/bus'
+import { isSameVueObj } from '@/utils'
 import { getLinkToken, getToken } from '@/utils/auth'
 import ElTreeSelect from '@/components/ElTreeSelect'
 import customInput from '@/components/widget/DeWidget/customInput'
@@ -170,7 +171,7 @@ export default {
       })
     },
     'element.options.attrs.sort': function(value, old) {
-      if (value === null || typeof value === 'undefined' || value === old) return
+      if (value === null || typeof value === 'undefined' || value === old || isSameVueObj(value, old)) return
       this.datas = []
 
       let method = mappingFieldValues
@@ -224,7 +225,6 @@ export default {
     },
     change() {
       setTimeout(() => {
-        console.log(123, this.$refs.deSelectTree.$refs.select.$el)
         textSelectWidget(this.$refs.deSelectTree.$refs.select.$el, this.element.style)
       }, 50)
     },
@@ -349,11 +349,9 @@ export default {
     },
     // 树点击
     _nodeClickFun(data, node, vm) {
-      console.log('this _nodeClickFun', this.value, data, node)
     },
     // 树过滤
     _searchFun(value) {
-      console.log(value, '<--_searchFun')
       // 自行判断 是走后台查询，还是前端过滤
       this.$refs.deSelectTree.filterFun(value)
       // 后台查询