Skip to content

Commit cf5ff04

Browse files
committed
Fixed basic, legancy, gauge charts to apply theme correctly.
1 parent 00e61a2 commit cf5ff04

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

client/packages/lowcoder-comps/src/comps/basicChartComp/chartUtils.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,9 @@ export function getEchartsConfig(
228228
itemStyle: {
229229
...series.itemStyle,
230230
...chartStyleWrapper(props?.chartStyle, theme?.chartStyle)
231+
},
232+
lineStyle: {
233+
...chartStyleWrapper(props?.chartStyle, theme?.chartStyle)
231234
}
232235
})),
233236
};

client/packages/lowcoder-comps/src/comps/chartComp/chartUtils.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ export function getEchartsConfig(
181181
...props.legendConfig,
182182
textStyle: {
183183
...styleWrapper(props?.legendStyle, theme?.legendStyle, 15)
184-
}
184+
},
185185
},
186186
tooltip: props.tooltip&&{
187187
trigger: "axis",
@@ -228,6 +228,9 @@ export function getEchartsConfig(
228228
itemStyle: {
229229
...series.itemStyle,
230230
...chartStyleWrapper(props?.chartStyle, theme?.chartStyle)
231+
},
232+
lineStyle: {
233+
...chartStyleWrapper(props?.chartStyle, theme?.chartStyle)
231234
}
232235
})),
233236
};

client/packages/lowcoder-comps/src/comps/gaugeChartComp/gaugeChartUtils.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -394,8 +394,8 @@ export function getEchartsConfig(
394394
},
395395
detail: {
396396
...styleWrapper(props?.legendStyle, theme?.legendStyle, 16, '#ffffff', 0, 'inherit'),
397-
"width": props?.legendStyle?.detailSize?.split('px')[0] || theme?.legendStyle?.detailSize.split('px')[0] || 40,
398-
"height": props?.legendStyle?.detailSize?.split('px')[1] || theme?.legendStyle?.detailSize.split('px')[1] || 20,
397+
"width": props?.legendStyle?.detailSize?.split('px')[0] || theme?.legendStyle?.detailSize && theme?.legendStyle?.detailSize.split('px')[0] || 40,
398+
"height": props?.legendStyle?.detailSize?.split('px')[1] || theme?.legendStyle?.detailSize && theme?.legendStyle?.detailSize.split('px')[1] || 20,
399399
formatter: props?.multiTitleGaugeOption?.data?.map(data => data.formatter)[0],
400400
}
401401
}
@@ -554,8 +554,8 @@ export function getEchartsConfig(
554554
},
555555
detail: {
556556
...styleWrapper(props?.legendStyle, theme?.legendStyle, 16, 'inherit', 1, ''),
557-
"width": props?.legendStyle?.detailSize?.split('px')[0] || theme?.legendStyle?.detailSize.split('px')[0] || 50,
558-
"height": props?.legendStyle?.detailSize?.split('px')[1] || theme?.legendStyle?.detailSize.split('px')[1] || 20,
557+
"width": props?.legendStyle?.detailSize?.split('px')[0] || theme?.legendStyle?.detailSize && theme?.legendStyle?.detailSize.split('px')[0] || 50,
558+
"height": props?.legendStyle?.detailSize?.split('px')[1] || theme?.legendStyle?.detailSize && theme?.legendStyle?.detailSize.split('px')[1] || 20,
559559
formatter: props?.ringGaugeOption?.data?.map(data => data.formatter)[0],
560560
}
561561
}

0 commit comments

Comments
 (0)