waterfall done

Imiss-U1025 · Imiss-U1025 · commit 52bfbbb833be · 2025-02-11T03:27:06.000-05:00
diff --git a/client/packages/lowcoder-comps/src/comps/barChartComp/barChartConstants.tsx b/client/packages/lowcoder-comps/src/comps/barChartComp/barChartConstants.tsx
@@ -245,6 +245,7 @@ export const chartUiModeChildren = {
   data: jsonControl(toJSONObjectArray, i18nObjs.defaultDataSource),
   xAxisKey: valueComp<string>(""), // x-axis, key from data
   xAxisDirection: dropdownControl(XAxisDirectionOptions, "horizontal"),
+  xAxisData: jsonControl(toArray, []),
   series: SeriesListComp,
   xConfig: XAxisConfig,
   yConfig: YAxisConfig,
diff --git a/client/packages/lowcoder-comps/src/comps/barChartComp/barChartPropertyView.tsx b/client/packages/lowcoder-comps/src/comps/barChartComp/barChartPropertyView.tsx
@@ -35,6 +35,9 @@ export function barChartPropertyView(
             dispatch(changeChildAction("xAxisKey", value));
           }}
         />
+        {children.chartConfig.getView().subtype === "waterfall" && children.xAxisData.propertyView({
+          label: "X-Label-Data"
+        })}
         <Option
           items={series}
           title={trans("chart.chartSeries")}
diff --git a/client/packages/lowcoder-comps/src/comps/barChartComp/barChartUtils.ts b/client/packages/lowcoder-comps/src/comps/barChartComp/barChartUtils.ts
@@ -210,12 +210,16 @@ export function getEchartsConfig(
       if(typeof item[seriesColumnNames[0]] === 'number') return acc + item[seriesColumnNames[0]];
       else return acc;
     }, 0)
+    const total = sum;
     transformedData.map(d => {
       d[`${seriesColumnNames[0]}_placeholder`] = sum - d[seriesColumnNames[0]];
       sum = d[`${seriesColumnNames[0]}_placeholder`];
     })
+    transformedData = [{[seriesColumnNames[0] + "_placeholder"]: 0, [seriesColumnNames[0]]: total}, ...transformedData]
   }
 
+  console.log("TransformedData", transformedData);
+
   config = {
     ...config,
     dataset: [
@@ -236,10 +240,10 @@ export function getEchartsConfig(
       },
       lineStyle: {
         ...chartStyleWrapper(props?.chartStyle, theme?.chartStyle)
-      }
+      },
+      data: transformedData.map((i: any) => i[series.name])
     })),
   };
-  console.log("Series", config.series);
   if (axisChart) {
     // pure chart's size except the margin around
     let chartRealSize;
@@ -270,7 +274,8 @@ export function getEchartsConfig(
         ...finalXyConfig.xConfig,
         axisLabel: {
           ...styleWrapper(props?.xAxisStyle, theme?.xAxisStyle, 11)
-        }
+        },
+        data: finalXyConfig.xConfig.type === "category"?props?.xAxisData:undefined,
       },
       // @ts-ignore
       yAxis: {
@@ -280,6 +285,8 @@ export function getEchartsConfig(
         }
       },
     };
+    console.log("Config", config);
+    console.log("Props", props);
   }
   // log.log("Echarts transformedData and config", transformedData, config);
   return config;
