Merge pull request #1452 from lowcoder-org/feature-DynamicData

Converted input data JSON to Array.

Author: FalkWolsky

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

@@ -17,7 +17,8 @@ import {
   clickEvent,
   styleControl,
   EchartDefaultTextStyle,
-  EchartDefaultChartStyle
+  EchartDefaultChartStyle,
+  toArray
 } from "lowcoder-sdk";
 import { RecordConstructorToComp, RecordConstructorToView } from "lowcoder-core";
 import { BarChartConfig } from "./chartConfigs/barChartConfig";
@@ -253,7 +254,7 @@ export const chartUiModeChildren = {
 };
 
 let chartJsonModeChildren: any = {
-  echartsData: jsonControl(toJSONObjectArray),
+  echartsData: jsonControl(toArray),
   echartsOption: jsonControl(toObject, i18nObjs.defaultEchartsJsonOption),
   echartsTitle: withDefault(StringControl, trans("echarts.defaultTitle")),
   echartsLegendConfig: EchartsLegendConfig,

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

@@ -17,7 +17,8 @@ import {
   clickEvent,
   styleControl,
   EchartCandleStickChartStyle,
-  EchartDefaultTextStyle
+  EchartDefaultTextStyle,
+  toArray
 } from "lowcoder-sdk";
 import { RecordConstructorToComp, RecordConstructorToView } from "lowcoder-core";
 import { BarChartConfig } from "../chartComp/chartConfigs/barChartConfig";
@@ -250,7 +251,7 @@ export const chartUiModeChildren = {
 };
 
 let chartJsonModeChildren: any = {
-  echartsData: jsonControl(toObject),
+  echartsData: jsonControl(toArray),
   echartsOption: jsonControl(toObject, i18nObjs.defaultCandleStickChartOption),
   echartsTitle: withDefault(StringControl, trans("candleStickChart.defaultTitle")),
   echartsTitleVerticalConfig: EchartsTitleVerticalConfig,

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

@@ -213,7 +213,7 @@ export function getEchartsConfig(
             show: true,
             position: props?.echartsLabelConfig.top
           },
-          data: props?.echartsData?.data || props?.echartsOption.data,
+          data: props?.echartsData.length !== 0 && props?.echartsData || props?.echartsOption.data,
           itemStyle: props?.echartsData.itemStyle ? {
             ...props?.echartsData.itemStyle,
             borderWidth: props?.chartStyle?.chartBorderWidth || theme?.chartStyle?.borderWidth,

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

@@ -18,7 +18,8 @@ import {
   clickEvent,
   EchartDefaultTextStyle,
   styleControl,
-  EchartDefaultChartStyle
+  EchartDefaultChartStyle,
+  toArray
 } from "lowcoder-sdk";
 import { RecordConstructorToComp, RecordConstructorToView } from "lowcoder-core";
 import { BarChartConfig } from "./chartConfigs/barChartConfig";
@@ -263,7 +264,7 @@ export const chartUiModeChildren = {
 };
 
 let chartJsonModeChildren: any = {
-  echartsData: jsonControl(toJSONObjectArray),
+  echartsData: jsonControl(toArray),
   echartsTitle: withDefault(StringControl, trans("echarts.defaultTitle")),
   echartsOption: jsonControl(toObject, i18nObjs.defaultEchartsJsonOption),
 

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

@@ -17,7 +17,8 @@ import {
   clickEvent,
   styleControl,
   EchartDefaultChartStyle,
-  EchartDefaultTextStyle
+  EchartDefaultTextStyle,
+  toArray
 } from "lowcoder-sdk";
 import { RecordConstructorToComp, RecordConstructorToView } from "lowcoder-core";
 import { BarChartConfig } from "../chartComp/chartConfigs/barChartConfig";
@@ -255,7 +256,7 @@ export const chartUiModeChildren = {
 };
 
 let chartJsonModeChildren: any = {
-  echartsData: jsonControl(toObject),
+  echartsData: jsonControl(toArray),
   echartsOption: jsonControl(toObject, i18nObjs.defaultFunnelChartOption),
   echartsTitle: withDefault(StringControl, trans("funnelChart.defaultTitle")),
   echartsTitleVerticalConfig: EchartsTitleVerticalConfig,

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

@@ -184,7 +184,7 @@ export function getEchartsConfig(
             "position": props.echartsLabelConfig.top,
             ...styleWrapper(props?.labelStyle,theme?.labelStyle, 13),
           },
-          "data": props?.echartsData?.data || props.echartsOption.data
+          "data": props?.echartsData.length !== 0 && props?.echartsData || props.echartsOption.data
         }
       ]
     }

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

@@ -19,7 +19,8 @@ import {
   EchartDefaultChartStyle,
   EchartDefaultTextStyle,
   ColorControl,
-  EchartDefaultDetailStyle
+  EchartDefaultDetailStyle,
+  toArray
 } from "lowcoder-sdk";
 import { RecordConstructorToComp, RecordConstructorToView } from "lowcoder-core";
 import { BarChartConfig } from "../chartComp/chartConfigs/barChartConfig";
@@ -268,7 +269,7 @@ export const chartUiModeChildren = {
 };
 
 let chartJsonModeChildren: any = {
-  echartsData: jsonControl(toObject),
+  echartsData: jsonControl(toArray),
   echartsOption: jsonControl(toObject, i18nObjs.defaultGaugeChartOption),
   stageGaugeOption: jsonControl(toObject, i18nObjs.defaultStageGaugeChartOption),
   gradeGaugeOption: jsonControl(toObject, i18nObjs.defaultGradeGaugeChartOption),
@@ -278,13 +279,13 @@ let chartJsonModeChildren: any = {
   clockGaugeOption: jsonControl(toObject, i18nObjs.defaultClockGaugeChartOption),
   barometerGaugeOption: jsonControl(toObject, i18nObjs.defaultBarometerGaugeChartOption),
 
-  stageGaugeData:jsonControl(toObject),
-  gradeGaugeData:jsonControl(toObject),
-  temperatureGaugeData:jsonControl(toObject),
-  multiTitleGaugeData:jsonControl(toObject),
-  ringGaugeData:jsonControl(toObject),
-  clockGaugeData:jsonControl(toObject),
-  barometerGaugeData:jsonControl(toObject),
+  stageGaugeData:jsonControl(toArray),
+  gradeGaugeData:jsonControl(toArray),
+  temperatureGaugeData:jsonControl(toArray),
+  multiTitleGaugeData:jsonControl(toArray),
+  ringGaugeData:jsonControl(toArray),
+  clockGaugeData:jsonControl(toArray),
+  barometerGaugeData:jsonControl(toArray),
 
   chartType: dropdownControl(ChartTypeOptions, trans("chart.default")),
   echartsTitle: withDefault(StringControl, trans("gaugeChart.defaultTitle")),

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

@@ -83,7 +83,7 @@ export function gaugeChartPropertyView(
   const stageGaugePropertyView = (
     <>
       <Section name={trans("chart.config")}>
-        {children.gradeGaugeData.propertyView({ label: trans("chart.data") })}
+        {children.stageGaugeData.propertyView({ label: trans("chart.data") })}
         {children.chartType.propertyView({label: trans("gaugeChart.chartType"), tooltip: trans("gaugeChart.chartTypeTooltip") })}
         {children.echartsTitleConfig.getPropertyView()}
         {children.echartsTitle.propertyView({ label: trans("gaugeChart.title"), tooltip: trans("echarts.titleTooltip") })}