Skip to content

Commit ad00227

Browse files
Imiss-U1025Imiss-U1025
committed
Completed the ability to input static/dynamic data via data fields added to all charts.
1 parent 712dae0 commit ad00227

26 files changed

+302
-102
lines changed

‎client/packages/lowcoder-comps/src/comps/basicChartComp/chartConstants.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ export const chartUiModeChildren = {
253253
};
254254

255255
let chartJsonModeChildren: any = {
256-
echartsData: withDefault(StringControl, trans("echarts.defaultTitle")),
256+
echartsData: jsonControl(toJSONObjectArray),
257257
echartsOption: jsonControl(toObject, i18nObjs.defaultEchartsJsonOption),
258258
echartsTitle: withDefault(StringControl, trans("echarts.defaultTitle")),
259259
echartsLegendConfig: EchartsLegendConfig,

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -212,9 +212,9 @@ export function getEchartsConfig(
212212
.map((s) => s.getView().columnName);
213213
// y-axis is category and time, data doesn't need to aggregate
214214
const transformedData =
215-
yAxisConfig.type === "category" || yAxisConfig.type === "time"
216-
? props.data
217-
: transformData(props.data, props.xAxisKey, seriesColumnNames);
215+
yAxisConfig.type === "category" || yAxisConfig.type === "time" ? props.echartsData : transformData(props.echartsData, props.xAxisKey, seriesColumnNames)
216+
||
217+
yAxisConfig.type === "category" || yAxisConfig.type === "time" ? props.data : transformData(props.data, props.xAxisKey, seriesColumnNames);
218218
config = {
219219
...config,
220220
dataset: [

‎client/packages/lowcoder-comps/src/comps/candleStickChartComp/candleStickChartConstants.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ export const chartUiModeChildren = {
250250
};
251251

252252
let chartJsonModeChildren: any = {
253-
echartsData: withDefault(StringControl, trans("candleStickChart.defaultTitle")),
253+
echartsData: jsonControl(toObject),
254254
echartsOption: jsonControl(toObject, i18nObjs.defaultCandleStickChartOption),
255255
echartsTitle: withDefault(StringControl, trans("candleStickChart.defaultTitle")),
256256
echartsTitleVerticalConfig: EchartsTitleVerticalConfig,

‎client/packages/lowcoder-comps/src/comps/candleStickChartComp/candleStickChartUtils.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ export function getEchartsConfig(
213213
show: true,
214214
position: props?.echartsLabelConfig.top
215215
},
216-
data: props?.echartsOption.data,
216+
data: props?.echartsData?.data || props?.echartsOption.data,
217217
itemStyle: {
218218
...props?.echartsOption.itemStyle,
219219
borderWidth: props?.chartStyle?.chartBorderWidth || theme?.chartStyle?.borderWidth,
@@ -227,7 +227,7 @@ export function getEchartsConfig(
227227
},
228228
],
229229
}
230-
return props.echartsOption ? opt : {};
230+
return props.echartsData || props.echartsOption ? opt : {};
231231

232232
}
233233

‎client/packages/lowcoder-comps/src/comps/chartComp/chartConstants.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ export const chartUiModeChildren = {
263263
};
264264

265265
let chartJsonModeChildren: any = {
266-
echartsData: withDefault(StringControl, trans("echarts.defaultTitle")),
266+
echartsData: jsonControl(toJSONObjectArray),
267267
echartsTitle: withDefault(StringControl, trans("echarts.defaultTitle")),
268268
echartsOption: jsonControl(toObject, i18nObjs.defaultEchartsJsonOption),
269269

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ export function getEchartsConfig(
136136
theme?: any,
137137
): EChartsOptionWithMap {
138138
if (props.mode === "json") {
139-
return props.echartsOption ? props.echartsOption : {};
139+
return props.echartsOption || props.echartsOption ? props.echartsOption : {};
140140
}
141141
if(props.mode === "map") {
142142
const {
@@ -212,9 +212,9 @@ export function getEchartsConfig(
212212
.map((s) => s.getView().columnName);
213213
// y-axis is category and time, data doesn't need to aggregate
214214
const transformedData =
215-
yAxisConfig.type === "category" || yAxisConfig.type === "time"
216-
? props.data
217-
: transformData(props.data, props.xAxisKey, seriesColumnNames);
215+
yAxisConfig.type === "category" || yAxisConfig.type === "time" ? props.echartsData : transformData(props.echartsData, props.xAxisKey, seriesColumnNames)
216+
||
217+
yAxisConfig.type === "category" || yAxisConfig.type === "time" ? props.data : transformData(props.data, props.xAxisKey, seriesColumnNames);
218218
config = {
219219
...config,
220220
dataset: [

‎client/packages/lowcoder-comps/src/comps/funnelChartComp/funnelChartConstants.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ export const chartUiModeChildren = {
255255
};
256256

257257
let chartJsonModeChildren: any = {
258-
echartsData: withDefault(StringControl, trans("funnelChart.defaultTitle")),
258+
echartsData: jsonControl(toObject),
259259
echartsOption: jsonControl(toObject, i18nObjs.defaultFunnelChartOption),
260260
echartsTitle: withDefault(StringControl, trans("funnelChart.defaultTitle")),
261261
echartsTitleVerticalConfig: EchartsTitleVerticalConfig,

‎client/packages/lowcoder-comps/src/comps/funnelChartComp/funnelChartUtils.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,11 +184,11 @@ export function getEchartsConfig(
184184
"position": props.echartsLabelConfig.top,
185185
...styleWrapper(props?.labelStyle,theme?.labelStyle, 13),
186186
},
187-
"data": props.echartsOption.data
187+
"data": props?.echartsData?.data || props.echartsOption.data
188188
}
189189
]
190190
}
191-
return props.echartsOption ? opt : {};
191+
return props.echartsData || props.echartsOption ? opt : {};
192192

193193
}
194194

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ export const chartUiModeChildren = {
268268
};
269269

270270
let chartJsonModeChildren: any = {
271-
echartsData: withDefault(StringControl, trans("funnelChart.defaultTitle")),
271+
echartsData: jsonControl(toObject),
272272
echartsOption: jsonControl(toObject, i18nObjs.defaultGaugeChartOption),
273273
stageGaugeOption: jsonControl(toObject, i18nObjs.defaultStageGaugeChartOption),
274274
gradeGaugeOption: jsonControl(toObject, i18nObjs.defaultGradeGaugeChartOption),
@@ -278,13 +278,13 @@ let chartJsonModeChildren: any = {
278278
clockGaugeOption: jsonControl(toObject, i18nObjs.defaultClockGaugeChartOption),
279279
barometerGaugeOption: jsonControl(toObject, i18nObjs.defaultBarometerGaugeChartOption),
280280

281-
stageGaugeData:withDefault(StringControl, trans("gaugeChart.defaultTitle")),
282-
gradeGaugeData:withDefault(StringControl, trans("gaugeChart.defaultTitle")),
283-
temperatureGaugeData:withDefault(StringControl, trans("gaugeChart.defaultTitle")),
284-
multiTitleGaugeData:withDefault(StringControl, trans("gaugeChart.defaultTitle")),
285-
ringGaugeData:withDefault(StringControl, trans("gaugeChart.defaultTitle")),
286-
clockGaugeData:withDefault(StringControl, trans("gaugeChart.defaultTitle")),
287-
barometerGaugeData:withDefault(StringControl, trans("gaugeChart.defaultTitle")),
281+
stageGaugeData:jsonControl(toObject),
282+
gradeGaugeData:jsonControl(toObject),
283+
temperatureGaugeData:jsonControl(toObject),
284+
multiTitleGaugeData:jsonControl(toObject),
285+
ringGaugeData:jsonControl(toObject),
286+
clockGaugeData:jsonControl(toObject),
287+
barometerGaugeData:jsonControl(toObject),
288288

289289
chartType: dropdownControl(ChartTypeOptions, trans("chart.default")),
290290
echartsTitle: withDefault(StringControl, trans("gaugeChart.defaultTitle")),

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy