fix: 调整报表

src/views/view-all-manage/create-view/index.vue

@@ -106,7 +106,7 @@
             />
           </div>
         </div>
-        <y-chart v-else-if="previewData.type === 'chart'" :chart-cfg="previewData.chartCfg"></y-chart>
+        <y-chart v-else-if="previewData.type === 'chart'" :chart-cfg="previewData.chartCfg" :filter-config="previewData.filter" @toFilt="toPreview"></y-chart>
         <div class="preview-area" v-else>
           <div><BarChartOutlined /></div>
           <div>预览区</div>
@@ -165,7 +165,8 @@ const previewData = reactive({
   columnConfig: [], // 表格表头
   dataList: [], // 表格数据
   filterData: {},
-  chartCfg: {},
+  config: {},
+  filter: [],
   page: 1,
   perPage: 20,
   total: 0,
@@ -246,25 +247,33 @@ const resetPreviewData = () => {
   previewData.total = 0;
 };
 
-const toPreview = () => {
+const toPreview = ({filter}) => {
   previewLoading.value = true;
-  const filter = previewData.filterConfig
-    .filter((item) => {
-      return previewData.filterData[item.name] !== undefined;
-    })
-    .map((item) => {
-      return {
-        name: item.name,
-        type: item.type,
-        value: previewData.filterData[item.name],
-      };
-    });
+  let filterData
+  if (!filter) {
+    
+    filterData = previewData.filterConfig
+      .filter((item) => {
+        return previewData.filterData[item.name] !== undefined;
+      })
+      .map((item) => {
+        return {
+          name: item.name,
+          type: item.type,
+          value: previewData.filterData[item.name],
+        };
+      });
+  } else {
+    filterData = filter;
+  }
+  console.log('filterData',filterData)
+  
   preview({
     modularId: modularId.value,
     fieldIds: fieldIds.value.toString(),
     page: previewData.page,
     perPage: previewData.perPage,
-    filter,
+    filter: filterData,
     showTypeId: showTypeId.value,
     xDataId: xDataId.value?.toString(),
     yDataId: yDataId.value?.toString(),
@@ -283,6 +292,7 @@ const toPreview = () => {
         previewData.total = res.data.count;
       } else {
         previewData.chartCfg = res.data.config;
+        previewData.filter = res.data.filter;
       }
     })
     .finally(() => {