Skip to content

Commit 3d30bad

Browse files
Imiss-U1025Imiss-U1025
committed
Fixed a border Radius on styleWrapper.
1 parent 6056207 commit 3d30bad

File tree

4 files changed

+21
-12
lines changed

4 files changed

+21
-12
lines changed

‎client/packages/lowcoder-comps/src/comps/gaugeChartComp/gaugeChartConstants.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,7 @@ let chartJsonModeChildren: any = {
313313
gradePointerIcon:withDefault(StringControl, trans('gaugeChart.gradeDefaultPointerIcon')),
314314
clockPointerIcon:withDefault(StringControl, trans('gaugeChart.clockDefaultPointerIcon')),
315315
barometerPointerIcon:withDefault(StringControl, trans('gaugeChart.defaultBarometerPointerIcon')),
316+
multiTitlePointerIcon:withDefault(StringControl, trans('gaugeChart.defaultMultiTitlePointerIcon')),
316317
progressBarWidth:withDefault(NumberControl,trans('gaugeChart.defaultProgressBarWidth')),
317318
axisTickWidth: withDefault(NumberControl, trans('gaugeChart.defaultAxisTickWidth')),
318319
axisTickLength: withDefault(NumberControl, trans('gaugeChart.defaultAxisTickLength')),
@@ -324,6 +325,7 @@ let chartJsonModeChildren: any = {
324325
gradeGaugePointer_Y:withDefault(NumberControl,trans('gaugeChart.defaultGradeGaugePointer_Y')),
325326
stageProgressBarWidth:withDefault(NumberControl,trans('gaugeChart.defaultStageProgressBarWidth')),
326327
temperatureProgressBarWidth:withDefault(NumberControl,trans('gaugeChart.defaultTemperatureProgressBarWidth')),
328+
ringProgressBarWidth:withDefault(NumberControl,trans('gaugeChart.defaultRingProgressBarWidth')),
327329
temperatureAxisLabelDistance:withDefault(NumberControl,trans('gaugeChart.defaultTemperatureAxisLabelDistance')),
328330
stageAxisTickColor: withDefault(ColorControl, trans('gaugeChart.defaultStageAxisTickColor')),
329331
gradeAxisTickColor: withDefault(ColorControl),

‎client/packages/lowcoder-comps/src/comps/gaugeChartComp/gaugeChartPropertyView.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ export function gaugeChartPropertyView(
304304
{children.pointerLength.propertyView({ label: trans("gaugeChart.pointerLength"), tooltip: trans("echarts.pointerLengthTooltip") })}
305305
{children.pointerWidth.propertyView({ label: trans("gaugeChart.pointerWidth"), tooltip: trans("echarts.pointerWidthTooltip") })}
306306
{children.pointer_Y.propertyView({ label: trans("gaugeChart.pointer_Y"), tooltip: trans("gaugeChart.pointer_Y_Tooltip") })}
307-
{children.pointerIcon.propertyView({ label: trans("gaugeChart.pointerIcon"), tooltip: trans("gaugeChart.pointerIconTooltip") })}
307+
{children.multiTitlePointerIcon.propertyView({ label: trans("gaugeChart.pointerIcon"), tooltip: trans("gaugeChart.pointerIconTooltip") })}
308308
{children.progressBarWidth.propertyView({ label: trans("gaugeChart.progressBarWidth"), tooltip: trans("echarts.pointerWidthTooltip") })}
309309
{children.tooltip.propertyView({ label: trans("gaugeChart.tooltip"), tooltip: trans("echarts.tooltipVisibilityTooltip") })}
310310
{children.roundCap.propertyView({ label: trans("gaugeChart.roundCap"), tooltip: trans("echarts.roundCapVisibilityTooltip") })}
@@ -357,7 +357,7 @@ export function gaugeChartPropertyView(
357357
{children.max.propertyView({ label: trans("gaugeChart.max"), tooltip: trans("echarts.maxTooltip") })}
358358
{children.position_x.propertyView({ label: trans("gaugeChart.position_x"), tooltip: trans("echarts.positionChart_x_Tooltip") })}
359359
{children.position_y.propertyView({ label: trans("gaugeChart.position_y"), tooltip: trans("echarts.positionChart_x_Tooltip") })}
360-
{children.progressBarWidth.propertyView({ label: trans("gaugeChart.progressBarWidth"), tooltip: trans("echarts.pointerWidthTooltip") })}
360+
{children.ringProgressBarWidth.propertyView({ label: trans("gaugeChart.progressBarWidth"), tooltip: trans("echarts.pointerWidthTooltip") })}
361361
{children.tooltip.propertyView({ label: trans("gaugeChart.tooltip"), tooltip: trans("echarts.tooltipVisibilityTooltip") })}
362362
{children.roundCap.propertyView({ label: trans("gaugeChart.roundCap"), tooltip: trans("echarts.roundCapVisibilityTooltip") })}
363363
</Section>

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

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ export function getEchartsConfig(
152152
"borderColor": styleContainer?.chartBorderColor || themeContainer?.borderColor || 'inherit',
153153
"borderWidth": styleContainer?.chartBorderWidth || themeContainer?.borderWidth || detailBorderWidth,
154154
"borderType": styleContainer?.chartBorderStyle || themeContainer?.borderType,
155-
"borderRadius": styleContainer?.chartBorderRadius || themeContainer?.borderRadius,
155+
"borderRadius": Number(styleContainer?.chartBorderRadius || themeContainer?.borderRadius),
156156
"backgroundColor": styleContainer?.chartBackgroundColor || themeContainer?.backgroundColor || defaultBackgroundColor,
157157
"width": styleContainer?.detailSize?.split('px')[0] || themeContainer?.detailSize.split('px')[0] || 24,
158158
"height": styleContainer?.detailSize?.split('px')[1] || themeContainer?.detailSize.split('px')[1] || 12,
@@ -218,7 +218,7 @@ export function getEchartsConfig(
218218
"borderColor": props?.chartStyle?.chartBorderColor || theme?.chartStyle?.borderColor,
219219
"borderWidth": props?.chartStyle?.chartBorderWidth || theme?.chartStyle?.borderWidth,
220220
"borderType": props?.chartStyle?.chartBorderStyle || theme?.chartStyle?.borderType,
221-
"borderRadius": props?.chartStyle?.chartBorderRadius || theme?.chartStyle?.borderRadius,
221+
"borderRadius": Number(props?.chartStyle?.chartBorderRadius || theme?.chartStyle?.borderRadius),
222222
"shadowColor": props?.chartStyle?.chartShadowColor || theme?.chartStyle?.shadowColor,
223223
"shadowBlur": props?.chartStyle?.chartBoxShadow?.split('px')[0] || theme?.chartStyle?.boxShadow?.split('px')[0],
224224
"shadowOffsetX": props?.chartStyle?.chartBoxShadow?.split('px')[1] || theme?.chartStyle?.boxShadow?.split('px')[1],
@@ -386,7 +386,7 @@ export function getEchartsConfig(
386386
anchor: {
387387
show: true,
388388
showAbove: true,
389-
size: 10,
389+
size: Number(props?.pointerWidth) * 1.5,
390390
itemStyle: {
391391
color: props?.multiTitleGaugeOption?.data[0]["value"].slice(-1)[0]
392392
}
@@ -419,6 +419,10 @@ export function getEchartsConfig(
419419
title: {
420420
...styleWrapper(props?.labelStyle, theme?.labelStyle, 16),
421421
},
422+
pointer: {
423+
...basicSeries.pointer,
424+
icon: props?.multiTitlePointerIcon,
425+
},
422426
detail: {
423427
...styleWrapper(props?.legendStyle, theme?.legendStyle, 16, '#ffffff', 0, 'inherit'),
424428
formatter: props?.multiTitleGaugeOption?.data?.map(data => data.formatter)[0],
@@ -535,17 +539,18 @@ export function getEchartsConfig(
535539
show: false
536540
},
537541
progress: {
538-
"roundCap": props.roundCap,
542+
roundCap: props?.roundCap,
539543
show: true,
540-
width: props?.progressBarWidth,
544+
width: props?.ringProgressBarWidth,
541545
overlap: false,
542546
clip: false,
543547
},
544-
// axisLine: {
545-
// lineStyle: {
546-
// width: 20 // Reduced from 40
547-
// }
548-
// },
548+
axisLine: {
549+
roundCap: props?.roundCap,
550+
lineStyle: {
551+
width: props?.ringProgressBarWidth
552+
}
553+
},
549554
splitLine: {
550555
show: false
551556
},

‎client/packages/lowcoder-comps/src/i18n/comps/locales/en.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ export const en = {
139139
defaultProgressBarWidth: '10',
140140
defaultStageProgressBarWidth: '15',
141141
defaultTemperatureProgressBarWidth: '35',
142+
defaultRingProgressBarWidth: '20',
142143
progressBar: 'Progress Bar',
143144
roundCap: "Round Cap",
144145
chartType: "Chart Type",
@@ -147,6 +148,7 @@ export const en = {
147148
gradeDefaultPointerIcon: "path://M12.8,0.7l12,40.1H0.7L12.8,0.7z",
148149
clockDefaultPointerIcon: "path://M2.9,0.7L2.9,0.7c1.4,0,2.6,1.2,2.6,2.6v115c0,1.4-1.2,2.6-2.6,2.6l0,0c-1.4,0-2.6-1.2-2.6-2.6V3.3C0.3,1.9,1.4,0.7,2.9,0.7z",
149150
defaultBarometerPointerIcon: 'path://M2090.36389,615.30999 L2090.36389,615.30999 C2091.48372,615.30999 2092.40383,616.194028 2092.44859,617.312956 L2096.90698,728.755929 C2097.05155,732.369577 2094.2393,735.416212 2090.62566,735.56078 C2090.53845,735.564269 2090.45117,735.566014 2090.36389,735.566014 L2090.36389,735.566014 C2086.74736,735.566014 2083.81557,732.63423 2083.81557,729.017692 C2083.81557,728.930412 2083.81732,728.84314 2083.82081,728.755929 L2088.2792,617.312956 C2088.32396,616.194028 2089.24407,615.30999 2090.36389,615.30999 Z',
151+
defaultMultiTitlePointerIcon: 'path://M2.9,0.7L2.9,0.7c1.4,0,2.6,1.2,2.6,2.6v115c0,1.4-1.2,2.6-2.6,2.6l0,0c-1.4,0-2.6-1.2-2.6-2.6V3.3C0.3,1.9,1.4,0.7,2.9,0.7z',
150152
pointer_Y: "Pointer-Y",
151153
pointer_Y_Tooltip: "select vertical of pointer",
152154
pointerIcon: "Pointer Icon",

0 commit comments

Comments
 (0)