center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

fix(图表): 修复双轴图折线图标缺失问题

Browse Source
This commit is contained in:
ulleo 2024-09-20 16:07:30 +08:00
parent 9141de1cd0
commit 424498f8e3
8 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/core-frontend/src/assets/svg/chart-mix-dual-line-dark.svg Normal file
View File

@ -0,0 +1,7 @@
<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 2V50.9977L76 50.9977L76 53.9977H4V2H7Z" fill="#434343"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M72.8196 13.7602C73.1363 14.2126 73.0262 14.8362 72.5738 15.1529L50.2198 29.3007L37.043 16.1239L36.7137 16.4943C36.0548 17.2352 35.1121 18.2952 33.9766 19.5713C31.7056 22.1235 28.6637 25.5405 25.5801 28.9991C19.434 35.8927 13.0676 43.0139 12.3741 43.7074C11.9836 44.098 11.3504 44.098 10.9599 43.7074C10.5694 43.3169 10.5694 42.6837 10.9599 42.2932C11.5997 41.6534 17.9 34.608 24.0872 27.6682C27.1703 24.2102 30.2117 20.7938 32.4824 18.2418C33.6178 16.9659 34.5604 15.906 35.2192 15.1652L36.2526 14.0029C36.2526 14.0029 36.2529 14.0026 37.0003 14.667L36.2526 14.0029L36.9575 13.21L50.4475 26.7L71.4269 13.5144C71.8793 13.1977 72.5028 13.3077 72.8196 13.7602Z" fill="#3370FF"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M36.2315 13.274C36.6138 12.844 37.2791 12.8245 37.686 13.2313L50.5191 26.0644L71.1513 13.097C71.8291 12.6316 72.7567 12.7985 73.2292 13.4735C73.7043 14.1521 73.5392 15.0874 72.8605 15.5625L72.851 15.5692L50.8253 29.5092C50.43 29.7594 49.9141 29.7021 49.5834 29.3713L37.0644 16.8524C36.4066 17.5921 35.4725 18.6423 34.3501 19.9037C32.0791 22.456 29.0371 25.873 25.9533 29.3319C19.8175 36.2139 13.4346 43.354 12.7277 44.061C12.1419 44.6468 11.1921 44.6468 10.6063 44.061C10.0205 43.4752 10.0205 42.5255 10.6063 41.9397C11.2327 41.3133 17.5164 34.2868 23.714 27.3354C26.7969 23.8776 29.8382 20.4613 32.1089 17.9095C33.2442 16.6336 34.1868 15.5738 34.8455 14.833L36.2315 13.274ZM36.3401 16.162L37.0217 15.3955L50.2905 28.6642L72.2949 14.7377C72.5145 14.5776 72.5665 14.2705 72.4099 14.0469C72.2516 13.8207 71.9398 13.7657 71.7136 13.924L71.7034 13.9312L50.3759 27.3355C46.6555 23.5997 40.5 17.0002 37.3315 14.2924L37.3324 14.2931L36.6683 15.0408L36.2943 14.7086L35.5929 15.4975C34.934 16.2383 33.9913 17.2982 32.856 18.5742C30.5852 21.1262 27.5436 24.5427 24.4605 28.0009C18.2835 34.9291 11.9667 41.9935 11.3134 42.6468C11.1182 42.842 11.1182 43.1586 11.3134 43.3539M10.9599 43.7074L11.3134 43.3539C11.5087 43.5491 11.8253 43.5491 12.0205 43.3539C12.7006 42.6738 19.0505 35.5715 25.2069 28.6664C28.2903 25.2079 31.3321 21.7911 33.603 19.2389C34.7385 17.9629 35.6812 16.9029 36.3401 16.162" fill="#3370FF"/>
<path d="M37.686 13.2308C37.2791 12.824 36.6138 12.8435 36.2315 13.2735L34.8455 14.8325C34.1868 15.5733 33.2442 16.633 32.1089 17.9089C29.8382 20.4608 26.7969 23.8771 23.714 27.3349C17.5164 34.2863 11.2327 41.3128 10.6063 41.9391C10.0205 42.5249 10.0205 43.4747 10.6063 44.0605C11.1921 44.6462 12.1419 44.6462 12.7277 44.0605C13.4346 43.3535 19.8175 36.2134 25.9533 29.3314C29.0371 25.8725 32.0791 22.4555 34.3501 19.9032C35.4725 18.6418 36.4066 17.5915 37.0644 16.8519L49.5834 29.3708C49.9141 29.7016 50.43 29.7589 50.8253 29.5087L72.851 15.5686L72.8605 15.562C73.5392 15.0869 73.7043 14.1516 73.2292 13.4729C72.7567 12.798 71.8291 12.631 71.1513 13.0965L50.5191 26.0639L37.686 13.2308Z" fill="#3370FF"/>
<path d="M11.667 26.5C10.8386 26.5 10.167 27.1716 10.167 28C10.167 28.8284 10.8386 29.5 11.667 29.5H33.6392L42.646 40.1151C42.8119 40.3107 43.0467 40.4351 43.3017 40.4624L71.4856 43.489C72.3058 43.589 73.0528 43.0065 73.1554 42.1861C73.2582 41.364 72.6751 40.6143 71.8531 40.5115L44.4294 37.5801L35.3277 26.853C35.1377 26.6291 34.8588 26.5 34.5651 26.5H11.667Z" fill="#00D6B9"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 3.4 KiB

