Skip to content

Commit ab040d8

Browse files
committed
Converted repetitive control fields to JSON option, optimize and clear code
1 parent 5d7020c commit ab040d8

File tree

6 files changed

+143
-229
lines changed

6 files changed

+143
-229
lines changed

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

Lines changed: 15 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ let chartJsonModeChildren: any = {
290290
bottom:withDefault(NumberControl,trans('gaugeChart.defaultBottom')),
291291
width:withDefault(NumberControl,trans('gaugeChart.defaultWidth')),
292292
radius:withDefault(NumberControl,trans('gaugeChart.defaultRadius')),
293-
radiusTemperature:withDefault(NumberControl,trans('gaugeChart.defaultRadiusTemperature')),
293+
temperatureRadius:withDefault(NumberControl,trans('gaugeChart.defaultTemperatureRadius')),
294294
min:withDefault(NumberControl,trans('gaugeChart.defaultMin')),
295295
max:withDefault(NumberControl,trans('gaugeChart.defaultMax')),
296296
gap:withDefault(NumberControl,trans('gaugeChart.defaultGap')),
@@ -302,34 +302,23 @@ let chartJsonModeChildren: any = {
302302
pointerLength:withDefault(NumberControl,trans('gaugeChart.defaultPointerLength')),
303303
pointerWidth:withDefault(NumberControl,trans('gaugeChart.defaultPointerWidth')),
304304
pointer_Y:withDefault(NumberControl,trans('gaugeChart.defaultPointer_Y')),
305-
gradeGaugePointerLength:withDefault(NumberControl,trans('gaugeChart.defaultGradeGaugePointerLength')),
306-
gradeGaugePointerWidth:withDefault(NumberControl,trans('gaugeChart.defaultGradeGaugePointerWidth')),
307-
gradeGaugePointer_Y:withDefault(NumberControl,trans('gaugeChart.defaultGradeGaugePointer_Y')),
308305
pointerIcon:withDefault(StringControl),
306+
gradePointerIcon:withDefault(StringControl, trans('gaugeChart.gradeDefaultPointerIcon')),
309307
progressBarWidth:withDefault(NumberControl,trans('gaugeChart.defaultProgressBarWidth')),
310-
progressBarWidthStage:withDefault(NumberControl,trans('gaugeChart.defaultProgressBarWidthStage')),
311-
progressBarWidthTemperature:withDefault(NumberControl,trans('gaugeChart.defaultProgressBarWidthTemperature')),
312-
stageGaugeProgressBarColor1: withDefault(ColorControl, trans('gaugeChart.stageGauge.defaultProgressBarColor1')),
313-
stageGaugeProgressBarColor2: withDefault(ColorControl, trans('gaugeChart.stageGauge.defaultProgressBarColor2')),
314-
stageGaugeProgressBarColor3: withDefault(ColorControl, trans('gaugeChart.stageGauge.defaultProgressBarColor3')),
315-
stageGaugeProgressBarColor4: withDefault(ColorControl, trans('gaugeChart.stageGauge.defaultProgressBarColor4')),
316-
stageGaugeProgressBarInterval1: withDefault(NumberControl, trans('gaugeChart.stageGauge.defaultProgressBarInterval1')),
317-
stageGaugeProgressBarInterval2: withDefault(NumberControl, trans('gaugeChart.stageGauge.defaultProgressBarInterval2')),
318-
stageGaugeProgressBarInterval3: withDefault(NumberControl, trans('gaugeChart.stageGauge.defaultProgressBarInterval3')),
319-
gradeGaugeProgressBarInterval1: withDefault(NumberControl, trans('gaugeChart.stageGauge.defaultGradeProgressBarInterval1')),
320-
gradeGaugeProgressBarInterval2: withDefault(NumberControl, trans('gaugeChart.stageGauge.defaultGradeProgressBarInterval2')),
321-
gradeGaugeProgressBarInterval3: withDefault(NumberControl, trans('gaugeChart.stageGauge.defaultGradeProgressBarInterval3')),
322-
gradeGaugeProgressBarInterval4: withDefault(NumberControl, trans('gaugeChart.stageGauge.defaultGradeProgressBarInterval4')),
323-
gradeGaugeProgressBarString1: withDefault(StringControl, trans('gaugeChart.stageGauge.defaultGradeGaugeProgressBarString1')),
324-
gradeGaugeProgressBarString2: withDefault(StringControl, trans('gaugeChart.stageGauge.defaultGradeGaugeProgressBarString2')),
325-
gradeGaugeProgressBarString3: withDefault(StringControl, trans('gaugeChart.stageGauge.defaultGradeGaugeProgressBarString3')),
326-
gradeGaugeProgressBarString4: withDefault(StringControl, trans('gaugeChart.stageGauge.defaultGradeGaugeProgressBarString4')),
327-
axisTickWidth: withDefault(NumberControl, trans('gaugeChart.stageGauge.defaultAxisTickWidth')),
328-
axisTickLength: withDefault(NumberControl, trans('gaugeChart.stageGauge.defaultAxisTickLength')),
329-
axisTickColor: withDefault(ColorControl, trans('gaugeChart.stageGauge.defaultAxisTickColor')),
330-
axisTickColorStage: withDefault(ColorControl, trans('gaugeChart.stageGauge.defaultAxisTickColorStage')),
331-
axisTickColorGrade: withDefault(ColorControl),
308+
axisTickWidth: withDefault(NumberControl, trans('gaugeChart.defaultAxisTickWidth')),
309+
axisTickLength: withDefault(NumberControl, trans('gaugeChart.defaultAxisTickLength')),
332310
axisLabelDistance: withDefault(NumberControl, trans('gaugeChart.defaultAxisLabelDistance')),
311+
axisTickColor: withDefault(ColorControl, trans('gaugeChart.defaultAxisTickColor')),
312+
313+
gradeGaugePointerLength:withDefault(NumberControl,trans('gaugeChart.defaultGradeGaugePointerLength')),
314+
gradeGaugePointerWidth:withDefault(NumberControl,trans('gaugeChart.defaultGradeGaugePointerWidth')),
315+
gradeGaugePointer_Y:withDefault(NumberControl,trans('gaugeChart.defaultGradeGaugePointer_Y')),
316+
stageProgressBarWidth:withDefault(NumberControl,trans('gaugeChart.defaultStageProgressBarWidth')),
317+
temperatureProgressBarWidth:withDefault(NumberControl,trans('gaugeChart.defaultTemperatureProgressBarWidth')),
318+
temperatureAxisLabelDistance:withDefault(NumberControl,trans('gaugeChart.defaultTemperatureAxisLabelDistance')),
319+
stageAxisTickColor: withDefault(ColorControl, trans('gaugeChart.defaultStageAxisTickColor')),
320+
gradeAxisTickColor: withDefault(ColorControl),
321+
333322
}
334323

335324
if (EchartDefaultChartStyle && EchartDefaultTextStyle) {

0 commit comments

Comments
 (0)