diff --git a/src/plugins/icon.ts b/src/plugins/icon.ts index bcc7cd19..3b39f6bb 100644 --- a/src/plugins/icon.ts +++ b/src/plugins/icon.ts @@ -53,8 +53,7 @@ import { ArrowForward as ArrowForwardIcon, Planet as PawIcon, Search as SearchIcon, - Reload as ReloadIcon, - Filter as FilterIcon + Reload as ReloadIcon } from '@vicons/ionicons5' import { @@ -83,7 +82,9 @@ import { FitToScreen as FitToScreenIcon, FitToHeight as FitToHeightIcon, FitToWidth as FitToWidthIcon, - Save as SaveIcon + Save as SaveIcon, + Filter as FilterIcon, + FilterEdit as FilterEditIcon } from '@vicons/carbon' const ionicons5 = { @@ -195,9 +196,7 @@ const ionicons5 = { // 搜索(放大镜) SearchIcon, // 加载 - ReloadIcon, - // 过滤 - FilterIcon + ReloadIcon } const carbon = { @@ -243,7 +242,10 @@ const carbon = { FitToHeightIcon, FitToWidthIcon, // 保存 - SaveIcon + SaveIcon, + // 过滤器 + 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 @@