From 0f2d1ff5d50485e1fe0ee5a7c2e4b065194e670a Mon Sep 17 00:00:00 2001
From: ulleo <ulleo.wang@gmail.com>
Date: Thu, 13 Jun 2024 15:58:36 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E5=9B=BE=E8=A1=A8):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=88=86=E7=BB=84=E6=9F=B1=E7=BA=BF=E7=BB=84=E5=90=88=E5=9B=BE?=
 =?UTF-8?q?&=E5=A0=86=E5=8F=A0=E6=9F=B1=E7=BA=BF=E7=BB=84=E5=90=88?=
 =?UTF-8?q?=E5=9B=BE=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/assets/svg/chart-mix-group-dark.svg          |  8 ++++++++
 .../core-frontend/src/assets/svg/chart-mix-group.svg |  8 ++++++++
 .../src/assets/svg/chart-mix-stack-dark.svg          | 12 ++++++++++++
 .../core-frontend/src/assets/svg/chart-mix-stack.svg | 12 ++++++++++++
 .../src/views/chart/components/editor/util/chart.ts  |  4 ++--
 5 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 core/core-frontend/src/assets/svg/chart-mix-group-dark.svg
 create mode 100644 core/core-frontend/src/assets/svg/chart-mix-group.svg
 create mode 100644 core/core-frontend/src/assets/svg/chart-mix-stack-dark.svg
 create mode 100644 core/core-frontend/src/assets/svg/chart-mix-stack.svg

