From 1145c59db5b373214a7643d5d9dd4c68bc6bfd7a Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 29 Nov 2022 16:00:34 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E8=BF=87=E6=BB=A4=E5=99=A8):=20=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E5=99=A8=E6=9F=A5=E8=AF=A2=E5=87=BA=E7=9A=84=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=E4=B8=8E=E5=AE=9E=E9=99=85=E7=BB=93=E6=9E=9C=E4=B8=8D?=
 =?UTF-8?q?=E7=AC=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canvas/components/editor/ComponentWrapper.vue          | 7 ++++++-
 .../src/components/canvas/components/editor/DeEditor.vue   | 5 +++++
 .../src/components/canvas/components/editor/Preview.vue    | 5 +++++
 .../src/components/canvas/customComponent/UserView.vue     | 7 ++++++-
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/canvas/components/editor/ComponentWrapper.vue b/frontend/src/components/canvas/components/editor/ComponentWrapper.vue
index 639bb5f740..4b8d60a606 100644
--- a/frontend/src/components/canvas/components/editor/ComponentWrapper.vue
+++ b/frontend/src/components/canvas/components/editor/ComponentWrapper.vue
@@ -312,9 +312,14 @@ export default {
       }
     },
     clearHandler() {
-      if (this.$refs.deOutWidget && this.$refs.deOutWidget.clearHandler) {
+      if (this.$refs.deOutWidget?.clearHandler) {
         this.$refs.deOutWidget.clearHandler()
       }
+    },
+    responseResetButton() {
+      if (this.$refs.wrapperChild?.responseResetButton) {
+        this.$refs.wrapperChild.responseResetButton()
+      }
     }
   }
 }
diff --git a/frontend/src/components/canvas/components/editor/DeEditor.vue b/frontend/src/components/canvas/components/editor/DeEditor.vue
index fec084e0b4..6b5c72af68 100644
--- a/frontend/src/components/canvas/components/editor/DeEditor.vue
+++ b/frontend/src/components/canvas/components/editor/DeEditor.vue
@@ -1106,6 +1106,11 @@ export default {
     },
     triggerResetButton() {
       this.triggerSearchButton(true)
+      this.$refs['wrapperChild']?.forEach(item => {
+        if (item?.['responseResetButton']) {
+          item.responseResetButton()
+        }
+      })
     },
     refreshButtonInfo(isClear = false) {
       const result = this.buildButtonFilterMap(this.componentData, isClear)
diff --git a/frontend/src/components/canvas/components/editor/Preview.vue b/frontend/src/components/canvas/components/editor/Preview.vue
index 9c27ac73e7..63dbe117eb 100644
--- a/frontend/src/components/canvas/components/editor/Preview.vue
+++ b/frontend/src/components/canvas/components/editor/Preview.vue
@@ -410,6 +410,11 @@ export default {
     },
     triggerResetButton() {
       this.triggerSearchButton(true)
+      this.$refs['viewWrapperChild']?.forEach(item => {
+        if (item?.responseResetButton) {
+          item.responseResetButton()
+        }
+      })
     },
     triggerSearchButton(isClear = false) {
       const result = this.buildButtonFilterMap(this.componentData, isClear)
diff --git a/frontend/src/components/canvas/customComponent/UserView.vue b/frontend/src/components/canvas/customComponent/UserView.vue
index a6cd3f3a8c..7cfa271f49 100644
--- a/frontend/src/components/canvas/customComponent/UserView.vue
+++ b/frontend/src/components/canvas/customComponent/UserView.vue
@@ -469,7 +469,7 @@ export default {
     },
     'cfilters': {
       handler: function(val1, val2) {
-        if ((isChange(val1, val2) || isChange(val1, this.filters)) && !this.isFirstLoad) {
+        if (isChange(val1, val2) && !this.isFirstLoad) {
           this.getData(this.element.propValue.viewId)
         }
       },
@@ -555,6 +555,11 @@ export default {
     }
   },
   methods: {
+    responseResetButton() {
+      if (!this.cfilters?.length) {
+        this.getData(this.element.propValue.viewId, false)
+      }
+    },
     exportExcel() {
       this.$refs['userViewDialog'].exportExcel()
     },