Merge pull request #12413 from dataease/pr@dev-v2_st

fix: svg分包

core/core-frontend/src/components/icon-group/chart-dark-divide-list.ts

@@ -0,0 +1,11 @@
+import bubbleMapDark from '@/assets/svg/bubble-map-dark.svg'
+import heatMapDark from '@/assets/svg/heat-map-dark.svg'
+import symbolicMapDark from '@/assets/svg/symbolic-map-dark.svg'
+
+const iconChartDarkDivideMap = {
+  'bubble-map-dark': bubbleMapDark,
+  'heat-map-dark': heatMapDark,
+  'symbolic-map-dark': symbolicMapDark
+}
+
+export { iconChartDarkDivideMap }

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

@@ -8,7 +8,6 @@ import barRangeDark from '@/assets/svg/bar-range-dark.svg'
 import barStackDark from '@/assets/svg/bar-stack-dark.svg'
 import barStackHorizontalDark from '@/assets/svg/bar-stack-horizontal-dark.svg'
 import bidirectionalBarDark from '@/assets/svg/bidirectional-bar-dark.svg'
-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'
@@ -16,7 +15,6 @@ 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'
-import heatMapDark from '@/assets/svg/heat-map-dark.svg'
 import indicatorDark from '@/assets/svg/indicator-dark.svg'
 import lineDark from '@/assets/svg/line-dark.svg'
 import liquidDark from '@/assets/svg/liquid-dark.svg'
@@ -34,7 +32,6 @@ import richTextDark from '@/assets/svg/rich-text-dark.svg'
 import sankeyDark from '@/assets/svg/sankey-dark.svg'
 import scatterDark from '@/assets/svg/scatter-dark.svg'
 import stockLineDark from '@/assets/svg/stock-line-dark.svg'
-import symbolicMapDark from '@/assets/svg/symbolic-map-dark.svg'
 import tableInfoDark from '@/assets/svg/table-info-dark.svg'
 import tableNormalDark from '@/assets/svg/table-normal-dark.svg'
 import tablePivotDark from '@/assets/svg/table-pivot-dark.svg'
