File tree Expand file tree Collapse file tree 2 files changed +7
-1
lines changed
Expand file tree Collapse file tree 2 files changed +7
-1
lines changed Original file line number Diff line number Diff line change @@ -23,6 +23,7 @@ export type ChartStyleConfigDTO = {
2323 key : string ;
2424 value ?: any ;
2525 rows ?: ChartStyleConfigDTO [ ] ;
26+ comType ?: string ;
2627} ;
2728
2829export type ChartDataConfigDTO = ChartDataConfig & { } ;
Original file line number Diff line number Diff 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 ) ) {
You can’t perform that action at this time.
0 commit comments