Skip to content

Commit f6dc050

Browse files
committed
data option for candleStickChart
1 parent ae595bc commit f6dc050

File tree

4 files changed

+5
-1
lines changed

4 files changed

+5
-1
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,7 @@ let chartJsonModeChildren: any = {
254254
echartsData: jsonControl(toArray),
255255
echartsOption: jsonControl(toObject, i18nObjs.defaultCandleStickChartOption),
256256
echartsTitle: withDefault(StringControl, trans("candleStickChart.defaultTitle")),
257+
echartsTitleData: jsonControl(toArray),
257258
echartsTitleVerticalConfig: EchartsTitleVerticalConfig,
258259
echartsLabelConfig: EchartsLabelConfig,
259260
echartsTitleConfig:EchartsTitleConfig,

client/packages/lowcoder-comps/src/comps/candleStickChartComp/candleStickChartPropertyView.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ export function candleStickChartPropertyView(
1818
<Section name={trans("chart.config")}>
1919
{children.echartsData.propertyView({ label: trans("chart.data") })}
2020
{children.echartsTitleConfig.getPropertyView()}
21+
{children.echartsTitleData.propertyView({ label: trans("chart.xAxisLabels"), tooltip: trans("chart.xAxisLabelsTooltip") })}
2122
{children.echartsTitleVerticalConfig.getPropertyView()}
2223
{children.echartsTitle.propertyView({ label: trans("candleStickChart.title"), tooltip: trans("echarts.titleTooltip") })}
2324
{children.left.propertyView({ label: trans("candleStickChart.left"), tooltip: trans("echarts.leftTooltip") })}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ export function getEchartsConfig(
187187
},
188188
xAxis: props?.echartsOption && {
189189
type: 'category',
190-
data: props?.echartsData.xAxis && props?.echartsData.xAxis.data || props?.echartsOption.xAxis && props?.echartsOption.xAxis.data,
190+
data: props?.echartsTitleData.length && props?.echartsTitleData || props?.echartsData.xAxis && props?.echartsData.xAxis.data || props?.echartsOption.xAxis && props?.echartsOption.xAxis.data,
191191
splitArea: !props?.axisFlagVisibility && {
192192
show: true,
193193
areaStyle: {

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -374,6 +374,8 @@ export const en = {
374374
dataColumns: "Data Columns",
375375
title: "Title",
376376
tooltip:'Tooltip',
377+
xAxisLabels: "Labels-X",
378+
xAxisLabelsTooltip: "Label data for Axis-X (JSON Array)",
377379
xAxisDirection: "X-axis Direction",
378380
xAxisName: "X-axis Name",
379381
xAxisType: "X-axis Type",

0 commit comments

Comments
 (0)