Merge pull request lowcoder-org#1498 from lowcoder-org/dev

Dev -> Main for 2.6.1 Release
placidic · Feb 4, 2025 · e2df7b6 · e2df7b6
2 parents 73ad9ee + 6a3d7d3
commit e2df7b6
Show file tree

Hide file tree

Showing 89 changed files with 6,304 additions and 13,483 deletions.
diff --git a/client/VERSION b/client/VERSION
@@ -1 +1 @@
-2.6.0
+2.6.1
diff --git a/client/packages/lowcoder-comps/package.json b/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": {

diff --git a/client/packages/lowcoder-comps/src/comps/basicChartComp/chartUtils.ts b/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],

diff --git a/client/packages/lowcoder-comps/src/comps/candleStickChartComp/candleStickChartConstants.tsx b/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,

diff --git a/...t/packages/lowcoder-comps/src/comps/candleStickChartComp/candleStickChartPropertyView.tsx b/...t/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") })}

diff --git a/client/packages/lowcoder-comps/src/comps/candleStickChartComp/candleStickChartUtils.ts b/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: {

diff --git a/client/packages/lowcoder-comps/src/comps/funnelChartComp/funnelChartConstants.tsx b/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,

diff --git a/client/packages/lowcoder-comps/src/comps/graphChartComp/graphChartConstants.tsx b/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,

diff --git a/client/packages/lowcoder-comps/src/comps/graphChartComp/graphChartPropertyView.tsx b/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()}

diff --git a/client/packages/lowcoder-comps/src/comps/graphChartComp/graphChartUtils.ts b/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 : {};
 
   }
 

