public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-06-17 21:08:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 图片组、富文本兼容最新条件样式 (#18044)

Browse Source
This commit is contained in:
王嘉豪
2026-03-09 19:02:46 +08:00
committed by wangjiahao
parent c119285f81
commit c513666c9a
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/core-frontend/src/custom-component/picture-group/Component.vue
View File

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

6
core/core-frontend/src/custom-component/rich-text/DeRichTextView.vue
View File

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