Skip to content

Commit aaed49e

Browse files
committed
fix:(Chart)fix mergeChartStyleConfigs function judgement condition
1 parent 0d4ea0e commit aaed49e

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

frontend/src/app/types/ChartConfigDTO.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ export type ChartStyleConfigDTO = {
2323
key: string;
2424
value?: any;
2525
rows?: ChartStyleConfigDTO[];
26+
comType?: string;
2627
};
2728

2829
export type ChartDataConfigDTO = ChartDataConfig & {};

frontend/src/app/utils/internalChartHelper.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,12 @@ export function mergeChartStyleConfigs(
413413
const sEle =
414414
'key' in tEle ? source?.find(s => s?.key === tEle.key) : source?.[index];
415415

416-
if (!isUndefined(sEle?.['value'])) {
416+
if (!isUndefined(sEle?.['value']) && (!sEle?.comType || !tEle.comType)) {
417+
tEle['value'] = sEle?.['value'];
418+
} else if (
419+
!isUndefined(sEle?.['value']) &&
420+
sEle?.comType === tEle.comType
421+
) {
417422
tEle['value'] = sEle?.['value'];
418423
}
419424
if (!isEmptyArray(tEle?.rows)) {

0 commit comments

Comments
 (0)