From df93a7c94660e12ece5ae63da20dbdbc3a458b00 Mon Sep 17 00:00:00 2001
From: Hexqi <wu_12556@126.com>
Date: Fri, 20 Dec 2024 14:15:36 +0800
Subject: [PATCH 01/19] chore: update version to 2.1.0-rc.0 (#947)

---
 designer-demo/package.json                            | 2 +-
 mockServer/package.json                               | 2 +-
 packages/block-compiler/package.json                  | 7 +++----
 packages/blockToWebComponentTemplate/package.json     | 2 +-
 packages/build/vite-config/package.json               | 2 +-
 packages/build/vite-plugin-meta-comments/package.json | 2 +-
 packages/builtinComponent/package.json                | 2 +-
 packages/canvas/package.json                          | 2 +-
 packages/common/package.json                          | 2 +-
 packages/configurator/package.json                    | 2 +-
 packages/design-core/package.json                     | 2 +-
 packages/engine-cli/package.json                      | 2 +-
 packages/i18n/package.json                            | 2 +-
 packages/layout/package.json                          | 2 +-
 packages/plugins/block/package.json                   | 2 +-
 packages/plugins/bridge/package.json                  | 2 +-
 packages/plugins/datasource/package.json              | 2 +-
 packages/plugins/help/package.json                    | 2 +-
 packages/plugins/i18n/package.json                    | 2 +-
 packages/plugins/materials/package.json               | 2 +-
 packages/plugins/page/package.json                    | 2 +-
 packages/plugins/robot/package.json                   | 2 +-
 packages/plugins/schema/package.json                  | 2 +-
 packages/plugins/script/package.json                  | 2 +-
 packages/plugins/state/package.json                   | 2 +-
 packages/plugins/tree/package.json                    | 2 +-
 packages/plugins/tutorial/package.json                | 2 +-
 packages/register/package.json                        | 2 +-
 packages/settings/design/package.json                 | 2 +-
 packages/settings/events/package.json                 | 2 +-
 packages/settings/panel/package.json                  | 2 +-
 packages/settings/props/package.json                  | 2 +-
 packages/settings/styles/package.json                 | 2 +-
 packages/svgs/package.json                            | 2 +-
 packages/theme/base/package.json                      | 2 +-
 packages/theme/dark/package.json                      | 2 +-
 packages/theme/light/package.json                     | 2 +-
 packages/toolbars/breadcrumb/package.json             | 2 +-
 packages/toolbars/clean/package.json                  | 2 +-
 packages/toolbars/collaboration/package.json          | 2 +-
 packages/toolbars/fullscreen/package.json             | 2 +-
 packages/toolbars/generate-code/package.json          | 2 +-
 packages/toolbars/lang/package.json                   | 2 +-
 packages/toolbars/layout/package.json                 | 2 +-
 packages/toolbars/lock/package.json                   | 2 +-
 packages/toolbars/logo/package.json                   | 2 +-
 packages/toolbars/logout/package.json                 | 2 +-
 packages/toolbars/media/package.json                  | 2 +-
 packages/toolbars/preview/package.json                | 2 +-
 packages/toolbars/redoundo/package.json               | 2 +-
 packages/toolbars/refresh/package.json                | 2 +-
 packages/toolbars/save/package.json                   | 2 +-
 packages/toolbars/setting/package.json                | 2 +-
 packages/utils/package.json                           | 2 +-
 packages/vue-generator/package.json                   | 2 +-
 packages/webcomponent/package.json                    | 2 +-
 56 files changed, 58 insertions(+), 59 deletions(-)

diff --git a/designer-demo/package.json b/designer-demo/package.json
index 4227e1722..f4611f088 100644
--- a/designer-demo/package.json
+++ b/designer-demo/package.json
@@ -1,7 +1,7 @@
 {
   "name": "designer-demo",
   "private": true,
-  "version": "2.0.0",
+  "version": "2.1.0-rc.0",
   "type": "module",
   "scripts": {
     "dev": "cross-env VITE_THEME=light vite",
diff --git a/mockServer/package.json b/mockServer/package.json
index 4ed5473c3..4b8de73b8 100644
--- a/mockServer/package.json
+++ b/mockServer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-mock",
-  "version": "2.0.0",
+  "version": "2.1.0-rc.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/block-compiler/package.json b/packages/block-compiler/package.json
index 923c956f3..241184c19 100644
--- a/packages/block-compiler/package.json
+++ b/packages/block-compiler/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-block-compiler",
-  "version": "2.0.0-rc.2",
+  "version": "2.1.0-rc.0",
   "publishConfig": {
     "access": "public"
   },
@@ -27,7 +27,6 @@
   "author": "OpenTiny Team",
   "license": "MIT",
   "homepage": "https://opentiny.design/tiny-engine",
-  "dependencies": {},
   "devDependencies": {
     "@esbuild-plugins/node-globals-polyfill": "^0.2.3",
     "@esbuild-plugins/node-modules-polyfill": "^0.2.2",
@@ -43,7 +42,7 @@
   "peerDependencies": {
     "@babel/core": "^7.26.0",
     "@vue/babel-plugin-jsx": "^1.2.5",
-    "vue": "^3.4.15",
-    "@vue/compiler-sfc": "^3.4.15"
+    "@vue/compiler-sfc": "^3.4.15",
+    "vue": "^3.4.15"
   }
 }
diff --git a/packages/blockToWebComponentTemplate/package.json b/packages/blockToWebComponentTemplate/package.json
index 732431244..98c7b0fab 100644
--- a/packages/blockToWebComponentTemplate/package.json
+++ b/packages/blockToWebComponentTemplate/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-block-build",
-  "version": "2.0.0",
+  "version": "2.1.0-rc.0",
   "description": "translate block to webcomponent template",
   "main": "./dist/web-components.es.js",
   "type": "module",
diff --git a/packages/build/vite-config/package.json b/packages/build/vite-config/package.json
index cde773dd4..cf3822f5e 100644
--- a/packages/build/vite-config/package.json
+++ b/packages/build/vite-config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-vite-config",
-  "version": "2.0.0",
+  "version": "2.1.0-rc.0",
   "description": "",
   "type": "module",
   "main": "./index.js",
diff --git a/packages/build/vite-plugin-meta-comments/package.json b/packages/build/vite-plugin-meta-comments/package.json
index 9fe3c8d5f..a6e03efb0 100644
--- a/packages/build/vite-plugin-meta-comments/package.json
+++ b/packages/build/vite-plugin-meta-comments/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-vite-plugin-meta-comments",
-  "version": "2.0.0",
+  "version": "2.1.0-rc.0",
   "description": "",
   "type": "module",
   "main": "dist/index.cjs",
diff --git a/packages/builtinComponent/package.json b/packages/builtinComponent/package.json
index 5ce300444..1eff2ed82 100644
--- a/packages/builtinComponent/package.json
+++ b/packages/builtinComponent/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-builtin-component",
-  "version": "2.0.0",
+  "version": "2.1.0-rc.0",
   "description": "",
   "main": "dist/index.mjs",
   "module": "dist/index.mjs",
diff --git a/packages/canvas/package.json b/packages/canvas/package.json
index 7ea66850f..9f7c8dae1 100644
--- a/packages/canvas/package.json
+++ b/packages/canvas/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-canvas",
-  "version": "2.0.0",
+  "version": "2.1.0-rc.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/common/package.json b/packages/common/package.json
index e9129089d..7067e5a48 100644
--- a/packages/common/package.json
+++ b/packages/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-common",
-  "version": "2.0.0",
+  "version": "2.1.0-rc.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/configurator/package.json b/packages/configurator/package.json
index 6887276d5..fffdf5495 100644
--- a/packages/configurator/package.json
+++ b/packages/configurator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-configurator",
-  "version": "2.0.0",
+  "version": "2.1.0-rc.0",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.js",
diff --git a/packages/design-core/package.json b/packages/design-core/package.json
index c299eaa6c..672fb23e7 100644
--- a/packages/design-core/package.json
+++ b/packages/design-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine",
-  "version": "2.0.0",
+  "version": "2.1.0-rc.0",
   "type": "module",
   "description": "TinyEngine enables developers to customize low-code platforms, build low-bit platforms online in real time, and support secondary development or integration of low-bit platform capabilities.",
   "homepage": "https://opentiny.design/tiny-engine",
diff --git a/packages/engine-cli/package.json b/packages/engine-cli/package.json
index dd5da0337..162c74c87 100644
--- a/packages/engine-cli/package.json
+++ b/packages/engine-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-cli",
-  "version": "2.0.0",
+  "version": "2.1.0-rc.0",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
diff --git a/packages/i18n/package.json b/packages/i18n/package.json
index 08549005b..8f6f84a2c 100644
--- a/packages/i18n/package.json
+++ b/packages/i18n/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-i18n-host",
-  "version": "2.0.0",
+  "version": "2.1.0-rc.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/layout/package.json b/packages/layout/package.json
index f699c3e1b..cae1dc1e1 100644
--- a/packages/layout/package.json
+++ b/packages/layout/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-layout",
-  "version": "2.0.0",
+  "version": "2.1.0-rc.0",
   "scripts": {
     "build": "vite build"
   },
diff --git a/packages/plugins/block/package.json b/packages/plugins/block/package.json
index f7e2c5dc5..8c8803443 100644
--- a/packages/plugins/block/package.json
+++ b/packages/plugins/block/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-block",
-  "version": "2.0.0",
+  "version": "2.1.0-rc.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/bridge/package.json b/packages/plugins/bridge/package.json
index 0c9d2bc32..c214bc3ae 100644
--- a/packages/plugins/bridge/package.json
+++ b/packages/plugins/bridge/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-bridge",
-  "version": "2.0.0",
+  "version": "2.1.0-rc.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/datasource/package.json b/packages/plugins/datasource/package.json
index cddaf1c69..42eb0c6c5 100644
--- a/packages/plugins/datasource/package.json
+++ b/packages/plugins/datasource/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-datasource",
-  "version": "2.0.0",
+  "version": "2.1.0-rc.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/help/package.json b/packages/plugins/help/package.json
index 7f9e9bad9..4bf11fa71 100644
--- a/packages/plugins/help/package.json
+++ b/packages/plugins/help/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-help",
-  "version": "2.0.0",
+  "version": "2.1.0-rc.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/i18n/package.json b/packages/plugins/i18n/package.json
index 06e8d0ab5..834cd290e 100644
--- a/packages/plugins/i18n/package.json
+++ b/packages/plugins/i18n/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-i18n",
-  "version": "2.0.0",
+  "version": "2.1.0-rc.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/materials/package.json b/packages/plugins/materials/package.json
index dc3ea9472..aeaf9e8a4 100644
--- a/packages/plugins/materials/package.json
+++ b/packages/plugins/materials/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-materials",
-  "version": "2.0.0",
+  "version": "2.1.0-rc.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/page/package.json b/packages/plugins/page/package.json
index 844ba8abc..971a72cd1 100644
--- a/packages/plugins/page/package.json
+++ b/packages/plugins/page/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-page",
-  "version": "2.0.0",
+  "version": "2.1.0-rc.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/robot/package.json b/packages/plugins/robot/package.json
index 45d90de13..8c47ad42b 100644
--- a/packages/plugins/robot/package.json
+++ b/packages/plugins/robot/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-robot",
-  "version": "2.0.0",
+  "version": "2.1.0-rc.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/schema/package.json b/packages/plugins/schema/package.json
index df87f33c8..4dc758240 100644
--- a/packages/plugins/schema/package.json
+++ b/packages/plugins/schema/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-schema",
-  "version": "2.0.0",
+  "version": "2.1.0-rc.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/script/package.json b/packages/plugins/script/package.json
index d32c06a3d..376d17284 100644
--- a/packages/plugins/script/package.json
+++ b/packages/plugins/script/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-script",
-  "version": "2.0.0",
+  "version": "2.1.0-rc.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/state/package.json b/packages/plugins/state/package.json
index 1aa1d522c..0ee82a073 100644
--- a/packages/plugins/state/package.json
+++ b/packages/plugins/state/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-state",
-  "version": "2.0.0",
+  "version": "2.1.0-rc.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/tree/package.json b/packages/plugins/tree/package.json
index 9cf1d0266..4c5c21029 100644
--- a/packages/plugins/tree/package.json
+++ b/packages/plugins/tree/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-tree",
-  "version": "2.0.0",
+  "version": "2.1.0-rc.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/tutorial/package.json b/packages/plugins/tutorial/package.json
index b5d46dd18..0b18be1ad 100644
--- a/packages/plugins/tutorial/package.json
+++ b/packages/plugins/tutorial/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-tutorial",
-  "version": "2.0.0",
+  "version": "2.1.0-rc.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/register/package.json b/packages/register/package.json
index 77123cde5..daca16d5f 100644
--- a/packages/register/package.json
+++ b/packages/register/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-meta-register",
-  "version": "2.0.0",
+  "version": "2.1.0-rc.0",
   "description": "",
   "type": "module",
   "main": "dist/index.js",
diff --git a/packages/settings/design/package.json b/packages/settings/design/package.json
index d7f091524..d6b87e008 100644
--- a/packages/settings/design/package.json
+++ b/packages/settings/design/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-setting-design",
-  "version": "2.0.0",
+  "version": "2.1.0-rc.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/settings/events/package.json b/packages/settings/events/package.json
index a5cf82f05..09d8a7155 100644
--- a/packages/settings/events/package.json
+++ b/packages/settings/events/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-setting-events",
-  "version": "2.0.0",
+  "version": "2.1.0-rc.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/settings/panel/package.json b/packages/settings/panel/package.json
index 8f9ca1fe3..6845492eb 100644
--- a/packages/settings/panel/package.json
+++ b/packages/settings/panel/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-settings-panel",
-  "version": "2.0.0",
+  "version": "2.1.0-rc.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/settings/props/package.json b/packages/settings/props/package.json
index eb3c79695..b6de69e97 100644
--- a/packages/settings/props/package.json
+++ b/packages/settings/props/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-setting-props",
-  "version": "2.0.0",
+  "version": "2.1.0-rc.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/settings/styles/package.json b/packages/settings/styles/package.json
index a34515bb5..ae92a0c1e 100644
--- a/packages/settings/styles/package.json
+++ b/packages/settings/styles/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-setting-styles",
-  "version": "2.0.0",
+  "version": "2.1.0-rc.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/svgs/package.json b/packages/svgs/package.json
index 5f3e6f802..d008f6774 100644
--- a/packages/svgs/package.json
+++ b/packages/svgs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-svgs",
-  "version": "2.0.0",
+  "version": "2.1.0-rc.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/theme/base/package.json b/packages/theme/base/package.json
index 0e9533b45..dbc22f3df 100644
--- a/packages/theme/base/package.json
+++ b/packages/theme/base/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-theme-base",
-  "version": "2.0.0",
+  "version": "2.1.0-rc.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/theme/dark/package.json b/packages/theme/dark/package.json
index b6ff0e1c9..eaa501b50 100644
--- a/packages/theme/dark/package.json
+++ b/packages/theme/dark/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-theme-dark",
-  "version": "2.0.0",
+  "version": "2.1.0-rc.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/theme/light/package.json b/packages/theme/light/package.json
index a369c3714..993e97c54 100644
--- a/packages/theme/light/package.json
+++ b/packages/theme/light/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-theme-light",
-  "version": "2.0.0",
+  "version": "2.1.0-rc.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/breadcrumb/package.json b/packages/toolbars/breadcrumb/package.json
index 431ceef88..356a040f0 100644
--- a/packages/toolbars/breadcrumb/package.json
+++ b/packages/toolbars/breadcrumb/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-breadcrumb",
-  "version": "2.0.0",
+  "version": "2.1.0-rc.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/clean/package.json b/packages/toolbars/clean/package.json
index 6e2285d76..46b6a2ff5 100644
--- a/packages/toolbars/clean/package.json
+++ b/packages/toolbars/clean/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-clean",
-  "version": "2.0.0",
+  "version": "2.1.0-rc.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/collaboration/package.json b/packages/toolbars/collaboration/package.json
index d89f05ad8..72dcf6974 100644
--- a/packages/toolbars/collaboration/package.json
+++ b/packages/toolbars/collaboration/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-collaboration",
-  "version": "2.0.0",
+  "version": "2.1.0-rc.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/fullscreen/package.json b/packages/toolbars/fullscreen/package.json
index e14103360..fba8f6e14 100644
--- a/packages/toolbars/fullscreen/package.json
+++ b/packages/toolbars/fullscreen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-fullscreen",
-  "version": "2.0.0",
+  "version": "2.1.0-rc.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/generate-code/package.json b/packages/toolbars/generate-code/package.json
index 959ce71d6..1ece18072 100644
--- a/packages/toolbars/generate-code/package.json
+++ b/packages/toolbars/generate-code/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-generate-code",
-  "version": "2.0.0",
+  "version": "2.1.0-rc.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/lang/package.json b/packages/toolbars/lang/package.json
index 9668c8679..45b0d9f16 100644
--- a/packages/toolbars/lang/package.json
+++ b/packages/toolbars/lang/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-lang",
-  "version": "2.0.0",
+  "version": "2.1.0-rc.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/layout/package.json b/packages/toolbars/layout/package.json
index ccbbec00e..f9a2a9f11 100644
--- a/packages/toolbars/layout/package.json
+++ b/packages/toolbars/layout/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-layout",
-  "version": "2.0.0",
+  "version": "2.1.0-rc.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/lock/package.json b/packages/toolbars/lock/package.json
index 46dacb9dc..645aaea27 100644
--- a/packages/toolbars/lock/package.json
+++ b/packages/toolbars/lock/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-lock",
-  "version": "2.0.0",
+  "version": "2.1.0-rc.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/logo/package.json b/packages/toolbars/logo/package.json
index 3dcdbbf7d..1e9c7fed6 100644
--- a/packages/toolbars/logo/package.json
+++ b/packages/toolbars/logo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-logo",
-  "version": "2.0.0",
+  "version": "2.1.0-rc.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/logout/package.json b/packages/toolbars/logout/package.json
index fe1de5ba1..6136ffa6f 100644
--- a/packages/toolbars/logout/package.json
+++ b/packages/toolbars/logout/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-logout",
-  "version": "2.0.0",
+  "version": "2.1.0-rc.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/media/package.json b/packages/toolbars/media/package.json
index 6782ecc60..dd475f024 100644
--- a/packages/toolbars/media/package.json
+++ b/packages/toolbars/media/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-media",
-  "version": "2.0.0",
+  "version": "2.1.0-rc.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/preview/package.json b/packages/toolbars/preview/package.json
index 352cf2677..b117f24ee 100644
--- a/packages/toolbars/preview/package.json
+++ b/packages/toolbars/preview/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-preview",
-  "version": "2.0.0",
+  "version": "2.1.0-rc.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/redoundo/package.json b/packages/toolbars/redoundo/package.json
index e45104eca..de2c3b5d6 100644
--- a/packages/toolbars/redoundo/package.json
+++ b/packages/toolbars/redoundo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-redoundo",
-  "version": "2.0.0",
+  "version": "2.1.0-rc.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/refresh/package.json b/packages/toolbars/refresh/package.json
index 8cbd7b1e0..69591161e 100644
--- a/packages/toolbars/refresh/package.json
+++ b/packages/toolbars/refresh/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-refresh",
-  "version": "2.0.0",
+  "version": "2.1.0-rc.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/save/package.json b/packages/toolbars/save/package.json
index 6f1600564..ea6ab8324 100644
--- a/packages/toolbars/save/package.json
+++ b/packages/toolbars/save/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-save",
-  "version": "2.0.0",
+  "version": "2.1.0-rc.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/setting/package.json b/packages/toolbars/setting/package.json
index 8a15b591d..e20409e9c 100644
--- a/packages/toolbars/setting/package.json
+++ b/packages/toolbars/setting/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-setting",
-  "version": "2.0.0",
+  "version": "2.1.0-rc.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/utils/package.json b/packages/utils/package.json
index db41fc097..3e3445ab0 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-utils",
-  "version": "2.0.0",
+  "version": "2.1.0-rc.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/vue-generator/package.json b/packages/vue-generator/package.json
index e2b29c1bc..3b24babdd 100644
--- a/packages/vue-generator/package.json
+++ b/packages/vue-generator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-dsl-vue",
-  "version": "2.0.0",
+  "version": "2.1.0-rc.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/webcomponent/package.json b/packages/webcomponent/package.json
index 9c90656f1..23921a5d5 100644
--- a/packages/webcomponent/package.json
+++ b/packages/webcomponent/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-webcomponent-core",
-  "version": "2.0.0",
+  "version": "2.1.0-rc.0",
   "publishConfig": {
     "access": "public"
   },

From 5b813e29376631b243d19ff570ee35f2226c6b6f Mon Sep 17 00:00:00 2001
From: chilingling <26962197+chilingling@users.noreply.github.com>
Date: Mon, 23 Dec 2024 19:44:32 -0800
Subject: [PATCH 02/19] feat: add pull request base branch release/* (#954)

---
 .github/workflows/push-check.yml | 60 ++++++++++++++++----------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/push-check.yml b/.github/workflows/push-check.yml
index 0acaab2bd..03d23d21c 100644
--- a/.github/workflows/push-check.yml
+++ b/.github/workflows/push-check.yml
@@ -4,40 +4,40 @@ on:
   push:
     branches: []
   pull_request:
-    branches: [develop,main, refactor/develop]
+    branches: [develop, main, refactor/develop, release/*]
 
 jobs:
   push-check:
-    runs-on: ubuntu-latest  # windows-latest || macos-latest
-    
+    runs-on: ubuntu-latest # windows-latest || macos-latest
+
     steps:
-    - uses: actions/checkout@v4
-    - name: Install pnpm
-      uses: pnpm/action-setup@v4
-      with:
-        version: 9
-    - uses: actions/setup-node@v4
-      with:
-        node-version: 18
+      - uses: actions/checkout@v4
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 9
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 18
 
-    - name: Install dependencies
-      run: pnpm i
+      - name: Install dependencies
+        run: pnpm i
 
-    - name: Get changed files
-      id: get_changed_files
-      uses: tj-actions/changed-files@v41
-      with:
-        files: |
-              **.js
-              **.vue
-              **.jsx
-    - name: Run ESLint
-      run: npx eslint ${{steps.get_changed_files.outputs.all_changed_files}}
-    - name: Run Build
-      run: pnpm run build:plugin && pnpm run build:alpha > build-alpha.log 2>&1
+      - name: Get changed files
+        id: get_changed_files
+        uses: tj-actions/changed-files@v41
+        with:
+          files: |
+            **.js
+            **.vue
+            **.jsx
+      - name: Run ESLint
+        run: npx eslint ${{steps.get_changed_files.outputs.all_changed_files}}
+      - name: Run Build
+        run: pnpm run build:plugin && pnpm run build:alpha > build-alpha.log 2>&1
 
-    - name: Upload build logs
-      uses: actions/upload-artifact@v4
-      with:
-        name: build-alpha-log
-        path: build-alpha.log
+      - name: Upload build logs
+        uses: actions/upload-artifact@v4
+        with:
+          name: build-alpha-log
+          path: build-alpha.log

From 526cfd48834aae98eb080706c8ff2dd37f1b9417 Mon Sep 17 00:00:00 2001
From: chilingling <26962197+chilingling@users.noreply.github.com>
Date: Mon, 23 Dec 2024 20:02:59 -0800
Subject: [PATCH 03/19] fix: chore bug fix for v2.1 (#953)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 修复清空画布报错的 bug
2. 修复区块加载错误的 bug
3. 修复画布拖拽组件到最前面的时候，组件会消失的  bug
---
 .../canvas/DesignCanvas/src/api/useCanvas.js    | 17 ++++++++++-------
 packages/canvas/render/src/render.js            |  2 +-
 .../materials/src/composable/block-compile.js   |  2 +-
 packages/toolbars/clean/src/Main.vue            |  5 ++---
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/packages/canvas/DesignCanvas/src/api/useCanvas.js b/packages/canvas/DesignCanvas/src/api/useCanvas.js
index beebdc405..9c0c6a3b8 100644
--- a/packages/canvas/DesignCanvas/src/api/useCanvas.js
+++ b/packages/canvas/DesignCanvas/src/api/useCanvas.js
@@ -297,15 +297,18 @@ const operationTypeMap = {
       }
     }
 
-    if (position === 'after') {
+    if (position === 'before') {
+      parentNode.children.unshift(newNodeData)
+    } else {
       parentNode.children.push(newNodeData)
-      setNode(newNodeData, parentNode)
+    }
 
-      // 递归构建 nodeMap
-      if (Array.isArray(newNodeData?.children) && newNodeData.children.length) {
-        const newNode = getNode(newNodeData.id)
-        generateNodesMap(newNodeData.children, newNode)
-      }
+    setNode(newNodeData, parentNode)
+
+    // 递归构建 nodeMap
+    if (Array.isArray(newNodeData?.children) && newNodeData.children.length) {
+      const newNode = getNode(newNodeData.id)
+      generateNodesMap(newNodeData.children, newNode)
     }
 
     return {
diff --git a/packages/canvas/render/src/render.js b/packages/canvas/render/src/render.js
index 339927327..6458f045f 100644
--- a/packages/canvas/render/src/render.js
+++ b/packages/canvas/render/src/render.js
@@ -215,7 +215,7 @@ export const generateFn = (innerFn, context) => {
     }
 
     // 这里注意如果innerFn返回的是一个promise则需要捕获异常，重新返回默认一条空数据
-    if (result.then) {
+    if (result?.then) {
       result = new Promise((resolve) => {
         result.then(resolve).catch((error) => {
           globalNotify({
diff --git a/packages/plugins/materials/src/composable/block-compile.js b/packages/plugins/materials/src/composable/block-compile.js
index 38db57cc5..54da3fa4b 100644
--- a/packages/plugins/materials/src/composable/block-compile.js
+++ b/packages/plugins/materials/src/composable/block-compile.js
@@ -27,7 +27,7 @@ export const getBlockCompileRes = async (schema) => {
 
   const generateCodeService = getMetaApi('engine.service.generateCode')
   const blocks = await generateCodeService.getAllNestedBlocksSchema(schema, fetchBlockSchema)
-  const componentsMap = useResource().resState.componentsMap
+  const componentsMap = useResource().appSchemaState.componentsMap
 
   // 调用 api 得到页面出码结果
   let blocksSourceCode = null
diff --git a/packages/toolbars/clean/src/Main.vue b/packages/toolbars/clean/src/Main.vue
index b34f4a6f2..2f77f3488 100644
--- a/packages/toolbars/clean/src/Main.vue
+++ b/packages/toolbars/clean/src/Main.vue
@@ -51,9 +51,8 @@ export default {
                 }
               </div>
             ]
-          }
-        }).then((res) => {
-          if (res === 'confirm') {
+          },
+          exec: () => {
             clearCanvas()
           }
         })

From bc0eb01c496a0dedc7d53c31e5eb6a5beece7421 Mon Sep 17 00:00:00 2001
From: chilingling <26962197+chilingling@users.noreply.github.com>
Date: Wed, 25 Dec 2024 03:46:56 -0800
Subject: [PATCH 04/19] fix: resolve some schema update issue (#956)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: resolve some schema update issue

1. 调整画布宽度时，画布选中框不及时更新的 bug
2. 空页面的时候，拖拽组件到画布提示两次新建页面的 bug
3. importSchema 的时候，清空选择
4. 页面 schema 保存的时候，设置保存状态为 false
5. 增强 AdvanceConfig 配置对 props 的容错

* fix: updateRect async change to callback style

* fix: first time enter app should show empty page warning
---
 packages/canvas/DesignCanvas/src/DesignCanvas.vue     |  3 ++-
 packages/canvas/DesignCanvas/src/api/useCanvas.js     |  2 ++
 .../canvas/container/src/components/CanvasResize.vue  | 11 ++++++++++-
 packages/plugins/schema/src/Main.vue                  |  6 +++++-
 .../settings/events/src/components/AdvanceConfig.vue  |  2 +-
 5 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/packages/canvas/DesignCanvas/src/DesignCanvas.vue b/packages/canvas/DesignCanvas/src/DesignCanvas.vue
index 295c6fde6..bb34022cd 100644
--- a/packages/canvas/DesignCanvas/src/DesignCanvas.vue
+++ b/packages/canvas/DesignCanvas/src/DesignCanvas.vue
@@ -96,10 +96,11 @@ export default {
         // 1. 页面或区块状态是未保存状态（尝试编辑）
         // 2. 页面刷新或第一次进入页面(含从别的页面或区块切换到别的页面或区块)
         // 3. 页面上已经有弹窗，不允许重复弹窗
+        // 4. 当前历史堆栈为0，且当前未保存状态和上一次未保存状态不一致，不重复弹窗
 
         const showConfirm = !isSaved || pageSchema !== oldPageSchema
 
-        if (!showConfirm || showModal) {
+        if (!showConfirm || showModal || (useHistory().historyState?.index === 0 && isSaved !== oldIsSaved)) {
           return
         }
 
diff --git a/packages/canvas/DesignCanvas/src/api/useCanvas.js b/packages/canvas/DesignCanvas/src/api/useCanvas.js
index 9c0c6a3b8..dfe347fd8 100644
--- a/packages/canvas/DesignCanvas/src/api/useCanvas.js
+++ b/packages/canvas/DesignCanvas/src/api/useCanvas.js
@@ -518,6 +518,8 @@ const importSchema = (data) => {
   resetCanvasState({
     pageSchema: importData
   })
+
+  canvasApi.value?.clearSelect?.()
 }
 
 const exportSchema = () => {
diff --git a/packages/canvas/container/src/components/CanvasResize.vue b/packages/canvas/container/src/components/CanvasResize.vue
index 68a11894d..87da4c0cc 100644
--- a/packages/canvas/container/src/components/CanvasResize.vue
+++ b/packages/canvas/container/src/components/CanvasResize.vue
@@ -11,7 +11,7 @@
 </template>
 <script>
 import { ref, computed, watch, nextTick } from 'vue'
-import { useLayout } from '@opentiny/tiny-engine-meta-register'
+import { useLayout, useCanvas } from '@opentiny/tiny-engine-meta-register'
 import { canvasState } from '../container'
 
 export default {
@@ -106,6 +106,15 @@ export default {
       { flush: 'post' }
     )
 
+    watch(
+      () => sizeStyle.value,
+      () => {
+        nextTick(() => {
+          useCanvas().canvasApi.value?.updateRect?.()
+        })
+      }
+    )
+
     return {
       onMouseDown,
       onMouseMove,
diff --git a/packages/plugins/schema/src/Main.vue b/packages/plugins/schema/src/Main.vue
index 5047a535a..8bdef930a 100644
--- a/packages/plugins/schema/src/Main.vue
+++ b/packages/plugins/schema/src/Main.vue
@@ -102,7 +102,11 @@ export default {
         componentName: pageState.pageSchema.componentName
       }
 
-      useCanvas().importSchema(value)
+      const { importSchema, setSaved } = useCanvas()
+
+      importSchema(value)
+      setSaved(false)
+
       // TODO: 历史堆栈
       // useHistory().addHistory()
       state.pageData = ''
diff --git a/packages/settings/events/src/components/AdvanceConfig.vue b/packages/settings/events/src/components/AdvanceConfig.vue
index a3674d225..889c370d1 100644
--- a/packages/settings/events/src/components/AdvanceConfig.vue
+++ b/packages/settings/events/src/components/AdvanceConfig.vue
@@ -135,7 +135,7 @@ export default {
       }
 
       const isNumber = Number(value).toString() !== 'NaN'
-      let newPropsKey = schema.props.key
+      let newPropsKey = schema.props?.key
 
       if (value && !isNumber) {
         newPropsKey = {

From 7f050293fdc6c86aefb4e213be6a6a96550266e4 Mon Sep 17 00:00:00 2001
From: chilingling <26962197+chilingling@users.noreply.github.com>
Date: Wed, 25 Dec 2024 04:56:44 -0800
Subject: [PATCH 05/19] fix: resolve warnings (#957)

* fix: resolve warnings

* fix: add access guard avoid runtime errors

* fix: change placeholder prop type

* fix: resolve type check

* fix: toolbarbaseicon props default value
---
 packages/common/component/MetaCodeEditor.vue  |  3 +-
 packages/common/component/MetaListItems.vue   | 52 ++++++++++---------
 packages/common/component/PluginBlockList.vue |  2 +-
 .../toolbar-built-in/ToolbarBaseButton.vue    |  9 +---
 .../toolbar-built-in/ToolbarBaseIcon.vue      | 11 +---
 .../TabsGroupConfigurator.vue                 |  4 +-
 packages/layout/src/DesignSettings.vue        | 11 ++--
 packages/plugins/i18n/src/Main.vue            |  2 +-
 .../src/meta/block/src/BlockGroup.vue         |  1 +
 .../src/meta/block/src/BlockList.vue          |  1 -
 .../materials/src/meta/layout/src/Main.vue    | 10 ++--
 packages/settings/styles/src/Main.vue         | 30 +++++++----
 .../src/components/border/BorderGroup.vue     |  8 +--
 .../src/components/inputs/NumericSelect.vue   |  2 +-
 14 files changed, 71 insertions(+), 75 deletions(-)

diff --git a/packages/common/component/MetaCodeEditor.vue b/packages/common/component/MetaCodeEditor.vue
index d7f86934f..5e730bf8a 100644
--- a/packages/common/component/MetaCodeEditor.vue
+++ b/packages/common/component/MetaCodeEditor.vue
@@ -255,7 +255,8 @@ export default {
         minimap: {
           enabled: false
         }
-      }
+      },
+      locale
     }
   }
 }
diff --git a/packages/common/component/MetaListItems.vue b/packages/common/component/MetaListItems.vue
index 74a451e3f..b770266dc 100644
--- a/packages/common/component/MetaListItems.vue
+++ b/packages/common/component/MetaListItems.vue
@@ -30,31 +30,33 @@
     </vue-draggable-next>
   </template>
   <template v-else>
-    <div v-for="(item, index) in optionsList" :key="index" class="option-item not-draggable">
-      <meta-list-item
-        :item="item"
-        :index="index"
-        :itemClick="itemClick"
-        :dataScource="listItemOption"
-        @changeItem="changeItem"
-        @deleteItem="deleteItem"
-        @editItem="editItem"
-      >
-        <template #content>
-          <slot name="content" :data="item">
-            <span>{{ item[textField] || formatName(item) }}</span>
-          </slot>
-        </template>
-        <template #operate>
-          <slot name="operate" :data="item"></slot>
-        </template>
-        <template #metaForm>
-          <slot name="form" :data="item"></slot>
-        </template>
-        <template #footer>
-          <slot name="footer" :data="item"></slot>
-        </template>
-      </meta-list-item>
+    <div>
+      <div v-for="(item, index) in optionsList" :key="index" class="option-item not-draggable">
+        <meta-list-item
+          :item="item"
+          :index="index"
+          :itemClick="itemClick"
+          :dataScource="listItemOption"
+          @changeItem="changeItem"
+          @deleteItem="deleteItem"
+          @editItem="editItem"
+        >
+          <template #content>
+            <slot name="content" :data="item">
+              <span>{{ item[textField] || formatName(item) }}</span>
+            </slot>
+          </template>
+          <template #operate>
+            <slot name="operate" :data="item"></slot>
+          </template>
+          <template #metaForm>
+            <slot name="form" :data="item"></slot>
+          </template>
+          <template #footer>
+            <slot name="footer" :data="item"></slot>
+          </template>
+        </meta-list-item>
+      </div>
     </div>
   </template>
 </template>
diff --git a/packages/common/component/PluginBlockList.vue b/packages/common/component/PluginBlockList.vue
index c1f34c5ee..04a566d6d 100644
--- a/packages/common/component/PluginBlockList.vue
+++ b/packages/common/component/PluginBlockList.vue
@@ -205,7 +205,7 @@ export default {
   emits: ['click', 'iconClick', 'add', 'deleteBlock', 'openVersionPanel', 'editBlock', 'checkAll', 'cancelCheckAll'],
   setup(props, { emit }) {
     const panelState = inject('panelState', {})
-    const blockUsers = inject('blockUsers')
+    const blockUsers = inject('blockUsers', [])
     const state = reactive({
       activeIndex: -1,
       data: computed(() => props.data),
diff --git a/packages/common/component/toolbar-built-in/ToolbarBaseButton.vue b/packages/common/component/toolbar-built-in/ToolbarBaseButton.vue
index 3ddfd0c20..30a4051bd 100644
--- a/packages/common/component/toolbar-built-in/ToolbarBaseButton.vue
+++ b/packages/common/component/toolbar-built-in/ToolbarBaseButton.vue
@@ -1,5 +1,5 @@
 <template>
-  <tiny-button v-bind="extendAttrs" class="toolbar-button">
+  <tiny-button class="toolbar-button">
     <span class="svg-wrap">
       <svg-icon v-if="icon" :name="icon"></svg-icon>
       <span v-if="options?.showDots" class="dots"></span>
@@ -9,7 +9,6 @@
   </tiny-button>
 </template>
 <script>
-import { inject } from 'vue'
 import { Button } from '@opentiny/vue'
 
 export default {
@@ -29,12 +28,6 @@ export default {
       type: Object,
       default: () => ({})
     }
-  },
-  setup() {
-    const extendAttrs = inject('extend-attributes') || {}
-    return {
-      extendAttrs
-    }
   }
 }
 </script>
diff --git a/packages/common/component/toolbar-built-in/ToolbarBaseIcon.vue b/packages/common/component/toolbar-built-in/ToolbarBaseIcon.vue
index b763a5059..2404f3903 100644
--- a/packages/common/component/toolbar-built-in/ToolbarBaseIcon.vue
+++ b/packages/common/component/toolbar-built-in/ToolbarBaseIcon.vue
@@ -8,7 +8,7 @@
   >
     <template #reference>
       <span class="icon">
-        <span class="icon-hides" v-bind="extendAttrs">
+        <span class="icon-hides" v-bind="$attrs">
           <svg-icon :name="icon"></svg-icon>
           <span v-if="options?.showDots" class="dots"></span>
         </span>
@@ -17,7 +17,6 @@
   </tiny-popover>
 </template>
 <script>
-import { inject } from 'vue'
 import { Popover } from '@opentiny/vue'
 
 export default {
@@ -35,13 +34,7 @@ export default {
     },
     options: {
       type: Object,
-      default: () => {}
-    }
-  },
-  setup() {
-    const extendAttrs = inject('extend-attributes') || {}
-    return {
-      extendAttrs
+      default: () => ({})
     }
   }
 }
diff --git a/packages/configurator/src/tabs-group-configurator/TabsGroupConfigurator.vue b/packages/configurator/src/tabs-group-configurator/TabsGroupConfigurator.vue
index 952331936..3d22853b7 100644
--- a/packages/configurator/src/tabs-group-configurator/TabsGroupConfigurator.vue
+++ b/packages/configurator/src/tabs-group-configurator/TabsGroupConfigurator.vue
@@ -78,8 +78,8 @@ const props = defineProps({
   },
   // tabItem宽度
   labelWidth: {
-    type: Number,
-    default: 63
+    type: [Number, String],
+    default: '63'
   },
   // tab的选项，如果选项中包含collapsed，则会折叠为下拉
   options: {
diff --git a/packages/layout/src/DesignSettings.vue b/packages/layout/src/DesignSettings.vue
index c79bcaeda..17e7d4f37 100644
--- a/packages/layout/src/DesignSettings.vue
+++ b/packages/layout/src/DesignSettings.vue
@@ -2,7 +2,7 @@
   <div id="tiny-right-panel">
     <tiny-tabs v-model="layoutState.settings.render">
       <tiny-tab-item v-for="(setting, index) in settings" :key="index" :title="setting.title" :name="setting.name">
-        <component :is="setting.entry" :is-collapsed="isCollapsed"></component>
+        <component :is="setting.entry"></component>
         <div v-show="activating" class="active"></div>
       </tiny-tab-item>
     </tiny-tabs>
@@ -15,14 +15,15 @@
 </template>
 
 <script>
-import { computed, ref } from 'vue'
-import { Tabs, TabItem } from '@opentiny/vue'
+import { computed, provide, ref } from 'vue'
+import { Tabs, TabItem, Tooltip } from '@opentiny/vue'
 import { useLayout } from '@opentiny/tiny-engine-meta-register'
 
 export default {
   components: {
     TinyTabs: Tabs,
-    TinyTabItem: TabItem
+    TinyTabItem: TabItem,
+    TinyTooltip: Tooltip
   },
   props: {
     settings: {
@@ -37,6 +38,8 @@ export default {
     const isCollapsed = ref(false)
     const settingIcon = computed(() => (isCollapsed.value ? 'style-panel-collapsed' : 'style-panel-expand'))
 
+    provide('isCollapsed', isCollapsed)
+
     return {
       showMask,
       isCollapsed,
diff --git a/packages/plugins/i18n/src/Main.vue b/packages/plugins/i18n/src/Main.vue
index 40772c8a3..64d7da17c 100644
--- a/packages/plugins/i18n/src/Main.vue
+++ b/packages/plugins/i18n/src/Main.vue
@@ -114,7 +114,7 @@
           </tiny-grid-column>
           <template #empty>
             <div v-if="isLoading" id="empty-loading-box" class="i18n-loading"></div>
-            <search-empty isShow="!isLoading" />
+            <search-empty v-else />
           </template>
         </tiny-grid>
       </div>
diff --git a/packages/plugins/materials/src/meta/block/src/BlockGroup.vue b/packages/plugins/materials/src/meta/block/src/BlockGroup.vue
index 11a0c71d8..e9715b6c3 100644
--- a/packages/plugins/materials/src/meta/block/src/BlockGroup.vue
+++ b/packages/plugins/materials/src/meta/block/src/BlockGroup.vue
@@ -168,6 +168,7 @@ export default {
       default: () => []
     }
   },
+  emits: ['changeGroup'],
   setup(props) {
     const validateIcon = iconError()
     const panelState = inject('panelState', {})
diff --git a/packages/plugins/materials/src/meta/block/src/BlockList.vue b/packages/plugins/materials/src/meta/block/src/BlockList.vue
index edfe0b4bb..de6b6613a 100644
--- a/packages/plugins/materials/src/meta/block/src/BlockList.vue
+++ b/packages/plugins/materials/src/meta/block/src/BlockList.vue
@@ -1,6 +1,5 @@
 <template>
   <plugin-block-list
-    class="block-list-wrap"
     ref="blockRef"
     :data="blockList"
     :show-add-button="state.showAddButton"
diff --git a/packages/plugins/materials/src/meta/layout/src/Main.vue b/packages/plugins/materials/src/meta/layout/src/Main.vue
index 35692b1ba..61a5bdcd5 100644
--- a/packages/plugins/materials/src/meta/layout/src/Main.vue
+++ b/packages/plugins/materials/src/meta/layout/src/Main.vue
@@ -2,7 +2,7 @@
   <plugin-panel :title="shortcut ? '' : title" @close="$emit('close')">
     <template #header>
       <component
-        :is="headerComponent"
+        :is="registryData?.components?.header"
         :fixedPanels="fixedPanels"
         @fix-panel="(id) => $emit('fix-panel', id)"
       ></component>
@@ -52,14 +52,11 @@ export default {
     })
     provide('panelState', panelState) // 使用provide传给子组件,后续可能会有调整，先暂定
 
-    const pluginRegistryData = ref(props.registryData)
     const rightPanelRef = ref(null)
-    const displayComponentIds = pluginRegistryData.value.options.displayComponentIds || []
-    const headerComponent = pluginRegistryData.value.components?.header
+    const displayComponentIds = props.registryData?.options?.displayComponentIds || []
     const onlyShowDefault = ref(displayComponentIds.length === 1)
     const activeTabId =
-      displayComponentIds.find((item) => item === pluginRegistryData.value.options?.defaultTabId) ||
-      displayComponentIds[0]
+      displayComponentIds.find((item) => item === props.registryData?.options?.defaultTabId) || displayComponentIds[0]
 
     const activeName = ref(activeTabId)
     const defaultComponent = getMergeMeta(activeName.value)?.entry
@@ -75,7 +72,6 @@ export default {
     const title = ref(props.registryData?.title)
 
     return {
-      headerComponent,
       title,
       activeName,
       defaultComponent,
diff --git a/packages/settings/styles/src/Main.vue b/packages/settings/styles/src/Main.vue
index f1f31f013..c1f1bb69a 100644
--- a/packages/settings/styles/src/Main.vue
+++ b/packages/settings/styles/src/Main.vue
@@ -65,7 +65,7 @@
 </template>
 
 <script>
-import { computed, watch } from 'vue'
+import { watch, inject, ref } from 'vue'
 import { Collapse, CollapseItem, Input } from '@opentiny/vue'
 import { useHistory, useCanvas, useProperties } from '@opentiny/tiny-engine-meta-register'
 import { CodeConfigurator, VariableConfigurator } from '@opentiny/tiny-engine-configurator'
@@ -105,13 +105,8 @@ export default {
     TinyInput: Input,
     VariableConfigurator
   },
-  props: {
-    isCollapsed: {
-      type: Boolean,
-      default: false
-    }
-  },
-  setup(props) {
+  props: {},
+  setup() {
     const styleCategoryGroup = [
       'layout',
       'spacing',
@@ -122,7 +117,8 @@ export default {
       'borders',
       'effects'
     ]
-    const activeNames = computed(() => (props.isCollapsed ? [styleCategoryGroup[0]] : styleCategoryGroup))
+    const isCollapsed = inject('isCollapsed')
+    const activeNames = ref(styleCategoryGroup)
     const { getCurrentSchema } = useCanvas()
     // 获取当前节点 style 对象
     const { state, updateStyle } = useStyle() // updateStyle
@@ -130,7 +126,7 @@ export default {
     const { getSchema, setProp } = useProperties()
 
     const handoverGroup = (actives) => {
-      if (props.isCollapsed) {
+      if (isCollapsed.value) {
         activeNames.value = actives.length > 1 ? actives.shift() : actives
       }
     }
@@ -200,6 +196,17 @@ export default {
       }
     )
 
+    watch(
+      () => isCollapsed.value,
+      () => {
+        if (isCollapsed.value) {
+          activeNames.value = [styleCategoryGroup[0]]
+        } else {
+          activeNames.value = styleCategoryGroup
+        }
+      }
+    )
+
     return {
       state,
       activeNames,
@@ -209,7 +216,8 @@ export default {
       save,
       close,
       updateStyle,
-      setConfig
+      setConfig,
+      isCollapsed
     }
   }
 }
diff --git a/packages/settings/styles/src/components/border/BorderGroup.vue b/packages/settings/styles/src/components/border/BorderGroup.vue
index 241750891..11a0ed7f2 100644
--- a/packages/settings/styles/src/components/border/BorderGroup.vue
+++ b/packages/settings/styles/src/components/border/BorderGroup.vue
@@ -38,7 +38,7 @@
         <numeric-select
           :name="getProperty(BORDER_RADIUS_PROPERTY.BorderTopLeftRadius).name"
           :numericalText="borderRadius.BorderTopLeftRadius"
-          :placeholder="0"
+          placeholder="0"
           @update="updateStyle"
         />
       </div>
@@ -51,7 +51,7 @@
         <numeric-select
           :name="getProperty(BORDER_RADIUS_PROPERTY.BorderTopRightRadius).name"
           :numericalText="borderRadius.BorderTopRightRadius"
-          :placeholder="0"
+          placeholder="0"
           @update="updateStyle"
         />
       </div>
@@ -64,7 +64,7 @@
         <numeric-select
           :name="getProperty(BORDER_RADIUS_PROPERTY.BorderBottomLeftRadius).name"
           :numericalText="borderRadius.BorderBottomLeftRadius"
-          :placeholder="0"
+          placeholder="0"
           @update="updateStyle"
         />
       </div>
@@ -76,7 +76,7 @@
         </tiny-tooltip>
         <numeric-select
           :name="getProperty(BORDER_RADIUS_PROPERTY.BorderBottomRightRadius).name"
-          :placeholder="0"
+          placeholder="0"
           :numericalText="borderRadius.BorderBottomRightRadius"
           @update="updateStyle"
         />
diff --git a/packages/settings/styles/src/components/inputs/NumericSelect.vue b/packages/settings/styles/src/components/inputs/NumericSelect.vue
index 9d737afa2..7d8403670 100644
--- a/packages/settings/styles/src/components/inputs/NumericSelect.vue
+++ b/packages/settings/styles/src/components/inputs/NumericSelect.vue
@@ -41,7 +41,7 @@ export default {
       default: false
     },
     placeholder: {
-      type: [String, Number],
+      type: String,
       default: ''
     },
     suffix: {

From 702357bfdcd141d130e8a356a82df8bf5f14f4a6 Mon Sep 17 00:00:00 2001
From: chilingling <26962197+chilingling@users.noreply.github.com>
Date: Mon, 30 Dec 2024 19:48:53 -0800
Subject: [PATCH 06/19] fix: time asc add i18n failed (#976)

* fix: time asc add i18n failed

* fix: search invalid

---------

Co-authored-by: hexqi <wu_12556@126.com>
---
 packages/plugins/i18n/src/Main.vue | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/packages/plugins/i18n/src/Main.vue b/packages/plugins/i18n/src/Main.vue
index 64d7da17c..e7cb06285 100644
--- a/packages/plugins/i18n/src/Main.vue
+++ b/packages/plugins/i18n/src/Main.vue
@@ -123,7 +123,7 @@
 </template>
 
 <script lang="jsx">
-import { computed, ref, watchEffect, reactive, onMounted, nextTick, resolveComponent } from 'vue'
+import { computed, ref, watchEffect, reactive, onMounted, nextTick, resolveComponent, watch } from 'vue'
 import useClipboard from 'vue-clipboard3'
 import { Grid, GridColumn, Input, Popover, Button, FileUpload, Loading, Tooltip, Select } from '@opentiny/vue'
 import { iconLoadingShadow, iconUpload } from '@opentiny/vue-icon'
@@ -244,13 +244,16 @@ export default {
       }
     }
 
-    watchEffect(() => {
-      langList.value = fullLangList.value.filter((item) => {
-        const reg = new RegExp(searchKey.value, 'i')
-        return reg.test(item?.zh_CN) || reg.test(item?.en_US) || reg.test(item?.key)
-      })
-      sortTypeChanges(currentSearchType.value)
-    })
+    watch(
+      () => [fullLangList.value, currentSearchType.value, searchKey.value],
+      () => {
+        langList.value = fullLangList.value.filter((item) => {
+          const reg = new RegExp(searchKey.value, 'i')
+          return reg.test(item?.zh_CN) || reg.test(item?.en_US) || reg.test(item?.key)
+        })
+        sortTypeChanges(currentSearchType.value)
+      }
+    )
 
     watchEffect(() => {
       if (i18nResource.locales.length) {

From 88986b65647d191b4806dacfaf0a6fb328903ae0 Mon Sep 17 00:00:00 2001
From: chilingling <26962197+chilingling@users.noreply.github.com>
Date: Mon, 30 Dec 2024 21:58:06 -0800
Subject: [PATCH 07/19] fix: basePropsGroup use deepclone prevent clone array
 itself  (#975)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: basePropsGroup use deepclone prevent clone array itself

basePropsGroup 使用深拷贝方式复制自身

* fix: filter duplicated property
---
 .../plugins/materials/src/composable/useMaterial.js  | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/plugins/materials/src/composable/useMaterial.js b/packages/plugins/materials/src/composable/useMaterial.js
index cfa99d9d7..0d87df183 100644
--- a/packages/plugins/materials/src/composable/useMaterial.js
+++ b/packages/plugins/materials/src/composable/useMaterial.js
@@ -25,7 +25,7 @@ import {
 import meta from '../../meta'
 import { getBlockCompileRes, getBlockByName, updateBlockCompileCache } from './block-compile'
 
-const { camelize, capitalize } = utils
+const { camelize, capitalize, deepClone } = utils
 const { MATERIAL_TYPE } = constants
 
 // 这里存放所有TinyVue组件、原生HTML、内置组件的缓存，包含了物料插件面板里所有显示的组件，也包含了没显示的一些联动组件
@@ -113,13 +113,17 @@ const patchBaseProps = (schemaProperties) => {
     })
 
     if (group) {
+      const targetInsertContent = basePropGroup.content.filter(
+        (item) => !group.content.some((prop) => prop.property === item.property)
+      )
+
       if (insertPosition === 'start') {
-        group.content.splice(0, 0, ...basePropGroup.content)
+        group.content.splice(0, 0, ...deepClone(targetInsertContent))
       } else {
-        group.content.push(...basePropGroup.content)
+        group.content.push(...deepClone(targetInsertContent))
       }
     } else {
-      schemaProperties.push(basePropGroup)
+      schemaProperties.push(deepClone(basePropGroup))
     }
   }
 }

From da356e12049605ecf4d761dfb276efb2c6d19a87 Mon Sep 17 00:00:00 2001
From: chilingling <26962197+chilingling@users.noreply.github.com>
Date: Mon, 30 Dec 2024 23:02:30 -0800
Subject: [PATCH 08/19] fix: generate code accessor scenario (#972)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: generate code accessor scenario

修复 state  accessor 出码的bug

* fix: objectVal gettter value
---
 .../generator/vue/sfc/generateAttribute.js    |  17 ++-
 .../testcases/sfc/accessor/accessor.test.js   |  11 ++
 .../sfc/accessor/expected/Accessor.vue        |  74 +++++++++++++
 .../test/testcases/sfc/accessor/schema.json   | 101 ++++++++++++++++++
 4 files changed, 201 insertions(+), 2 deletions(-)
 create mode 100644 packages/vue-generator/test/testcases/sfc/accessor/accessor.test.js
 create mode 100644 packages/vue-generator/test/testcases/sfc/accessor/expected/Accessor.vue
 create mode 100644 packages/vue-generator/test/testcases/sfc/accessor/schema.json

diff --git a/packages/vue-generator/src/generator/vue/sfc/generateAttribute.js b/packages/vue-generator/src/generator/vue/sfc/generateAttribute.js
index 9b623ca76..a713728e7 100644
--- a/packages/vue-generator/src/generator/vue/sfc/generateAttribute.js
+++ b/packages/vue-generator/src/generator/vue/sfc/generateAttribute.js
@@ -379,7 +379,9 @@ export const handleTinyIconPropsHook = (schemaData, globalHooks, config) => {
 
 export const transformObjType = (obj, globalHooks, config) => {
   if (!obj || typeof obj !== 'object') {
-    return obj
+    return {
+      res: obj
+    }
   }
 
   let resStr = []
@@ -413,7 +415,18 @@ export const transformObjType = (obj, globalHooks, config) => {
     }
 
     if (hasAccessor(value?.accessor)) {
-      resStr.push(`${renderKey}${value.defaultValue || "''"}`)
+      if (typeof value.defaultValue === 'string') {
+        resStr.push(`${renderKey}"${value.defaultValue.replaceAll("'", "\\'").replaceAll(/"/g, "'")}"`)
+      } else {
+        const { res: tempRes, shouldBindToState: tempShouldBindToState } =
+          transformObjType(value.defaultValue, globalHooks, config) || {}
+
+        resStr.push(`${renderKey}${tempRes}`)
+
+        if (tempShouldBindToState) {
+          shouldBindToState = true
+        }
+      }
 
       if (isSetter(value?.accessor)) {
         globalHooks.addStatement({
diff --git a/packages/vue-generator/test/testcases/sfc/accessor/accessor.test.js b/packages/vue-generator/test/testcases/sfc/accessor/accessor.test.js
new file mode 100644
index 000000000..33f63288b
--- /dev/null
+++ b/packages/vue-generator/test/testcases/sfc/accessor/accessor.test.js
@@ -0,0 +1,11 @@
+import { expect, test } from 'vitest'
+import { genSFCWithDefaultPlugin } from '@/generator/vue/sfc'
+import schema from './schema.json'
+import { formatCode } from '@/utils/formatCode'
+
+test('should validate tagName', async () => {
+  const res = genSFCWithDefaultPlugin(schema, [])
+  const formattedCode = formatCode(res, 'vue')
+
+  await expect(formattedCode).toMatchFileSnapshot('./expected/Accessor.vue')
+})
diff --git a/packages/vue-generator/test/testcases/sfc/accessor/expected/Accessor.vue b/packages/vue-generator/test/testcases/sfc/accessor/expected/Accessor.vue
new file mode 100644
index 000000000..00ffda6f0
--- /dev/null
+++ b/packages/vue-generator/test/testcases/sfc/accessor/expected/Accessor.vue
@@ -0,0 +1,74 @@
+<template>
+  <div>
+    <span class="page-header">测试 state accessor 出码场景</span>
+  </div>
+</template>
+
+<script setup>
+import * as vue from 'vue'
+import { defineProps, defineEmits } from 'vue'
+import { I18nInjectionKey } from 'vue-i18n'
+
+const props = defineProps({})
+
+const emit = defineEmits([])
+const { t, lowcodeWrap, stores } = vue.inject(I18nInjectionKey).lowcode()
+const wrap = lowcodeWrap(props, { emit })
+wrap({ stores })
+
+const state = vue.reactive({
+  firstName: 'Opentiny',
+  lastName: 'TinyEngine',
+  nullValue: null,
+  numberValue: 0,
+  emptyStr: '',
+  strVal: 'i am str.',
+  trueVal: true,
+  falseVal: false,
+  arrVal: [1, '2', { aaa: 'aaa' }, [3, 4], true, false],
+  objVal: { aaa: 'aaa', arr: [1, '2', true, false, 0], ccc: { bbb: 'bbb' }, d: 32432, e: '', f: null, g: false }
+})
+wrap({ state })
+
+vue.watchEffect(
+  wrap(function () {
+    this.state.nullValue = `${this.state.firstName} ${this.state.lastName}`
+  })
+)
+vue.watchEffect(
+  wrap(function () {
+    this.state.numberValue = `${this.state.firstName} ${this.state.lastName}`
+  })
+)
+vue.watchEffect(
+  wrap(function () {
+    this.state.emptyStr = `${this.state.firstName} ${this.state.lastName}`
+  })
+)
+vue.watchEffect(
+  wrap(function () {
+    this.state.strVal = `${this.state.firstName} ${this.state.lastName}`
+  })
+)
+vue.watchEffect(
+  wrap(function () {
+    this.state.trueVal = `${this.state.firstName} ${this.state.lastName}`
+  })
+)
+vue.watchEffect(
+  wrap(function () {
+    this.state.falseVal = `${this.state.firstName} ${this.state.lastName}`
+  })
+)
+vue.watchEffect(
+  wrap(function () {
+    this.state.arrVal = `${this.state.firstName} ${this.state.lastName}`
+  })
+)
+vue.watchEffect(
+  wrap(function () {
+    this.state.objVal = `${this.state.firstName} ${this.state.lastName}`
+  })
+)
+</script>
+<style scoped></style>
diff --git a/packages/vue-generator/test/testcases/sfc/accessor/schema.json b/packages/vue-generator/test/testcases/sfc/accessor/schema.json
new file mode 100644
index 000000000..27a6c664d
--- /dev/null
+++ b/packages/vue-generator/test/testcases/sfc/accessor/schema.json
@@ -0,0 +1,101 @@
+{
+  "componentName": "Page",
+  "fileName": "Accessor",
+  "css": "",
+  "props": {},
+  "children": [
+    {
+      "componentName": "Text",
+      "props": {
+        "className": "page-header",
+        "text": "测试 state accessor 出码场景"
+      }
+    }
+  ],
+  "state": {
+    "firstName": "Opentiny",
+    "lastName": "TinyEngine",
+    "nullValue": {
+      "defaultValue": null,
+      "accessor": {
+        "getter": {
+          "type": "JSFunction",
+          "value": "function() { this.state.nullValue = `${this.state.firstName} ${this.state.lastName}` }"
+        }
+      }
+    },
+    "numberValue": {
+      "defaultValue": 0,
+      "accessor": {
+        "getter": {
+          "type": "JSFunction",
+          "value": "function() { this.state.numberValue = `${this.state.firstName} ${this.state.lastName}` }"
+        }
+      }
+    },
+    "emptyStr": {
+      "defaultValue": "",
+      "accessor": {
+        "getter": {
+          "type": "JSFunction",
+          "value": "function() { this.state.emptyStr = `${this.state.firstName} ${this.state.lastName}` }"
+        }
+      }
+    },
+    "strVal": {
+      "defaultValue": "i am str.",
+      "accessor": {
+        "getter": {
+          "type": "JSFunction",
+          "value": "function() { this.state.strVal = `${this.state.firstName} ${this.state.lastName}` }"
+        }
+      }
+    },
+    "trueVal": {
+      "defaultValue": true,
+      "accessor": {
+        "getter": {
+          "type": "JSFunction",
+          "value": "function() { this.state.trueVal = `${this.state.firstName} ${this.state.lastName}` }"
+        }
+      }
+    },
+    "falseVal": {
+      "defaultValue": false,
+      "accessor": {
+        "getter": {
+          "type": "JSFunction",
+          "value": "function() { this.state.falseVal = `${this.state.firstName} ${this.state.lastName}` }"
+        }
+      }
+    },
+    "arrVal": {
+      "defaultValue": [1, "2", { "aaa": "aaa" }, [3, 4], true, false],
+      "accessor": {
+        "getter": {
+          "type": "JSFunction",
+          "value": "function() { this.state.arrVal = `${this.state.firstName} ${this.state.lastName}` }"
+        }
+      }
+    },
+    "objVal": {
+      "defaultValue": {
+        "aaa": "aaa",
+        "arr": [1, "2", true, false, 0],
+        "ccc": { "bbb": "bbb" },
+        "d": 32432,
+        "e": "",
+        "f": null,
+        "g": false
+      },
+      "accessor": {
+        "getter": {
+          "type": "JSFunction",
+          "value": "function() { this.state.objVal = `${this.state.firstName} ${this.state.lastName}` }"
+        }
+      }
+    }
+  },
+  "lifeCycles": {},
+  "methods": {}
+}

From bf48d6734a8a26c5d35648df370865ac5be94007 Mon Sep 17 00:00:00 2001
From: chilingling <26962197+chilingling@users.noreply.github.com>
Date: Tue, 31 Dec 2024 02:35:31 -0800
Subject: [PATCH 09/19] fix: blockPublishLogic (#973)

* fix: breadcrumb publish block cannot get correct version

* fix: block schema change sync

* fix: del useless comment code

* fix: hide publish block button when creating block
---
 .../common/component/BlockDeployDialog.vue    | 65 ++++++++++++-------
 packages/plugins/block/src/BlockSetting.vue   | 49 +++++++-------
 .../plugins/block/src/composable/useBlock.js  |  2 +-
 .../plugins/block/src/js/blockSetting.jsx     | 13 +++-
 packages/toolbars/breadcrumb/src/Main.vue     | 39 +++++------
 .../src/composable/useBreadcrumb.js           |  4 +-
 6 files changed, 96 insertions(+), 76 deletions(-)

diff --git a/packages/common/component/BlockDeployDialog.vue b/packages/common/component/BlockDeployDialog.vue
index 3c15521b1..f304a59db 100644
--- a/packages/common/component/BlockDeployDialog.vue
+++ b/packages/common/component/BlockDeployDialog.vue
@@ -1,6 +1,6 @@
 <template>
   <tiny-dialog-box
-    :visible="$attrs.visible"
+    :visible="visible"
     title="发布区块"
     width="550px"
     append-to-body
@@ -80,7 +80,7 @@ import {
   Popover as TinyPopover,
   FormItem as TinyFormItem
 } from '@opentiny/vue'
-import { useNotify, useCanvas, getMetaApi, META_APP, useBlock } from '@opentiny/tiny-engine-meta-register'
+import { useNotify, getMetaApi, META_APP } from '@opentiny/tiny-engine-meta-register'
 import { constants } from '@opentiny/tiny-engine-utils'
 import VueMonaco from './VueMonaco.vue'
 
@@ -96,13 +96,17 @@ export default {
     VueMonaco
   },
   props: {
-    nextVersion: {
-      type: String,
-      default: ''
+    block: {
+      type: Object,
+      default: () => ({})
+    },
+    visible: {
+      type: Boolean,
+      default: false
     }
   },
-  emits: ['update:visible'],
-  setup(props, { emit, attrs }) {
+  emits: ['update:visible', 'changeSchema'],
+  setup(props, { emit }) {
     const { COMPONENT_NAME } = constants
     const formState = reactive({
       deployInfo: '',
@@ -137,12 +141,31 @@ export default {
       }
     }
 
+    const getNextVersion = (block) => {
+      const backupList = block.histories || []
+
+      let latestVersion = '1.0.0'
+      let latestTime = 0
+      backupList.forEach((v) => {
+        const vTime = new Date(v.created_at).getTime()
+
+        if (vTime > latestTime) {
+          latestTime = vTime
+          latestVersion = v.version
+        }
+      })
+      // version 符合X.Y.Z的字符结构
+      return latestVersion.replace(/\d+$/, (match) => Number(match) + 1)
+    }
+
     watch(
-      () => attrs.visible,
+      () => props.visible,
       (visible) => {
-        if (visible && !formState.version) {
-          formState.version = props.nextVersion
+        if (!visible) {
+          return
         }
+
+        formState.version = getNextVersion(props.block)
       }
     )
 
@@ -150,10 +173,11 @@ export default {
 
     const deployBlock = async () => {
       deployBlockRef.value.validate((valid) => {
-        const { getEditBlock, publishBlock } = getMetaApi(META_APP.BlockManage)
+        const { publishBlock } = getMetaApi(META_APP.BlockManage)
+
         if (valid) {
           const params = {
-            block: getEditBlock() || useBlock().getCurrentBlock(),
+            block: props.block,
             is_compile: true,
             deploy_info: formState.deployInfo,
             version: formState.version,
@@ -170,21 +194,14 @@ export default {
 
     const changeCompare = async (value) => {
       const api = getMetaApi(META_APP.BlockManage)
+
       if (value) {
-        const block = api.getEditBlock()
+        const block = props.block
         const remote = await api.getBlockById(block?.id)
         const originalObj = remote?.content || {}
         state.originalCode = JSON.stringify(originalObj, null, 2)
-        const getSchema = useCanvas().getSchema
 
-        // 转为普通对象，和线上代码顺序保持一致
-        const pageSchema = getSchema?.() || {}
-        if (pageSchema.componentName === 'Block') {
-          state.code = JSON.stringify(pageSchema, null, 2)
-        } else {
-          // 非区块编辑
-          state.code = state.originalCode
-        }
+        state.code = JSON.stringify(block?.content || {}, null, 2)
         state.compareVisible = true
       }
     }
@@ -207,8 +224,8 @@ export default {
         return
       }
       try {
-        const pageSchema = JSON.parse(state.newCode)
-        useCanvas().importSchema({ ...pageSchema, componentName: COMPONENT_NAME.Block })
+        const newSchema = JSON.parse(state.newCode)
+        emit('changeSchema', { ...newSchema, componentName: COMPONENT_NAME.Block })
         close()
       } catch (err) {
         useNotify({
diff --git a/packages/plugins/block/src/BlockSetting.vue b/packages/plugins/block/src/BlockSetting.vue
index e9b6407bc..2b347c2ce 100644
--- a/packages/plugins/block/src/BlockSetting.vue
+++ b/packages/plugins/block/src/BlockSetting.vue
@@ -75,14 +75,17 @@
       </tiny-collapse>
     </template>
   </plugin-setting>
-  <block-deploy-dialog v-model:visible="state.showDeployBlock" :nextVersion="nextVersion"></block-deploy-dialog>
+  <block-deploy-dialog
+    v-model:visible="state.showDeployBlock"
+    :block="publishBlock"
+    @changeSchema="handleChangeSchema"
+  ></block-deploy-dialog>
 </template>
 
 <script lang="jsx">
 import { reactive, ref, watch, watchEffect, computed } from 'vue'
 import { Button as TinyButton, Collapse as TinyCollapse, CollapseItem as TinyCollapseItem } from '@opentiny/vue'
-import { useModal } from '@opentiny/tiny-engine-meta-register'
-import { getMergeMeta, useBlock } from '@opentiny/tiny-engine-meta-register'
+import { useModal, getMergeMeta, useBlock } from '@opentiny/tiny-engine-meta-register'
 import { BlockHistoryList, PluginSetting, CloseIcon, SvgButton, ButtonGroup } from '@opentiny/tiny-engine-common'
 import { previewBlock } from '@opentiny/tiny-engine-common/js/preview'
 import { LifeCycles } from '@opentiny/tiny-engine-common'
@@ -136,6 +139,16 @@ export default {
   setup() {
     const { confirm } = useModal()
     const editBlock = computed(getEditBlock)
+    const publishBlock = computed(() => {
+      const currentBlock = useBlock().getCurrentBlock()
+      const currentEditBlock = getEditBlock()
+
+      if (currentBlock?.id === currentEditBlock?.id) {
+        return currentBlock
+      }
+
+      return currentEditBlock
+    })
     const blockConfigForm = ref(null)
 
     const state = reactive({
@@ -151,24 +164,6 @@ export default {
       state.bindLifeCycles = getEditBlock()?.content?.lifeCycles || {}
     })
 
-    // 按时间最新提交的版本的修订版本号+1, 提示输入的下一个版本
-    const nextVersion = computed(() => {
-      const backupList = state.backupList || []
-
-      let latestVersion = '1.0.0'
-      let latestTime = 0
-      backupList.forEach((v) => {
-        const vTime = new Date(v.created_at).getTime()
-
-        if (vTime > latestTime) {
-          latestTime = vTime
-          latestVersion = v.version
-        }
-      })
-      // version 符合X.Y.Z的字符结构
-      return latestVersion.replace(/\d+$/, (match) => Number(match) + 1)
-    })
-
     watch(
       () => {
         const block = getEditBlock()
@@ -264,10 +259,16 @@ export default {
       setConfigItemVisible(false)
     }
 
+    const handleChangeSchema = (newSchema) => {
+      // 如果是当前正在画布编辑的区块，需要重新 importSchema
+      if (getEditBlock()?.id === useBlock().getCurrentBlock()?.id) {
+        useBlock().initBlock({ ...useBlock().getCurrentBlock(), content: newSchema })
+      }
+    }
+
     return {
       state,
       isOpen,
-      nextVersion,
       showDeployBlockDialog,
       closePanel,
       deleteBlock,
@@ -279,7 +280,9 @@ export default {
       globalConfig: getMergeMeta('engine.config'),
       onMouseLeave,
       handleClick,
-      handleShowGuide
+      handleShowGuide,
+      handleChangeSchema,
+      publishBlock
     }
   }
 }
diff --git a/packages/plugins/block/src/composable/useBlock.js b/packages/plugins/block/src/composable/useBlock.js
index f21ebbe45..1cedf024b 100644
--- a/packages/plugins/block/src/composable/useBlock.js
+++ b/packages/plugins/block/src/composable/useBlock.js
@@ -287,7 +287,7 @@ const initBlock = async (block = {}, _langs = {}, isEdit) => {
   block.content = getSchema()
 
   setCurrentBlock(block)
-  setBreadcrumbBlock([block[nameCn] || block.label], block.histories)
+  setBreadcrumbBlock([block[nameCn] || block.label])
 
   // 如果是点击区块管理列表进来的则不需要执行以下操作
   if (!isEdit) {
diff --git a/packages/plugins/block/src/js/blockSetting.jsx b/packages/plugins/block/src/js/blockSetting.jsx
index 3a8d804f7..74fd891a2 100644
--- a/packages/plugins/block/src/js/blockSetting.jsx
+++ b/packages/plugins/block/src/js/blockSetting.jsx
@@ -419,10 +419,17 @@ export const refreshBlockData = async (block = {}) => {
       if (newBlock?.public_scope_tenants?.length) {
         newBlock.public_scope_tenants = newBlock.public_scope_tenants.map((e) => e.id)
       }
-      Object.assign(block, newBlock)
-      useLayout().layoutState.pageStatus = getCanvasStatus(newBlock?.occupier)
 
-      useHistory().addHistory(block.content)
+      // 与当前正在画布编辑态的区块相同，需要同步更新
+      if (useBlock().getCurrentBlock()?.id === block.id) {
+        useLayout().layoutState.pageStatus = getCanvasStatus(newBlock?.occupier)
+        useHistory().addHistory(block.content)
+        Object.assign(useBlock().getCurrentBlock(), newBlock)
+      }
+      // 与当前区块管理面板的区块相同，需要同步更新
+      if (getEditBlock()?.id === block.id) {
+        Object.assign(getEditBlock(), newBlock)
+      }
     }
   }
 }
diff --git a/packages/toolbars/breadcrumb/src/Main.vue b/packages/toolbars/breadcrumb/src/Main.vue
index b3312d5ce..90e8115e3 100644
--- a/packages/toolbars/breadcrumb/src/Main.vue
+++ b/packages/toolbars/breadcrumb/src/Main.vue
@@ -17,14 +17,18 @@
 
         <tiny-button
           class="publish"
-          v-if="breadcrumbData[0] === CONSTANTS.BLOCKTEXT"
+          v-if="breadcrumbData[0] === CONSTANTS.BLOCKTEXT && currentBlock?.id"
           @click="publishBlock()"
           type="primary"
           size="small"
           >发布区块
         </tiny-button>
       </div>
-      <block-deploy-dialog v-model:visible="state.showDeployBlock" :nextVersion="nextVersion"></block-deploy-dialog>
+      <block-deploy-dialog
+        v-model:visible="state.showDeployBlock"
+        :block="currentBlock"
+        @changeSchema="handleChangeSchema"
+      ></block-deploy-dialog>
     </template>
   </toolbar-base>
 </template>
@@ -32,7 +36,7 @@
 <script>
 import { reactive, computed } from 'vue'
 import { Breadcrumb, BreadcrumbItem, Button } from '@opentiny/vue'
-import { useBreadcrumb, useLayout } from '@opentiny/tiny-engine-meta-register'
+import { useBreadcrumb, useLayout, useBlock } from '@opentiny/tiny-engine-meta-register'
 import { ToolbarBase } from '@opentiny/tiny-engine-common'
 import { BlockDeployDialog } from '@opentiny/tiny-engine-common'
 
@@ -68,36 +72,25 @@ export default {
       state.showDeployBlock = true
     }
 
-    const nextVersion = computed(() => {
-      const backupList = getBreadcrumbData().value[2] || []
-
-      let latestVersion = '1.0.0'
-      let latestTime = 0
-      backupList.forEach((v) => {
-        const vTime = new Date(v.created_at).getTime()
-
-        if (vTime > latestTime) {
-          latestTime = vTime
-          latestVersion = v.version
-        }
-      })
-
-      // version 符合X.Y.Z的字符结构
-      return latestVersion.replace(/\d+$/, (match) => Number(match) + 1)
-    })
-
     const open = () => {
       if (!plugins) return
       plugins.render = breadcrumbData.value[0] === CONSTANTS.PAGETEXT ? PLUGINS_ID.PAGEID : PLUGINS_ID.BLOCKID
     }
 
+    const currentBlock = computed(useBlock().getCurrentBlock)
+
+    const handleChangeSchema = (newSchema) => {
+      useBlock().initBlock({ ...useBlock().getCurrentBlock(), content: newSchema })
+    }
+
     return {
       breadcrumbData,
       publishBlock,
       state,
-      nextVersion,
       CONSTANTS,
-      open
+      open,
+      currentBlock,
+      handleChangeSchema
     }
   }
 }
diff --git a/packages/toolbars/breadcrumb/src/composable/useBreadcrumb.js b/packages/toolbars/breadcrumb/src/composable/useBreadcrumb.js
index 4d1c62e36..52c119d80 100644
--- a/packages/toolbars/breadcrumb/src/composable/useBreadcrumb.js
+++ b/packages/toolbars/breadcrumb/src/composable/useBreadcrumb.js
@@ -23,8 +23,8 @@ const setBreadcrumbPage = (value) => {
   sessionStorage.setItem('pageInfo', value)
 }
 
-const setBreadcrumbBlock = (value, histories = []) => {
-  breadcrumbData.value = [CONSTANTS.BLOCKTEXT, ...value, histories]
+const setBreadcrumbBlock = (value) => {
+  breadcrumbData.value = [CONSTANTS.BLOCKTEXT, ...value]
 }
 
 const getBreadcrumbData = () => breadcrumbData

From bdc26f6d9897fdb0af32cca6f7eee5529f447361 Mon Sep 17 00:00:00 2001
From: chilingling <26962197+chilingling@users.noreply.github.com>
Date: Tue, 31 Dec 2024 02:35:55 -0800
Subject: [PATCH 10/19] fix: blockCompile get correct version (#964)

* fix: blockCompile get correct version

* fix: support refresh block selected version

* fix: clear all compileCache

* fix: use correct version key to find history schema

* fix: add id for stylesheet

* fix: clean style sheet when remove cache

* fix: should remove stylesheet before clean cache
---
 packages/block-compiler/src/index.ts          |  4 +-
 packages/canvas/container/src/container.js    |  4 +-
 packages/canvas/render/src/RenderMain.js      |  4 +-
 packages/canvas/render/src/render.js          | 81 +++++++++----------
 .../materials/src/composable/block-compile.js | 63 +++++++++------
 .../plugins/materials/src/meta/block/index.js |  5 +-
 .../src/meta/block/src/BlockVersionSelect.vue |  9 +--
 7 files changed, 86 insertions(+), 84 deletions(-)

diff --git a/packages/block-compiler/src/index.ts b/packages/block-compiler/src/index.ts
index 3c537e63f..6f2c340d8 100644
--- a/packages/block-compiler/src/index.ts
+++ b/packages/block-compiler/src/index.ts
@@ -58,7 +58,7 @@ export interface IResultMap {
   [key: string]: compiledItem
 }
 
-const resolveRelativeImport = (code: string, globalGetterName = 'getBlockComponentBlobUrl') => {
+const resolveRelativeImport = (code: string, globalGetterName = 'loadBlockComponent') => {
   const magicStr = new MagicString(code)
   const ast = babelParse(code, { sourceType: 'module', plugins: ['jsx'] }).program.body
 
@@ -86,7 +86,7 @@ const resolveRelativeImport = (code: string, globalGetterName = 'getBlockCompone
         // 声明异步组件 const Block = defineAsyncComponent(() => import(getBlockUrl(Block)))
         magicStr.appendLeft(
           node.start!,
-          `const ${defaultImportId} = defineAsyncComponent(() => import(window.${globalGetterName}('${fileName}')))`
+          `const ${defaultImportId} = defineAsyncComponent(() => window.${globalGetterName}('${fileName}'))`
         )
 
         // 移除 import Block from './Block.vue' 语句
diff --git a/packages/canvas/container/src/container.js b/packages/canvas/container/src/container.js
index 758b9ca14..6d7be9376 100644
--- a/packages/canvas/container/src/container.js
+++ b/packages/canvas/container/src/container.js
@@ -822,8 +822,8 @@ export const canvasApi = {
   getDocument,
   canvasDispatch,
   Builtin,
-  removeBlockCompsCacheByName: (...args) => {
-    return canvasState.renderer.removeBlockCompsCacheByName(...args)
+  removeBlockCompsCache: (...args) => {
+    return canvasState.renderer.removeBlockCompsCache(...args)
   },
   updateCanvas: (...args) => {
     return canvasState.renderer.updateCanvas(...args)
diff --git a/packages/canvas/render/src/RenderMain.js b/packages/canvas/render/src/RenderMain.js
index 3e64c9217..3d2167631 100644
--- a/packages/canvas/render/src/RenderMain.js
+++ b/packages/canvas/render/src/RenderMain.js
@@ -22,7 +22,7 @@ import renderer, {
   setController,
   globalNotify,
   isStateAccessor,
-  removeBlockCompsCacheByName
+  removeBlockCompsCache
 } from './render'
 import { setContext, getContext, setCondition, context, getDesignMode, setDesignMode } from './context'
 import CanvasEmpty from './CanvasEmpty.vue'
@@ -505,6 +505,6 @@ export const api = {
   setRenderer,
   getDesignMode,
   setDesignMode,
-  removeBlockCompsCacheByName,
+  removeBlockCompsCache,
   updateCanvas
 }
diff --git a/packages/canvas/render/src/render.js b/packages/canvas/render/src/render.js
index 6458f045f..f11152ac6 100644
--- a/packages/canvas/render/src/render.js
+++ b/packages/canvas/render/src/render.js
@@ -254,65 +254,58 @@ const parseFunctionString = (fnStr) => {
   return null
 }
 
-const blockComponentsMap = new Map()
 const blockComponentsBlobUrlMap = new Map()
 
 // TODO: 这里的全局 getter 方法名，可以做成配置化
-window.getBlockComponentBlobUrl = (name) => blockComponentsBlobUrlMap.get(name)
-
-const getBlockComponent = (name) => {
-  if (blockComponentsMap.has(name)) {
-    return blockComponentsMap.get(name)
-  }
-
-  const BlockComp = defineAsyncComponent(async () => {
-    try {
-      const blocksBlob = await getController().getBlockByName(name)
+const loadBlockComponent = async (name) => {
+  try {
+    if (blockComponentsBlobUrlMap.has(name)) {
+      return import(/* @vite-ignore */ blockComponentsBlobUrlMap.get(name))
+    }
 
-      for (const [fileName, value] of Object.entries(blocksBlob)) {
-        // 注册异步组件
-        blockComponentsMap.set(
-          fileName,
-          defineAsyncComponent(() => import(/* @vite-ignore */ value.blobURL))
-        )
+    const blocksBlob = await getController().getBlockByName(name)
 
-        blockComponentsBlobUrlMap.set(fileName, value.blobURL)
+    for (const [fileName, value] of Object.entries(blocksBlob)) {
+      blockComponentsBlobUrlMap.set(fileName, value.blobURL)
 
-        if (!value.style) {
-          continue
-        }
+      if (!value.style) {
+        continue
+      }
 
-        // 注册 CSS，以区块为维度
-        const stylesheet = document.querySelector(`#${fileName}`)
+      // 注册 CSS，以区块为维度
+      const stylesheet = document.querySelector(`#${fileName}`)
 
-        if (stylesheet) {
-          stylesheet.innerHTML = value.style
-        } else {
-          const newStylesheet = document.createElement('style')
-          newStylesheet.innerHTML = value.style
-          document.head.appendChild(newStylesheet)
-        }
+      if (stylesheet) {
+        stylesheet.innerHTML = value.style
+      } else {
+        const newStylesheet = document.createElement('style')
+        newStylesheet.innerHTML = value.style
+        newStylesheet.setAttribute('id', fileName)
+        document.head.appendChild(newStylesheet)
       }
-
-      return blockComponentsMap.get(name)
-    } catch (error) {
-      // 加载错误提示
-      return h(BlockLoadError, { name })
     }
-  })
 
