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

Author: freddysundowner

client/config/test/jest.config.js

@@ -6,14 +6,10 @@ export function currentDirName(importMetaUrl) {
   return dirname(fileURLToPath(importMetaUrl));
 }
 
-
 const globals = {};
 buildVars.forEach(({ name, defaultValue }) => {
   globals[name] = process.env[name] || defaultValue;
 });
-const edition = process.env.REACT_APP_EDITION;
-const isEEGlobal = edition === "enterprise-global";
-const isEE = edition === "enterprise" || isEEGlobal;
 const currentDir = currentDirName(import.meta.url);
 
 export default {
@@ -22,8 +18,7 @@ export default {
     "react-markdown": path.resolve(currentDir, "./mocks/react-markdown.js"),
     "\\.md\\?url$": path.resolve(currentDir, "./mocks/markdown-url-module.js"),
     "^@lowcoder-ee(.*)$": path.resolve(
-      currentDir,
-      isEE ? "../../packages/lowcoder/src/ee/$1" : "../../packages/lowcoder/src/$1"
+      currentDir, "../../packages/lowcoder/src/$1"
     ),
     "lowcoder-sdk": path.resolve(currentDir, "../../packages/lowcoder/src/index.sdk"),
   },

client/package.json

@@ -13,7 +13,6 @@
     "start": "yarn workspace lowcoder start",
     "start-win": "LOWCODER_API_SERVICE_URL=http://localhost:3000 yarn start",
     "start:ee": "REACT_APP_EDITION=enterprise yarn workspace lowcoder start",
-    "start:ee-global": "REACT_APP_EDITION=enterprise-global yarn workspace lowcoder start",
     "build": "yarn node ./scripts/build.js",
     "test": "jest && yarn workspace lowcoder-comps test",
     "prepare": "yarn workspace lowcoder prepare",
@@ -52,7 +51,6 @@
     "mq-polyfill": "^1.1.8",
     "prettier": "^3.1.0",
     "rimraf": "^3.0.2",
-    "rollup": "^2.79.0",
     "shelljs": "^0.8.5",
     "svgo": "^3.0.0",
     "typescript": "^4.8.4",
@@ -76,11 +74,12 @@
     "@testing-library/react": "^14.1.2",
     "@testing-library/user-event": "^14.5.1",
     "@types/styled-components": "^5.1.34",
-    "antd-mobile": "^5.28.0",
+    "antd-mobile": "^5.34.0",
     "chalk": "4",
     "number-precision": "^1.6.0",
     "react-player": "^2.11.0",
     "resize-observer-polyfill": "^1.5.1",
+    "rollup": "^4.13.0",
     "simplebar": "^6.2.5",
     "tui-image-editor": "^3.15.3"
   }

client/packages/lowcoder-comps/.gitignore

@@ -1,3 +1,4 @@
 /lib
 /node_modules
+/package
 *.tgz

client/packages/lowcoder-comps/package.json

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

client/packages/lowcoder-comps/tsconfig.json

@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "es5",
+    "target": "ESNext",
     "experimentalDecorators": true,
     "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": true,

client/packages/lowcoder-design/src/components/GlobalInstances.tsx

@@ -1,7 +1,7 @@
-import { App } from 'antd';
-import type { MessageInstance } from 'antd/es/message/interface';
-import type { ModalStaticFunctions } from 'antd/es/modal/confirm';
-import type { NotificationInstance } from 'antd/es/notification/interface';
+import { default as App } from "antd/es/app";
+import type { MessageInstance } from "antd/es/message/interface";
+import type { ModalStaticFunctions } from "antd/es/modal/confirm";
+import type { NotificationInstance } from "antd/es/notification/interface";
 
 let messageInstance: MessageInstance;
 let notificationInstance: NotificationInstance;

client/packages/lowcoder-design/src/components/ScrollBar.tsx

@@ -1,11 +1,11 @@
 import React from "react";
 import SimpleBar from "simplebar-react";
-import 'simplebar-react/dist/simplebar.min.css';
 import styled from "styled-components";
 import { DebouncedFunc } from 'lodash'; // Assuming you're using lodash's DebouncedFunc type
 
+// import 'simplebar-react/dist/simplebar.min.css';
 
-const ScrollBarWrapper = styled.div<{ hidePlaceholder?: boolean }>`
+const ScrollBarWrapper = styled.div<{ $hideplaceholder?: boolean }>`
   min-height: 0;
   height: 100%;
   width: 100%;
@@ -37,7 +37,7 @@ const ScrollBarWrapper = styled.div<{ hidePlaceholder?: boolean }>`
     bottom: 10px;
   }
 
-  ${props => props.hidePlaceholder && `
+  ${props => Boolean(props.$hideplaceholder) && `
     .simplebar-placeholder {
       display: none !important;
     }
@@ -54,24 +54,32 @@ interface IProps {
   scrollableNodeProps?: {
     onScroll: DebouncedFunc<(e: any) => void>;
   };
-  hidePlaceholder?: boolean;
+  $hideplaceholder?: boolean;
   hideScrollbar?: boolean;
 }
 
-export const ScrollBar = ({ height = "100%", className, children, style, scrollableNodeProps, hideScrollbar, ...otherProps }: IProps) => {
+export const ScrollBar = ({
+  className,
+  children,
+  style,
+  scrollableNodeProps,
+  hideScrollbar = false,
+  $hideplaceholder = false,
+  ...otherProps
+}: IProps) => {
+  const height = style?.height ?? '100%';
   // You can now use the style prop directly or pass it to SimpleBar
   const combinedStyle = { ...style, height }; // Example of combining height with passed style
 
-  return (hideScrollbar ?? false) ? (
+  return hideScrollbar ? (
+    <ScrollBarWrapper className={className}>
+      {children}
+    </ScrollBarWrapper>
+  ) : (
     <ScrollBarWrapper className={className}>
       <SimpleBar style={combinedStyle} scrollableNodeProps={scrollableNodeProps} {...otherProps}>
         {children}
       </SimpleBar>
     </ScrollBarWrapper>
-  )
-  : (
-    <ScrollBarWrapper className={className}>
-      {children}
-    </ScrollBarWrapper>
   );
 };

client/packages/lowcoder-design/src/components/Section.tsx

@@ -75,6 +75,7 @@ const ShowChildren = styled.div<{ $show?: string; $noMargin?: boolean }>`
 
 interface ISectionConfig<T> {
   name?: string;
+  open?: boolean;
   width?: number;
   noMargin?: boolean;
   style?: React.CSSProperties;
@@ -103,7 +104,9 @@ export const PropertySectionContext = React.createContext<PropertySectionContext
 export const BaseSection = (props: ISectionConfig<ReactNode>) => {
   const { name } = props;
   const { compName, state, toggle } = useContext(PropertySectionContext);
-  const open = name ? state[compName]?.[name] !== false : true;
+  const open = props.open !== undefined ? props.open : name ? state[compName]?.[name] !== false : true;
+
+  // console.log("open", open, props.open);
 
   const handleToggle = () => {
     if (!name) {

client/packages/lowcoder-design/src/components/Trees.tsx

@@ -1,7 +1,7 @@
 import styled, { css } from "styled-components";
 import { ReactComponent as Folded } from "icons/icon-folded.svg";
-import { DataNode, TreeProps } from "antd/lib/tree";
-import DirectoryTree from "antd/lib/tree/DirectoryTree";
+import { DataNode, TreeProps } from "antd/es/tree";
+import DirectoryTree from "antd/es/tree/DirectoryTree";
 
 export const Treediv = styled.div<{ $height?: number }>`
   padding-left: 24px;

client/packages/lowcoder-design/src/components/audio.tsx

@@ -1,8 +1,10 @@
 import { CSSProperties } from "react";
-import { Ref } from "react";
-import ReactPlayer from "react-player";
+import { lazy, Ref } from "react";
+import type {default as ReactPlayerType} from "react-player";
 import styled from "styled-components";
 
+const ReactPlayer = lazy(() => import("react-player"));
+
 const Audio = styled(ReactPlayer)`
   height: 32px !important;
 `;
@@ -14,7 +16,7 @@ export function TacoAudio(props: {
   onEnded?: () => void;
   className?: string;
   style?: CSSProperties;
-  audioRef?: Ref<ReactPlayer>;
+  audioRef?: Ref<ReactPlayerType>;
   autoPlay?: boolean;
   loop?: boolean;
 }) {