pull from origin dev

Author: MenamAfzal

.github/workflows/docker-images.yml

@@ -0,0 +1,135 @@
+name: Build lowcoder docker images
+
+on:
+  workflow_dispatch:
+    inputs:
+      imageTag:
+        type: choice
+        description: 'Choose a tag for built docker image(s)'
+        required: true
+        default: 'latest'
+        options:
+        - latest
+        - test
+      build_allinone:
+        type: boolean
+        description: 'Build the All-In-One image'
+        default: true
+      build_frontend:
+        type: boolean
+        description: 'Build the Frontend image'
+        default: true
+      build_nodeservice:
+        type: boolean
+        description: 'Build the Node service image'
+        default: true
+      build_apiservice:
+        type: boolean
+        description: 'Build the API service image'
+        default: true
+  push:
+    branches: dev
+    paths:
+      - 'client/**'
+      - 'server/**'
+      - 'deploy/docker/**'
+  release:
+    types: [released]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set environment variables
+        shell: bash
+        run: |
+          # Get the short SHA of last commit
+          echo "SHORT_SHA=$(echo ${{ github.sha }} | cut -c1-7)" >> "${GITHUB_ENV}"
+          
+          # Get branch name - we don't use github.ref_head_name since we don't build on PRs
+          echo "BRANCH_NAME=${{ github.ref_name }}" >> "${GITHUB_ENV}"
+          
+          # Set docker image tag
+          echo "IMAGE_TAG=${{ inputs.imageTag || github.ref_name }}" >> "${GITHUB_ENV}"
+          
+          # Control which images to build
+          echo "BUILD_ALLINONE=${{ inputs.build_allinone || true }}" >> "${GITHUB_ENV}"
+          echo "BUILD_FRONTEND=${{ inputs.build_frontend || true }}" >> "${GITHUB_ENV}"
+          echo "BUILD_NODESERVICE=${{ inputs.build_nodeservice || true }}" >> "${GITHUB_ENV}"
+          echo "BUILD_APISERVICE=${{ inputs.build_apiservice || true }}" >> "${GITHUB_ENV}"
+
+      - name: Checkout lowcoder source
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.BRANCH_NAME }}
+
+      - name: Log into Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_LOGIN }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Setup Docker Buildx with cloud driver
+        uses: docker/setup-buildx-action@v3
+        with:
+          version: "lab:latest"
+          driver: cloud
+          endpoint: "lowcoderorg/lowcoder-cloud-builder"
+
+      - name: Build and push the all-in-one image
+        if: ${{ env.BUILD_ALLINONE == 'true' }}
+        uses: docker/build-push-action@v6
+        env:
+          NODE_ENV: production
+        with:
+          file: ./deploy/docker/Dockerfile
+          build-args: |
+            REACT_APP_ENV=production
+            REACT_APP_COMMIT_ID="dev #${{ env.SHORT_SHA }}"
+          platforms: |
+            linux/amd64
+            linux/arm64
+          push: true
+          tags: lowcoderorg/lowcoder-ce:${{ env.IMAGE_TAG }}
+
+      - name: Build and push the frontend image
+        if: ${{ env.BUILD_FRONTEND == 'true' }}
+        uses: docker/build-push-action@v6
+        env:
+          NODE_ENV: production
+        with:
+          file: ./deploy/docker/Dockerfile
+          target: lowcoder-ce-frontend
+          build-args: |
+            REACT_APP_ENV=production
+            REACT_APP_COMMIT_ID="dev #${{ env.SHORT_SHA }}"
+          platforms: |
+            linux/amd64
+            linux/arm64
+          push: true
+          tags: lowcoderorg/lowcoder-ce-frontend:${{ env.IMAGE_TAG }}
+
+      - name: Build and push the node service image
+        if: ${{ env.BUILD_NODESERVICE == 'true' }}
+        uses: docker/build-push-action@v6
+        with:
+          file: ./deploy/docker/Dockerfile
+          target: lowcoder-ce-node-service
+          platforms: |
+            linux/amd64
+            linux/arm64
+          push: true
+          tags: lowcoderorg/lowcoder-ce-node-service:${{ env.IMAGE_TAG }}
+
+      - name: Build and push the API service image
+        if: ${{ env.BUILD_APISERVICE == 'true' }}
+        uses: docker/build-push-action@v6
+        with:
+          file: ./deploy/docker/Dockerfile
+          target: lowcoder-ce-api-service
+          platforms: |
+            linux/amd64
+            linux/arm64
+          push: true
+          tags: lowcoderorg/lowcoder-ce-api-service:${{ env.IMAGE_TAG }}
+

.gitignore

@@ -14,4 +14,5 @@ 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

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/VERSION

@@ -1 +1 @@
-2.4.4
+2.4.5

client/package.json

@@ -80,7 +80,7 @@
     "chalk": "4",
     "flag-icons": "^7.2.1",
     "number-precision": "^1.6.0",
-    "posthog-js": "^1.144.2",
+    "posthog-js": "^1.155.4",
     "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/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.10",
+  "version": "2.4.13",
   "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,