-  return BlockComp
+    return import(/* @vite-ignore */ blockComponentsBlobUrlMap.get(name))
+  } catch (error) {
+    // 加载错误提示
+    return h(BlockLoadError, { name })
+  }
+}
+
+window.loadBlockComponent = loadBlockComponent
+
+const getBlockComponent = (name) => {
+  return defineAsyncComponent(() => loadBlockComponent(name))
 }
 
 // 移除区块缓存
-export const removeBlockCompsCacheByName = (name) => {
-  if (blockComponentsMap.has(name)) {
-    blockComponentsMap.delete(name)
-  }
+export const removeBlockCompsCache = () => {
+  blockComponentsBlobUrlMap.forEach((_, fileName) => {
+    const stylesheet = document.querySelector(`#${fileName}`)
+    stylesheet?.remove?.()
+  })
 
-  if (blockComponentsBlobUrlMap.has(name)) {
-    blockComponentsBlobUrlMap.delete(name)
-  }
+  blockComponentsBlobUrlMap.clear()
 }
 
 export const getComponent = (name) => {
diff --git a/packages/plugins/materials/src/composable/block-compile.js b/packages/plugins/materials/src/composable/block-compile.js
index 54da3fa4b..bf4c5c2d4 100644
--- a/packages/plugins/materials/src/composable/block-compile.js
+++ b/packages/plugins/materials/src/composable/block-compile.js
@@ -1,18 +1,35 @@
 import { getMetaApi, META_SERVICE, useMaterial, useResource, useCanvas } from '@opentiny/tiny-engine-meta-register'
 import { compile as blockCompiler } from '@opentiny/tiny-engine-block-compiler'
 
+const blockVersionMap = new Map()
 const blockCompileCache = new Map()
 
+// 获取所有区块分组下的所有区块
+const getAllGroupBlocks = async () => {
+  const { fetchGroups, fetchGroupBlocksByIds } = getMetaApi('engine.plugins.materials.block')
+  const appId = getMetaApi(META_SERVICE.GlobalService).getBaseInfo().id
+
+  const groups = await fetchGroups(appId)
+
+  const groupIds = groups.map((groupItem) => groupItem.id)
+
+  const blocks = await fetchGroupBlocksByIds({ groupIds })
+
+  for (const blockItem of blocks) {
+    if (blockItem?.content?.fileName && blockItem?.current_version) {
+      blockVersionMap.set(blockItem.content.fileName, blockItem.current_version)
+    }
+  }
+}
+
 export const fetchBlockSchema = async (blockName) =>
   getMetaApi(META_SERVICE.Http).get(`/material-center/api/block?label=${blockName}`)
 
 // TODO: 待验证
-export const updateBlockCompileCache = (name) => {
-  if (blockCompileCache.has(name)) {
-    blockCompileCache.delete(name)
-
-    useCanvas().canvasApi.value?.removeBlockCompsCacheByName(name)
-  }
+export const updateBlockCompileCache = () => {
+  blockVersionMap.clear()
+  useCanvas().canvasApi.value?.removeBlockCompsCache()
+  blockCompileCache.clear()
 }
 
 // 预构建 block
@@ -26,26 +43,19 @@ export const getBlockCompileRes = async (schema) => {
   }
 
   const generateCodeService = getMetaApi('engine.service.generateCode')
-  const blocks = await generateCodeService.getAllNestedBlocksSchema(schema, fetchBlockSchema)
   const componentsMap = useResource().appSchemaState.componentsMap
 
-  // 调用 api 得到页面出码结果
-  let blocksSourceCode = null
-  const blocksWithoutCache = blocks.filter((blockItem) => !blockCompileCache.has(blockItem.fileName))
-
   // 需要出码的区块
-  blocksSourceCode = [schema, ...blocksWithoutCache].map((blockSchema) => {
-    const sourceCode = generateCodeService.generatePageCode(blockSchema, componentsMap || [], {
-      blockRelativePath: './'
-    })
-
-    return {
-      fileName: blockSchema.fileName,
-      sourceCode
-    }
+  const sourceCode = generateCodeService.generatePageCode(schema, componentsMap || [], {
+    blockRelativePath: './'
   })
 
-  const compiledResult = blockCompiler(blocksSourceCode, {
+  const blocksSourceCode = {
+    fileName: schema.fileName,
+    sourceCode
+  }
+
+  const compiledResult = blockCompiler([blocksSourceCode], {
     compileCache: blockCompileCache
   })
 
@@ -54,6 +64,11 @@ export const getBlockCompileRes = async (schema) => {
 
 // 获取 blockBlob
 export const getBlockByName = async (name) => {
+  // version map 为空，获取所有区块的版本记录
+  if (blockVersionMap.size === 0) {
+    await getAllGroupBlocks()
+  }
+
   // 找到对应区块的 schema
   const block = await fetchBlockSchema(name)
   const blockItem = block?.[0]
@@ -62,13 +77,13 @@ export const getBlockByName = async (name) => {
     return
   }
 
-  const historyId = blockItem?.current_history
-  const historySchema = blockItem?.histories?.find?.((historyItem) => historyItem?.id === historyId)
+  const historyVersion = blockVersionMap.get(name)
+  const historySchema = blockItem?.histories?.find?.((historyItem) => historyItem?.version === historyVersion)
 
   let schemaContent = null
 
   // 有指定的历史版本，优先选用历史版本
-  if (historyId && historySchema?.content) {
+  if (historyVersion && historySchema?.content) {
     schemaContent = historySchema.content
   } else {
     schemaContent = blockItem?.content
diff --git a/packages/plugins/materials/src/meta/block/index.js b/packages/plugins/materials/src/meta/block/index.js
index b801a21b5..e9f3f110b 100644
--- a/packages/plugins/materials/src/meta/block/index.js
+++ b/packages/plugins/materials/src/meta/block/index.js
@@ -1,12 +1,13 @@
 import entry from './src/Main.vue'
 import metaData from './meta'
-import { fetchGroups } from './src/http'
+import { fetchGroups, fetchGroupBlocksByIds } from './src/http'
 
 export default {
   ...metaData,
   entry,
   apis: {
-    fetchGroups
+    fetchGroups,
+    fetchGroupBlocksByIds
   },
   options: {
     title: '区块'
diff --git a/packages/plugins/materials/src/meta/block/src/BlockVersionSelect.vue b/packages/plugins/materials/src/meta/block/src/BlockVersionSelect.vue
index 2d2a24e18..928b6f97d 100644
--- a/packages/plugins/materials/src/meta/block/src/BlockVersionSelect.vue
+++ b/packages/plugins/materials/src/meta/block/src/BlockVersionSelect.vue
@@ -88,16 +88,9 @@ export default {
                 isRefresh.value = true
                 closePanel()
                 // 刷新缓存
-                useMaterial().updateBlockCompileCache(selectedRow.content?.fileName)
+                useMaterial().updateBlockCompileCache()
                 // 刷新画布
                 useCanvas().canvasApi.value?.updateCanvas()
-                // confirm({
-                //   title: '切换区块版本成功',
-                //   message: `${selectedBlock.value.label}区块，已切换为${selectedRow.version}版本，修改版本后需要刷新页面才生效，是否刷新页面？`,
-                //   exec: () => {
-                //     window.location.reload()
-                //   }
-                // })
               })
               .catch((error) => {
                 message({

From f4d32151399f58f836b4cc708b6a8fc4c2c0fbd5 Mon Sep 17 00:00:00 2001
From: zhangjuncao <163953928+zhangjuncao@users.noreply.github.com>
Date: Wed, 1 Jan 2025 17:11:20 -0800
Subject: [PATCH 11/19] fix:modify style (#981)

---
 packages/common/component/PluginSetting.vue            |  4 ++++
 .../materials/src/meta/block/src/BlockGroup.vue        | 10 ++++++++++
 packages/theme/base/src/component-common.less          |  7 +++++--
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/packages/common/component/PluginSetting.vue b/packages/common/component/PluginSetting.vue
index b822f87b1..c4e13912d 100644
--- a/packages/common/component/PluginSetting.vue
+++ b/packages/common/component/PluginSetting.vue
@@ -176,6 +176,10 @@ export default {
     .plugin-setting-header-title {
       font-size: 12px;
       font-weight: 700;
+      margin-right: 20px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
     }
     :deep(.svg-button + .svg-button) {
       margin: 0;
diff --git a/packages/plugins/materials/src/meta/block/src/BlockGroup.vue b/packages/plugins/materials/src/meta/block/src/BlockGroup.vue
index e9715b6c3..30bcd258f 100644
--- a/packages/plugins/materials/src/meta/block/src/BlockGroup.vue
+++ b/packages/plugins/materials/src/meta/block/src/BlockGroup.vue
@@ -429,6 +429,7 @@ export default {
     border-bottom: 1px solid var(--ti-lowcode-materials-block-group-item-border-color);
     :deep(.tiny-input__inner) {
       border-color: transparent;
+      width: 180px;
     }
   }
   .confirm-btns {
@@ -438,6 +439,9 @@ export default {
     :deep(svg) {
       color: var(--ti-lowcode-component-svg-button-color);
     }
+    :deep(.tiny-button) {
+      padding: 0 2px;
+    }
   }
   &.show-underline {
     border-bottom: 1px solid var(--ti-lowcode-materials-block-group-item-border-color);
@@ -455,6 +459,12 @@ export default {
   .option-right {
     display: none;
   }
+  .option-label {
+    width: 180px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
 }
 .tiny-form .tiny-form-item.edit-form-item {
   margin-bottom: 0;
diff --git a/packages/theme/base/src/component-common.less b/packages/theme/base/src/component-common.less
index 29d76ff19..38927966f 100644
--- a/packages/theme/base/src/component-common.less
+++ b/packages/theme/base/src/component-common.less
@@ -12,6 +12,9 @@
       font-size: var(--te-base-font-size-1);
       color: var(--te-common-text-weaken);
     }
+    .tiny-input__inner {
+      padding-right: 30px;
+    }
   }
   .tiny-select__tags {
     .tiny-tag {
@@ -498,7 +501,7 @@
   }
   &.is-controls-right {
     .tiny-numeric__input-inner {
-      padding: 0 42px 0 12px;
+      padding: 0 20px 0 12px;
     }
     //加减按钮
     .tiny-numeric__decrease,
@@ -519,7 +522,7 @@
     background-color: var(--te-common-bg-default);
     border-color: var(--te-common-border-default);
     &.has-unit .tiny-numeric__input-inner {
-      padding: 0 42px 0 12px;
+      padding: 0 20px 0 12px;
     }
   }
   .tiny-numeric__unit {

From 611059137ba9603d233570147ec9045fd2f2a1ba Mon Sep 17 00:00:00 2001
From: lisong <53158783+SonyLeo@users.noreply.github.com>
Date: Thu, 2 Jan 2025 09:11:47 +0800
Subject: [PATCH 12/19] fix: optimize save code button marker position (#982)

* fix: optimize save code button marker position

* fix: resolve point style issues for page Schema and page JS
---
 .../toolbar-built-in/ToolbarBaseButton.vue    | 24 +++++++++----------
 packages/plugins/schema/src/Main.vue          | 13 +++++-----
 packages/plugins/script/src/Main.vue          | 10 ++++----
 3 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/packages/common/component/toolbar-built-in/ToolbarBaseButton.vue b/packages/common/component/toolbar-built-in/ToolbarBaseButton.vue
index 30a4051bd..67d4de388 100644
--- a/packages/common/component/toolbar-built-in/ToolbarBaseButton.vue
+++ b/packages/common/component/toolbar-built-in/ToolbarBaseButton.vue
@@ -1,12 +1,12 @@
 <template>
-  <tiny-button class="toolbar-button">
-    <span class="svg-wrap">
+  <div class="svg-wrap">
+    <span v-if="options?.showDots" class="dot"></span>
+    <tiny-button class="toolbar-button">
       <svg-icon v-if="icon" :name="icon"></svg-icon>
-      <span v-if="options?.showDots" class="dots"></span>
-    </span>
-    <span class="save-title">{{ content }}</span>
-    <slot></slot>
-  </tiny-button>
+      <span class="save-title">{{ content }}</span>
+      <slot></slot>
+    </tiny-button>
+  </div>
 </template>
 <script>
 import { Button } from '@opentiny/vue'
@@ -45,15 +45,15 @@ export default {
 
 .svg-wrap {
   position: relative;
-  .dots {
+
+  .dot {
+    position: absolute;
     width: 6px;
     height: 6px;
     background: var(--ti-lowcode-toolbar-dot-color);
     border-radius: 50%;
-    display: inline-block;
-    position: absolute;
-    top: -2px;
-    right: -2px;
+    top: -3px;
+    right: 2px;
     z-index: 100;
   }
 }
diff --git a/packages/plugins/schema/src/Main.vue b/packages/plugins/schema/src/Main.vue
index 8bdef930a..23e179510 100644
--- a/packages/plugins/schema/src/Main.vue
+++ b/packages/plugins/schema/src/Main.vue
@@ -194,6 +194,7 @@ export default {
     justify-content: flex-end;
     align-items: center;
     .icon-wrap {
+      position: relative;
       .tiny-button {
         width: 40px;
         padding: 0;
@@ -203,15 +204,15 @@ export default {
         line-height: 24px;
       }
       .red {
-        width: 5px;
-        height: 5px;
-        border-radius: 3px;
-        background-color: #f00;
+        width: 6px;
+        height: 6px;
+        border-radius: 50%;
+        background-color: var(--ti-lowcode-common-error-color);
         display: block;
         z-index: 100;
         position: absolute;
-        top: 1px;
-        right: 1px;
+        top: -3px;
+        right: -4px;
       }
     }
     & > span:not(:last-child) {
diff --git a/packages/plugins/script/src/Main.vue b/packages/plugins/script/src/Main.vue
index ae7b3fda9..656879f9d 100644
--- a/packages/plugins/script/src/Main.vue
+++ b/packages/plugins/script/src/Main.vue
@@ -149,13 +149,13 @@ export default {
         height: 24px;
         line-height: 24px;
         .dots {
-          width: 10px;
-          height: 10px;
-          background: var(--ti-lowcode-warning-color-1);
+          width: 6px;
+          height: 6px;
+          background: var(--ti-lowcode-common-error-color);
           border-radius: 50%;
           position: absolute;
-          top: 5px;
-          right: 40px;
+          top: 9px;
+          right: 34px;
         }
       }
       .icon-wrap {

From 8467dbd901093a9972eba768f33a5d136c0adba1 Mon Sep 17 00:00:00 2001
From: Hexqi <wu_12556@126.com>
Date: Thu, 2 Jan 2025 09:49:23 +0800
Subject: [PATCH 13/19] fix: update cli template resolve preview error (#983)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

更新 cli 模板
---
 .../engine-cli/template/designer/package.json |  19 +--
 .../template/designer/public/mock/bundle.json | 109 ++++++++++++++-
 .../engine-cli/template/designer/registry.js  |   2 +-
 .../designer/src/composable/http/Login.vue    |  83 ++++++++++++
 .../designer/src/composable/http/index.js     | 125 ++++++++++++++++--
 .../template/designer/src/preview.js          |   3 +-
 6 files changed, 317 insertions(+), 24 deletions(-)
 create mode 100644 packages/engine-cli/template/designer/src/composable/http/Login.vue

diff --git a/packages/engine-cli/template/designer/package.json b/packages/engine-cli/template/designer/package.json
index 6be053ec2..42ac898df 100644
--- a/packages/engine-cli/template/designer/package.json
+++ b/packages/engine-cli/template/designer/package.json
@@ -11,19 +11,22 @@
     "build": "cross-env NODE_OPTIONS=--max-old-space-size=8192 VITE_THEME=light vite build --mode prod"
   },
   "dependencies": {
-    "vue": "^3.4.21",
-    "@opentiny/tiny-engine": "^2.0.0-alpha.5",
-    "@opentiny/tiny-engine-theme-dark": "^2.0.0-alpha.5",
-    "@opentiny/tiny-engine-theme-light": "^2.0.0-alpha.5",
+    "@opentiny/tiny-engine": "^2.1.0",
+    "@opentiny/tiny-engine-theme-dark": "^2.1.0",
+    "@opentiny/tiny-engine-theme-light": "^2.1.0",
+    "@opentiny/tiny-engine-utils": "^2.1.0",
     "@opentiny/vue": "~3.14.0",
-    "@opentiny/vue-icon": "~3.14.0",
     "@opentiny/vue-design-smb": "~3.14.0",
+    "@opentiny/vue-icon": "~3.14.0",
+    "@opentiny/vue-locale": "~3.14.0",
     "@opentiny/vue-renderless": "~3.14.0",
-    "@opentiny/vue-theme": "~3.14.0"
+    "@opentiny/vue-theme": "~3.14.0",
+    "@vueuse/core": "^9.6.0",
+    "vue": "^3.4.21"
   },
   "devDependencies": {
-    "@opentiny/tiny-engine-vite-config": "^2.0.0-alpha.5",
-    "@opentiny/tiny-engine-mock": "^2.0.0-alpha.5",
+    "@opentiny/tiny-engine-mock": "^2.1.0",
+    "@opentiny/tiny-engine-vite-config": "^2.1.0",
     "@vitejs/plugin-vue": "^5.1.2",
     "cross-env": "^7.0.3",
     "concurrently": "^8.2.0",
diff --git a/packages/engine-cli/template/designer/public/mock/bundle.json b/packages/engine-cli/template/designer/public/mock/bundle.json
index 77114bb43..328a4f277 100644
--- a/packages/engine-cli/template/designer/public/mock/bundle.json
+++ b/packages/engine-cli/template/designer/public/mock/bundle.json
@@ -4828,6 +4828,113 @@
             }
           }
         },
+        {
+          "icon": "row",
+          "name": {
+            "zh_CN": "row"
+          },
+          "component": "TinyLayout",
+          "description": "定义 Layout 的行配置信息",
+          "docUrl": "",
+          "screenshot": "",
+          "tags": "",
+          "keywords": "",
+          "devMode": "proCode",
+          "npm": {
+            "package": "@opentiny/vue",
+            "exportName": "Layout",
+            "version": "3.14.0",
+            "destructuring": true,
+            "script": "https://unpkg.com/@opentiny/vue@~3.14/runtime/tiny-vue.mjs",
+            "css": "https://unpkg.com/@opentiny/vue-theme@~3.14/index.css"
+          },
+          "group": "component",
+          "priority": 5,
+          "schema": {
+            "properties": [
+              {
+                "label": {
+                  "zh_CN": "基础信息"
+                },
+                "description": {
+                  "zh_CN": "基础信息"
+                },
+                "content": [
+                  {
+                    "property": "cols",
+                    "label": {
+                      "text": {
+                        "zh_CN": "总栅格数"
+                      }
+                    },
+                    "cols": 12,
+                    "widget": {
+                      "component": "ButtonGroupConfigurator",
+                      "props": {
+                        "options": [
+                          {
+                            "label": "12",
+                            "value": 12
+                          },
+                          {
+                            "label": "24",
+                            "value": 24
+                          }
+                        ]
+                      }
+                    },
+                    "description": {
+                      "zh_CN": "选择总栅格数"
+                    },
+                    "labelPosition": "none"
+                  },
+                  {
+                    "property": "tag",
+                    "label": {
+                      "text": {
+                        "zh_CN": "layout渲染的标签"
+                      }
+                    },
+                    "required": false,
+                    "readOnly": false,
+                    "disabled": false,
+                    "cols": 12,
+                    "widget": {
+                      "component": "InputConfigurator",
+                      "props": {}
+                    },
+                    "description": {
+                      "zh_CN": "定义Layout元素渲染后的标签，默认为 div"
+                    }
+                  }
+                ]
+              }
+            ]
+          },
+          "configure": {
+            "loop": true,
+            "condition": true,
+            "styles": true,
+            "isContainer": true,
+            "isModal": false,
+            "nestingRule": {
+              "childWhitelist": ["TinyRow", "TinyCol"],
+              "parentWhitelist": "",
+              "descendantBlacklist": "",
+              "ancestorWhitelist": ""
+            },
+            "isNullNode": false,
+            "isLayout": false,
+            "rootSelector": "",
+            "shortcuts": {
+              "properties": ["disabled"]
+            },
+            "contextMenu": {
+              "actions": ["create symbol"],
+              "disable": ["copy", "remove"]
+            }
+          }
+        },
         {
           "icon": "form",
           "name": {
@@ -9613,7 +9720,7 @@
                     "required": true,
                     "readOnly": false,
                     "disabled": false,
-                    "onChange": "this.delProp('data')",
+                    "onChange": "function () { this.delProp('data') } ",
                     "cols": 12,
                     "widget": {
                       "component": "CodeConfigurator",
diff --git a/packages/engine-cli/template/designer/registry.js b/packages/engine-cli/template/designer/registry.js
index ac499e930..45d09f154 100644
--- a/packages/engine-cli/template/designer/registry.js
+++ b/packages/engine-cli/template/designer/registry.js
@@ -50,7 +50,7 @@ import { HttpService } from './src/composable'
 export default {
   root: {
     id: 'engine.root',
-    metas: [HttpService, GenerateCodeService, GlobalService]
+    metas: [HttpService, GenerateCodeService, GlobalService] // GlobalService 依赖 HttpService，HttpService需要在前面处理
   },
   config: engineConfig,
   layout: {
diff --git a/packages/engine-cli/template/designer/src/composable/http/Login.vue b/packages/engine-cli/template/designer/src/composable/http/Login.vue
new file mode 100644
index 000000000..6c5c8b0d6
--- /dev/null
+++ b/packages/engine-cli/template/designer/src/composable/http/Login.vue
@@ -0,0 +1,83 @@
+<template>
+  <div v-if="visible" class="tiny-popup__wrapper">
+    <div class="tiny-sso__box">
+      <div class="tiny-sso__body">
+        <iframe :src="url" class="tiny-sso__body-iframe" frameBorder="0" scrolling="no"></iframe>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { ref } from 'vue'
+
+export default {
+  setup() {
+    const visible = ref(false)
+    const url = ref('')
+
+    const openLogin = (procession, newUrl) => {
+      visible.value = true
+      url.value = newUrl
+
+      return new Promise((resolve, reject) => {
+        procession.mePromise.resolve = resolve
+        procession.mePromise.reject = reject
+      })
+    }
+
+    const closeLogin = () => {
+      visible.value = false
+    }
+
+    return {
+      openLogin,
+      closeLogin,
+      visible,
+      url
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+.tiny-popup__wrapper {
+  z-index: 9999;
+  background: rgba(0, 0, 0, 0.5);
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  overflow: auto;
+  margin: 0;
+
+  .tiny-sso__box {
+    position: absolute;
+    background: #fff;
+    border: 1px solid transparent;
+    box-shadow: 2px 2px 2px 0 rgba(0, 0, 0, 0.2);
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%, -50%);
+
+    .tiny-sso__body {
+      text-align: initial;
+      padding: 20px;
+      color: #5a5e66;
+      line-height: 32px;
+      font-size: 14px;
+
+      .tiny-sso__body-iframe {
+        width: 450px;
+        height: 450px;
+        overflow: hidden;
+        //兼容edge
+        @supports (-ms-ime-align: auto) {
+          height: 460px;
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/packages/engine-cli/template/designer/src/composable/http/index.js b/packages/engine-cli/template/designer/src/composable/http/index.js
index 26b7edae7..f11538395 100644
--- a/packages/engine-cli/template/designer/src/composable/http/index.js
+++ b/packages/engine-cli/template/designer/src/composable/http/index.js
@@ -1,36 +1,135 @@
+import { createApp } from 'vue'
 import { HttpService } from '@opentiny/tiny-engine'
+import { useBroadcastChannel } from '@vueuse/core'
+import { constants } from '@opentiny/tiny-engine-utils'
+import Login from './Login.vue'
+
+const LOGIN_EXPIRED_CODE = 401
+const { BROADCAST_CHANNEL } = constants
+
+const { post: globalNotify } = useBroadcastChannel({ name: BROADCAST_CHANNEL.Notify })
+
+const procession = {
+  promiseLogin: null,
+  mePromise: {}
+}
+let loginVM = null
+
+const showError = (url, message) => {
+  globalNotify({
+    type: 'error',
+    title: '接口报错',
+    message: `报错接口: ${url} \n报错信息: ${message ?? ''}`
+  })
+}
 
 const preRequest = (config) => {
+  const isDevelopEnv = import.meta.env.MODE?.includes('dev')
+
+  if (isDevelopEnv && config.url.match(/\/generate\//)) {
+    config.baseURL = ''
+  }
+
+  const isVsCodeEnv = window.vscodeBridge
+
+  if (isVsCodeEnv) {
+    config.baseURL = ''
+  }
+
   return config
 }
 
 const preResponse = (res) => {
+  if (res.data?.error) {
+    showError(res.config?.url, res?.data?.error?.message)
+
+    return Promise.reject(res.data.error)
+  }
+
   return res.data?.data
 }
 
+const openLogin = () => {
+  if (!window.lowcode) {
+    const loginDom = document.createElement('div')
+    document.body.appendChild(loginDom)
+    loginVM = createApp(Login).mount(loginDom)
+
+    window.lowcode = {
+      platformCenter: {
+        Session: {
+          rebuiltCallback: function () {
+            loginVM.closeLogin()
+
+            procession.mePromise.resolve('login ok')
+            procession.promiseLogin = null
+            procession.mePromise = {}
+          }
+        }
+      }
+    }
+  }
+
+  return new Promise((resolve, reject) => {
+    if (!procession.promiseLogin) {
+      procession.promiseLogin = loginVM.openLogin(procession, '/api/rebuildSession')
+      procession.promiseLogin.then((response) => {
+        HttpService.apis.request(response.config).then(resolve, reject)
+      })
+    }
+  })
+}
+
 const errorResponse = (error) => {
-  return Promise.reject(error.message)
+  // 用户信息失效时，弹窗提示登录
+  const { response } = error
+
+  if (response?.status === LOGIN_EXPIRED_CODE) {
+    // vscode 插件环境弹出输入框提示登录
+    if (window.vscodeBridge) {
+      return Promise.resolve(true)
+    }
+
+    // 浏览器环境弹出小窗登录
+    if (response?.headers['x-login-url']) {
+      return openLogin()
+    }
+  }
+
+  showError(error.config?.url, error?.message)
+
+  return response?.data.error ? Promise.reject(response.data.error) : Promise.reject(error.message)
 }
 
 const getConfig = (env = import.meta.env) => {
+  const baseURL = env.VITE_ORIGIN
+  // 仅在本地开发时，启用 withCredentials
+  const dev = env.MODE?.includes('dev')
+  // 获取租户 id
+  const getTenant = () => new URLSearchParams(location.search).get('tenant')
+
   return {
-    baseURL: env.VITE_ORIGIN,
+    baseURL,
+    withCredentials: dev,
     headers: {
-      'x-lowcode-mode': env.MODE
+      ...(dev && { 'x-lowcode-mode': 'develop' }),
+      'x-lowcode-org': getTenant()
     }
   }
 }
 
-const options = {
-  axiosConfig: getConfig(),
-  enableMock: false,
-  mockData: {},
-  interceptors: {
-    request: [preRequest],
-    response: [[preResponse, errorResponse]]
+const customizeHttpService = () => {
+  const options = {
+    axiosConfig: getConfig(),
+    interceptors: {
+      request: [preRequest],
+      response: [[preResponse, errorResponse]]
+    }
   }
-}
 
-HttpService.apis.setOptions(options)
+  HttpService.apis.setOptions(options)
+
+  return HttpService
+}
 
-export default HttpService
+export default customizeHttpService()
diff --git a/packages/engine-cli/template/designer/src/preview.js b/packages/engine-cli/template/designer/src/preview.js
index 4e120d4c6..eb7717c66 100644
--- a/packages/engine-cli/template/designer/src/preview.js
+++ b/packages/engine-cli/template/designer/src/preview.js
@@ -14,6 +14,7 @@ import { initHook, HOOK_NAME, GenerateCodeService, Breadcrumb, Media, Lang } fro
 import { initPreview } from '@opentiny/tiny-engine'
 import 'virtual:svg-icons-register'
 import '@opentiny/tiny-engine-theme'
+import { HttpService } from './composable'
 
 const beforeAppCreate = () => {
   initHook(HOOK_NAME.useEnv, import.meta.env)
@@ -23,7 +24,7 @@ initPreview({
   registry: {
     root: {
       id: 'engine.root',
-      metas: [GenerateCodeService]
+      metas: [HttpService, GenerateCodeService]
     },
     config: { id: 'engine.config', theme: 'light' },
     toolbars: [Breadcrumb, Media, Lang]

From fdee3f2b8dfd7dcbabfefc0e7a74fc7622c2435f Mon Sep 17 00:00:00 2001
From: chilingling <26962197+chilingling@users.noreply.github.com>
Date: Wed, 1 Jan 2025 19:28:05 -0800
Subject: [PATCH 14/19] fix: block switch select property failed (#984)

* fix: block switch select property failed

* fix: del assignment
---
 packages/settings/props/src/composable/useProperty.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/settings/props/src/composable/useProperty.js b/packages/settings/props/src/composable/useProperty.js
index 81ffe30f1..3beba42a9 100644
--- a/packages/settings/props/src/composable/useProperty.js
+++ b/packages/settings/props/src/composable/useProperty.js
@@ -11,7 +11,6 @@
  */
 
 import { computed } from 'vue'
-import { extend } from '@opentiny/vue-renderless/common/object'
 import { constants } from '@opentiny/tiny-engine-utils'
 import { useBlock } from '@opentiny/tiny-engine-meta-register'
 
@@ -26,7 +25,7 @@ const addPropertyLinks = ({ linked, propertyName, componentProperties }) => {
       const property = propertyList[j]
 
       if (property.property === propertyName) {
-        propertyList[j] = extend(true, {}, property, {
+        Object.assign(property, {
           linked,
           widget: {
             props: {

From 76ed2d7966347249ea00ef65b9b9289986779b02 Mon Sep 17 00:00:00 2001
From: Gene <Pacify.98@gmail.com>
Date: Thu, 2 Jan 2025 14:37:45 +0800
Subject: [PATCH 15/19] fix: fix param type error when create group (#986)

---
 packages/plugins/block/src/js/blockSetting.jsx | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/packages/plugins/block/src/js/blockSetting.jsx b/packages/plugins/block/src/js/blockSetting.jsx
index 74fd891a2..5532ac802 100644
--- a/packages/plugins/block/src/js/blockSetting.jsx
+++ b/packages/plugins/block/src/js/blockSetting.jsx
@@ -734,15 +734,25 @@ export const getBlockById = async (id) => {
 
 export const createOrUpdateCategory = async ({ categoryId, ...params }, isEdit) => {
   const appId = getAppId()
-  params.app = Number(appId)
   const replaceCategoryWithGroup = useBlock().shouldReplaceCategoryWithGroup()
-  let requestFunc = replaceCategoryWithGroup ? updateGroup : updateCategory
+  let requestFunc
+
+  if (replaceCategoryWithGroup) {
+    params.app = appId
+    requestFunc = updateGroup
+  } else {
+    params.app = Number(appId)
+    requestFunc = updateCategory
+  }
 
   if (!isEdit) {
-    if (!replaceCategoryWithGroup) {
+    // 替换成创建接口
+    if (replaceCategoryWithGroup) {
+      requestFunc = createGroup
+    } else {
+      requestFunc = createCategory
       params.category_id = categoryId
     }
-    requestFunc = replaceCategoryWithGroup ? createGroup : createCategory
   }
 
   const res = await requestFunc(params)

From b364554ce7c842c4e6fef868468184d9886b5ecf Mon Sep 17 00:00:00 2001
From: chilingling <26962197+chilingling@users.noreply.github.com>
Date: Wed, 1 Jan 2025 23:02:37 -0800
Subject: [PATCH 16/19] fix: resolve block property issue (#971)

* fix: resolve block property issue

* fix: block property form rename

---------

Co-authored-by: hexqi <wu_12556@126.com>
---
 packages/canvas/render/src/builtin/builtin.json  | 16 ++++++++--------
 packages/plugins/block/src/BlockPropertyForm.vue |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/canvas/render/src/builtin/builtin.json b/packages/canvas/render/src/builtin/builtin.json
index 924f197cf..f6f95147f 100644
--- a/packages/canvas/render/src/builtin/builtin.json
+++ b/packages/canvas/render/src/builtin/builtin.json
@@ -83,7 +83,7 @@
                 "content": [
                   {
                     "property": "name",
-                    "type": "String",
+                    "type": "string",
                     "label": {
                       "text": {
                         "zh_CN": "插槽名称"
@@ -97,7 +97,7 @@
                   },
                   {
                     "property": "params",
-                    "type": "String",
+                    "type": "string",
                     "defaultValue": "",
                     "label": {
                       "text": {
@@ -157,7 +157,7 @@
                 "content": [
                   {
                     "property": "condition",
-                    "type": "Boolean",
+                    "type": "boolean",
                     "defaultValue": true,
                     "label": {
                       "text": {
@@ -173,7 +173,7 @@
                   },
                   {
                     "property": "style",
-                    "type": "String",
+                    "type": "string",
                     "defaultValue": "",
                     "label": {
                       "text": {
@@ -189,7 +189,7 @@
                   },
                   {
                     "property": "dataSource",
-                    "type": "String",
+                    "type": "string",
                     "defaultValue": "",
                     "bindState": false,
                     "label": {
@@ -243,7 +243,7 @@
                 "content": [
                   {
                     "property": "text",
-                    "type": "String",
+                    "type": "string",
                     "defaultValue": "TinyEngine 前端可视化设计器，为设计器开发者提供定制服务，在线构建出自己专属的设计器。",
                     "label": {
                       "text": {
@@ -315,7 +315,7 @@
                 "content": [
                   {
                     "property": "name",
-                    "type": "String",
+                    "type": "string",
                     "defaultValue": "IconDel",
                     "bindState": true,
                     "label": {
@@ -385,7 +385,7 @@
                 "content": [
                   {
                     "property": "src",
-                    "type": "String",
+                    "type": "string",
                     "defaultValue": "",
                     "bindState": true,
                     "label": {
diff --git a/packages/plugins/block/src/BlockPropertyForm.vue b/packages/plugins/block/src/BlockPropertyForm.vue
index 374e48b75..8ea1d9834 100644
--- a/packages/plugins/block/src/BlockPropertyForm.vue
+++ b/packages/plugins/block/src/BlockPropertyForm.vue
@@ -5,10 +5,10 @@
       {{ propertyName }}
     </div>
     <tiny-form class="property-form" label-position="left" label-width="110px">
-      <tiny-form-item label="显示值">
+      <tiny-form-item label="属性名(ID)">
         <tiny-input v-model="propertyName"></tiny-input>
       </tiny-form-item>
-      <tiny-form-item label="值类型">
+      <tiny-form-item label="属性值类型">
         <tiny-select v-model="type" :options="typeList" @change="changeType"></tiny-select>
       </tiny-form-item>
       <tiny-form-item label="属性面板组件">
@@ -82,7 +82,7 @@
           @update:modelValue="updateDefaultValue"
         ></config-item>
       </tiny-form-item>
-      <tiny-form-item label="描述">
+      <tiny-form-item label="属性显示名">
         <tiny-input v-model="label"></tiny-input>
       </tiny-form-item>
       <tiny-form-item label="获取属性值">

From d30593a9ff2addcedc7e4d1409fce7589ff5e794 Mon Sep 17 00:00:00 2001
From: chilingling <26962197+chilingling@users.noreply.github.com>
Date: Wed, 1 Jan 2025 23:04:02 -0800
Subject: [PATCH 17/19] fix: cannot publish current editing block (#987)

---
 packages/plugins/block/src/js/blockSetting.jsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/plugins/block/src/js/blockSetting.jsx b/packages/plugins/block/src/js/blockSetting.jsx
index 5532ac802..ab7c5c844 100644
--- a/packages/plugins/block/src/js/blockSetting.jsx
+++ b/packages/plugins/block/src/js/blockSetting.jsx
@@ -420,6 +420,8 @@ export const refreshBlockData = async (block = {}) => {
         newBlock.public_scope_tenants = newBlock.public_scope_tenants.map((e) => e.id)
       }
 
+      Object.assign(block, newBlock)
+
       // 与当前正在画布编辑态的区块相同，需要同步更新
       if (useBlock().getCurrentBlock()?.id === block.id) {
         useLayout().layoutState.pageStatus = getCanvasStatus(newBlock?.occupier)

From 3e63170a17fea490cef99af1a939e832f97d6365 Mon Sep 17 00:00:00 2001
From: chilingling <26962197+chilingling@users.noreply.github.com>
Date: Thu, 2 Jan 2025 01:17:46 -0800
Subject: [PATCH 18/19] fix: preview page breadcrumb don't exist useBlock
 method and preview block error when type undefined (#988)

* fix: preview breadcrumb don't exist useBlock method

* fix: resolve block preview error when type is undefined

---------

Co-authored-by: hexqi <wu_12556@126.com>
---
 packages/toolbars/breadcrumb/src/Main.vue                      | 2 +-
 packages/vue-generator/src/generator/vue/sfc/generateScript.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/toolbars/breadcrumb/src/Main.vue b/packages/toolbars/breadcrumb/src/Main.vue
index 90e8115e3..b0efbbdb8 100644
--- a/packages/toolbars/breadcrumb/src/Main.vue
+++ b/packages/toolbars/breadcrumb/src/Main.vue
@@ -77,7 +77,7 @@ export default {
       plugins.render = breadcrumbData.value[0] === CONSTANTS.PAGETEXT ? PLUGINS_ID.PAGEID : PLUGINS_ID.BLOCKID
     }
 
-    const currentBlock = computed(useBlock().getCurrentBlock)
+    const currentBlock = computed(() => useBlock?.()?.getCurrentBlock?.())
 
     const handleChangeSchema = (newSchema) => {
       useBlock().initBlock({ ...useBlock().getCurrentBlock(), content: newSchema })
diff --git a/packages/vue-generator/src/generator/vue/sfc/generateScript.js b/packages/vue-generator/src/generator/vue/sfc/generateScript.js
index 78ebab4d1..5a705f4e4 100644
--- a/packages/vue-generator/src/generator/vue/sfc/generateScript.js
+++ b/packages/vue-generator/src/generator/vue/sfc/generateScript.js
@@ -21,7 +21,7 @@ export const defaultGenPropsHook = (schema) => {
 
   properties.forEach(({ content = [] }) => {
     content.forEach(({ property, type, defaultValue }) => {
-      let propType = capitalize(type)
+      let propType = type && capitalize(type)
       let propValue = defaultValue
 
       if (propType === 'String') {

From faf3072c75ea5024689972e2a687916e084c156f Mon Sep 17 00:00:00 2001
From: chilingling <michaelchiling1024@gmail.com>
Date: Thu, 2 Jan 2025 02:10:05 -0800
Subject: [PATCH 19/19] v2.1.0

---
 designer-demo/package.json                            | 2 +-
 mockServer/package.json                               | 2 +-
 packages/block-compiler/package.json                  | 2 +-
 packages/blockToWebComponentTemplate/package.json     | 2 +-
 packages/build/vite-config/package.json               | 2 +-
 packages/build/vite-plugin-meta-comments/package.json | 2 +-
 packages/builtinComponent/package.json                | 2 +-
 packages/canvas/package.json                          | 2 +-
 packages/common/package.json                          | 2 +-
 packages/configurator/package.json                    | 2 +-
 packages/design-core/package.json                     | 2 +-
 packages/engine-cli/package.json                      | 2 +-
 packages/i18n/package.json                            | 2 +-
 packages/layout/package.json                          | 2 +-
 packages/plugins/block/package.json                   | 2 +-
 packages/plugins/bridge/package.json                  | 2 +-
 packages/plugins/datasource/package.json              | 2 +-
 packages/plugins/help/package.json                    | 2 +-
 packages/plugins/i18n/package.json                    | 2 +-
 packages/plugins/materials/package.json               | 2 +-
 packages/plugins/page/package.json                    | 2 +-
 packages/plugins/robot/package.json                   | 2 +-
 packages/plugins/schema/package.json                  | 2 +-
 packages/plugins/script/package.json                  | 2 +-
 packages/plugins/state/package.json                   | 2 +-
 packages/plugins/tree/package.json                    | 2 +-
 packages/plugins/tutorial/package.json                | 2 +-
 packages/register/package.json                        | 2 +-
 packages/settings/design/package.json                 | 2 +-
 packages/settings/events/package.json                 | 2 +-
 packages/settings/panel/package.json                  | 2 +-
 packages/settings/props/package.json                  | 2 +-
 packages/settings/styles/package.json                 | 2 +-
 packages/svgs/package.json                            | 2 +-
 packages/theme/base/package.json                      | 2 +-
 packages/theme/dark/package.json                      | 2 +-
 packages/theme/light/package.json                     | 2 +-
 packages/toolbars/breadcrumb/package.json             | 2 +-
 packages/toolbars/clean/package.json                  | 2 +-
 packages/toolbars/collaboration/package.json          | 2 +-
 packages/toolbars/fullscreen/package.json             | 2 +-
 packages/toolbars/generate-code/package.json          | 2 +-
 packages/toolbars/lang/package.json                   | 2 +-
 packages/toolbars/layout/package.json                 | 2 +-
 packages/toolbars/lock/package.json                   | 2 +-
 packages/toolbars/logo/package.json                   | 2 +-
 packages/toolbars/logout/package.json                 | 2 +-
 packages/toolbars/media/package.json                  | 2 +-
 packages/toolbars/preview/package.json                | 2 +-
 packages/toolbars/redoundo/package.json               | 2 +-
 packages/toolbars/refresh/package.json                | 2 +-
 packages/toolbars/save/package.json                   | 2 +-
 packages/toolbars/setting/package.json                | 2 +-
 packages/utils/package.json                           | 2 +-
 packages/vue-generator/package.json                   | 2 +-
 packages/webcomponent/package.json                    | 2 +-
 56 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/designer-demo/package.json b/designer-demo/package.json
index f4611f088..f39d5ae22 100644
--- a/designer-demo/package.json
+++ b/designer-demo/package.json
@@ -1,7 +1,7 @@
 {
   "name": "designer-demo",
   "private": true,
-  "version": "2.1.0-rc.0",
+  "version": "2.1.0",
   "type": "module",
   "scripts": {
     "dev": "cross-env VITE_THEME=light vite",
diff --git a/mockServer/package.json b/mockServer/package.json
index 4b8de73b8..dfac7ce03 100644
--- a/mockServer/package.json
+++ b/mockServer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-mock",
-  "version": "2.1.0-rc.0",
+  "version": "2.1.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/block-compiler/package.json b/packages/block-compiler/package.json
index 241184c19..a23b78d33 100644
--- a/packages/block-compiler/package.json
+++ b/packages/block-compiler/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-block-compiler",
-  "version": "2.1.0-rc.0",
+  "version": "2.1.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/blockToWebComponentTemplate/package.json b/packages/blockToWebComponentTemplate/package.json
index 98c7b0fab..5c6104fcf 100644
--- a/packages/blockToWebComponentTemplate/package.json
+++ b/packages/blockToWebComponentTemplate/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-block-build",
-  "version": "2.1.0-rc.0",
+  "version": "2.1.0",
   "description": "translate block to webcomponent template",
   "main": "./dist/web-components.es.js",
   "type": "module",
diff --git a/packages/build/vite-config/package.json b/packages/build/vite-config/package.json
index cf3822f5e..654ed3461 100644
--- a/packages/build/vite-config/package.json
+++ b/packages/build/vite-config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-vite-config",
-  "version": "2.1.0-rc.0",
+  "version": "2.1.0",
   "description": "",
   "type": "module",
   "main": "./index.js",
diff --git a/packages/build/vite-plugin-meta-comments/package.json b/packages/build/vite-plugin-meta-comments/package.json
index a6e03efb0..2853da54c 100644
--- a/packages/build/vite-plugin-meta-comments/package.json
+++ b/packages/build/vite-plugin-meta-comments/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-vite-plugin-meta-comments",
-  "version": "2.1.0-rc.0",
+  "version": "2.1.0",
   "description": "",
   "type": "module",
   "main": "dist/index.cjs",
diff --git a/packages/builtinComponent/package.json b/packages/builtinComponent/package.json
index 1eff2ed82..3869da894 100644
--- a/packages/builtinComponent/package.json
+++ b/packages/builtinComponent/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-builtin-component",
-  "version": "2.1.0-rc.0",
+  "version": "2.1.0",
   "description": "",
   "main": "dist/index.mjs",
   "module": "dist/index.mjs",
diff --git a/packages/canvas/package.json b/packages/canvas/package.json
index 9f7c8dae1..b6b388207 100644
--- a/packages/canvas/package.json
+++ b/packages/canvas/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-canvas",
-  "version": "2.1.0-rc.0",
+  "version": "2.1.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/common/package.json b/packages/common/package.json
index 7067e5a48..7e11d9acb 100644
--- a/packages/common/package.json
+++ b/packages/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-common",
-  "version": "2.1.0-rc.0",
+  "version": "2.1.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/configurator/package.json b/packages/configurator/package.json
index fffdf5495..1cd793f11 100644
--- a/packages/configurator/package.json
+++ b/packages/configurator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-configurator",
-  "version": "2.1.0-rc.0",
+  "version": "2.1.0",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.js",
diff --git a/packages/design-core/package.json b/packages/design-core/package.json
index 672fb23e7..cb69bfe9e 100644
--- a/packages/design-core/package.json
+++ b/packages/design-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine",
-  "version": "2.1.0-rc.0",
+  "version": "2.1.0",
   "type": "module",
   "description": "TinyEngine enables developers to customize low-code platforms, build low-bit platforms online in real time, and support secondary development or integration of low-bit platform capabilities.",
   "homepage": "https://opentiny.design/tiny-engine",
diff --git a/packages/engine-cli/package.json b/packages/engine-cli/package.json
index 162c74c87..1c4117158 100644
--- a/packages/engine-cli/package.json
+++ b/packages/engine-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-cli",
-  "version": "2.1.0-rc.0",
+  "version": "2.1.0",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
diff --git a/packages/i18n/package.json b/packages/i18n/package.json
index 8f6f84a2c..6b12b4595 100644
--- a/packages/i18n/package.json
+++ b/packages/i18n/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-i18n-host",
-  "version": "2.1.0-rc.0",
+  "version": "2.1.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/layout/package.json b/packages/layout/package.json
index cae1dc1e1..3e905a9a8 100644
--- a/packages/layout/package.json
+++ b/packages/layout/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-layout",
-  "version": "2.1.0-rc.0",
+  "version": "2.1.0",
   "scripts": {
     "build": "vite build"
   },
diff --git a/packages/plugins/block/package.json b/packages/plugins/block/package.json
index 8c8803443..cd9af3745 100644
--- a/packages/plugins/block/package.json
+++ b/packages/plugins/block/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-block",
-  "version": "2.1.0-rc.0",
+  "version": "2.1.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/bridge/package.json b/packages/plugins/bridge/package.json
index c214bc3ae..232b4c604 100644
--- a/packages/plugins/bridge/package.json
+++ b/packages/plugins/bridge/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-bridge",
-  "version": "2.1.0-rc.0",
+  "version": "2.1.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/datasource/package.json b/packages/plugins/datasource/package.json
index 42eb0c6c5..f92ff21c1 100644
--- a/packages/plugins/datasource/package.json
+++ b/packages/plugins/datasource/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-datasource",
-  "version": "2.1.0-rc.0",
+  "version": "2.1.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/help/package.json b/packages/plugins/help/package.json
index 4bf11fa71..affb89565 100644
--- a/packages/plugins/help/package.json
+++ b/packages/plugins/help/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-help",
-  "version": "2.1.0-rc.0",
+  "version": "2.1.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/i18n/package.json b/packages/plugins/i18n/package.json
index 834cd290e..913769835 100644
--- a/packages/plugins/i18n/package.json
+++ b/packages/plugins/i18n/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-i18n",
-  "version": "2.1.0-rc.0",
+  "version": "2.1.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/materials/package.json b/packages/plugins/materials/package.json
index aeaf9e8a4..9687c45bc 100644
--- a/packages/plugins/materials/package.json
+++ b/packages/plugins/materials/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-materials",
-  "version": "2.1.0-rc.0",
+  "version": "2.1.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/page/package.json b/packages/plugins/page/package.json
index 971a72cd1..f70ab0796 100644
--- a/packages/plugins/page/package.json
+++ b/packages/plugins/page/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-page",
-  "version": "2.1.0-rc.0",
+  "version": "2.1.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/robot/package.json b/packages/plugins/robot/package.json
index 8c47ad42b..0c661a03d 100644
--- a/packages/plugins/robot/package.json
+++ b/packages/plugins/robot/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-robot",
-  "version": "2.1.0-rc.0",
+  "version": "2.1.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/schema/package.json b/packages/plugins/schema/package.json
index 4dc758240..a4ffc3e56 100644
--- a/packages/plugins/schema/package.json
+++ b/packages/plugins/schema/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-schema",
-  "version": "2.1.0-rc.0",
+  "version": "2.1.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/script/package.json b/packages/plugins/script/package.json
index 376d17284..d0eb347ef 100644
--- a/packages/plugins/script/package.json
+++ b/packages/plugins/script/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-script",
-  "version": "2.1.0-rc.0",
+  "version": "2.1.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/state/package.json b/packages/plugins/state/package.json
index 0ee82a073..33e287781 100644
--- a/packages/plugins/state/package.json
+++ b/packages/plugins/state/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-state",
-  "version": "2.1.0-rc.0",
+  "version": "2.1.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/tree/package.json b/packages/plugins/tree/package.json
index 4c5c21029..a08bc95d2 100644
--- a/packages/plugins/tree/package.json
+++ b/packages/plugins/tree/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-tree",
-  "version": "2.1.0-rc.0",
+  "version": "2.1.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/tutorial/package.json b/packages/plugins/tutorial/package.json
index 0b18be1ad..353a55f3d 100644
--- a/packages/plugins/tutorial/package.json
+++ b/packages/plugins/tutorial/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-tutorial",
-  "version": "2.1.0-rc.0",
+  "version": "2.1.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/register/package.json b/packages/register/package.json
index daca16d5f..819fc1903 100644
--- a/packages/register/package.json
+++ b/packages/register/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-meta-register",
-  "version": "2.1.0-rc.0",
+  "version": "2.1.0",
   "description": "",
   "type": "module",
   "main": "dist/index.js",
diff --git a/packages/settings/design/package.json b/packages/settings/design/package.json
index d6b87e008..444ec4970 100644
--- a/packages/settings/design/package.json
+++ b/packages/settings/design/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-setting-design",
-  "version": "2.1.0-rc.0",
+  "version": "2.1.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/settings/events/package.json b/packages/settings/events/package.json
index 09d8a7155..9f603d7dc 100644
--- a/packages/settings/events/package.json
+++ b/packages/settings/events/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-setting-events",
-  "version": "2.1.0-rc.0",
+  "version": "2.1.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/settings/panel/package.json b/packages/settings/panel/package.json
index 6845492eb..9a43bb763 100644
--- a/packages/settings/panel/package.json
+++ b/packages/settings/panel/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-settings-panel",
-  "version": "2.1.0-rc.0",
+  "version": "2.1.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/settings/props/package.json b/packages/settings/props/package.json
index b6de69e97..8d541130a 100644
--- a/packages/settings/props/package.json
+++ b/packages/settings/props/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-setting-props",
-  "version": "2.1.0-rc.0",
+  "version": "2.1.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/settings/styles/package.json b/packages/settings/styles/package.json
index ae92a0c1e..f8bd1a6ae 100644
--- a/packages/settings/styles/package.json
+++ b/packages/settings/styles/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-setting-styles",
-  "version": "2.1.0-rc.0",
+  "version": "2.1.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/svgs/package.json b/packages/svgs/package.json
index d008f6774..fc2e9369b 100644
--- a/packages/svgs/package.json
+++ b/packages/svgs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-svgs",
-  "version": "2.1.0-rc.0",
+  "version": "2.1.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/theme/base/package.json b/packages/theme/base/package.json
index dbc22f3df..4305875b6 100644
--- a/packages/theme/base/package.json
+++ b/packages/theme/base/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-theme-base",
-  "version": "2.1.0-rc.0",
+  "version": "2.1.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/theme/dark/package.json b/packages/theme/dark/package.json
index eaa501b50..e1c8397ea 100644
--- a/packages/theme/dark/package.json
+++ b/packages/theme/dark/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-theme-dark",
-  "version": "2.1.0-rc.0",
+  "version": "2.1.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/theme/light/package.json b/packages/theme/light/package.json
index 993e97c54..cbd4c8bb5 100644
--- a/packages/theme/light/package.json
+++ b/packages/theme/light/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-theme-light",
-  "version": "2.1.0-rc.0",
+  "version": "2.1.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/breadcrumb/package.json b/packages/toolbars/breadcrumb/package.json
index 356a040f0..6bacbbaf7 100644
--- a/packages/toolbars/breadcrumb/package.json
+++ b/packages/toolbars/breadcrumb/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-breadcrumb",
-  "version": "2.1.0-rc.0",
+  "version": "2.1.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/clean/package.json b/packages/toolbars/clean/package.json
index 46b6a2ff5..168ebd23c 100644
--- a/packages/toolbars/clean/package.json
+++ b/packages/toolbars/clean/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-clean",
-  "version": "2.1.0-rc.0",
+  "version": "2.1.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/collaboration/package.json b/packages/toolbars/collaboration/package.json
index 72dcf6974..0216b62b8 100644
--- a/packages/toolbars/collaboration/package.json
+++ b/packages/toolbars/collaboration/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-collaboration",
-  "version": "2.1.0-rc.0",
+  "version": "2.1.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/fullscreen/package.json b/packages/toolbars/fullscreen/package.json
index fba8f6e14..7862e57d5 100644
--- a/packages/toolbars/fullscreen/package.json
+++ b/packages/toolbars/fullscreen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-fullscreen",
-  "version": "2.1.0-rc.0",
+  "version": "2.1.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/generate-code/package.json b/packages/toolbars/generate-code/package.json
index 1ece18072..a8d97da14 100644
--- a/packages/toolbars/generate-code/package.json
+++ b/packages/toolbars/generate-code/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-generate-code",
-  "version": "2.1.0-rc.0",
+  "version": "2.1.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/lang/package.json b/packages/toolbars/lang/package.json
index 45b0d9f16..bdb03f8eb 100644
--- a/packages/toolbars/lang/package.json
+++ b/packages/toolbars/lang/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-lang",
-  "version": "2.1.0-rc.0",
+  "version": "2.1.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/layout/package.json b/packages/toolbars/layout/package.json
index f9a2a9f11..856495924 100644
--- a/packages/toolbars/layout/package.json
+++ b/packages/toolbars/layout/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-layout",
-  "version": "2.1.0-rc.0",
+  "version": "2.1.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/lock/package.json b/packages/toolbars/lock/package.json
index 645aaea27..34ee747a6 100644
--- a/packages/toolbars/lock/package.json
+++ b/packages/toolbars/lock/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-lock",
-  "version": "2.1.0-rc.0",
+  "version": "2.1.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/logo/package.json b/packages/toolbars/logo/package.json
index 1e9c7fed6..b85dde57f 100644
--- a/packages/toolbars/logo/package.json
+++ b/packages/toolbars/logo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-logo",
-  "version": "2.1.0-rc.0",
+  "version": "2.1.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/logout/package.json b/packages/toolbars/logout/package.json
index 6136ffa6f..306445e81 100644
--- a/packages/toolbars/logout/package.json
+++ b/packages/toolbars/logout/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-logout",
-  "version": "2.1.0-rc.0",
+  "version": "2.1.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/media/package.json b/packages/toolbars/media/package.json
index dd475f024..16b1842d8 100644
--- a/packages/toolbars/media/package.json
+++ b/packages/toolbars/media/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-media",
-  "version": "2.1.0-rc.0",
+  "version": "2.1.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/preview/package.json b/packages/toolbars/preview/package.json
index b117f24ee..75f4e6fdd 100644
--- a/packages/toolbars/preview/package.json
+++ b/packages/toolbars/preview/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-preview",
-  "version": "2.1.0-rc.0",
+  "version": "2.1.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/redoundo/package.json b/packages/toolbars/redoundo/package.json
index de2c3b5d6..67749a2c9 100644
--- a/packages/toolbars/redoundo/package.json
+++ b/packages/toolbars/redoundo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-redoundo",
-  "version": "2.1.0-rc.0",
+  "version": "2.1.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/refresh/package.json b/packages/toolbars/refresh/package.json
index 69591161e..70400b272 100644
--- a/packages/toolbars/refresh/package.json
+++ b/packages/toolbars/refresh/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-refresh",
-  "version": "2.1.0-rc.0",
+  "version": "2.1.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/save/package.json b/packages/toolbars/save/package.json
index ea6ab8324..437cf107f 100644
--- a/packages/toolbars/save/package.json
+++ b/packages/toolbars/save/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-save",
-  "version": "2.1.0-rc.0",
+  "version": "2.1.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/setting/package.json b/packages/toolbars/setting/package.json
index e20409e9c..e68a485f2 100644
--- a/packages/toolbars/setting/package.json
+++ b/packages/toolbars/setting/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-setting",
-  "version": "2.1.0-rc.0",
+  "version": "2.1.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/utils/package.json b/packages/utils/package.json
index 3e3445ab0..397c633f9 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-utils",
-  "version": "2.1.0-rc.0",
+  "version": "2.1.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/vue-generator/package.json b/packages/vue-generator/package.json
index 3b24babdd..d5e043330 100644
--- a/packages/vue-generator/package.json
+++ b/packages/vue-generator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-dsl-vue",
-  "version": "2.1.0-rc.0",
+  "version": "2.1.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/webcomponent/package.json b/packages/webcomponent/package.json
index 23921a5d5..2e25249ae 100644
--- a/packages/webcomponent/package.json
+++ b/packages/webcomponent/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-webcomponent-core",
-  "version": "2.1.0-rc.0",
+  "version": "2.1.0",
   "publishConfig": {
     "access": "public"
   },