From 424498f8e3ba1e0d1eeafdc3e73214c84155c1d9 Mon Sep 17 00:00:00 2001 From: ulleo Date: Fri, 20 Sep 2024 16:07:30 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=8F=8C=E8=BD=B4=E5=9B=BE=E6=8A=98=E7=BA=BF=E5=9B=BE=E6=A0=87?= =?UTF-8?q?=E7=BC=BA=E5=A4=B1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/assets/svg/chart-mix-dual-line-dark.svg | 7 +++++++ .../src/assets/svg/chart-mix-dual-line-origin.svg | 4 ++++ core/core-frontend/src/assets/svg/chart-mix-dual-line.svg | 5 +++++ .../src/components/data-visualization/RealTimeGroup.vue | 2 ++ .../src/components/data-visualization/RealTimeListTree.vue | 2 ++ .../src/components/icon-group/chart-dark-list.ts | 2 ++ core/core-frontend/src/components/icon-group/chart-list.ts | 2 ++ .../src/views/chart/components/editor/util/chart.ts | 2 +- 8 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 core/core-frontend/src/assets/svg/chart-mix-dual-line-dark.svg create mode 100644 core/core-frontend/src/assets/svg/chart-mix-dual-line-origin.svg create mode 100644 core/core-frontend/src/assets/svg/chart-mix-dual-line.svg diff --git a/core/core-frontend/src/assets/svg/chart-mix-dual-line-dark.svg b/core/core-frontend/src/assets/svg/chart-mix-dual-line-dark.svg new file mode 100644 index 0000000000..c3819a1f67 --- /dev/null +++ b/core/core-frontend/src/assets/svg/chart-mix-dual-line-dark.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/core/core-frontend/src/assets/svg/chart-mix-dual-line-origin.svg b/core/core-frontend/src/assets/svg/chart-mix-dual-line-origin.svg new file mode 100644 index 0000000000..43f590b6df --- /dev/null +++ b/core/core-frontend/src/assets/svg/chart-mix-dual-line-origin.svg @@ -0,0 +1,4 @@ + + + + diff --git a/core/core-frontend/src/assets/svg/chart-mix-dual-line.svg b/core/core-frontend/src/assets/svg/chart-mix-dual-line.svg new file mode 100644 index 0000000000..f2b52d592a --- /dev/null +++ b/core/core-frontend/src/assets/svg/chart-mix-dual-line.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/core/core-frontend/src/components/data-visualization/RealTimeGroup.vue b/core/core-frontend/src/components/data-visualization/RealTimeGroup.vue index 2ed822d42c..af1b3b8a8d 100644 --- a/core/core-frontend/src/components/data-visualization/RealTimeGroup.vue +++ b/core/core-frontend/src/components/data-visualization/RealTimeGroup.vue @@ -25,6 +25,7 @@ import bubbleMapOrigin from '@/assets/svg/bubble-map-origin.svg' import chartMixGroupOrigin from '@/assets/svg/chart-mix-group-origin.svg' import chartMixOrigin from '@/assets/svg/chart-mix-origin.svg' import chartMixStackOrigin from '@/assets/svg/chart-mix-stack-origin.svg' +import chartMixDualLineOrigin from '@/assets/svg/chart-mix-dual-line-origin.svg' import flowMapOrigin from '@/assets/svg/flow-map-origin.svg' import funnelOrigin from '@/assets/svg/funnel-origin.svg' import gaugeOrigin from '@/assets/svg/gauge-origin.svg' @@ -201,6 +202,7 @@ const iconMap = { 'chart-mix-group-origin': chartMixGroupOrigin, 'chart-mix-origin': chartMixOrigin, 'chart-mix-stack-origin': chartMixStackOrigin, + 'chart-mix-dual-line': chartMixDualLineOrigin, 'flow-map-origin': flowMapOrigin, 'funnel-origin': funnelOrigin, 'gauge-origin': gaugeOrigin, diff --git a/core/core-frontend/src/components/data-visualization/RealTimeListTree.vue b/core/core-frontend/src/components/data-visualization/RealTimeListTree.vue index ce54ba7774..bf569967c9 100644 --- a/core/core-frontend/src/components/data-visualization/RealTimeListTree.vue +++ b/core/core-frontend/src/components/data-visualization/RealTimeListTree.vue @@ -25,6 +25,7 @@ import bubbleMapOrigin from '@/assets/svg/bubble-map-origin.svg' import chartMixGroupOrigin from '@/assets/svg/chart-mix-group-origin.svg' import chartMixOrigin from '@/assets/svg/chart-mix-origin.svg' import chartMixStackOrigin from '@/assets/svg/chart-mix-stack-origin.svg' +import chartMixDualLineOrigin from '@/assets/svg/chart-mix-dual-line-origin.svg' import flowMapOrigin from '@/assets/svg/flow-map-origin.svg' import funnelOrigin from '@/assets/svg/funnel-origin.svg' import gaugeOrigin from '@/assets/svg/gauge-origin.svg' @@ -292,6 +293,7 @@ const iconMap = { 'chart-mix-group-origin': chartMixGroupOrigin, 'chart-mix-origin': chartMixOrigin, 'chart-mix-stack-origin': chartMixStackOrigin, + 'chart-mix-dual-line-origin': chartMixDualLineOrigin, 'flow-map-origin': flowMapOrigin, 'funnel-origin': funnelOrigin, 'gauge-origin': gaugeOrigin, diff --git a/core/core-frontend/src/components/icon-group/chart-dark-list.ts b/core/core-frontend/src/components/icon-group/chart-dark-list.ts index 21d8b090d0..fafc88eb6f 100644 --- a/core/core-frontend/src/components/icon-group/chart-dark-list.ts +++ b/core/core-frontend/src/components/icon-group/chart-dark-list.ts @@ -12,6 +12,7 @@ import bubbleMapDark from '@/assets/svg/bubble-map-dark.svg' import chartMixDark from '@/assets/svg/chart-mix-dark.svg' import chartMixGroupDark from '@/assets/svg/chart-mix-group-dark.svg' import chartMixStackDark from '@/assets/svg/chart-mix-stack-dark.svg' +import chartMixDualLineDark from '@/assets/svg/chart-mix-dual-line-dark.svg' import flowMapDark from '@/assets/svg/flow-map-dark.svg' import funnelDark from '@/assets/svg/funnel-dark.svg' import gaugeDark from '@/assets/svg/gauge-dark.svg' @@ -57,6 +58,7 @@ const iconChartDarkMap = { 'chart-mix-dark': chartMixDark, 'chart-mix-group-dark': chartMixGroupDark, 'chart-mix-stack-dark': chartMixStackDark, + 'chart-mix-dual-line-dark': chartMixDualLineDark, 'flow-map-dark': flowMapDark, 'funnel-dark': funnelDark, 'gauge-dark': gaugeDark, diff --git a/core/core-frontend/src/components/icon-group/chart-list.ts b/core/core-frontend/src/components/icon-group/chart-list.ts index 7ac375750f..fd28cbf6bb 100644 --- a/core/core-frontend/src/components/icon-group/chart-list.ts +++ b/core/core-frontend/src/components/icon-group/chart-list.ts @@ -11,6 +11,7 @@ import bidirectionalBar from '@/assets/svg/bidirectional-bar.svg' import bubbleMap from '@/assets/svg/bubble-map.svg' import chartMixGroup from '@/assets/svg/chart-mix-group.svg' import chartMixStack from '@/assets/svg/chart-mix-stack.svg' +import chartMixDualLine from '@/assets/svg/chart-mix-dual-line.svg' import chartMix from '@/assets/svg/chart-mix.svg' import flowMap from '@/assets/svg/flow-map.svg' import funnel from '@/assets/svg/funnel.svg' @@ -57,6 +58,7 @@ const iconChartMap = { 'bubble-map': bubbleMap, 'chart-mix-group': chartMixGroup, 'chart-mix-stack': chartMixStack, + 'chart-mix-dual-line': chartMixDualLine, 'chart-mix': chartMix, 'flow-map': flowMap, funnel: funnel, diff --git a/core/core-frontend/src/views/chart/components/editor/util/chart.ts b/core/core-frontend/src/views/chart/components/editor/util/chart.ts index 41dcbf0c24..bfb2fc71db 100644 --- a/core/core-frontend/src/views/chart/components/editor/util/chart.ts +++ b/core/core-frontend/src/views/chart/components/editor/util/chart.ts @@ -1488,7 +1488,7 @@ export const CHART_TYPE_CONFIGS = [ category: 'dual_axes', value: 'chart-mix-dual-line', title: t('chart.chart_mix_dual_line'), - icon: 'line' + icon: 'chart-mix-dual-line' } ] },