Merge pull request #1498 from lowcoder-org/dev

Dev -> Main for 2.6.1 Release

Author: FalkWolsky

client/VERSION

@@ -1 +1 @@
-2.6.0
+2.6.1

client/packages/lowcoder-comps/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lowcoder-comps",
-  "version": "2.6.1",
+  "version": "2.6.2",
   "type": "module",
   "license": "MIT",
   "dependencies": {

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

@@ -146,8 +146,11 @@ export function getEchartsConfig(
       mapOptions,
       showCharts,
     } = props;
+    let newMapOptions: any = {...mapOptions};
+    newMapOptions.series = [{...newMapOptions.series[0]}];
+    if(props.echartsData && props.echartsData.length > 0) newMapOptions.series[0].data = props.echartsData;
 
-    const echartsOption = mapOptions && showCharts ? mapOptions : {};
+    const echartsOption = newMapOptions && showCharts ? newMapOptions : {};
     return {
       gmap: {
         center: [mapCenterLng, mapCenterLat],

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

@@ -251,9 +251,10 @@ export const chartUiModeChildren = {
 };
 
 let chartJsonModeChildren: any = {
-  echartsData: jsonControl(toArray),
+  echartsData: jsonControl(toArray, i18nObjs.defaultCandleStickChartOption.data),
   echartsOption: jsonControl(toObject, i18nObjs.defaultCandleStickChartOption),
   echartsTitle: withDefault(StringControl, trans("candleStickChart.defaultTitle")),
+  echartsTitleData: jsonControl(toArray, i18nObjs.defaultCandleStickChartOption.xAxis.data),
   echartsTitleVerticalConfig: EchartsTitleVerticalConfig,
   echartsLabelConfig: EchartsLabelConfig,
   echartsTitleConfig:EchartsTitleConfig,

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

@@ -18,6 +18,7 @@ export function candleStickChartPropertyView(
       <Section name={trans("chart.config")}>
         {children.echartsData.propertyView({ label: trans("chart.data") })}
         {children.echartsTitleConfig.getPropertyView()}
+        {children.echartsTitleData.propertyView({ label: trans("chart.xAxisLabels"), tooltip: trans("chart.xAxisLabelsTooltip") })}
         {children.echartsTitleVerticalConfig.getPropertyView()}
         {children.echartsTitle.propertyView({ label: trans("candleStickChart.title"), tooltip: trans("echarts.titleTooltip") })}
         {children.left.propertyView({ label: trans("candleStickChart.left"), tooltip: trans("echarts.leftTooltip") })}

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

@@ -187,7 +187,7 @@ export function getEchartsConfig(
       },
       xAxis: props?.echartsOption && {
         type: 'category',
-        data: props?.echartsData.xAxis && props?.echartsData.xAxis.data || props?.echartsOption.xAxis && props?.echartsOption.xAxis.data,
+        data: props?.echartsTitleData.length && props?.echartsTitleData || props?.echartsData.xAxis && props?.echartsData.xAxis.data || props?.echartsOption.xAxis && props?.echartsOption.xAxis.data,
         splitArea: !props?.axisFlagVisibility && {
           show: true,
           areaStyle: {

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

@@ -256,7 +256,7 @@ export const chartUiModeChildren = {
 };
 
 let chartJsonModeChildren: any = {
-  echartsData: jsonControl(toArray),
+  echartsData: jsonControl(toArray, i18nObjs.defaultFunnelChartOption.data),
   echartsOption: jsonControl(toObject, i18nObjs.defaultFunnelChartOption),
   echartsTitle: withDefault(StringControl, trans("funnelChart.defaultTitle")),
   echartsTitleVerticalConfig: EchartsTitleVerticalConfig,

client/packages/lowcoder-comps/src/comps/graphChartComp/graphChartConstants.tsx

@@ -254,7 +254,9 @@ export const chartUiModeChildren = {
 };
 
 let chartJsonModeChildren: any = {
-  echartsData: jsonControl(toArray),
+  echartsCategories: jsonControl(toArray, i18nObjs.defaultGraphChartOption.categories),
+  echartsLinks: jsonControl(toArray, i18nObjs.defaultGraphChartOption.links),
+  echartsNodes: jsonControl(toArray, i18nObjs.defaultGraphChartOption.nodes),
   echartsOption: jsonControl(toObject, i18nObjs.defaultGraphChartOption),
   echartsTitle: withDefault(StringControl, trans("graphChart.defaultTitle")),
   echartsLegendConfig: EchartsLegendConfig,

client/packages/lowcoder-comps/src/comps/graphChartComp/graphChartPropertyView.tsx

@@ -16,7 +16,9 @@ export function graphChartPropertyView(
   const jsonModePropertyView = (
     <>
       <Section name={trans("chart.config")}>
-        {children.echartsData.propertyView({ label: trans("chart.data") })}
+        {children.echartsCategories.propertyView({ label: trans("graphChart.categories") })}
+        {children.echartsLinks.propertyView({ label: trans("graphChart.links") })}
+        {children.echartsNodes.propertyView({ label: trans("graphChart.nodes") })}
         {children.echartsTitle.propertyView({ label: trans("graphChart.title"), tooltip: trans("echarts.titleTooltip") })}
         {children.echartsTitleConfig.getPropertyView()}
         {children.echartsTitleVerticalConfig.getPropertyView()}

client/packages/lowcoder-comps/src/comps/graphChartComp/graphChartUtils.ts

@@ -154,8 +154,8 @@ export function getEchartsConfig(
 
           "type": "graph",
           "layout": "force",
-          'categories': props?.echartsData?.categories || props.echartsOption.categories,
-          'links': props?.echartsData.length !== 0 && props?.echartsData || props.echartsOption.links,
+          'categories': props?.echartsCategories.length !== 0 && props?.echartsCategories || props.echartsOption.categories,
+          'links': props?.echartsLinks.length !== 0 && props?.echartsLinks || props.echartsOption.links,
           "force": {
             "repulsion": props.repulsion,
             "gravity": props?.gravity,
@@ -165,20 +165,20 @@ export function getEchartsConfig(
           edgeSymbolSize: [0, props?.arrowSize],
           symbolSize: props?.pointSize,
           lineStyle: {
-            color: props.echartsData?.color?.lineColor || props.echartsOption?.color?.lineColor || "#00000033",
+            color: props.echartsOption?.color?.lineColor || "#00000033",
             ...chartStyleWrapper(props?.chartStyle,theme?.chartStyle),
             width: props?.lineWidth || 1,
             curveness: props?.curveness
           },
-          'nodes': props?.echartsData?.nodes || props.echartsOption.nodes,
+          'nodes': props?.echartsNodes.length !==0 && props?.echartsNodes || props.echartsOption.nodes,
           itemStyle: {
-            "color": props.echartsData?.color?.pointColor || props.echartsOption?.color?.pointColor || "#0000ff",
+            "color": props.echartsOption?.color?.pointColor || "#0000ff",
             ...chartStyleWrapper(props?.chartStyle,theme?.chartStyle),
           },
         }
       ],
     }
-    return props.echartsData || props.echartsOption ? opt : {};
+    return props.echartsOption ? opt : {};
 
   }