Merge pull request #6896 from dataease/pr@dev@perf_filter

perf: 过滤器在编辑页面触发两次请求

core/frontend/src/components/canvas/DeCanvas.vue

@@ -509,7 +509,7 @@ export default {
       this.$store.commit('setComponentWithId', this.currentFilterCom)
       this.$store.commit('recordSnapshot', 'sureFilter')
       this.$store.commit('setCurComponent', { component: this.currentFilterCom, index: this.curComponentIndex })
-      bus.$emit('reset-default-value', this.currentFilterCom.id)
+      bus.$emit('reset-default-value', this.currentFilterCom)
       this.closeFilter()
     },
     reFreshComponent(component) {

core/frontend/src/components/widget/deWidget/DeDate.vue

@@ -418,8 +418,10 @@ export default {
         this.$refs.dateRef.hidePicker()
       }
     },
-    resetDefaultValue(id) {
+    resetDefaultValue(ele) {
-      if (this.inDraw && this.manualModify && this.element.id === id) {
+      const id = ele.id
+      const eleVal = ele.options.value.toString()
+      if (this.inDraw && this.manualModify && this.element.id === id && this.values.toString() !== eleVal && this.defaultValueStr === eleVal) {
         if (!this.element.options.attrs.default.isDynamic) {
           this.values = this.fillValueDerfault()
           this.dateChange(this.values)

core/frontend/src/components/widget/deWidget/DeInputSearch.vue

@@ -99,8 +99,10 @@ export default {
     clearHandler() {
       this.value = null
     },
-    resetDefaultValue(id) {
+    resetDefaultValue(ele) {
-      if (this.inDraw && this.manualModify && this.element.id === id) {
+      const id = ele.id
+      const eleVal = ele.options.value.toString()
+      if (this.inDraw && this.manualModify && this.element.id === id && this.value.toString() !== eleVal && this.defaultValueStr === eleVal) {
         this.value = this.fillValueDerfault()
         this.search()
       }

core/frontend/src/components/widget/deWidget/DeNumberRange.vue

@@ -160,8 +160,10 @@ export default {
       this.form.min = null
       this.form.max = null
     },
-    resetDefaultValue(id) {
+    resetDefaultValue(ele) {
-      if (this.inDraw && this.manualModify && this.element.id === id) {
+      const id = ele.id
+      const eleVal = ele.options.value.toString()
+      if (this.inDraw && this.manualModify && this.element.id === id && this.defaultValueStr === eleVal) {
         if (!this.element.options.value) {
           this.form.min = null
           this.form.max = null

core/frontend/src/components/widget/deWidget/DeSelect.vue

@@ -345,8 +345,10 @@ export default {
         this.$refs.deSelect.$refs.visualSelect.blur()
       }
     },
-    resetDefaultValue(id) {
+    resetDefaultValue(ele) {
-      if (this.inDraw && this.manualModify && this.element.id === id) {
+      const id = ele.id
+      const eleVal = ele.options.value.toString()
+      if (this.inDraw && this.manualModify && this.element.id === id && this.value.toString() !== eleVal && this.defaultValueStr === eleVal) {
         if (this.selectFirst) {
           this.fillFirstValue()
           this.firstChange(this.value)

core/frontend/src/components/widget/deWidget/DeSelectGrid.vue

@@ -282,8 +282,10 @@ export default {
       this.checkAll = false
       this.isIndeterminate = false
     },
-    resetDefaultValue(id) {
+    resetDefaultValue(ele) {
-      if (this.inDraw && this.manualModify && this.element.id === id) {
+      const id = ele.id
+      const eleVal = ele.options.value.toString()
+      if (this.inDraw && this.manualModify && this.element.id === id && this.value.toString() !== eleVal && this.defaultValueStr === eleVal) {
         this.value = this.fillValueDerfault()
         this.changeValue(this.value)
 

core/frontend/src/components/widget/deWidget/DeSelectTree.vue

@@ -234,8 +234,10 @@ export default {
       this.value = this.element.options.attrs.multiple ? [] : null
       this.$refs.deSelectTree && this.$refs.deSelectTree.resetSelectAll && this.$refs.deSelectTree.resetSelectAll()
     },
-    resetDefaultValue(id) {
+    resetDefaultValue(ele) {
-      if (this.inDraw && this.manualModify && this.element.id === id) {
+      const id = ele.id
+      const eleVal = ele.options.value.toString()
+      if (this.inDraw && this.manualModify && this.element.id === id && this.value.toString() !== eleVal && this.defaultValueStr === eleVal) {
         this.value = this.fillValueDerfault()
         this.changeValue(this.value)
       }

core/frontend/src/views/panel/edit/index.vue

@@ -1269,7 +1269,7 @@ export default {
       this.$store.commit('recordSnapshot', 'sureFilter')
       this.$store.commit('setCurComponent', { component: this.currentFilterCom, index: this.curComponentIndex })
       this.$store.commit('setComponentFromList', this.currentFilterCom)
-      bus.$emit('reset-default-value', this.currentFilterCom.id)
+      bus.$emit('reset-default-value', this.currentFilterCom)
       this.closeFilter()
     },
     reFreshComponent(component) {