From e7774cb241438ebfe78ed4857f97c08c8cbb55f6 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 27 Jun 2022 14:16:58 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=BF=87=E6=BB=A4=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=BB=98=E8=AE=A4=E9=80=89=E9=A1=B9=E5=90=8E?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=97=A0=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/widget/DeWidget/DeDate.vue       | 3 +++
 .../src/components/widget/DeWidget/DeInputSearch.vue     | 5 ++++-
 .../src/components/widget/DeWidget/DeNumberRange.vue     | 7 +++++--
 frontend/src/components/widget/DeWidget/DeSelect.vue     | 9 ++++++---
 frontend/src/components/widget/DeWidget/DeSelectGrid.vue | 3 +++
 frontend/src/components/widget/DeWidget/DeSelectTree.vue | 7 +++++--
 6 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/frontend/src/components/widget/DeWidget/DeDate.vue b/frontend/src/components/widget/DeWidget/DeDate.vue
index 568ad3d463..83934b8679 100644
--- a/frontend/src/components/widget/DeWidget/DeDate.vue
+++ b/frontend/src/components/widget/DeWidget/DeDate.vue
@@ -130,6 +130,9 @@ export default {
       }
     })
   },
+  beforeDestroy() {
+    bus.$off('reset-default-value')
+  },
   methods: {
     onBlur() {
       this.onFocus = false
diff --git a/frontend/src/components/widget/DeWidget/DeInputSearch.vue b/frontend/src/components/widget/DeWidget/DeInputSearch.vue
index 56987e306c..da83bef29e 100644
--- a/frontend/src/components/widget/DeWidget/DeInputSearch.vue
+++ b/frontend/src/components/widget/DeWidget/DeInputSearch.vue
@@ -2,12 +2,12 @@
 
   <el-input
     v-if="element.options!== null && element.options.attrs!==null"
+    ref="de-input-search"
     v-model="value"
     resize="vertical"
     :placeholder="$t(element.options.attrs.placeholder)"
     :size="size"
     class="de-range-tag"
-    ref="de-input-search"
     @input="valueChange"
     @keypress.enter.native="search"
     @dblclick="setEdit"
@@ -78,6 +78,9 @@ export default {
       }
     })
   },
+  beforeDestroy() {
+    bus.$off('reset-default-value')
+  },
   methods: {
     search() {
       if (!this.inDraw) {
diff --git a/frontend/src/components/widget/DeWidget/DeNumberRange.vue b/frontend/src/components/widget/DeWidget/DeNumberRange.vue
index fcdde09fb5..6a5a5a34b4 100644
--- a/frontend/src/components/widget/DeWidget/DeNumberRange.vue
+++ b/frontend/src/components/widget/DeWidget/DeNumberRange.vue
@@ -3,11 +3,11 @@
   <el-form v-if="element.options!== null && element.options.attrs!==null" ref="form" :model="form" :rules="rules">
     <div class="de-number-range-container">
       <el-form-item prop="min">
-        <el-input ref='de-number-range-min' v-model="form.min" :placeholder="$t(element.options.attrs.placeholder_min)" :size="size" @input="inputChange" @change="handleMinChange" />
+        <el-input ref="de-number-range-min" v-model="form.min" :placeholder="$t(element.options.attrs.placeholder_min)" :size="size" @input="inputChange" @change="handleMinChange" />
       </el-form-item>
       <span>{{ $t('denumberrange.split_placeholder') }}</span>
       <el-form-item prop="max">
-        <el-input ref='de-number-range-max' v-model="form.max" :placeholder="$t(element.options.attrs.placeholder_max)" :size="size" @input="inputChange" @change="handleMaxChange" />
+        <el-input ref="de-number-range-max" v-model="form.max" :placeholder="$t(element.options.attrs.placeholder_max)" :size="size" @input="inputChange" @change="handleMaxChange" />
       </el-form-item>
     </div>
   </el-form>
@@ -115,6 +115,9 @@ export default {
       }
     })
   },
