Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 4a1a09c

Browse files
Merge pull request #1546 from lowcoder-org/fix/chart_column_name
Fixed line/bar chart issue with column name
2 parents dd58106 + bfe925b commit 4a1a09c

File tree

5 files changed

+17
-16
lines changed

5 files changed

+17
-16
lines changed

‎client/packages/lowcoder-cli/actions/build.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import fsExtra from "fs-extra";
33
import { build } from "vite";
44
import { writeFileSync, existsSync, readFileSync, readdirSync } from "fs";
55
import { resolve } from "path";
6+
import { pathToFileURL } from "url";
67
import paths from "../config/paths.js";
78
import "../util/log.js";
89
import chalk from "chalk";
@@ -80,7 +81,9 @@ export default async function buildAction(options) {
8081
console.log("");
8182
console.cyan("Building...");
8283

83-
const viteConfig = await import(paths.appViteConfigJs).default;
84+
const viteConfigURL = pathToFileURL(paths.appViteConfigJs);
85+
const viteConfig = await import(viteConfigURL).default;
86+
console.log(paths.appViteConfigJs);
8487
await build(viteConfig);
8588

8689
// write package.json

‎client/packages/lowcoder-comps/src/comps/barChartComp/barChartUtils.ts‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ export function getSeriesConfig(props: EchartsConfigProps) {
109109
}
110110
return {
111111
name: props.chartConfig.subtype === "waterfall" && index === 0?" ":s.getView().seriesName,
112+
columnName: props.chartConfig.subtype === "waterfall" && index === 0?" ":s.getView().columnName,
112113
selectedMode: "single",
113114
select: {
114115
itemStyle: {
@@ -128,10 +129,10 @@ export function getSeriesConfig(props: EchartsConfigProps) {
128129
},
129130
};
130131
} else {
131-
// pie
132132
const radiusAndCenter = getPieRadiusAndCenter(seriesLength, index, props.chartConfig);
133133
return {
134134
...props.chartConfig,
135+
columnName: s.getView().columnName,
135136
radius: radiusAndCenter.radius,
136137
center: radiusAndCenter.center,
137138
name: s.getView().seriesName,
@@ -227,7 +228,7 @@ export function getEchartsConfig(
227228
d[` `] = sum - d[seriesColumnNames[0]];
228229
sum = d[` `];
229230
})
230-
transformedData = [{[seriesColumnNames[0]+"_placeholder"]: 0, [seriesColumnNames[0]]: total, [props.xAxisKey]: "Total"}, ...transformedData]
231+
transformedData = [{[" "]: 0, [seriesColumnNames[0]]: total, [props.xAxisKey]: "Total"}, ...transformedData]
231232
}
232233

233234
if(props.chartConfig.subtype === "polar") {
@@ -272,7 +273,7 @@ export function getEchartsConfig(
272273
lineStyle: {
273274
...chartStyleWrapper(props?.chartStyle, theme?.chartStyle)
274275
},
275-
data: transformedData.map((i: any) => i[series.name])
276+
data: transformedData.map((i: any) => i[series.columnName])
276277
})),
277278
};
278279
if (axisChart) {
@@ -334,7 +335,7 @@ export function getEchartsConfig(
334335
}
335336
}
336337
}
337-
// log.log("Echarts transformedData and config", transformedData, config);
338+
// console.log("Echarts transformedData and config", transformedData, config);
338339
return config;
339340
}
340341

‎client/packages/lowcoder-comps/src/comps/basicChartComp/chartConfigs/lineChartConfig.tsx‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -116,13 +116,9 @@ export const LineChartConfig = (function () {
116116
symbolSize: props.symbolSize,
117117
itemStyle: {
118118
color: (params) => {
119-
if (!params.encode || !params.dimensionNames) {
120-
return params.color;
121-
}
122-
const dataKey = params.dimensionNames[params.encode[props.polar?"radius":"y"][0]];
123119
const color = (props.itemColor as any)({
124120
seriesName: params.seriesName,
125-
value: (params.dataasany)[dataKey],
121+
value: params.data,
126122
});
127123
if (color === "true") {
128124
return "red";

‎client/packages/lowcoder-comps/src/comps/lineChartComp/lineChartUtils.ts‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ export function getSeriesConfig(props: EchartsConfigProps) {
9797
}}, {[horizontalX?"xAxis":"yAxis"]: area.getView().to}]));
9898
return {
9999
name: s.getView().seriesName,
100+
columnName: s.getView().columnName,
100101
selectedMode: "single",
101102
select: {
102103
itemStyle: {
@@ -126,10 +127,10 @@ export function getSeriesConfig(props: EchartsConfigProps) {
126127
},
127128
};
128129
} else {
129-
// pie
130130
const radiusAndCenter = getPieRadiusAndCenter(seriesLength, index, props.chartConfig);
131131
return {
132132
...props.chartConfig,
133+
columnName: s.getView().columnName,
133134
radius: radiusAndCenter.radius,
134135
center: radiusAndCenter.center,
135136
name: s.getView().seriesName,
@@ -264,7 +265,7 @@ export function getEchartsConfig(
264265
...series,
265266
encode: {
266267
...series.encode,
267-
y: series.name,
268+
y: series.columnName,
268269
},
269270
itemStyle: {
270271
...series.itemStyle,
@@ -273,7 +274,7 @@ export function getEchartsConfig(
273274
lineStyle: {
274275
...chartStyleWrapper(props?.chartStyle, theme?.chartStyle)
275276
},
276-
data: transformedData.map((i: any) => i[series.name])
277+
data: transformedData.map((i: any) => i[series.columnName])
277278
})),
278279
};
279280
if (axisChart) {
@@ -336,7 +337,7 @@ export function getEchartsConfig(
336337
}
337338
}
338339

339-
// log.log("Echarts transformedData and config", transformedData, config);
340+
// console.log("Echarts transformedData and config", transformedData, config);
340341
return config;
341342
}
342343

‎client/packages/lowcoder-comps/src/comps/pieChartComp/pieChartUtils.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ export function getSeriesConfig(props: EchartsConfigProps) {
128128
}
129129
}
130130
}
131-
if(props.chartConfig.subtype !== "doughnutPie") config.radius = s.radius;
131+
if(props.chartConfig.subtype !== 'doughnutPie') config.radius = s.radius;
132132
if(s.left!="" && s.top!="") {
133133
config.center = [s.left, s.top];
134134
}
@@ -280,7 +280,7 @@ export function getEchartsConfig(
280280
]
281281
}
282282

283-
// console.log("Echarts transformedData and config", transformedData, config);
283+
console.log("Echarts transformedData and config", transformedData, config);
284284
return config;
285285
}
286286

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /