Merge branch 'feature/echarts' of https://github.com/lowcoder-org/lowcoder into feature/echarts

Imiss-U1025 · Imiss-U1025 · commit 6f4042941946 · 2025-02-26T13:49:26.000-05:00
diff --git a/client/config/test/transform/babelTransform.js b/client/config/test/transform/babelTransform.js
@@ -8,6 +8,13 @@ export default babelJest.createTransformer({
         runtime: "automatic",
       },
     ],
+    [
+      "babel-preset-vite",
+      {
+        "env": true,
+        "glob": false
+      }
+    ]
   ],
   babelrc: false,
   configFile: false,
diff --git a/client/package.json b/client/package.json
@@ -43,6 +43,7 @@
     "add": "^2.0.6",
     "babel-jest": "^29.3.0",
     "babel-preset-react-app": "^10.0.1",
+    "babel-preset-vite": "^1.1.3",
     "husky": "^8.0.1",
     "jest": "^29.5.0",
     "jest-canvas-mock": "^2.5.2",
diff --git a/client/packages/lowcoder-comps/package.json b/client/packages/lowcoder-comps/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lowcoder-comps",
-  "version": "2.6.3",
+  "version": "2.6.4",
   "type": "module",
   "license": "MIT",
   "dependencies": {
diff --git a/client/packages/lowcoder-comps/src/comps/basicChartComp/chartConfigs/pieChartConfig.tsx b/client/packages/lowcoder-comps/src/comps/basicChartComp/chartConfigs/pieChartConfig.tsx
@@ -51,7 +51,7 @@ export const PieChartConfig = (function () {
         subtype: props.type,
         label: {
           show: true,
-          formatter: "{c}",
+          formatter: "{d}%",
         },
         range: props.range,
       };
diff --git a/client/packages/lowcoder/src/comps/index.tsx b/client/packages/lowcoder/src/comps/index.tsx
@@ -233,6 +233,62 @@ export var uiCompMap: Registry = {
     },
   },
 
+  barChart: {
+    name: trans("uiComp.basicChartCompName"),
+    enName: "Bar Chart",
+    description: trans("uiComp.basicChartCompDesc"),
+    categories: ["dashboards"],
+    icon: ChartCompIcon,
+    comp: remoteComp({ ...builtInRemoteComps, compName: "barChart" }),
+    keywords: trans("uiComp.basicChartCompKeywords"),
+    layoutInfo: {
+      w: 12,
+      h: 40,
+    },
+  },
+
+  lineChart: {
+    name: trans("uiComp.basicChartCompName"),
+    enName: "Line Chart",
+    description: trans("uiComp.basicChartCompDesc"),
+    categories: ["dashboards"],
+    icon: ChartCompIcon,
+    comp: remoteComp({ ...builtInRemoteComps, compName: "lineChart" }),
+    keywords: trans("uiComp.basicChartCompKeywords"),
+    layoutInfo: {
+      w: 12,
+      h: 40,
+    },
+  },
+
+  pieChart: {
+    name: trans("uiComp.basicChartCompName"),
+    enName: "Pie Chart",
+    description: trans("uiComp.basicChartCompDesc"),
+    categories: ["dashboards"],
+    icon: ChartCompIcon,
+    comp: remoteComp({ ...builtInRemoteComps, compName: "pieChart" }),
+    keywords: trans("uiComp.basicChartCompKeywords"),
+    layoutInfo: {
+      w: 12,
+      h: 40,
+    },
+  },
+
+  scatterChart: {
+    name: trans("uiComp.basicChartCompName"),
+    enName: "Scatter Chart",
+    description: trans("uiComp.basicChartCompDesc"),
+    categories: ["dashboards"],
+    icon: ChartCompIcon,
+    comp: remoteComp({ ...builtInRemoteComps, compName: "scatterChart" }),
+    keywords: trans("uiComp.basicChartCompKeywords"),
+    layoutInfo: {
+      w: 12,
+      h: 40,
+    },
+  },
+
   candleStickChart: {
     name: trans("uiComp.candleStickChartCompName"),
     enName: "Candlestick Chart",
diff --git a/client/packages/lowcoder/src/comps/uiCompRegistry.ts b/client/packages/lowcoder/src/comps/uiCompRegistry.ts
@@ -149,6 +149,10 @@ export type UICompType =
   | "responsiveLayout"
   | "splitLayout"
   | "tour"
+  | "barChart"
+  | "lineChart"
+  | "pieChart"
+  | "scatterChart"
   | "funnelChart"
   | "gaugeChart"
   | "sankeyChart"
diff --git a/client/packages/lowcoder/src/pages/editor/editorConstants.tsx b/client/packages/lowcoder/src/pages/editor/editorConstants.tsx
@@ -208,6 +208,11 @@ export const CompStateIcon: {
   themeriverChart : <ThemeriverChartCompIconSmall />,
   basicChart : <ChartCompIconSmall />,
 
+  barChart : <ChartCompIconSmall />,
+  lineChart : <ChartCompIconSmall />,
+  pieChart : <ChartCompIconSmall />,
+  scatterChart : <ChartCompIconSmall />,
+
   avatar: <AvatarCompIconSmall />,
   avatarGroup: <AvatarGroupCompIconSmall />,
   colorPicker: <ColorPickerCompIconSmall />,
diff --git a/client/yarn.lock b/client/yarn.lock
@@ -1785,6 +1785,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/runtime@npm:^7.13.9":
+  version: 7.26.9
+  resolution: "@babel/runtime@npm:7.26.9"
+  dependencies:
+    regenerator-runtime: ^0.14.0
+  checksum: 838492d8a925092f9ccfbd82ec183a54f430af3a4ce88fb1337a4570629202d5123bad3097a5b8df53822504d12ccb29f45c0f6842e86094f0164f17a51eec92
+  languageName: node
+  linkType: hard
+
 "@babel/runtime@npm:^7.25.7, @babel/runtime@npm:^7.26.0":
   version: 7.26.7
   resolution: "@babel/runtime@npm:7.26.7"
@@ -4484,7 +4493,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/babel__core@npm:^7.1.14":
+"@types/babel__core@npm:^7.1.12, @types/babel__core@npm:^7.1.14":
   version: 7.20.5
   resolution: "@types/babel__core@npm:7.20.5"
   dependencies:
@@ -6652,6 +6661,37 @@ __metadata:
   languageName: node
   linkType: hard
 
+"babel-plugin-transform-vite-meta-env@npm:1.0.3":
+  version: 1.0.3
+  resolution: "babel-plugin-transform-vite-meta-env@npm:1.0.3"
+  dependencies:
+    "@babel/runtime": ^7.13.9
+    "@types/babel__core": ^7.1.12
+  checksum: 781b4f7d9e7497e869d87749a6d0a13a882c19995e3d97262622d6bfaab0d6da1a182f8440facab8316f1360070bbd7ca6898b1c70400645d1f52990f960b801
+  languageName: node
+  linkType: hard
+
+"babel-plugin-transform-vite-meta-glob@npm:1.1.2":
+  version: 1.1.2
+  resolution: "babel-plugin-transform-vite-meta-glob@npm:1.1.2"
+  dependencies:
+    "@babel/runtime": ^7.13.9
+    "@types/babel__core": ^7.1.12
+    glob: ^10.3.10
+  checksum: 8a73f38a0827f07f2e5cd8f41066eb7fac08ec2ce900adc671cae817a55faf349f4f17946971d3fd80eb5f31657cd58c44e6da8f5a47668e39da0d90facd64bd
+  languageName: node
+  linkType: hard
+
+"babel-plugin-transform-vite-meta-hot@npm:1.0.0":
+  version: 1.0.0
+  resolution: "babel-plugin-transform-vite-meta-hot@npm:1.0.0"
+  dependencies:
+    "@babel/runtime": ^7.13.9
+    "@types/babel__core": ^7.1.12
+  checksum: bcaeecbe89f6f279c8bf90afa2cec0f3e86576179b268cefba9acac4070799a243e66d6e31ec6283068df964a5beb746390ed025b52bb6fc651e69a1610ccaa5
+  languageName: node
+  linkType: hard
+
 "babel-preset-current-node-syntax@npm:^1.0.0":
   version: 1.0.1
   resolution: "babel-preset-current-node-syntax@npm:1.0.1"
@@ -6710,6 +6750,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"babel-preset-vite@npm:^1.1.3":
+  version: 1.1.3
+  resolution: "babel-preset-vite@npm:1.1.3"
+  dependencies:
+    "@babel/runtime": ^7.13.9
+    "@types/babel__core": ^7.1.12
+    babel-plugin-transform-vite-meta-env: 1.0.3
+    babel-plugin-transform-vite-meta-glob: 1.1.2
+    babel-plugin-transform-vite-meta-hot: 1.0.0
+  checksum: 243b43c25846a597a03cf36b1b0e6b39d209f5a13207a238bdc9a03b61fcdd450abe2a26595cde17513c321ba63071868def875a54664e45058b5c532f8306a4
+  languageName: node
+  linkType: hard
+
 "bail@npm:^2.0.0":
   version: 2.0.2
   resolution: "bail@npm:2.0.2"
@@ -14035,6 +14088,7 @@ coolshapes-react@lowcoder-org/coolshapes-react:
     antd-mobile: ^5.34.0
     babel-jest: ^29.3.0
     babel-preset-react-app: ^10.0.1
+    babel-preset-vite: ^1.1.3
     chalk: 4
     flag-icons: ^7.2.1
     husky: ^8.0.1
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/service/AuthenticationApiServiceImpl.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/service/AuthenticationApiServiceImpl.java
@@ -32,8 +32,11 @@
 import org.lowcoder.domain.user.service.UserService;
 import org.lowcoder.sdk.auth.AbstractAuthConfig;
 import org.lowcoder.sdk.config.AuthProperties;
+import org.lowcoder.sdk.config.CommonConfig;
+import org.lowcoder.sdk.constants.WorkspaceMode;
 import org.lowcoder.sdk.exception.BizError;
 import org.lowcoder.sdk.exception.BizException;
+import org.lowcoder.sdk.models.HasIdAndAuditing;
 import org.lowcoder.sdk.util.CookieHelper;
 import org.springframework.security.core.context.ReactiveSecurityContextHolder;
 import org.springframework.stereotype.Service;
@@ -69,6 +72,7 @@ public class AuthenticationApiServiceImpl implements AuthenticationApiService {
     private final OrgMemberService orgMemberService;
     private final JWTUtils jwtUtils;
     private final AuthProperties authProperties;
+    private final CommonConfig commonConfig;
 
     @Override
     public Mono<AuthUser> authenticateByForm(String loginId, String password, String source, boolean register, String authId, String orgId) {
@@ -238,10 +242,16 @@ public Mono<Void> onUserRegister(User user, boolean isSuperAdmin) {
     }
 
     protected Mono<Void> onUserLogin(String orgId, User user, String source) {
-        if (StringUtils.isEmpty(orgId)) {
-            return Mono.empty();
+        Mono<String> orgMono;
+        if(commonConfig.getWorkspace().getMode() == WorkspaceMode.ENTERPRISE) {
+            orgMono = organizationService.getOrganizationInEnterpriseMode().map(HasIdAndAuditing::getId);
+        } else {
+            if (StringUtils.isEmpty(orgId)) {
+                return Mono.empty();
+            }
+            orgMono = Mono.just(orgId);
         }
-        return orgApiService.tryAddUserToOrgAndSwitchOrg(orgId, user.getId()).then();
+        return orgMono.flatMap(orgId2 -> orgApiService.tryAddUserToOrgAndSwitchOrg(orgId2, user.getId())).then();
     }
 
     @Override
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrganizationController.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrganizationController.java
@@ -19,10 +19,13 @@
 import org.lowcoder.domain.plugin.DatasourceMetaInfo;
 import org.lowcoder.domain.plugin.service.DatasourceMetaInfoService;
 import org.lowcoder.domain.user.service.UserService;
+import org.lowcoder.sdk.config.CommonConfig;
+import org.lowcoder.sdk.constants.WorkspaceMode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.codec.multipart.Part;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.server.ServerWebExchange;
+import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 import java.util.List;
@@ -47,14 +50,21 @@ public class OrganizationController implements OrganizationEndpoints
     private OrganizationService organizationService;
     @Autowired
     private UserService userService;
+    @Autowired
+    private CommonConfig commonConfig;
 
     @Override
     public Mono<PageResponseView<?>> getOrganizationByUser(@PathVariable String email,
                                                            @RequestParam(required = false, defaultValue = "1") Integer pageNum,
                                                            @RequestParam(required = false, defaultValue = "0") Integer pageSize) {
-        var flux = userService.findByEmailDeep(email).flux().flatMap(user -> orgMemberService.getAllActiveOrgs(user.getId()))
-                .flatMap(orgMember -> organizationService.getById(orgMember.getOrgId()))
-                .map(OrgView::new).cache();
+        Flux<?> flux;
+        if (commonConfig.getWorkspace().getMode() == WorkspaceMode.SAAS) {
+            flux = userService.findByEmailDeep(email).flux().flatMap(user -> orgMemberService.getAllActiveOrgs(user.getId()))
+                    .flatMap(orgMember -> organizationService.getById(orgMember.getOrgId()))
+                    .map(OrgView::new).cache();
+        } else {
+            flux = organizationService.getOrganizationInEnterpriseMode().flux().cache();
+        }
         return fluxToPageResponseView(pageNum, pageSize, flux);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "lowcoder-comps",`
`3`		`- "version": "2.6.3",`
	`3`	`+ "version": "2.6.4",`
`4`	`4`	`"type": "module",`
`5`	`5`	`"license": "MIT",`
`6`	`6`	`"dependencies": {`