+  beforeDestroy() {
+    bus.$off('reset-default-value')
+  },
   methods: {
     searchWithKey(index) {
       this.timeMachine = setTimeout(() => {
diff --git a/frontend/src/components/widget/DeWidget/DeSelect.vue b/frontend/src/components/widget/DeWidget/DeSelect.vue
index 025bfbe66d..cbbceea3f6 100644
--- a/frontend/src/components/widget/DeWidget/DeSelect.vue
+++ b/frontend/src/components/widget/DeWidget/DeSelect.vue
@@ -37,7 +37,7 @@ import { multFieldValues, linkMultFieldValues } from '@/api/dataset/dataset'
 import bus from '@/utils/bus'
 import { getLinkToken, getToken } from '@/utils/auth'
 import customInput from '@/components/widget/DeWidget/customInput'
-import {  textSelectWidget } from '@/components/widget/DeWidget/serviceNameFn.js'
+import { textSelectWidget } from '@/components/widget/DeWidget/serviceNameFn.js'
 
 export default {
   components: { ElVisualSelect },
@@ -182,6 +182,9 @@ export default {
       }
     })
   },
+  beforeDestroy() {
+    bus.$off('reset-default-value')
+  },
 
   methods: {
     onBlur() {
@@ -189,7 +192,7 @@ export default {
     },
     handleElTagStyle() {
       setTimeout(() => {
-        textSelectWidget(this.$refs["deSelect"].$el, this.element.style)
+        textSelectWidget(this.$refs['deSelect'].$el, this.element.style)
       }, 50)
     },
     initLoad() {
@@ -240,12 +243,12 @@ export default {
     },
 
     setCondition() {
-      console.log(this.element)
       const param = {
         component: this.element,
         value: this.formatFilterValue(),
         operator: this.operator
       }
+      console.log(param.value)
       this.inDraw && this.$store.commit('addViewFilter', param)
     },
     formatFilterValue() {
diff --git a/frontend/src/components/widget/DeWidget/DeSelectGrid.vue b/frontend/src/components/widget/DeWidget/DeSelectGrid.vue
index b94c9af63b..5a66ed6150 100644
--- a/frontend/src/components/widget/DeWidget/DeSelectGrid.vue
+++ b/frontend/src/components/widget/DeWidget/DeSelectGrid.vue
@@ -211,6 +211,9 @@ export default {
       }
     })
   },
+  beforeDestroy() {
+    bus.$off('reset-default-value')
+  },
 
   methods: {
     changeInputStyle() {
diff --git a/frontend/src/components/widget/DeWidget/DeSelectTree.vue b/frontend/src/components/widget/DeWidget/DeSelectTree.vue
index 132277d55f..6907204013 100644
--- a/frontend/src/components/widget/DeWidget/DeSelectTree.vue
+++ b/frontend/src/components/widget/DeWidget/DeSelectTree.vue
@@ -27,7 +27,7 @@ import bus from '@/utils/bus'
 import { getLinkToken, getToken } from '@/utils/auth'
 import ElTreeSelect from '@/components/ElTreeSelect'
 import customInput from '@/components/widget/DeWidget/customInput'
-import {  textSelectWidget } from '@/components/widget/DeWidget/serviceNameFn.js'
+import { textSelectWidget } from '@/components/widget/DeWidget/serviceNameFn.js'
 
 export default {
   components: { ElTreeSelect },
@@ -212,6 +212,9 @@ export default {
       }
     })
   },
+  beforeDestroy() {
+    bus.$off('reset-default-value')
+  },
 
   methods: {
     onFoucs() {
@@ -221,7 +224,7 @@ export default {
     },
     change() {
       setTimeout(() => {
-        console.log(123, this.$refs.deSelectTree.$refs.select.$el);
+        console.log(123, this.$refs.deSelectTree.$refs.select.$el)
         textSelectWidget(this.$refs.deSelectTree.$refs.select.$el, this.element.style)
       }, 50)
     },