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

refactor: 历史数据适配 (#18275)

Browse Source
This commit is contained in:
王嘉豪
2026-06-04 14:13:07 +08:00
committed by wangjiahao
parent a753ccd934
commit 006fff6192
2 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/core-frontend/src/components/dashboard/subject-setting/dashboard-style/ComponentColorSelector.vue
View File

@@ -277,20 +277,9 @@ const fontSizeList = computed(() => {
return arr
})
const colorForm = computed(() => ({
...(canvasStyleData.value.component.chartColor as DeepPartial<ChartAttr>),
label: {
color: '#000000',
fontSize: 12,
...(canvasStyleData.value.component.chartColor?.label || {})
},
tooltip: {
color: '#000000',
fontSize: 12,
backgroundColor: '#FFFFFF',
...(canvasStyleData.value.component.chartColor?.tooltip || {})
}
}))
const colorForm = computed(
() => canvasStyleData.value.component.chartColor as DeepPartial<ChartAttr>
)
const seniorForm = computed(() => canvasStyleData.value.component.seniorStyleSetting)

19
core/core-frontend/src/utils/canvasUtils.ts
View File

@@ -32,6 +32,7 @@ import { deepCopy, nameTrim } from '@/utils/utils'
import { ElMessage, ElMessageBox } from 'element-plus-secondary'
import { guid } from '@/views/visualized/data/dataset/form/util'
import { ShorthandMode } from '@/components/visualization/component-background/Types'
import { formatterItem } from '@/views/chart/components/js/formatter'
const dvMainStore = dvMainStoreWithOut()
const {
inMobile,
@@ -350,6 +351,24 @@ export function historyAdaptor(
canvasStyleResult['dialogBackgroundColor'] = canvasStyleResult['dialogBackgroundColor'] || '#fff'
canvasStyleResult['dialogButton'] = canvasStyleResult['dialogButton'] || '#020408'
canvasStyleResult['component']['formatterItem'] =
canvasStyleResult['component']['formatterItem'] || deepCopy(formatterItem)
canvasStyleResult.component.chartColor = {
...canvasStyleResult.component.chartColor,
label: {
color: '#000000',
fontSize: 12,
...(canvasStyleResult.component.chartColor?.label || {})
},
tooltip: {
color: '#000000',
fontSize: 12,
backgroundColor: '#FFFFFF',
...(canvasStyleResult.component.chartColor?.tooltip || {})
}
}
canvasDataResult.forEach(componentItem => {
historyItemAdaptor(componentItem, reportFilterInfo, attachInfo, canvasVersion, canvasInfo)
})