Merge pull request #1184 from lowcoder-org/dev

Dev -> Main - v2.4.7 preparation
lowcoder-org · Sep 23, 2024 · 5d03d01 · 5d03d01
2 parents 8a9b88e + 834f47e
commit 5d03d01
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 327 deletions.
diff --git a/client/packages/lowcoder-cli-template-typescript/package.json b/client/packages/lowcoder-cli-template-typescript/package.json
@@ -32,7 +32,7 @@
     "react-dom": "^18.2.0",
     "react-resize-detector": "^7.0.0",
     "typescript": "5.3.3",
-    "vite": "^4.5.2"
+    "vite": "^4.5.5"
   },
   "keywords": [
     "Lowcoder, Component, Template, Plugin, Demonstrator"

diff --git a/client/packages/lowcoder-cli/package.json b/client/packages/lowcoder-cli/package.json
@@ -33,7 +33,7 @@
     "react-dom": "^18.2.0",
     "react-json-view": "^1.21.3",
     "rollup-plugin-external-globals": "^0.7.1",
-    "vite": "^4.5.2",
+    "vite": "^4.5.5",
     "vite-plugin-css-injected-by-js": "^2.1.1",
     "vite-plugin-svgr": "^2.2.2"
   },

diff --git a/client/packages/lowcoder-comps/package.json b/client/packages/lowcoder-comps/package.json
@@ -205,7 +205,7 @@
   },
   "devDependencies": {
     "jest": "29.3.0",
-    "vite": "^5.0.12",
+    "vite": "^4.5.5",
     "vite-tsconfig-paths": "^3.6.0"
   }
 }
diff --git a/client/packages/lowcoder-plugin-demo/package.json b/client/packages/lowcoder-plugin-demo/package.json
@@ -35,6 +35,6 @@
     "lowcoder-cli": "workspace:^",
     "lowcoder-sdk": "workspace:^",
     "typescript": "4.8.4",
-    "vite": "^4.5.2"
+    "vite": "^4.5.5"
   }
 }
diff --git a/client/packages/lowcoder-sdk/package.json b/client/packages/lowcoder-sdk/package.json
@@ -47,7 +47,7 @@
     "rollup-plugin-terser": "^7.0.2",
     "rollup-plugin-typescript": "^1.0.1",
     "typescript": "^4.8.4",
-    "vite": "^4.5.2",
+    "vite": "^4.5.5",
     "vite-plugin-svgr": "^2.2.2",
     "vite-tsconfig-paths": "^3.6.0"
   },

diff --git a/client/packages/lowcoder/package.json b/client/packages/lowcoder/package.json
@@ -125,7 +125,7 @@
     "http-proxy-middleware": "^2.0.6",
     "rollup-plugin-visualizer": "^5.9.2",
     "typescript": "^4.8.4",
-    "vite": "^4.5.2",
+    "vite": "^4.5.5",
     "vite-plugin-checker": "^0.5.1",
     "vite-plugin-dynamic-import": "^1.5.0",
     "vite-plugin-html": "^3.2.0",

diff --git a/client/packages/lowcoder/src/pages/editor/AppEditor.tsx b/client/packages/lowcoder/src/pages/editor/AppEditor.tsx
@@ -115,7 +115,7 @@ const AppEditor = React.memo(() => {
     if (currentUser && application) {
       const lastEditedAt = dayjs(application?.lastEditedAt);
       const lastEditedDiff = dayjs().diff(lastEditedAt, 'minutes');
-      const shouldBlockEditing = currentUser.id !== application?.editingUserId && lastEditedDiff < 3;
+      const shouldBlockEditing = Boolean(application?.editingUserId) && currentUser.id !== application?.editingUserId && lastEditedDiff < 3;
       setBlockEditing(shouldBlockEditing);
     }
   }, [application, currentUser]);