diff --git a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
index fe8f3a5a4e..23716d853b 100644
--- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
+++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
@@ -138,14 +138,16 @@ public class ChartViewService {
         }.getType());
         List<ChartFieldCustomFilterDTO> fieldCustomFilter = new Gson().fromJson(view.getCustomFilter(), new TypeToken<List<ChartFieldCustomFilterDTO>>() {
         }.getType());
-        List<ChartCustomFilterDTO> customFilter = fieldCustomFilter.stream().map(ele -> {
-            ChartCustomFilterDTO dto = new ChartCustomFilterDTO();
-            ele.getFilter().forEach(f -> {
+        List<ChartCustomFilterDTO> customFilter = new ArrayList<>();
+        for (ChartFieldCustomFilterDTO ele : fieldCustomFilter) {
+            List<ChartCustomFilterDTO> collect = ele.getFilter().stream().map(f -> {
+                ChartCustomFilterDTO dto = new ChartCustomFilterDTO();
                 BeanUtils.copyBean(dto, f);
                 dto.setField(dataSetTableFieldsService.get(f.getFieldId()));
-            });
-            return dto;
-        }).collect(Collectors.toList());
+                return dto;
+            }).collect(Collectors.toList());
+            customFilter.addAll(collect);
+        }
 
         if (StringUtils.equalsIgnoreCase("text", view.getType()) || StringUtils.equalsIgnoreCase("gauge", view.getType())) {
             xAxis = new ArrayList<>();
diff --git a/frontend/src/views/dataset/add/AddCustom.vue b/frontend/src/views/dataset/add/AddCustom.vue
index a5b058a2aa..64031a1c50 100644
--- a/frontend/src/views/dataset/add/AddCustom.vue
+++ b/frontend/src/views/dataset/add/AddCustom.vue
@@ -88,6 +88,11 @@ export default {
     }
   },
   watch: {
+    'param.tableId': {
+      handler: function() {
+        this.resetComponent()
+      }
+    },
     'checkedList': function() {
       // console.log(this.checkedList)
       this.getUnionData()
@@ -239,8 +244,15 @@ export default {
       }
     },
 
-    dataReset() {
-
+    resetComponent() {
+      this.name = '自定义数据集'
+      this.table = {}
+      this.checkedList = []
+      this.unionData = []
+      this.height = 500
+      this.data = []
+      this.fields = []
+      this.customType = ['db', 'sql', 'excel']
     }
   }
 
diff --git a/frontend/src/views/dataset/add/AddSQL.vue b/frontend/src/views/dataset/add/AddSQL.vue
index 759c5f6ccd..4cb93f2393 100644
--- a/frontend/src/views/dataset/add/AddSQL.vue
+++ b/frontend/src/views/dataset/add/AddSQL.vue
@@ -163,6 +163,7 @@ export default {
   watch: {
     'param.tableId': {
       handler: function() {
+        this.resetComponent()
         this.initTableInfo()
       }
     }
@@ -283,7 +284,7 @@ export default {
     cancel() {
       // this.dataReset()
       if (this.param.tableId) {
-        this.$emit('switchComponent', { name: 'ViewTable', param: this.param.table})
+        this.$emit('switchComponent', { name: 'ViewTable', param: this.param.table })
       } else {
         this.$emit('switchComponent', { name: '' })
       }
@@ -302,6 +303,20 @@ export default {
       // console.log(newCode)
       this.sql = newCode
       this.$emit('codeChange', this.sql)
+    },
+
+    resetComponent() {
+      this.dataSource = ''
+      this.options = []
+      this.name = ''
+      this.sql = ''
+      this.data = []
+      this.fields = []
+      this.mode = '0'
+      this.syncType = 'sync_now'
+      this.height = 500
+      this.kettleRunning = false
+      this.$refs.plxTable.reloadData(this.data)
     }
   }
 }