Skip to content

Commit 41d668c

Browse files
FalkWolskyFalkWolsky
authored
Merge branch 'dev' into meta_api
2 parents 628f70f + 4a1a09c commit 41d668c

31 files changed

+10575
-37
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/package.json

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
"agora-rtm-sdk": "^1.5.1",
2424
"big.js": "^6.2.1",
2525
"echarts-extension-gmap": "^1.6.0",
26+
"echarts-gl": "^2.0.9",
2627
"echarts-wordcloud": "^2.1.0",
2728
"lowcoder-cli": "workspace:^",
2829
"lowcoder-sdk": "workspace:^",
@@ -90,6 +91,30 @@
9091
"h": 40
9192
}
9293
},
94+
"boxplotChart": {
95+
"name": "Boxplot Chart",
96+
"icon": "./icons/icon-chart.svg",
97+
"layoutInfo": {
98+
"w": 12,
99+
"h": 40
100+
}
101+
},
102+
"parallelChart": {
103+
"name": "Parallel Chart",
104+
"icon": "./icons/icon-chart.svg",
105+
"layoutInfo": {
106+
"w": 12,
107+
"h": 40
108+
}
109+
},
110+
"line3dChart": {
111+
"name": "Line3D Chart",
112+
"icon": "./icons/icon-chart.svg",
113+
"layoutInfo": {
114+
"w": 12,
115+
"h": 40
116+
}
117+
},
93118
"imageEditor": {
94119
"name": "Image Editor",
95120
"icon": "./icons/icon-chart.svg",

‎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.data as any)[dataKey],
121+
value: params.data,
126122
});
127123
if (color === "true") {
128124
return "red";

‎client/packages/lowcoder-comps/src/comps/basicChartComp/reactEcharts/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import * as echarts from "echarts";
2+
import "echarts-gl";
23
import "echarts-wordcloud";
34
import { EChartsReactProps, EChartsInstance, EChartsOptionWithMap } from "./types";
45
import EChartsReactCore from "./core";

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy