diff --git a/src/plugins/icon.ts b/src/plugins/icon.ts index cb016fce..c00bc7fb 100644 --- a/src/plugins/icon.ts +++ b/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 { @@ -81,7 +80,9 @@ import { Scale as ScaleIcon, FitToScreen as FitToScreenIcon, FitToHeight as FitToHeightIcon, - FitToWidth as FitToWidthIcon + FitToWidth as FitToWidthIcon, + Filter as FilterIcon, + FilterEdit as FilterEditIcon } from '@vicons/carbon' const ionicons5 = { @@ -237,7 +238,10 @@ const carbon = { ScaleIcon, FitToScreenIcon, FitToHeightIcon, - FitToWidthIcon + FitToWidthIcon, + // 过滤器 + FilterIcon, + FilterEditIcon } // https://www.xicons.org/#/ 还有很多 diff --git a/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMatchingAndShow/index.vue b/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMatchingAndShow/index.vue index 39d31cef..58f9d001 100644 --- a/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMatchingAndShow/index.vue +++ b/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMatchingAndShow/index.vue @@ -26,8 +26,8 @@ - - 点击{{ targetData.filter ? '「编辑」' : '「新增」' }}查看过滤规则 + + 过滤器将处理接口返回值的「data」字段 diff --git a/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMonacoEditor/index.vue b/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMonacoEditor/index.vue index 7cdf0931..d92569e1 100644 --- a/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMonacoEditor/index.vue +++ b/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMonacoEditor/index.vue @@ -9,22 +9,17 @@

}

@@ -82,13 +77,13 @@