Merge branch 'dev' into feat/helm-hpa-api-update

Author: dokdo2013

.gitignore

@@ -14,4 +14,6 @@ application-lowcoder.yml
 application-debug.yaml
 application-dev-localhost.yaml
 .vscode/settings.json
-.vscode/launch.json
+.vscode/launch.json
+server/api-service/lowcoder-server/src/main/resources/application-local-dev.yaml
+translations/locales/node_modules/

README.md

@@ -90,7 +90,7 @@ And we mean it... Day by day!
 ## 💻 Deployment Options
 [![Deploy to AWS using Stitch](https://img.shields.io/badge/deploy_with-Stitch-%23E369F7?logo=amazonaws&color=%23E369F7)](https://deploy.stitch.tech/lowcoder/lowcoder)
 
-[![Deploy in minutes on Elest.io](https://raw.githubusercontent.com/elestio-examples/element/main/deploy-on-elestio.png)](https://elest.io/open-source/lowcoder)
+[![Deploy to Elestio](https://img.shields.io/badge/Deploy_to-Elestio-%23E369F7?color=orange)](https://elest.io/open-source/lowcoder)
 
 You can access Lowcoder from [cloud-hosted version](https://app.lowcoder.cloud/) at any time, or use the following resources for self-host Lowcoder on different platforms:
 - [Docker](https://docs.lowcoder.cloud/lowcoder-documentation/setup-and-run/self-hosting)
@@ -110,4 +110,4 @@ Like ...  [@Darkjamin](https://github.com/Darkjamin), [@spacegoats-io](https://g
 
 ## Intro Video
 
-[![Watch the video](https://i.ytimg.com/vi/s4ltAqS0hzM/maxresdefault.jpg?sqp=-oaymwEmCIAKENAF8quKqQMa8AEB-AH-CYAC0AWKAgwIABABGD0gSShyMA8=&rs=AOn4CLAlPOIFdtauythoBKNPXhi6XGwlDQ)](https://youtu.be/s4ltAqS0hzM?feature=shared)
+[![Watch the video](https://i.ytimg.com/vi/s4ltAqS0hzM/maxresdefault.jpg?sqp=-oaymwEmCIAKENAF8quKqQMa8AEB-AH-CYAC0AWKAgwIABABGD0gSShyMA8=&rs=AOn4CLAlPOIFdtauythoBKNPXhi6XGwlDQ)](https://youtu.be/s4ltAqS0hzM?feature=shared)

client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lowcoder-root",
-  "version": "2.3.1",
+  "version": "2.4.5",
   "type": "module",
   "private": true,
   "workspaces": [
@@ -80,7 +80,6 @@
     "chalk": "4",
     "flag-icons": "^7.2.1",
     "number-precision": "^1.6.0",
-    "posthog-js": "^1.144.2",
     "react-countup": "^6.5.3",
     "react-player": "^2.11.0",
     "resize-observer-polyfill": "^1.5.1",

client/packages/lowcoder-cli/client.d.ts

@@ -29,8 +29,8 @@ declare var PUBLIC_URL: string;
 declare var REACT_APP_EDITION: string;
 declare var REACT_APP_LANGUAGES: string;
 declare var REACT_APP_COMMIT_ID: string;
-declare var REACT_APP_API_HOST: string;
-declare var LOWCODER_NODE_SERVICE_URL: string;
+declare var REACT_APP_API_SERVICE_URL: string;
+declare var REACT_APP_NODE_SERVICE_URL: string;
 declare var REACT_APP_ENV: string;
 declare var REACT_APP_BUILD_ID: string;
 declare var REACT_APP_LOG_LEVEL: string;

client/packages/lowcoder-cli/config/vite.config.js

@@ -27,8 +27,8 @@ export default defineConfig({
     extensions: [".mjs", ".js", ".ts", ".jsx", ".tsx", ".json"],
   },
   build: {
-    target: "es2015",
-    cssTarget: "chrome63",
+    target: "es2020",
+    cssTarget: "chrome87",
     outDir: paths.appOutPath,
     emptyOutDir: true,
     lib: {

client/packages/lowcoder-cli/dev-utils/buildVars.js

@@ -16,11 +16,11 @@ export const buildVars = [
     defaultValue: "00000",
   },
   {
-    name: "REACT_APP_API_HOST",
+    name: "REACT_APP_API_SERVICE_URL",
     defaultValue: "",
   },
   {
-    name: "LOWCODER_NODE_SERVICE_URL",
+    name: "REACT_APP_NODE_SERVICE_URL",
     defaultValue: "",
   },
   {

client/packages/lowcoder-comps/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lowcoder-comps",
-  "version": "2.4.11",
+  "version": "2.4.14",
   "type": "module",
   "license": "MIT",
   "dependencies": {

client/packages/lowcoder-comps/src/comps/basicChartComp/chartComp.tsx

@@ -26,7 +26,6 @@ import {
   chartColorPalette,
   getPromiseAfterDispatch,
   dropdownControl,
-  useMergeCompStyles,
 } from "lowcoder-sdk";
 import { getEchartsLocale, trans } from "i18n/comps";
 import { ItemColorComp } from "comps/chartComp/chartConfigs/lineChartConfig";
@@ -74,8 +73,6 @@ BasicChartTmpComp = withViewFn(BasicChartTmpComp, (comp) => {
     log.error('theme chart error: ', error);
   }
 
-  useMergeCompStyles?.(childrenToProps(comp.children), comp.dispatch);
-
   const triggerClickEvent = async (dispatch: any, action: CompAction<JSONValue>) => {
     await getPromiseAfterDispatch(
       dispatch,