diff --git a/core/core-frontend/src/custom-component/picture-group/Component.vue b/core/core-frontend/src/custom-component/picture-group/Component.vue index 457d510547..e21850c408 100644 --- a/core/core-frontend/src/custom-component/picture-group/Component.vue +++ b/core/core-frontend/src/custom-component/picture-group/Component.vue @@ -30,7 +30,7 @@ import eventBus from '@/utils/eventBus' import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain' import { getData } from '@/api/chart' import { parseJson } from '@/views/chart/components/js/util' -import { mappingColor } from '@/views/chart/components/js/panel/common/common_table' +import { mappingColorCustom } from '@/views/chart/components/js/panel/common/common_table' import { storeToRefs } from 'pinia' import ChartEmptyInfo from '@/views/chart/components/views/components/ChartEmptyInfo.vue' import ChartError from '@/views/chart/components/views/components/ChartError.vue' @@ -216,7 +216,7 @@ const conditionAdaptor = (chart: Chart) => { if (!aIsDefault && bIsDefault) return -1 return 0 }) - const checkResult = mappingColor( + const checkResult = mappingColorCustom( dataRowNameSelect.value[field.field.name], defaultValueColor, field, diff --git a/core/core-frontend/src/custom-component/rich-text/DeRichTextView.vue b/core/core-frontend/src/custom-component/rich-text/DeRichTextView.vue index 899951eaa5..1993ef7993 100644 --- a/core/core-frontend/src/custom-component/rich-text/DeRichTextView.vue +++ b/core/core-frontend/src/custom-component/rich-text/DeRichTextView.vue @@ -61,7 +61,7 @@ import ChartError from '@/views/chart/components/views/components/ChartError.vue import { useEmitt } from '@/hooks/web/useEmitt' import { valueFormatter } from '@/views/chart/components/js/formatter' import { parseJson } from '@/views/chart/components/js/util' -import { mappingColor } from '@/views/chart/components/js/panel/common/common_table' +import { mappingColorCustom } from '@/views/chart/components/js/panel/common/common_table' import { CHART_FONT_FAMILY_ORIGIN } from '@/views/chart/components/editor/util/chart' import { useAppearanceStoreWithOut } from '@/store/modules/appearance' const snapshotStore = snapshotStoreWithOut() @@ -719,13 +719,13 @@ const conditionAdaptor = (chart: Chart) => { let defaultValueColor = 'none' let defaultBgColor = 'none' res[field.field.name] = { - color: mappingColor( + color: mappingColorCustom( dataRowNameSelectSource.value[field.field.name], defaultValueColor, field, 'color' ), - backgroundColor: mappingColor( + backgroundColor: mappingColorCustom( dataRowNameSelectSource.value[field.field.name], defaultBgColor, field,