Merge branch 'dev' into link-oauth-providers-for-existing-users

Author: FalkWolsky

client/.yarnrc.yml

@@ -1,5 +1,4 @@
 nodeLinker: node-modules
-nmHoistingLimits: workspaces
 
 npmRegistryServer: "https://registry.npmjs.org"
 

client/jest.config.js

@@ -1,3 +1,4 @@
 export default {
   projects: ["<rootDir>/packages/lowcoder", "<rootDir>/packages/lowcoder-core"],
 };
+// we use this for testing.

client/packages/create-lowcoder-plugin/package.json

@@ -7,12 +7,8 @@
     "chalk": "4",
     "commander": "^9.4.1",
     "cross-spawn": "^7.0.3",
-    "fs-extra": "^10.1.0"
-  },
-  "peerDependencies": {
-    "lowcoder-cli": "*",
-    "lowcoder-dev-utils": "*",
-    "lowcoder-sdk": "*"
+    "fs-extra": "^10.1.0",
+    "lowcoder-dev-utils": "workspace:^"
   },
   "license": "MIT",
   "keywords": [

client/packages/lowcoder-cli-template-typescript/package.json

@@ -16,13 +16,10 @@
     }
   },
   "devDependencies": {
+    "lowcoder-cli": "workspace:^",
+    "lowcoder-sdk": "workspace:^",
     "typescript": "^4.8.4",
-    "vite": "^4.5.1"
-  },
-  "peerDependencies": {
-    "lowcoder-cli": "*",
-    "lowcoder-dev-utils": "*",
-    "lowcoder-sdk": "*"
+    "vite": "^4.3.9"
   },
   "keywords": [
     "Lowcoder, Component, Template, Plugin"

client/packages/lowcoder-cli/package.json

@@ -29,11 +29,12 @@
     "commander": "^9.4.1",
     "cross-spawn": "^7.0.3",
     "fs-extra": "^10.1.0",
+    "lowcoder-dev-utils": "workspace:^",
     "react": "^17",
     "react-dom": "^17",
     "react-json-view": "^1.21.3",
     "rollup-plugin-external-globals": "^0.7.1",
-    "vite": "^4.5.1",
+    "vite": "^4.3.9",
     "vite-plugin-css-injected-by-js": "^2.1.1",
     "vite-plugin-svgr": "^2.2.2"
   },
@@ -42,7 +43,6 @@
     "typescript": "^4.8.4"
   },
   "peerDependencies": {
-    "lowcoder-dev-utils": "*",
     "lowcoder-sdk": "*"
   },
   "keywords": [

client/packages/lowcoder-comps/package.json

@@ -16,10 +16,11 @@
     "big.js": "^6.2.1",
     "echarts-extension-gmap": "^1.6.0",
     "echarts-wordcloud": "^2.1.0",
+    "lowcoder-cli": "workspace:^",
+    "lowcoder-sdk": "workspace:^",
     "mermaid": "^10.2.4",
     "react": "17",
     "react-dom": "17",
-    "react-resize-detector": "^7.0.0",
     "typescript": "4.8.4"
   },
   "lowcoder": {
@@ -69,12 +70,7 @@
   "devDependencies": {
     "jest": "29.3.0",
     "jest-canvas-mock": "^2.5.2",
-    "vite": "^4.5.1",
+    "vite": "^4.3.9",
     "vite-tsconfig-paths": "^3.6.0"
-  },
-  "peerDependencies": {
-    "lowcoder-cli": "*",
-    "lowcoder-dev-utils": "*",
-    "lowcoder-sdk": "*"
   }
 }

client/packages/lowcoder-design/package.json

@@ -8,6 +8,7 @@
   },
   "dependencies": {
     "colord": "^2.9.3",
+    "react-fontawesome": "^0.2.0",
     "react-markdown": "^8.0.0",
     "react-virtualized": "^9.22.3",
     "rehype-raw": "^6.1.1",

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

@@ -153,8 +153,9 @@ const OptionItem = (props: {
   popoverTitle?: string;
   draggable?: boolean;
   optionExtra?: React.ReactNode;
+  scrollable?: boolean;
 }) => {
-  const { content, config, title, popoverTitle, draggable = true, optionExtra } = props;
+  const { content, config, title, popoverTitle, draggable = true, optionExtra, scrollable } = props;
   const [visible, setVisible] = useState(false);
   const { attributes, listeners, setNodeRef, transform, transition } = useSortable({
     id: config.dataIndex,
@@ -182,6 +183,7 @@ const OptionItem = (props: {
       setVisible={(vis) => {
         setVisible(vis);
       }}
+      scrollable={scrollable}
     >
       {optionRow}
     </SimplePopover>
@@ -204,6 +206,7 @@ function Option<T extends ConstructorToComp<MultiCompConstructor>>(props: {
   optionToolbar?: React.ReactNode;
   headerItem?: React.ReactNode;
   itemExtra?: (comp: T) => React.ReactNode;
+  scrollable?: boolean;
 }) {
   const { items, uniqVal, headerItem, optionToolbar, itemExtra } = props;
   const itemsDistinctValCount = uniqVal
@@ -286,6 +289,7 @@ function Option<T extends ConstructorToComp<MultiCompConstructor>>(props: {
                     title={props.itemTitle(item)}
                     config={{ dataIndex: dataIndex }}
                     optionExtra={optionExtra}
+                    scrollable={props.scrollable}
                   />
                 );
               })}

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

@@ -51,13 +51,15 @@ const SimplePopover = (props: {
   setVisible?: (vis: boolean) => void;
   children: JSX.Element | React.ReactNode;
   content: JSX.Element | React.ReactNode;
+  scrollable?: boolean;
 }) => {
   const { visible, setVisible } = props;
   const contentWithBox = (
     <SuspensionBox
       title={props.title}
       onClose={() => setVisible?.(false)}
       content={props.content}
+      scrollable={props.scrollable}
     />
   );
   return (
@@ -66,7 +68,7 @@ const SimplePopover = (props: {
       align={{
         offset: [-12, 0, 0, 0],
       }}
-      destroyTooltipOnHide
+      // destroyTooltipOnHide
       content={contentWithBox}
       trigger="click"
       open={visible}