4
core/core-frontend/src/assets/svg/chart-mix-dual-line-origin.svg Normal file
View File

@ -0,0 +1,4 @@
<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<path d="M0.713135 21.4739V1.80273C0.713135 1.52659 0.936992 1.30273 1.21313 1.30273H2.26008C2.53623 1.30273 2.76008 1.52659 2.76008 1.80273V20.5523H22.5686C22.8447 20.5523 23.0686 20.7761 23.0686 21.0523V22.0992C23.0686 22.3754 22.8447 22.5992 22.5686 22.5992H1.83907C1.54045 22.5992 1.25407 22.4806 1.04291 22.2694C0.83176 22.0583 0.713135 21.7725 0.713135 21.4739Z"/>
<path d="M4.19544 18.3911C3.96872 18.2313 3.91539 17.9175 4.07659 17.6918L8.90155 10.9358C8.97757 10.8235 9.07516 10.7274 9.18865 10.6531C9.30213 10.5788 9.42925 10.5278 9.56262 10.5031C9.69599 10.4784 9.83293 10.4804 9.96551 10.5091C10.0981 10.5377 10.2236 10.5925 10.3349 10.6701L15.7191 14.2624L20.9481 8.16625C21.1291 7.95528 21.4474 7.93239 21.6567 8.11531L22.4497 8.80844C22.6562 8.98892 22.6788 9.30208 22.5003 9.51031L16.6806 16.2998C16.5179 16.4883 16.2919 16.611 16.0452 16.6449C15.7984 16.6788 15.5478 16.6215 15.3402 16.4839L10.0275 12.9315L5.77196 18.8941C5.61221 19.118 5.30171 19.1708 5.07694 19.0124L4.19544 18.3911Z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

5
core/core-frontend/src/assets/svg/chart-mix-dual-line.svg Normal file
View File

@ -0,0 +1,5 @@
<svg width="80" height="56" viewBox="0 0 80 56" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M37.686 13.231C37.2791 12.8242 36.6138 12.8437 36.2315 13.2737L34.8455 14.8327C34.1868 15.5735 33.2442 16.6333 32.1089 17.9092C29.8382 20.4611 26.7969 23.8773 23.714 27.3352C17.5164 34.2865 11.2327 41.313 10.6063 41.9394C10.0205 42.5252 10.0205 43.4749 10.6063 44.0607C11.1921 44.6465 12.1419 44.6465 12.7277 44.0607C13.4346 43.3537 19.8175 36.2136 25.9533 29.3316C29.0371 25.8728 32.0791 22.4557 34.3501 19.9034C35.4725 18.642 36.4066 17.5918 37.0644 16.8521L49.5834 29.3711C49.9141 29.7018 50.43 29.7591 50.8253 29.5089L72.851 15.5689L72.8605 15.5622C73.5392 15.0872 73.7043 14.1519 73.2292 13.4732C72.7567 12.7982 71.8291 12.6313 71.1513 13.0968L50.5191 26.0642L37.686 13.231Z" fill="#3370FF"/>
<path d="M11.667 26.5C10.8386 26.5 10.167 27.1716 10.167 28C10.167 28.8284 10.8386 29.5 11.667 29.5H33.6392L42.646 40.1151C42.8119 40.3107 43.0467 40.4351 43.3017 40.4624L71.4856 43.489C72.3058 43.589 73.0528 43.0065 73.1554 42.1861C73.2582 41.364 72.6751 40.6143 71.8531 40.5115L44.4294 37.5801L35.3277 26.853C35.1377 26.6291 34.8588 26.5 34.5651 26.5H11.667Z" fill="#00D6B9"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M7 2.00391V51.0016L76 51.0016L76 54.0016H4V2.00391H7Z" fill="#DEE0E3"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

2
core/core-frontend/src/components/data-visualization/RealTimeGroup.vue
View File

@ -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,

2
core/core-frontend/src/components/data-visualization/RealTimeListTree.vue
View File

@ -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,

2
core/core-frontend/src/components/icon-group/chart-dark-list.ts
View File

@ -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,

2
core/core-frontend/src/components/icon-group/chart-list.ts
View File

@ -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,

2
core/core-frontend/src/views/chart/components/editor/util/chart.ts
View File

@ -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'
}
]
},