diff --git a/core/core-frontend/src/assets/svg/chart-mix-group-dark.svg b/core/core-frontend/src/assets/svg/chart-mix-group-dark.svg
new file mode 100644
index 0000000000..a9219914cf
--- /dev/null
+++ b/core/core-frontend/src/assets/svg/chart-mix-group-dark.svg
@@ -0,0 +1,8 @@
+<svg width="80" height="56" viewBox="0 0 80 56" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7 2.00391V51.0016L76 51.0016L76 54.0016H4V2.00391H7Z" fill="#434343"/>
+<path d="M25 4.5C25 4.22386 25.2239 4 25.5 4H34.5C34.7761 4 35 4.22386 35 4.5V48.5C35 48.7761 34.7761 49 34.5 49H25.5C25.2239 49 25 48.7761 25 48.5V4.5Z" fill="#1F4399"/>
+<path d="M12 29.5C12 29.2239 12.2239 29 12.5 29H21.5C21.7761 29 22 29.2239 22 29.5V48.5C22 48.7761 21.7761 49 21.5 49H12.5C12.2239 49 12 48.7761 12 48.5V29.5Z" fill="#3370FF"/>
+<path d="M47 19.5C47 19.2239 47.2239 19 47.5 19H56.5C56.7761 19 57 19.2239 57 19.5V48.5C57 48.7761 56.7761 49 56.5 49H47.5C47.2239 49 47 48.7761 47 48.5V19.5Z" fill="#3370FF"/>
+<path d="M60 36.5C60 36.2239 60.2239 36 60.5 36H69.5C69.7761 36 70 36.2239 70 36.5V48.5C70 48.7761 69.7761 49 69.5 49H60.5C60.2239 49 60 48.7761 60 48.5V36.5Z" fill="#1F4399"/>
+<path d="M37.686 5.23115C37.2792 4.8243 36.6138 4.84386 36.2315 5.27389L34.8455 6.83278C34.1868 7.57357 33.2442 8.63334 32.1089 9.90925C29.8382 12.4611 26.7969 15.8774 23.714 19.3352C17.5164 26.2866 11.2327 33.3131 10.6063 33.9395C10.0205 34.5252 10.0205 35.475 10.6063 36.0608C11.1921 36.6466 12.1419 36.6466 12.7277 36.0608C13.4346 35.3538 19.8175 28.2137 25.9533 21.3317C29.0371 17.8728 32.0791 14.4558 34.3501 11.9035C35.4725 10.6421 36.4066 9.59185 37.0644 8.85216L49.5834 21.3711C49.9141 21.7019 50.43 21.7592 50.8253 21.509L72.851 7.56895L72.8605 7.56229C73.5392 7.08722 73.7043 6.15192 73.2292 5.47325C72.7567 4.7983 71.8291 4.63135 71.1513 5.09682L50.5191 18.0642L37.686 5.23115Z" fill="#00D6B9"/>
+</svg>
diff --git a/core/core-frontend/src/assets/svg/chart-mix-group.svg b/core/core-frontend/src/assets/svg/chart-mix-group.svg
new file mode 100644
index 0000000000..bd4a09635c
--- /dev/null
+++ b/core/core-frontend/src/assets/svg/chart-mix-group.svg
@@ -0,0 +1,8 @@
+<svg width="80" height="56" viewBox="0 0 80 56" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7 2.00391V51.0016L76 51.0016L76 54.0016H4V2.00391H7Z" fill="#DEE0E3"/>
+<path d="M25 4.5C25 4.22386 25.2239 4 25.5 4H34.5C34.7761 4 35 4.22386 35 4.5V48.5C35 48.7761 34.7761 49 34.5 49H25.5C25.2239 49 25 48.7761 25 48.5V4.5Z" fill="#ADC6FF"/>
+<path d="M12 29.5C12 29.2239 12.2239 29 12.5 29H21.5C21.7761 29 22 29.2239 22 29.5V48.5C22 48.7761 21.7761 49 21.5 49H12.5C12.2239 49 12 48.7761 12 48.5V29.5Z" fill="#3370FF"/>
+<path d="M47 19.5C47 19.2239 47.2239 19 47.5 19H56.5C56.7761 19 57 19.2239 57 19.5V48.5C57 48.7761 56.7761 49 56.5 49H47.5C47.2239 49 47 48.7761 47 48.5V19.5Z" fill="#3370FF"/>
+<path d="M60 36.5C60 36.2239 60.2239 36 60.5 36H69.5C69.7761 36 70 36.2239 70 36.5V48.5C70 48.7761 69.7761 49 69.5 49H60.5C60.2239 49 60 48.7761 60 48.5V36.5Z" fill="#ADC6FF"/>
+<path d="M37.686 5.23115C37.2792 4.8243 36.6138 4.84386 36.2315 5.27389L34.8455 6.83278C34.1868 7.57357 33.2442 8.63334 32.1089 9.90925C29.8382 12.4611 26.7969 15.8774 23.714 19.3352C17.5164 26.2866 11.2327 33.3131 10.6063 33.9395C10.0205 34.5252 10.0205 35.475 10.6063 36.0608C11.1921 36.6466 12.1419 36.6466 12.7277 36.0608C13.4346 35.3538 19.8175 28.2137 25.9533 21.3317C29.0371 17.8728 32.0791 14.4558 34.3501 11.9035C35.4725 10.6421 36.4066 9.59185 37.0644 8.85216L49.5834 21.3711C49.9141 21.7019 50.43 21.7592 50.8253 21.509L72.851 7.56895L72.8605 7.56229C73.5392 7.08722 73.7043 6.15192 73.2292 5.47325C72.7567 4.7983 71.8291 4.63135 71.1513 5.09682L50.5191 18.0642L37.686 5.23115Z" fill="#00D6B9"/>
+</svg>
diff --git a/core/core-frontend/src/assets/svg/chart-mix-stack-dark.svg b/core/core-frontend/src/assets/svg/chart-mix-stack-dark.svg
new file mode 100644
index 0000000000..b4edc0e563
--- /dev/null
+++ b/core/core-frontend/src/assets/svg/chart-mix-stack-dark.svg
@@ -0,0 +1,12 @@
+<svg width="80" height="56" viewBox="0 0 80 56" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7 2.00391V51.0016L76 51.0016L76 54.0016H4V2.00391H7Z" fill="#434343"/>
+<path d="M12 30.5C12 30.2239 12.2239 30 12.5 30H21.5C21.7761 30 22 30.2239 22 30.5V37H12V30.5Z" fill="#1F4399"/>
+<path d="M12 38H22V48.5C22 48.7761 21.7761 49 21.5 49H12.5C12.2239 49 12 48.7761 12 48.5V38Z" fill="#3370FF"/>
+<path d="M28 4.5C28 4.22386 28.2239 4 28.5 4H37.5C37.7761 4 38 4.22386 38 4.5V16H28V4.5Z" fill="#1F4399"/>
+<path d="M28 17H38V48.5C38 48.7761 37.7761 49 37.5 49H28.5C28.2239 49 28 48.7761 28 48.5V17Z" fill="#3370FF"/>
+<path d="M44 19.5C44 19.2239 44.2239 19 44.5 19H53.5C53.7761 19 54 19.2239 54 19.5V31H44V19.5Z" fill="#1F4399"/>
+<path d="M44 32H54V48.5C54 48.7761 53.7761 49 53.5 49H44.5C44.2239 49 44 48.7761 44 48.5V32Z" fill="#3370FF"/>
+<path d="M60 36.5C60 36.2239 60.2239 36 60.5 36H69.5C69.7761 36 70 36.2239 70 36.5V41H60V36.5Z" fill="#1F4399"/>
+<path d="M60 42H70V48.5C70 48.7761 69.7761 49 69.5 49H60.5C60.2239 49 60 48.7761 60 48.5V42Z" fill="#3370FF"/>
+<path d="M37.686 5.23115C37.2792 4.8243 36.6138 4.84386 36.2315 5.27389L34.8455 6.83278C34.1868 7.57357 33.2442 8.63334 32.1089 9.90925C29.8382 12.4611 26.7969 15.8774 23.714 19.3352C17.5164 26.2866 11.2327 33.3131 10.6063 33.9395C10.0205 34.5252 10.0205 35.475 10.6063 36.0608C11.1921 36.6466 12.1419 36.6466 12.7277 36.0608C13.4346 35.3538 19.8175 28.2137 25.9533 21.3317C29.0371 17.8728 32.0791 14.4558 34.3501 11.9035C35.4725 10.6421 36.4066 9.59185 37.0644 8.85216L49.5834 21.3711C49.9141 21.7019 50.43 21.7592 50.8253 21.509L72.851 7.56895L72.8605 7.56229C73.5392 7.08722 73.7043 6.15192 73.2292 5.47325C72.7567 4.7983 71.8291 4.63135 71.1513 5.09682L50.5191 18.0642L37.686 5.23115Z" fill="#00D6B9"/>
+</svg>
diff --git a/core/core-frontend/src/assets/svg/chart-mix-stack.svg b/core/core-frontend/src/assets/svg/chart-mix-stack.svg
new file mode 100644
index 0000000000..4fd947c892
--- /dev/null
+++ b/core/core-frontend/src/assets/svg/chart-mix-stack.svg
@@ -0,0 +1,12 @@
+<svg width="80" height="56" viewBox="0 0 80 56" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7 2.00391V51.0016L76 51.0016L76 54.0016H4V2.00391H7Z" fill="#DEE0E3"/>
+<path d="M12 30.5C12 30.2239 12.2239 30 12.5 30H21.5C21.7761 30 22 30.2239 22 30.5V37H12V30.5Z" fill="#ADC6FF"/>
+<path d="M12 38H22V48.5C22 48.7761 21.7761 49 21.5 49H12.5C12.2239 49 12 48.7761 12 48.5V38Z" fill="#3370FF"/>
+<path d="M28 4.5C28 4.22386 28.2239 4 28.5 4H37.5C37.7761 4 38 4.22386 38 4.5V16H28V4.5Z" fill="#ADC6FF"/>
+<path d="M28 17H38V48.5C38 48.7761 37.7761 49 37.5 49H28.5C28.2239 49 28 48.7761 28 48.5V17Z" fill="#3370FF"/>
+<path d="M44 19.5C44 19.2239 44.2239 19 44.5 19H53.5C53.7761 19 54 19.2239 54 19.5V31H44V19.5Z" fill="#ADC6FF"/>
+<path d="M44 32H54V48.5C54 48.7761 53.7761 49 53.5 49H44.5C44.2239 49 44 48.7761 44 48.5V32Z" fill="#3370FF"/>
+<path d="M60 36.5C60 36.2239 60.2239 36 60.5 36H69.5C69.7761 36 70 36.2239 70 36.5V41H60V36.5Z" fill="#ADC6FF"/>
+<path d="M60 42H70V48.5C70 48.7761 69.7761 49 69.5 49H60.5C60.2239 49 60 48.7761 60 48.5V42Z" fill="#3370FF"/>
+<path d="M37.686 5.23115C37.2792 4.8243 36.6138 4.84386 36.2315 5.27389L34.8455 6.83278C34.1868 7.57357 33.2442 8.63334 32.1089 9.90925C29.8382 12.4611 26.7969 15.8774 23.714 19.3352C17.5164 26.2866 11.2327 33.3131 10.6063 33.9395C10.0205 34.5252 10.0205 35.475 10.6063 36.0608C11.1921 36.6466 12.1419 36.6466 12.7277 36.0608C13.4346 35.3538 19.8175 28.2137 25.9533 21.3317C29.0371 17.8728 32.0791 14.4558 34.3501 11.9035C35.4725 10.6421 36.4066 9.59185 37.0644 8.85216L49.5834 21.3711C49.9141 21.7019 50.43 21.7592 50.8253 21.509L72.851 7.56895L72.8605 7.56229C73.5392 7.08722 73.7043 6.15192 73.2292 5.47325C72.7567 4.7983 71.8291 4.63135 71.1513 5.09682L50.5191 18.0642L37.686 5.23115Z" fill="#00D6B9"/>
+</svg>
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 d0ed6c2213..a88f20d88a 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
@@ -1380,14 +1380,14 @@ export const CHART_TYPE_CONFIGS = [
         category: 'dual_axes',
         value: 'chart-mix-group',
         title: t('chart.chart_mix_group_column'),
-        icon: 'chart-mix'
+        icon: 'chart-mix-group'
       },
       {
         render: 'antv',
         category: 'dual_axes',
         value: 'chart-mix-stack',
         title: t('chart.chart_mix_stack_column'),
-        icon: 'chart-mix'
+        icon: 'chart-mix-stack'
       }
     ]
   },