forked from github/dataease
Merge pull request #10650 from dataease/pr@dev-v2@fix_rich-text
fix(图表): 修复富文本这个指标条件颜色时,因格式化导致设置失效问题
This commit is contained in:
commit
2c3a93dd2c
@ -110,6 +110,7 @@ const state = reactive({
|
|||||||
})
|
})
|
||||||
const dataRowSelect = ref({})
|
const dataRowSelect = ref({})
|
||||||
const dataRowNameSelect = ref({})
|
const dataRowNameSelect = ref({})
|
||||||
|
const dataRowNameSelectSource = ref({})
|
||||||
const dataRowFiledName = ref([])
|
const dataRowFiledName = ref([])
|
||||||
const initReady = ref(false)
|
const initReady = ref(false)
|
||||||
const editShow = ref(true)
|
const editShow = ref(true)
|
||||||
@ -390,6 +391,7 @@ const initCurFields = chartDetails => {
|
|||||||
dataRowFiledName.value = []
|
dataRowFiledName.value = []
|
||||||
dataRowSelect.value = {}
|
dataRowSelect.value = {}
|
||||||
dataRowNameSelect.value = {}
|
dataRowNameSelect.value = {}
|
||||||
|
dataRowNameSelectSource.value = {} // 记录原格式,部分数字是经过格式化的,再匹配颜色时会有问题
|
||||||
if (chartDetails.data && chartDetails.data.sourceFields) {
|
if (chartDetails.data && chartDetails.data.sourceFields) {
|
||||||
const checkAllAxisStr =
|
const checkAllAxisStr =
|
||||||
JSON.stringify(chartDetails.xAxis) +
|
JSON.stringify(chartDetails.xAxis) +
|
||||||
@ -430,11 +432,13 @@ const initCurFields = chartDetails => {
|
|||||||
for (const key in rowData) {
|
for (const key in rowData) {
|
||||||
dataRowSelect.value[nameIdMap[key]] = rowData[key]
|
dataRowSelect.value[nameIdMap[key]] = rowData[key]
|
||||||
let rowDataValue = rowData[key]
|
let rowDataValue = rowData[key]
|
||||||
|
const rowDataValueSource = rowData[key]
|
||||||
const f = valueFieldMap[key]
|
const f = valueFieldMap[key]
|
||||||
if (f && f.formatterCfg) {
|
if (f && f.formatterCfg) {
|
||||||
rowDataValue = valueFormatter(rowDataValue, f.formatterCfg)
|
rowDataValue = valueFormatter(rowDataValue, f.formatterCfg)
|
||||||
}
|
}
|
||||||
dataRowNameSelect.value[sourceFieldNameIdMap[key]] = rowDataValue
|
dataRowNameSelect.value[sourceFieldNameIdMap[key]] = rowDataValue
|
||||||
|
dataRowNameSelectSource.value[sourceFieldNameIdMap[key]] = rowDataValueSource
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
element.value.propValue['innerType'] = chartDetails.type
|
element.value.propValue['innerType'] = chartDetails.type
|
||||||
@ -468,13 +472,13 @@ const conditionAdaptor = (chart: Chart) => {
|
|||||||
let defaultBgColor = 'none'
|
let defaultBgColor = 'none'
|
||||||
res[field.field.name] = {
|
res[field.field.name] = {
|
||||||
color: mappingColor(
|
color: mappingColor(
|
||||||
dataRowNameSelect.value[field.field.name],
|
dataRowNameSelectSource.value[field.field.name],
|
||||||
defaultValueColor,
|
defaultValueColor,
|
||||||
field,
|
field,
|
||||||
'color'
|
'color'
|
||||||
),
|
),
|
||||||
backgroundColor: mappingColor(
|
backgroundColor: mappingColor(
|
||||||
dataRowNameSelect.value[field.field.name],
|
dataRowNameSelectSource.value[field.field.name],
|
||||||
defaultBgColor,
|
defaultBgColor,
|
||||||
field,
|
field,
|
||||||
'backgroundColor'
|
'backgroundColor'
|
||||||
|
Loading…
Reference in New Issue
Block a user