@@ -54,7 +51,6 @@ const iconChartDarkMap = {
   'bar-stack-dark': barStackDark,
   'bar-stack-horizontal-dark': barStackHorizontalDark,
   'bidirectional-bar-dark': bidirectionalBarDark,
-  'bubble-map-dark': bubbleMapDark,
   'chart-mix-dark': chartMixDark,
   'chart-mix-group-dark': chartMixGroupDark,
   'chart-mix-stack-dark': chartMixStackDark,
@@ -62,7 +58,6 @@ const iconChartDarkMap = {
   'flow-map-dark': flowMapDark,
   'funnel-dark': funnelDark,
   'gauge-dark': gaugeDark,
-  'heat-map-dark': heatMapDark,
   'indicator-dark': indicatorDark,
   'line-dark': lineDark,
   'liquid-dark': liquidDark,
@@ -80,7 +75,6 @@ const iconChartDarkMap = {
   'sankey-dark': sankeyDark,
   'scatter-dark': scatterDark,
   'stock-line-dark': stockLineDark,
-  'symbolic-map-dark': symbolicMapDark,
   'table-info-dark': tableInfoDark,
   'table-normal-dark': tableNormalDark,
   'table-pivot-dark': tablePivotDark,

core/core-frontend/src/components/icon-group/chart-divide-list.ts

@@ -0,0 +1,11 @@
+import heatMap from '@/assets/svg/heat-map.svg'
+import symbolicMap from '@/assets/svg/symbolic-map.svg'
+import bubbleMap from '@/assets/svg/bubble-map.svg'
+
+const iconChartDivideMap = {
+  'heat-map': heatMap,
+  'bubble-map': bubbleMap,
+  'symbolic-map': symbolicMap
+}
+
+export { iconChartDivideMap }

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

@@ -8,7 +8,6 @@ import barStackHorizontal from '@/assets/svg/bar-stack-horizontal.svg'
 import barStack from '@/assets/svg/bar-stack.svg'
 import bar from '@/assets/svg/bar.svg'
 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'
@@ -16,7 +15,6 @@ import chartMix from '@/assets/svg/chart-mix.svg'
 import flowMap from '@/assets/svg/flow-map.svg'
 import funnel from '@/assets/svg/funnel.svg'
 import gauge from '@/assets/svg/gauge.svg'
-import heatMap from '@/assets/svg/heat-map.svg'
 import indicator from '@/assets/svg/indicator.svg'
 import line from '@/assets/svg/line.svg'
 import liquid from '@/assets/svg/liquid.svg'
@@ -34,7 +32,6 @@ import richText from '@/assets/svg/rich-text.svg'
 import sankey from '@/assets/svg/sankey.svg'
 import scatter from '@/assets/svg/scatter.svg'
 import stockLine from '@/assets/svg/stock-line.svg'
-import symbolicMap from '@/assets/svg/symbolic-map.svg'
 import tableInfo from '@/assets/svg/table-info.svg'
 import tableNormal from '@/assets/svg/table-normal.svg'
 import tablePivot from '@/assets/svg/table-pivot.svg'
@@ -55,7 +52,6 @@ const iconChartMap = {
   'bar-stack': barStack,
   bar: bar,
   'bidirectional-bar': bidirectionalBar,
-  'bubble-map': bubbleMap,
   'chart-mix-group': chartMixGroup,
   'chart-mix-stack': chartMixStack,
   'chart-mix-dual-line': chartMixDualLine,
@@ -63,7 +59,6 @@ const iconChartMap = {
   'flow-map': flowMap,
   funnel: funnel,
   gauge: gauge,
-  'heat-map': heatMap,
   indicator: indicator,
   line: line,
   liquid: liquid,
@@ -81,7 +76,6 @@ const iconChartMap = {
   sankey: sankey,
   scatter: scatter,
   'stock-line': stockLine,
-  'symbolic-map': symbolicMap,
   'table-info': tableInfo,
   'table-normal': tableNormal,
   'table-pivot': tablePivot,

core/core-frontend/src/components/visualization/LinkJumpSet.vue

@@ -17,7 +17,10 @@
             <Icon class-name="view-type-icon"
               ><component
                 class="svg-icon view-type-icon"
-                :is="iconChartMap[state.curJumpViewInfo.type]"
+                :is="
+                  iconChartMap[state.curJumpViewInfo.type] ||
+                  iconChartDivideMap[state.curJumpViewInfo.type]
+                "
               ></component
             ></Icon>
             {{ state.curJumpViewInfo.title }}</span
@@ -265,7 +268,9 @@
                                       ><component
                                         class="svg-icon view-type-icon"
                                         style="width: 14px; height: 14px"
-                                        :is="iconChartMap[item.type]"
+                                        :is="
+                                          iconChartMap[item.type] || iconChartDivideMap[item.type]
+                                        "
                                       ></component
                                     ></Icon>
                                     <span style="float: left; margin-left: 4px; font-size: 14px">{{
@@ -432,6 +437,7 @@
 <script lang="ts" setup>
 import { iconFieldMap } from '@/components/icon-group/field-list'
 import { iconChartMap } from '@/components/icon-group/chart-list'
+import { iconChartDivideMap } from '@/components/icon-group/chart-divide-list'
 import datasetOutline from '@/assets/svg/dataset-outline.svg'
 import dvLinkTarget from '@/assets/svg/dv-link-target.svg'
 import dvDashboardSpine from '@/assets/svg/dv-dashboard-spine.svg'

core/core-frontend/src/components/visualization/LinkageSet.vue

@@ -20,7 +20,10 @@
             <Icon class-name="view-type-icon"
               ><component
                 class="svg-icon view-type-icon"
-                :is="iconChartMap[state.curLinkageViewInfo.type]"
+                :is="
+                  iconChartMap[state.curLinkageViewInfo.type] ||
+                  iconChartDivideMap[state.curLinkageViewInfo.type]
+                "
               ></component
             ></Icon>
             {{ state.curLinkageViewInfo.title }}</span
@@ -87,7 +90,10 @@
                     <span class="tree-select-field">
                       <Icon class-name="view-type-icon"
                         ><component
-                          :is="iconChartMap[data.targetViewType]"
+                          :is="
+                            iconChartMap[data.targetViewType] ||
+                            iconChartDivideMap[data.targetViewType]
+                          "
                           style="margin-right: 4px"
                           class="svg-icon view-type-icon"
                         ></component
@@ -138,7 +144,10 @@
                         ><component
                           class="svg-icon view-type-icon"
                           style="margin-right: 4px"
-                          :is="iconChartMap[data.targetViewType]"
+                          :is="
+                            iconChartMap[data.targetViewType] ||
+                            iconChartDivideMap[data.targetViewType]
+                          "
                         ></component
                       ></Icon>
                       {{ data.targetViewName }}
@@ -270,6 +279,7 @@
 <script lang="ts" setup>
 import { iconFieldMap } from '@/components/icon-group/field-list'
 import { iconChartMap } from '@/components/icon-group/chart-list'
+import { iconChartDivideMap } from '@/components/icon-group/chart-divide-list'
 import datasetOutline from '@/assets/svg/dataset-outline.svg'
 import dvLinkTarget from '@/assets/svg/dv-link-target.svg'
 import icon_deleteTrash_outlined from '@/assets/svg/icon_delete-trash_outlined.svg'

core/core-frontend/src/custom-component/component-group/UserViewGroup.vue

@@ -1,5 +1,6 @@
 <script setup lang="tsx">
 import { iconChartMap } from '@/components/icon-group/chart-list'
+import { iconChartDivideMap } from '@/components/icon-group/chart-divide-list'
 import { reactive, ref, toRefs } from 'vue'
 import eventBus from '@/utils/eventBus'
 import { CHART_TYPE_CONFIGS } from '@/views/chart/components/editor/util/chart'
@@ -8,6 +9,7 @@ import { commonHandleDragEnd, commonHandleDragStart } from '@/utils/canvasUtils'
 import { ElScrollbar } from 'element-plus-secondary'
 import { XpackComponent } from '@/components/plugin'
 import { iconChartDarkMap } from '@/components/icon-group/chart-dark-list'
+import { iconChartDarkDivideMap } from '@/components/icon-group/chart-dark-divide-list'
 
 const props = defineProps({
   propValue: {
@@ -149,8 +151,9 @@ const loadPluginCategory = data => {
                   class="svg-icon item-top-icon"
                   :is="
                     props.themes === 'dark'
-                      ? iconChartDarkMap[`${chartInfo.icon}-dark`]
+                      ? iconChartDarkMap[`${chartInfo.icon}-dark`] ||
-                      : iconChartMap[chartInfo.icon]
+                        iconChartDarkDivideMap[`${chartInfo.icon}-dark`]
+                      : iconChartMap[chartInfo.icon] || iconChartDivideMap[chartInfo.icon]
                   "
                 ></component
               ></Icon>

core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue

@@ -43,6 +43,7 @@ import type { ManipulateType } from 'dayjs'
 import dayjs from 'dayjs'
 import ConditionDefaultConfiguration from '@/custom-component/v-query/ConditionDefaultConfiguration.vue'
 import { iconChartMap } from '@/components/icon-group/chart-list'
+import { iconChartDivideMap } from '@/components/icon-group/chart-divide-list'
 import { iconFieldMap } from '@/components/icon-group/field-list'
 
 const { t } = useI18n()
@@ -1571,7 +1572,10 @@ defineExpose({
                 ><el-icon class="component-type">
                   <Icon
                     ><component
-                      :is="iconChartMap[canvasViewInfo[field.componentId].type]"
+                      :is="
+                        iconChartMap[canvasViewInfo[field.componentId].type] ||
+                        iconChartDivideMap[canvasViewInfo[field.componentId].type]
+                      "
                     ></component
                   ></Icon> </el-icon
                 ><span

core/core-frontend/src/views/chart/components/editor/chart-type/ChartType.vue

@@ -5,6 +5,8 @@ import Icon from '@/components/icon-custom/src/Icon.vue'
 import { ElScrollbar } from 'element-plus-secondary'
 import { iconChartDarkMap } from '@/components/icon-group/chart-dark-list'
 import { iconChartMap } from '@/components/icon-group/chart-list'
+import { iconChartDivideMap } from '@/components/icon-group/chart-divide-list'
+import { iconChartDarkDivideMap } from '@/components/icon-group/chart-dark-divide-list'
 
 const props = defineProps({
   propValue: {
@@ -106,8 +108,9 @@ const groupActiveChange = category => {
                   class="svg-icon item-top-icon"
                   :is="
                     props.themes === 'dark'
-                      ? iconChartDarkMap[`${chartInfo.icon}-dark`]
+                      ? iconChartDarkMap[`${chartInfo.icon}-dark`] ||
-                      : iconChartMap[chartInfo.icon]
+                        iconChartDarkDivideMap[`${chartInfo.icon}-dark`]
+                      : iconChartMap[chartInfo.icon] || iconChartDivideMap[chartInfo.icon]
                   "
                 ></component
               ></Icon>

core/core-frontend/src/views/chart/components/editor/index.vue

@@ -66,6 +66,7 @@ import ChartTemplateInfo from '@/views/chart/components/editor/common/ChartTempl
 import { XpackComponent } from '@/components/plugin'
 import { useEmbedded } from '@/store/modules/embedded'
 import { iconChartMap } from '@/components/icon-group/chart-list'
+import { iconChartDivideMap } from '@/components/icon-group/chart-divide-list'
 import { iconFieldMap } from '@/components/icon-group/field-list'
 import {
   iconFieldCalculatedMap,
@@ -1829,7 +1830,10 @@ const deleteChartFieldItem = id => {
                               <Icon v-else class-name="chart-type-select-icon">
                                 <component
                                   class="svg-icon chart-type-select-icon"
-                                  :is="iconChartMap[state.chartTypeOptions[0].icon]"
+                                  :is="
+                                    iconChartMap[state.chartTypeOptions[0].icon] ||
+                                    iconChartDivideMap[state.chartTypeOptions[0].icon]
+                                  "
                                 ></component>
                               </Icon>
                             </template>

core/core-frontend/src/views/chart/components/views/components/ChartEmptyInfo.vue

@@ -1,6 +1,8 @@
 <script lang="tsx" setup>
 import { iconChartDarkMap } from '@/components/icon-group/chart-dark-list'
+import { iconChartDarkDivideMap } from '@/components/icon-group/chart-dark-divide-list'
 import { iconChartMap } from '@/components/icon-group/chart-list'
+import { iconChartDivideMap } from '@/components/icon-group/chart-divide-list'
 import { toRefs } from 'vue'
 const props = defineProps({
   viewIcon: {
@@ -23,7 +25,11 @@ const { viewIcon, themes } = toRefs(props)
     <Icon class-name="item-icon"
       ><component
         class="svg-icon item-icon"
-        :is="themes === 'dark' ? iconChartDarkMap[`${viewIcon}-dark`] : iconChartMap[viewIcon]"
+        :is="
+          themes === 'dark'
+            ? iconChartDarkMap[`${viewIcon}-dark`] || iconChartDarkDivideMap[`${viewIcon}-dark`]
+            : iconChartMap[viewIcon] || iconChartDivideMap[viewIcon]
+        "
       ></component
     ></Icon>
   </div>

core/core-frontend/src/views/data-visualization/MultiplexPreviewShow.vue

@@ -16,6 +16,7 @@ import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain'
 import { getCanvasStyle } from '@/utils/style'
 import EmptyBackground from '../../components/empty-background/src/EmptyBackground.vue'
 import { iconChartMap } from '@/components/icon-group/chart-list'
+import { iconChartDivideMap } from '@/components/icon-group/chart-divide-list'
 const dvMainStore = dvMainStoreWithOut()
 const viewShow = ref(true)
 
@@ -99,7 +100,7 @@ const iconMap = {
 const getIconName = item => {
   if (item.component === 'UserView') {
     const viewInfo = canvasViewInfo.value[item.id]
-    return iconChartMap[`${viewInfo.type}`]
+    return iconChartMap[`${viewInfo.type}`] || iconChartDivideMap[`${viewInfo.type}`]
   } else {
     return iconMap[item.icon]
   }