Merge branch 'dev' into dev-feat-multi-select

src/plugins/icon.ts

@@ -53,7 +53,6 @@ import {
   ArrowForward as ArrowForwardIcon,
   Planet as PawIcon,
   Search as SearchIcon,
-  Filter as FilterIcon
 } from '@vicons/ionicons5'
 
 import {
@@ -83,7 +82,9 @@ import {
   FitToHeight as FitToHeightIcon,
   FitToWidth as FitToWidthIcon,
   Carbon3DCursor as Carbon3DCursorIcon,
-  Carbon3DSoftware as Carbon3DSoftwareIcon
+  Carbon3DSoftware as Carbon3DSoftwareIcon,
+  Filter as FilterIcon,
+  FilterEdit as FilterEditIcon
 } from '@vicons/carbon'
 
 const ionicons5 = {
@@ -243,7 +244,10 @@ const carbon = {
   // 成组
   Carbon3DCursorIcon,
   // 解组
-  Carbon3DSoftwareIcon
+  Carbon3DSoftwareIcon,
+  // 过滤器
+  FilterIcon,
+  FilterEditIcon
 }
 
 // https://www.xicons.org/#/ 还有很多

src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMatchingAndShow/index.vue

@@ -26,8 +26,8 @@
       </n-table>
     </n-timeline-item>
     <n-timeline-item v-show="filterShow" color="#97846c" :title="TimelineTitleEnum.FILTER">
-      <n-space vertical>
-        <n-text depth="3">点击{{ targetData.filter ? '「编辑」' : '「新增」' }}查看过滤规则</n-text>
+      <n-space :size="18" vertical>
+        <n-text depth="3">过滤器将处理接口返回值的「data」字段</n-text>
         <chart-data-monaco-editor></chart-data-monaco-editor>
       </n-space>
     </n-timeline-item>

src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMonacoEditor/index.vue

@@ -9,22 +9,17 @@
       <p>}</p>
       <template #footer>
         <n-space justify="end">
-          <n-button tertiary size="small" @click="delFilter">
-            <template #icon>
-              <n-icon>
-                <trash-icon />
-              </n-icon>
-            </template>
-            删除
-          </n-button>
-          <n-button type="info" tertiary size="small" @click="addFilter">
+          <n-button type="primary" tertiary size="small" @click="addFilter">
             <template #icon>
               <n-icon>
-                <pencil-icon />
+                <filter-edit-icon />
               </n-icon>
             </template>
             编辑
           </n-button>
+          <n-button tertiary size="small" @click="delFilter">
+            删除
+          </n-button>
         </n-space>
       </template>
     </n-card>
@@ -82,13 +77,13 @@
       <template #action>
         <n-space justify="space-between">
           <div class="go-flex-items-center">
-            <n-tag :bordered="false" type="success">
+            <n-tag :bordered="false" type="primary">
               <template #icon>
                 <n-icon :component="DocumentTextIcon" />
               </template>
               规则
             </n-tag>
-            <n-text class="go-ml-2" depth="2">过滤器将对接口返回值的「data」字段进行处理</n-text>
+            <n-text class="go-ml-2" depth="2">过滤器将处理接口返回值的「data」字段</n-text>
           </div>
 
           <n-space>
@@ -111,7 +106,8 @@ import { goDialog, toString } from '@/utils'
 import { http } from '@/api/http'
 import cloneDeep from 'lodash/cloneDeep'
 
-const { PencilIcon, TrashIcon, FilterIcon, DocumentTextIcon } = icon.ionicons5
+const { DocumentTextIcon } = icon.ionicons5
+const { FilterIcon, FilterEditIcon } = icon.carbon
 const { targetData, chartEditStore } = useTargetData()
 const { requestDataType } = toRefs(targetData.value.data)
 const { requestOriginUrl } = toRefs(chartEditStore.getRequestGlobalConfig)