diff --git a/client/packages/lowcoder-comps/src/comps/heatmapChartComp/heatmapChartConstants.tsx b/client/packages/lowcoder-comps/src/comps/heatmapChartComp/heatmapChartConstants.tsx
@@ -254,7 +254,10 @@ export const chartUiModeChildren = {
 };
 
 let chartJsonModeChildren: any = {
-  echartsData: jsonControl(toArray),
+  echartsData: jsonControl(toArray, i18nObjs.defaultHeatmapChartOption.data),
+  echartsDataX: jsonControl(toArray, i18nObjs.defaultHeatmapChartOption.xAxis),
+  echartsDataY: jsonControl(toArray, i18nObjs.defaultHeatmapChartOption.yAxis),
+  echartsColor: jsonControl(toArray, i18nObjs.defaultHeatmapChartOption.color),
   echartsOption: jsonControl(toObject, i18nObjs.defaultHeatmapChartOption),
   echartsTitle: withDefault(StringControl, trans("heatmapChart.defaultTitle")),
   echartsLegendConfig: EchartsLegendConfig,

diff --git a/client/packages/lowcoder-comps/src/comps/heatmapChartComp/heatmapChartPropertyView.tsx b/client/packages/lowcoder-comps/src/comps/heatmapChartComp/heatmapChartPropertyView.tsx
@@ -17,6 +17,9 @@ export function heatmapChartPropertyView(
     <>
       <Section name={trans("chart.config")}>
         {children.echartsData.propertyView({ label: trans("chart.data") })}
+        {children.echartsDataX.propertyView({ label: trans("heatmapChart.xAxisData") })}
+        {children.echartsDataY.propertyView({ label: trans("heatmapChart.yAxisData") })}
+        {children.echartsColor.propertyView({ label: trans("heatmapChart.color") })}
         {children.echartsTitleConfig.getPropertyView()}
         {children.echartsTitleVerticalConfig.getPropertyView()}
         {children.echartsLegendAlignConfig.getPropertyView()}

diff --git a/client/packages/lowcoder-comps/src/comps/radarChartComp/radarChartConstants.tsx b/client/packages/lowcoder-comps/src/comps/radarChartComp/radarChartConstants.tsx
@@ -255,7 +255,8 @@ export const chartUiModeChildren = {
 };
 
 let chartJsonModeChildren: any = {
-  echartsData: jsonControl(toArray),
+  echartsData: jsonControl(toArray, i18nObjs.defaultRadarChartOption.series),
+  echartsIndicators: jsonControl(toArray, i18nObjs.defaultRadarChartOption.indicator),
   echartsOption: jsonControl(toObject, i18nObjs.defaultRadarChartOption),
   echartsTitle: withDefault(StringControl, trans("radarChart.defaultTitle")),
   echartsLegendConfig: EchartsLegendConfig,

diff --git a/client/packages/lowcoder-comps/src/comps/radarChartComp/radarChartPropertyView.tsx b/client/packages/lowcoder-comps/src/comps/radarChartComp/radarChartPropertyView.tsx
@@ -17,7 +17,7 @@ export function radarChartPropertyView(
     <>
       <Section name={trans("chart.config")}>
         {children.echartsData.propertyView({ label: trans("chart.data") })}
-
+        {children.echartsIndicators.propertyView({ label: trans("radarChart.indicators") })}
         {children.echartsTitleConfig.getPropertyView()}
         {children.echartsTitleVerticalConfig.getPropertyView()}
         {children.legendVisibility.getView() && children.echartsLegendAlignConfig.getPropertyView()}

diff --git a/client/packages/lowcoder-comps/src/comps/radarChartComp/radarChartUtils.ts b/client/packages/lowcoder-comps/src/comps/radarChartComp/radarChartUtils.ts
@@ -169,7 +169,7 @@ export function getEchartsConfig(
       },
       radar: [
         {
-          indicator: props.echartsData.indicator || props.echartsOption.indicator,
+          indicator: (props.echartsIndicators.length !== 0 && props.echartsIndicators) || props.echartsOption.indicator,
           center: [`${props?.position_x}%`, `${props?.position_y}%`],
           startAngle: props?.startAngle,
           endAngle: props?.endAngle,

diff --git a/client/packages/lowcoder-comps/src/comps/sankeyChartComp/sankeyChartConstants.tsx b/client/packages/lowcoder-comps/src/comps/sankeyChartComp/sankeyChartConstants.tsx
@@ -254,7 +254,8 @@ export const chartUiModeChildren = {
 };
 
 let chartJsonModeChildren: any = {
-  echartsData: jsonControl(toArray),
+  echartsData: jsonControl(toArray, i18nObjs.defaultSankeyChartOption.data),
+  echartsLinks: jsonControl(toArray, i18nObjs.defaultSankeyChartOption.links),
   echartsOption: jsonControl(toObject, i18nObjs.defaultSankeyChartOption),
   echartsTitle: withDefault(StringControl, trans("sankeyChart.defaultTitle")),
   echartsLegendConfig: EchartsLegendConfig,

diff --git a/client/packages/lowcoder-comps/src/comps/sankeyChartComp/sankeyChartPropertyView.tsx b/client/packages/lowcoder-comps/src/comps/sankeyChartComp/sankeyChartPropertyView.tsx
@@ -17,6 +17,7 @@ export function sankeyChartPropertyView(
     <>
       <Section name={trans("chart.config")}>
         {children.echartsData.propertyView({ label: trans("chart.data") })}
+        {children.echartsLinks.propertyView({ label: trans("chart.links") })}
 
         {children.echartsTitleConfig.getPropertyView()}
         {children.echartsTitleVerticalConfig.getPropertyView()}

diff --git a/client/packages/lowcoder-comps/src/comps/sankeyChartComp/sankeyChartUtils.ts b/client/packages/lowcoder-comps/src/comps/sankeyChartComp/sankeyChartUtils.ts
@@ -173,7 +173,7 @@ export function getEchartsConfig(
             name: item.name,
             itemStyle: isColorString(item.color) && {color: item.color}
           })),
-          links: props.echartsData.links || props.echartsOption.links,
+          links: (props.echartsLinks.length !== 0 && props.echartsLinks) || props.echartsOption.links,
           emphasis: {
             focus: props?.focus ? 'adjacency' : undefined,
           },

diff --git a/client/packages/lowcoder-comps/src/comps/sunburstChartComp/sunburstChartConstants.tsx b/client/packages/lowcoder-comps/src/comps/sunburstChartComp/sunburstChartConstants.tsx
@@ -253,7 +253,8 @@ export const chartUiModeChildren = {
 };
 
 let chartJsonModeChildren: any = {
-  echartsData: jsonControl(toArray),
+  echartsData: jsonControl(toArray, i18nObjs.defaultSunburstChartOption.data),
+  echartsLevels: jsonControl(toArray, i18nObjs.defaultSunburstChartOption.levels),
   echartsOption: jsonControl(toObject, i18nObjs.defaultSunburstChartOption),
   echartsTitle: withDefault(StringControl, trans("sunburstChart.defaultTitle")),
   echartsLegendConfig: EchartsLegendConfig,

diff --git a/client/packages/lowcoder-comps/src/comps/sunburstChartComp/sunburstChartPropertyView.tsx b/client/packages/lowcoder-comps/src/comps/sunburstChartComp/sunburstChartPropertyView.tsx
@@ -17,6 +17,7 @@ export function sunburstChartPropertyView(
     <>
       <Section name={trans("chart.config")}>
         {children.echartsData.propertyView({ label: trans("chart.data") })}
+        {children.echartsLevels.propertyView({ label: trans("sunburstChart.levels") })}
 
         {children.echartsTitleConfig.getPropertyView()}
         {children.echartsTitleVerticalConfig.getPropertyView()}

diff --git a/client/packages/lowcoder-comps/src/comps/sunburstChartComp/sunburstChartUtils.ts b/client/packages/lowcoder-comps/src/comps/sunburstChartComp/sunburstChartUtils.ts
@@ -149,7 +149,7 @@ export function getEchartsConfig(
       backgroundColor: parseBackground(
         props?.chartStyle?.background || theme?.chartStyle?.backgroundColor || "#FFFFFF"
       ),
-      color: props.echartsData.data?.map(data => data.color) || props.echartsOption.data?.map(data => data.color),
+      color: props.echartsOption.data?.map(data => data.color),
       tooltip: props.tooltip&&{
         trigger: "item",
         formatter: "{b}: {c}"
@@ -161,7 +161,7 @@ export function getEchartsConfig(
           center: [`${props?.position_x}%`, `${props?.position_y}%`],
           symbolSize: 7,
           data: props?.echartsData.length !== 0 && props?.echartsData || props.echartsOption.data,
-          levels: props.echartsData.levels || props.echartsOption.levels,
+          levels: props.echartsLevels.length !==0 && props.echartsLevels || props.echartsOption.levels,
           itemStyle: {
             ...chartStyleWrapper(props?.chartStyle, theme?.chartStyle)
           },
@@ -173,7 +173,7 @@ export function getEchartsConfig(
         }
       ],
     }
-    return props.echartsData || props.echartsOption ? opt : {};
+    return props.echartsOption ? opt : {};
 
   }
 

diff --git a/client/packages/lowcoder-comps/src/comps/themeriverChartComp/themeriverChartConstants.tsx b/client/packages/lowcoder-comps/src/comps/themeriverChartComp/themeriverChartConstants.tsx
@@ -254,7 +254,8 @@ export const chartUiModeChildren = {
 };
 
 let chartJsonModeChildren: any = {
-  echartsData: jsonControl(toArray),
+  echartsData: jsonControl(toArray, i18nObjs.defaultThemeriverChartOption.data),
+  echartsColors: jsonControl(toArray, i18nObjs.defaultThemeriverChartOption.color),
   echartsOption: jsonControl(toObject, i18nObjs.defaultThemeriverChartOption),
   echartsTitle: withDefault(StringControl, trans("themeriverChart.defaultTitle")),
   echartsLegendConfig: EchartsLegendConfig,

diff --git a/client/packages/lowcoder-comps/src/comps/themeriverChartComp/themeriverChartPropertyView.tsx b/client/packages/lowcoder-comps/src/comps/themeriverChartComp/themeriverChartPropertyView.tsx
@@ -17,6 +17,7 @@ export function themeriverChartPropertyView(
     <>
       <Section name={trans("chart.config")}>
         {children.echartsData.propertyView({ label: trans("chart.data") })}
+        {children.echartsColors.propertyView({ label: trans("themeriverChart.colors") })}
 
         {children.echartsTitleConfig.getPropertyView()}
         {children.echartsTitleVerticalConfig.getPropertyView()}

diff --git a/client/packages/lowcoder-comps/src/comps/themeriverChartComp/themeriverChartUtils.ts b/client/packages/lowcoder-comps/src/comps/themeriverChartComp/themeriverChartUtils.ts
@@ -204,12 +204,12 @@ export function getEchartsConfig(
               shadowColor: "rgba(0, 0, 0, 0.8)"
             }
           },
-          color: props.echartsData?.color && props.echartsData.color || props.echartsOption?.color && props.echartsOption.color
+          color: props.echartsColors.length !== 0 && props.echartsColors || props.echartsOption?.color && props.echartsOption.color
         },
       ]
     }
 
-    return props.echartsData || props.echartsOption ? opt : {};
+    return props.echartsOption ? opt : {};
 
   }
 

diff --git a/client/packages/lowcoder-comps/src/comps/treeChartComp/treeChartConstants.tsx b/client/packages/lowcoder-comps/src/comps/treeChartComp/treeChartConstants.tsx
@@ -254,7 +254,7 @@ export const chartUiModeChildren = {
 };
 
 let chartJsonModeChildren: any = {
-  echartsData: jsonControl(toArray),
+  echartsData: jsonControl(toArray, i18nObjs.defaultTreeChartOption.data),
   echartsOption: jsonControl(toObject, i18nObjs.defaultTreeChartOption),
   echartsTitle: withDefault(StringControl, trans("treeChart.defaultTitle")),
   echartsLegendConfig: EchartsLegendConfig,

diff --git a/client/packages/lowcoder-comps/src/comps/treemapChartComp/treemapChartConstants.tsx b/client/packages/lowcoder-comps/src/comps/treemapChartComp/treemapChartConstants.tsx
@@ -253,7 +253,7 @@ export const chartUiModeChildren = {
 };
 
 let chartJsonModeChildren: any = {
-  echartsData: jsonControl(toArray),
+  echartsData: jsonControl(toArray, i18nObjs.defaultTreemapChartOption.data),
   echartsOption: jsonControl(toObject, i18nObjs.defaultTreemapChartOption),
   echartsTitle: withDefault(StringControl, trans("treemapChart.defaultTitle")),
   echartsLegendConfig: EchartsLegendConfig,

diff --git a/client/packages/lowcoder-comps/src/i18n/comps/locales/en.ts b/client/packages/lowcoder-comps/src/i18n/comps/locales/en.ts
@@ -7,6 +7,7 @@ export const en = {
   },
   themeriverChart: {
     themeriverType: 'Themeriver Chart Type',
+    colors: 'Colors',
     title: 'Title',
     defaultTitle: 'Themeriver Chart',
     tooltip: 'Tooltip',
@@ -23,6 +24,7 @@ export const en = {
   },
   sunburstChart: {
     sunburstType: 'Sunburst Chart Type',
+    levels: 'Levels',
     title: 'Title',
     defaultTitle: 'Sunburst Chart',
     tooltip: 'Tooltip',
@@ -73,6 +75,9 @@ export const en = {
     lineWidthTooltip: "Set the Line Width of the Chart."
   },
   graphChart: {
+    categories: 'Categories',
+    nodes: 'Nodes',
+    links: 'Links',
     graphType: 'Graph Chart Type',
     title: 'Title',
     defaultTitle: 'Graph Chart',
@@ -105,6 +110,9 @@ export const en = {
   },
   heatmapChart: {
     heatmapType: 'Heatmap Chart Type',
+    color: 'Colors',
+    xAxisData: 'X-Axis Data',
+    yAxisData: 'Y-Axis Data',
     title: 'Title',
     left: 'Left',
     defaultLeft:'15',
@@ -145,6 +153,7 @@ export const en = {
     areaFlagTooltip: "Divide the area into a Line or a Circle.",
     indicatorVisibility: "Indicator",
     indicatorVisibilityTooltip: "Show or hide the Indicator of the Chart.",
+    indicators: 'Indicators',
   },
   candleStickChart: {
     candleStickType: 'CandleStick Chart Type',
@@ -361,6 +370,7 @@ export const en = {
   chart: {
     delete: "Delete",
     data: "Data",
+    links: "Links",
     mode: "Mode",
     config: "Configuration",
     UIMode: "UI Mode",
@@ -374,6 +384,8 @@ export const en = {
     dataColumns: "Data Columns",
     title: "Title",
     tooltip:'Tooltip',
+    xAxisLabels: "Labels-X",
+    xAxisLabelsTooltip: "Label data for Axis-X (JSON Array)",
     xAxisDirection: "X-axis Direction",
     xAxisName: "X-axis Name",
     xAxisType: "X-axis Type",