Skip to content

Commit 06b7383

Browse files
FalkWolskyFalkWolsky
authored
Merge branch 'dev' into ee-setup
2 parents 893e9cd + d847f57 commit 06b7383

File tree

203 files changed

+27416
-314
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

203 files changed

+27416
-314
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,4 @@ application-dev-localhost.yaml
1818
server/api-service/lowcoder-server/src/main/resources/application-local-dev.yaml
1919
translations/locales/node_modules/
2020
server/api-service/lowcoder-server/src/main/resources/application-local-dev-ee.yaml
21+
node_modules

‎client/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.6.3
1+
2.6.4

‎client/config/test/transform/babelTransform.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,13 @@ export default babelJest.createTransformer({
88
runtime: "automatic",
99
},
1010
],
11+
[
12+
"babel-preset-vite",
13+
{
14+
"env": true,
15+
"glob": false
16+
}
17+
]
1118
],
1219
babelrc: false,
1320
configFile: false,

‎client/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "lowcoder-frontend",
3-
"version": "2.6.3",
3+
"version": "2.6.4",
44
"type": "module",
55
"private": true,
66
"workspaces": [
@@ -43,6 +43,7 @@
4343
"add": "^2.0.6",
4444
"babel-jest": "^29.3.0",
4545
"babel-preset-react-app": "^10.0.1",
46+
"babel-preset-vite": "^1.1.3",
4647
"husky": "^8.0.1",
4748
"jest": "^29.5.0",
4849
"jest-canvas-mock": "^2.5.2",

‎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: 58 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "lowcoder-comps",
3-
"version": "2.6.3",
3+
"version": "2.6.5",
44
"type": "module",
55
"license": "MIT",
66
"dependencies": {
@@ -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:^",
@@ -58,6 +59,62 @@
5859
"h": 40
5960
}
6061
},
62+
"barChart": {
63+
"name": "Bar Chart",
64+
"icon": "./icons/icon-chart.svg",
65+
"layoutInfo": {
66+
"w": 12,
67+
"h": 40
68+
}
69+
},
70+
"lineChart": {
71+
"name": "Line Chart",
72+
"icon": "./icons/icon-chart.svg",
73+
"layoutInfo": {
74+
"w": 12,
75+
"h": 40
76+
}
77+
},
78+
"pieChart": {
79+
"name": "Pie Chart",
80+
"icon": "./icons/icon-chart.svg",
81+
"layoutInfo": {
82+
"w": 12,
83+
"h": 40
84+
}
85+
},
86+
"scatterChart": {
87+
"name": "Scatter Chart",
88+
"icon": "./icons/icon-chart.svg",
89+
"layoutInfo": {
90+
"w": 12,
91+
"h": 40
92+
}
93+
},
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+
},
61118
"imageEditor": {
62119
"name": "Image Editor",
63120
"icon": "./icons/icon-chart.svg",

0 commit comments

Comments
 (0)