diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml
index 2e64ad8fe2..a498b0bbe2 100644
--- a/.github/workflows/Release.yml
+++ b/.github/workflows/Release.yml
@@ -26,20 +26,19 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: 18
-          cache: 'pnpm'
           registry-url: 'https://registry.npmjs.org'
 
       - name: Install dependencies
         run: pnpm install
 
       - name: Run Build
-        run: pnpm run build:plugin && pnpm run build:alpha > build-alpha.log 2>&1
+        run: pnpm run build:plugin && pnpm run build:alpha > /tmp/build-alpha.log 2>&1
 
       - name: Upload build logs
         uses: actions/upload-artifact@v4
         with:
           name: build-alpha-log
-          path: build-alpha.log
+          path: /tmp/build-alpha.log
 
       - name: Parse Publish tag
         id: parse_tag
@@ -74,4 +73,4 @@ jobs:
       - name: Publish package to npm
         run: pnpm lerna publish from-package --dist-tag ${{steps.parse_tag.outputs.dist_tag}} --yes
         env:
-          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
diff --git a/designer-demo/package.json b/designer-demo/package.json
index a51846f5f3..3388ac5a14 100644
--- a/designer-demo/package.json
+++ b/designer-demo/package.json
@@ -1,7 +1,7 @@
 {
   "name": "designer-demo",
   "private": true,
-  "version": "2.1.0",
+  "version": "2.2.0",
   "type": "module",
   "scripts": {
     "dev": "cross-env VITE_THEME=light vite",
diff --git a/mockServer/package.json b/mockServer/package.json
index dfac7ce031..eed0f6bea4 100644
--- a/mockServer/package.json
+++ b/mockServer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-mock",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/mockServer/src/mock/get/app-center/v1/apps/schema/918.json b/mockServer/src/mock/get/app-center/v1/apps/schema/918.json
index 48e1973485..3c9a13c849 100644
--- a/mockServer/src/mock/get/app-center/v1/apps/schema/918.json
+++ b/mockServer/src/mock/get/app-center/v1/apps/schema/918.json
@@ -2093,7 +2093,7 @@
           "package": "axios",
           "destructuring": false,
           "exportName": "axios",
-          "cdnLink": "https://unpkg.com/browse/axios@1.7.9/dist/esm/axios.min.js"
+          "cdnLink": "https://unpkg.com/axios@1.7.9/dist/esm/axios.min.js"
         }
       },
       {
diff --git a/package.json b/package.json
index 69f335f60b..8ddedd70e5 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,8 @@
     "pub:prerelease": "pnpm run build:plugin && pnpm run build:alpha && pnpm lerna version prerelease --preid beta --no-push --yes && lerna publish from-package --pre-dist-tag beta --yes",
     "setup": "node ./scripts/setup.js",
     "splitMaterials": "node ./scripts/splitMaterials.mjs",
-    "buildMaterials": "node ./scripts/buildMaterials.mjs"
+    "buildMaterials": "node ./scripts/buildMaterials.mjs",
+    "updateTemplate": "node ./scripts/updateTemplate.mjs"
   },
   "devDependencies": {
     "@babel/eslint-parser": "^7.21.3",
diff --git a/packages/block-compiler/package.json b/packages/block-compiler/package.json
index 15496257b6..58a7dc9e2d 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",
+  "version": "2.2.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/blockToWebComponentTemplate/package.json b/packages/blockToWebComponentTemplate/package.json
index bba2556f3b..be31465c85 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",
+  "version": "2.2.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 654ed3461f..707ad0b50f 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",
+  "version": "2.2.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 2853da54c0..d8bef26392 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",
+  "version": "2.2.0",
   "description": "",
   "type": "module",
   "main": "dist/index.cjs",
diff --git a/packages/builtinComponent/package.json b/packages/builtinComponent/package.json
index 3869da894f..2ac55c378d 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",
+  "version": "2.2.0",
   "description": "",
   "main": "dist/index.mjs",
   "module": "dist/index.mjs",
diff --git a/packages/canvas/package.json b/packages/canvas/package.json
index 073f078a31..717f10b4bc 100644
--- a/packages/canvas/package.json
+++ b/packages/canvas/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-canvas",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/canvas/render/src/canvas-function/custom-renderer.ts b/packages/canvas/render/src/canvas-function/custom-renderer.ts
index 7b0d4773c7..3c7bfd2e9d 100644
--- a/packages/canvas/render/src/canvas-function/custom-renderer.ts
+++ b/packages/canvas/render/src/canvas-function/custom-renderer.ts
@@ -7,6 +7,7 @@ function defaultRenderer(schema, refreshKey, entry, active, isPage = true) {
   const rootChildrenSchema = {
     id: 0,
     componentName: 'div',
+    componentType: 'PageSection',
     // 手动添加一个唯一的属性，后续在画布选中此节点时方便处理额外的逻辑。由于没有修改schema，不会影响出码
     props: { ...schema.props, 'data-id': 'root-container', 'data-page-active': active },
     children: schema.children
diff --git a/packages/canvas/render/src/material-function/handle-scoped-css.ts b/packages/canvas/render/src/material-function/handle-scoped-css.ts
index 0f259507cd..8c831463e0 100644
--- a/packages/canvas/render/src/material-function/handle-scoped-css.ts
+++ b/packages/canvas/render/src/material-function/handle-scoped-css.ts
@@ -2,5 +2,5 @@ import postcss from 'postcss'
 import scopedPlugin from './scope-css-plugin'
 
 export function handleScopedCss(id: string, content: string) {
-  return postcss([scopedPlugin(id)]).process(content)
+  return postcss([scopedPlugin(id)]).process(content, { from: undefined })
 }
diff --git a/packages/canvas/render/src/material-function/page-getter.ts b/packages/canvas/render/src/material-function/page-getter.ts
index ab65b4956b..520b577a25 100644
--- a/packages/canvas/render/src/material-function/page-getter.ts
+++ b/packages/canvas/render/src/material-function/page-getter.ts
@@ -50,6 +50,7 @@ export const wrapPageComponent = (pageId: string) => {
         () => active.value,
         (activeValue) => {
           if (!activeValue) {
+            asyncData.value = null
             updateSchema()
           }
         }
diff --git a/packages/canvas/render/src/render.ts b/packages/canvas/render/src/render.ts
index 95ec2a3a7c..287264dd8a 100644
--- a/packages/canvas/render/src/render.ts
+++ b/packages/canvas/render/src/render.ts
@@ -82,7 +82,7 @@ const checkGroup = (componentName) => configure[componentName]?.nestingRule?.chi
 const clickCapture = (componentName) => configure[componentName]?.clickCapture !== false
 
 const getBindProps = (schema, scope, context, pageContext) => {
-  const { id, componentName } = schema
+  const { id, componentName, componentType } = schema
   const invalidity = configure[componentName]?.invalidity || []
 
   if (componentName === 'CanvasPlaceholder') {
@@ -120,7 +120,7 @@ const getBindProps = (schema, scope, context, pageContext) => {
   delete bindProps.className
 
   // 使画布中元素可拖拽
-  if (active) {
+  if (active && !['PageStart', 'PageSection'].includes(componentType)) {
     bindProps.draggable = true
   }
 
diff --git a/packages/canvas/route-bar/src/CanvasRouteBar.vue b/packages/canvas/route-bar/src/CanvasRouteBar.vue
index 62e3c4ae53..ca6c7c9d9a 100644
--- a/packages/canvas/route-bar/src/CanvasRouteBar.vue
+++ b/packages/canvas/route-bar/src/CanvasRouteBar.vue
@@ -65,16 +65,20 @@ watch(
     }
     const ancestors = (await getAncestors(value, true)) || []
 
-    routes.value = ancestors.concat(value).map((id) => {
-      const { route, isPage } = pageSettingState.treeDataMapping[id]
-      return {
-        id,
-        route: route
-          .replace(/\/+/g, '/') // 替换连续的 '/' 为单个 '/'
-          .replace(/^\/|\/$/g, ''), // 去掉开头和结尾的 '/'
-        isPage
-      }
-    })
+    routes.value = ancestors
+      .concat(value)
+      .map((id) => pageSettingState.treeDataMapping[id])
+      .filter((item) => Boolean(item))
+      .map((pageData) => {
+        const { id, route, isPage } = pageData
+        return {
+          id,
+          route: route
+            .replace(/\/+/g, '/') // 替换连续的 '/' 为单个 '/'
+            .replace(/^\/|\/$/g, ''), // 去掉开头和结尾的 '/'
+          isPage
+        }
+      })
   },
   { immediate: true }
 )
diff --git a/packages/common/component/BlockHistoryList.vue b/packages/common/component/BlockHistoryList.vue
index 8b3bf5c9d6..8ca06d0e52 100644
--- a/packages/common/component/BlockHistoryList.vue
+++ b/packages/common/component/BlockHistoryList.vue
@@ -1,5 +1,5 @@
 <template>
-  <tiny-grid v-if="history.length" :data="history" height="300">
+  <tiny-grid v-if="history.length" :data="history" row-id="id" height="300">
     <tiny-grid-column v-if="isBlockManage" field="version" title="版本号">
       <template v-slot="data">
         {{ data.row.version }}
diff --git a/packages/common/component/SvgButton.vue b/packages/common/component/SvgButton.vue
index 9db5fc1ea7..0ba31e0d07 100644
--- a/packages/common/component/SvgButton.vue
+++ b/packages/common/component/SvgButton.vue
@@ -1,5 +1,5 @@
 <template>
-  <span class="svg-button" :class="{ 'svg-button-hover': hoverBgColor }" @click="$emit('click', $event)">
+  <span class="svg-button" :class="{ 'svg-button-hover': hoverBgColor }" @click="handleClick($event)">
     <tiny-tooltip effect="light" :content="tips" :placement="placement">
       <component :is="name" v-if="isTinyIcon" />
       <svg-icon v-else :name="name"></svg-icon>
@@ -34,11 +34,17 @@ export default {
     }
   },
   emits: ['click'],
-  setup(props) {
+  setup(props, { emit }) {
     const isTinyIcon = computed(() => props.name.toLowerCase().indexOf('icon') === 0)
 
+    const handleClick = (event) => {
+      event.target.blur()
+      emit('click', event)
+    }
+
     return {
-      isTinyIcon
+      isTinyIcon,
+      handleClick
     }
   }
 }
diff --git a/packages/common/package.json b/packages/common/package.json
index c24a0beb4e..3ad381e84c 100644
--- a/packages/common/package.json
+++ b/packages/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-common",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/configurator/package.json b/packages/configurator/package.json
index d37d64fb12..d851bdcb05 100644
--- a/packages/configurator/package.json
+++ b/packages/configurator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-configurator",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.js",
diff --git a/packages/configurator/src/radio-group-configurator/RadioGroupConfigurator.vue b/packages/configurator/src/radio-group-configurator/RadioGroupConfigurator.vue
index a55e83717e..c474996528 100644
--- a/packages/configurator/src/radio-group-configurator/RadioGroupConfigurator.vue
+++ b/packages/configurator/src/radio-group-configurator/RadioGroupConfigurator.vue
@@ -75,4 +75,10 @@ export default {
 }
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+.meta-radio-group-container {
+  :deep(.tiny-radio-button__inner.tiny-radio-button__inner.tiny-radio-button__inner) {
+    padding: 5px 16px;
+  }
+}
+</style>
diff --git a/packages/design-core/package.json b/packages/design-core/package.json
index 8b5c209ace..92f2fc982f 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",
+  "version": "2.2.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",
@@ -76,7 +76,6 @@
     "@opentiny/tiny-engine-toolbar-fullscreen": "workspace:*",
     "@opentiny/tiny-engine-toolbar-generate-code": "workspace:*",
     "@opentiny/tiny-engine-toolbar-lang": "workspace:*",
-    "@opentiny/tiny-engine-toolbar-view-setting": "workspace:*",
     "@opentiny/tiny-engine-toolbar-layout": "workspace:*",
     "@opentiny/tiny-engine-toolbar-lock": "workspace:*",
     "@opentiny/tiny-engine-toolbar-logo": "workspace:*",
@@ -87,6 +86,7 @@
     "@opentiny/tiny-engine-toolbar-refresh": "workspace:*",
     "@opentiny/tiny-engine-toolbar-save": "workspace:*",
     "@opentiny/tiny-engine-toolbar-setting": "workspace:*",
+    "@opentiny/tiny-engine-toolbar-view-setting": "workspace:*",
     "@opentiny/tiny-engine-utils": "workspace:*",
     "@opentiny/tiny-engine-vite-plugin-meta-comments": "workspace:*",
     "@opentiny/tiny-engine-webcomponent-core": "workspace:*",
diff --git a/packages/design-core/src/preview/src/preview/importMap.json b/packages/design-core/src/preview/src/preview/importMap.json
index a85890fc7f..c388447de9 100644
--- a/packages/design-core/src/preview/src/preview/importMap.json
+++ b/packages/design-core/src/preview/src/preview/importMap.json
@@ -10,7 +10,7 @@
     "axios": "${VITE_CDN_DOMAIN}/axios@1.0.0/dist/esm/axios.js",
     "@opentiny/tiny-engine-webcomponent-core": "${VITE_CDN_DOMAIN}/@opentiny/tiny-engine-webcomponent-core@1/dist/tiny-engine-webcomponent-core.es.js",
     "@opentiny/tiny-engine-i18n-host": "${VITE_CDN_DOMAIN}/@opentiny/tiny-engine-i18n-host@1/dist/lowcode-design-i18n-host.es.js",
-    "@opentiny/tiny-engine-builtin-component": "${VITE_CDN_DOMAIN}/@opentiny/tiny-engine-builtin-component@^2.0.0/dist/index.js",
+    "@opentiny/tiny-engine-builtin-component": "${VITE_CDN_DOMAIN}/@opentiny/tiny-engine-builtin-component@^2.0.0/dist/index.mjs",
     "vue-demi": "${VITE_CDN_DOMAIN}/vue-demi@0.13.11/lib/index.mjs",
     "pinia": "${VITE_CDN_DOMAIN}/pinia@2.0.22/dist/pinia.esm-browser.js",
     "@opentiny/vue": "${VITE_CDN_DOMAIN}/@opentiny/vue-runtime@${opentinyVueVersion}/dist3/tiny-vue-pc.mjs",
diff --git a/packages/engine-cli/package.json b/packages/engine-cli/package.json
index 1c41171583..e304604947 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",
+  "version": "2.2.0",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
diff --git a/packages/engine-cli/template/designer/package.json b/packages/engine-cli/template/designer/package.json
index 08b36e16ae..85ff282f45 100644
--- a/packages/engine-cli/template/designer/package.json
+++ b/packages/engine-cli/template/designer/package.json
@@ -1,20 +1,20 @@
 {
-  "name": "designer-demo-template",
+  "name": "designer-demo",
   "private": true,
   "version": "0.0.0",
   "type": "module",
   "scripts": {
     "dev": "concurrently 'pnpm:serve:mock' 'pnpm:serve:frontend'",
-    "serve:frontend": "cross-env VITE_THEME=light vite",
-    "serve:mock": "node node_modules/@opentiny/tiny-engine-mock/dist/app.js",
     "build:alpha": "cross-env NODE_OPTIONS=--max-old-space-size=8192 VITE_THEME=light vite build --mode alpha",
-    "build": "cross-env NODE_OPTIONS=--max-old-space-size=8192 VITE_THEME=light vite build --mode prod"
+    "build": "cross-env NODE_OPTIONS=--max-old-space-size=8192 VITE_THEME=light vite build --mode prod",
+    "serve:frontend": "cross-env VITE_THEME=light vite",
+    "serve:mock": "node node_modules/@opentiny/tiny-engine-mock/dist/app.js"
   },
   "dependencies": {
-    "@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/tiny-engine": "2.2.0",
+    "@opentiny/tiny-engine-theme-dark": "2.2.0",
+    "@opentiny/tiny-engine-theme-light": "2.2.0",
+    "@opentiny/tiny-engine-utils": "2.2.0",
     "@opentiny/vue": "~3.20.0",
     "@opentiny/vue-design-smb": "~3.20.0",
     "@opentiny/vue-icon": "~3.20.0",
@@ -25,11 +25,11 @@
     "vue": "^3.4.21"
   },
   "devDependencies": {
-    "@opentiny/tiny-engine-mock": "^2.1.0",
-    "@opentiny/tiny-engine-vite-config": "^2.1.0",
+    "@opentiny/tiny-engine-mock": "2.2.0",
+    "@opentiny/tiny-engine-vite-config": "2.2.0",
     "@vitejs/plugin-vue": "^5.1.2",
     "cross-env": "^7.0.3",
-    "concurrently": "^8.2.0",
-    "vite": "^5.4.2"
+    "vite": "^5.4.2",
+    "concurrently": "^8.2.0"
   }
 }
diff --git a/packages/engine-cli/template/designer/registry.js b/packages/engine-cli/template/designer/registry.js
index 41a914705e..2e2fcacb1a 100644
--- a/packages/engine-cli/template/designer/registry.js
+++ b/packages/engine-cli/template/designer/registry.js
@@ -101,7 +101,20 @@ export default {
     Lang,
     ViewSetting
   ],
-  plugins: [Materials, Tree, Page, Block, Datasource, Bridge, I18n, Script, State, Schema, Help, Robot],
+  plugins: [
+    Materials,
+    Tree,
+    Page,
+    [Block, { options: { ...Block.options, mergeCategoriesAndGroups: true } }],
+    Datasource,
+    Bridge,
+    I18n,
+    Script,
+    State,
+    Schema,
+    Help,
+    Robot
+  ],
   dsls: [{ id: 'engine.dsls.dslvue' }],
   settings: [Props, Styles, Events],
   canvas: Canvas
diff --git a/packages/engine-cli/template/designer/vite.config.js b/packages/engine-cli/template/designer/vite.config.js
index 9dd2864eb6..f90c69aff1 100644
--- a/packages/engine-cli/template/designer/vite.config.js
+++ b/packages/engine-cli/template/designer/vite.config.js
@@ -7,6 +7,7 @@ export default defineConfig((configEnv) => {
     viteConfigEnv: configEnv,
     root: __dirname,
     iconDirs: [path.resolve(__dirname, './node_modules/@opentiny/tiny-engine/assets/')],
+    useSourceAlias: false,
     envDir: './env'
   })
 
diff --git a/packages/i18n/package.json b/packages/i18n/package.json
index 6b12b45950..bea832163e 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",
+  "version": "2.2.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/layout/package.json b/packages/layout/package.json
index 27e753034b..ad2821f2dc 100644
--- a/packages/layout/package.json
+++ b/packages/layout/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-layout",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "scripts": {
     "build": "vite build"
   },
diff --git a/packages/plugins/block/package.json b/packages/plugins/block/package.json
index ca39725999..4f5db9ef03 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",
+  "version": "2.2.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/block/src/BlockConfig.vue b/packages/plugins/block/src/BlockConfig.vue
index ccc19674b0..8d37f9f3e1 100644
--- a/packages/plugins/block/src/BlockConfig.vue
+++ b/packages/plugins/block/src/BlockConfig.vue
@@ -38,6 +38,7 @@
         popper-class="block-popper"
         :placeholder="groupLabels.selectPlaceholder"
         :options="categoryList"
+        :multiple="shouldReplaceCategoryWithGroup()"
         filterable
         :filter-method="categoryFilter"
         clearable
@@ -166,8 +167,12 @@ export default {
       }
       Object.assign(formData, block)
       formData[nameCn] = block[nameCn] ?? block.label
-      const [id] = block.categories || []
-      formData.categoryId = id || ''
+      if (shouldReplaceCategoryWithGroup()) {
+        formData.categoryId = (block.groups || []).map((group) => group.id)
+      } else {
+        const [id] = block.categories || []
+        formData.categoryId = id || ''
+      }
     })
 
     const rules = {
@@ -238,9 +243,10 @@ export default {
       const block = getEditBlock()
 
       if (block) {
-        const { category_id } = categoryList.value.find((item) => item.id === value) ?? {}
-        block.path = category_id
-        block.categories = [value]
+        const idKey = shouldReplaceCategoryWithGroup() ? 'id' : 'category_id'
+        const selectedCategory = categoryList.value.find((item) => item.id === value) ?? {}
+        block.path = selectedCategory[idKey]
+        block.categories = Array.isArray(value) ? value : value || ''
       }
     }
 
@@ -281,6 +287,7 @@ export default {
       blockForm,
       categoryFilter,
       changeBlockProperty,
+      shouldReplaceCategoryWithGroup,
       groupLabels
     }
   }
diff --git a/packages/plugins/block/src/Main.vue b/packages/plugins/block/src/Main.vue
index f33d19f434..00050619a5 100644
--- a/packages/plugins/block/src/Main.vue
+++ b/packages/plugins/block/src/Main.vue
@@ -140,6 +140,7 @@ import BlockGroupArrange from './BlockGroupArrange.vue'
 import CategoryEdit from './CategoryEdit.vue'
 import SaveNewBlock from './SaveNewBlock.vue'
 import {
+  setCurrentCategory,
   saveBlock,
   initEditBlock,
   mountedHook,
@@ -347,13 +348,8 @@ export default {
         }
 
     const changeCategory = (val) => {
-      let params = useBlock().shouldReplaceCategoryWithGroup() ? { groupId: val } : { categoryId: val }
-
-      if (!val) {
-        params = {}
-      }
-
-      updateBlockList(params)
+      setCurrentCategory(val)
+      updateBlockList()
     }
 
     const editCategory = (category) => {
diff --git a/packages/plugins/block/src/js/blockSetting.jsx b/packages/plugins/block/src/js/blockSetting.jsx
index bfa4ac51af..7d1cb9c2b4 100644
--- a/packages/plugins/block/src/js/blockSetting.jsx
+++ b/packages/plugins/block/src/js/blockSetting.jsx
@@ -10,7 +10,7 @@
  *
  */
 
-import { reactive, readonly, onMounted } from 'vue'
+import { ref, reactive, readonly, onMounted } from 'vue'
 import { extend } from '@opentiny/vue-renderless/common/object'
 import { remove } from '@opentiny/vue-renderless/common/array'
 import {
@@ -54,6 +54,8 @@ const { HOST_TYPE } = constants
 
 const STRING_SLOT = ['Slot', 'slot']
 
+const currentCategory = ref('')
+
 // 区块暴露属性和事件的类型
 export const META_TYPES = {
   array: 'array',
@@ -275,6 +277,10 @@ const state = reactive({
   arrayConfig: []
 })
 
+export const setCurrentCategory = (categoryId) => {
+  currentCategory.value = categoryId
+}
+
 export const getMaterialHistory = () => state.materialHistory
 
 export const setMaterialHistory = (value) => {
@@ -360,6 +366,8 @@ export const renameBlockEventName = (name, oldName) => {
   delete events[oldName]
 }
 
+const getAppId = () => getMetaApi(META_SERVICE.GlobalService).getBaseInfo().id
+
 export const initEditBlock = (block) => {
   const currentBlock = useBlock().getCurrentBlock()
   // 如果当前点击的区块和画布中的区块是同一区块，则直接获取最新的区块数据
@@ -391,6 +399,20 @@ export const getBlockBase64 = () => {
     })
 }
 
+export const updateBlockList = () => {
+  let params = useBlock().shouldReplaceCategoryWithGroup()
+    ? { groupId: currentCategory.value }
+    : { categoryId: currentCategory.value }
+  if (!currentCategory.value) {
+    params = {}
+  }
+  const appId = getAppId()
+  fetchBlockList({ appId, ...params }).then((data) => {
+    const blockListDescByUpdateAt = data.sort((a, b) => new Date(b.updated_at) - new Date(a.updated_at))
+    useBlock().setBlockList(blockListDescByUpdateAt)
+  })
+}
+
 export const delBlock = (closePanel) => () => {
   const { getBlockList } = useBlock()
   const { message } = useModal()
@@ -403,6 +425,8 @@ export const delBlock = (closePanel) => () => {
         // data:后台删除成功返回的是被删除的数据
         remove(getBlockList(), block)
         message({ message: '删除区块成功！', status: 'success' })
+        updateBlockList()
+        useBlock().isRefresh.value = true
         closePanel()
       })
       .catch((error) => {
@@ -511,6 +535,8 @@ export const publishBlock = (params) => {
       .then(() => {
         refreshBlockData(block)
         useNotify({ message: '区块发布成功!', type: 'success' })
+        updateBlockList()
+        useBlock().isRefresh.value = true
       })
       .catch((error) => {
         useModal().message({ message: error.message, status: 'error' })
@@ -518,8 +544,6 @@ export const publishBlock = (params) => {
   }
 }
 
-const getAppId = () => getMetaApi(META_SERVICE.GlobalService).getBaseInfo().id
-
 const getCategories = () => {
   const appId = getAppId()
   const fetchData = useBlock().shouldReplaceCategoryWithGroup() ? fetchGroups : fetchCategories
@@ -633,6 +657,7 @@ const updateBlock = (block = {}) => {
       }
       // 更新区块分类数据，分类下区块不为空的不能删除
       getCategories()
+      useBlock().isRefresh.value = true
     })
     .catch((error) => {
       useModal().message({ message: error.message, status: 'error' })
@@ -697,17 +722,10 @@ export const saveBlock = async (block) => {
 
     const actionPromise = block.id ? updateBlock(block) : createBlock(block)
     await actionPromise
+    updateBlockList()
   }
 }
 
-export const updateBlockList = (params) => {
-  const appId = getAppId()
-  fetchBlockList({ appId, ...params }).then((data) => {
-    const blockListDescByUpdateAt = data.sort((a, b) => new Date(b.updated_at) - new Date(a.updated_at))
-    useBlock().setBlockList(blockListDescByUpdateAt)
-  })
-}
-
 export const fetchMaterialId = () => {
   fetchComponentsMap(getAppId()).then((data) => {
     setMaterialHistory(data?.materialHistory)
diff --git a/packages/plugins/bridge/package.json b/packages/plugins/bridge/package.json
index 6b5f990ca6..ce40ae42e9 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",
+  "version": "2.2.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/datasource/package.json b/packages/plugins/datasource/package.json
index f6d9206082..176916e289 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",
+  "version": "2.2.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/datasource/src/DataSourceType.vue b/packages/plugins/datasource/src/DataSourceType.vue
index 58f245e44c..f01cd5d5ba 100644
--- a/packages/plugins/datasource/src/DataSourceType.vue
+++ b/packages/plugins/datasource/src/DataSourceType.vue
@@ -2,13 +2,10 @@
   <div class="right-item">
     <tiny-form label-position="top">
       <tiny-form-item prop="name" label="数据源类型">
-        <tiny-radio-group v-model="state.value" @change="handleChange">
-          <tiny-radio
-            v-for="item in state.dataType"
-            :key="item.value"
-            :label="item.name"
-            :disabled="editable"
-          ></tiny-radio>
+        <tiny-radio-group v-model="dataSourceType">
+          <div v-for="{ name, value } in RADIO_GROUP" :key="value">
+            <tiny-radio :text="name" :label="value" :disabled="editable" />
+          </div>
         </tiny-radio-group>
       </tiny-form-item>
     </tiny-form>
@@ -16,7 +13,7 @@
 </template>
 
 <script>
-import { reactive, watchEffect } from 'vue'
+import { watch, ref } from 'vue'
 import { Form, FormItem, RadioGroup, Radio } from '@opentiny/vue'
 
 export default {
@@ -38,46 +35,29 @@ export default {
   },
   emits: ['update:modelValue'],
   setup(props, { emit }) {
-    const state = reactive({
-      checkedIndex: 0,
-      value: '对象数组',
-      dataType: [
-        {
-          name: '对象数组',
-          icon: 'json',
-          value: 'array'
-        },
-        {
-          name: '树结构',
-          icon: 'tree-shape',
-          value: 'tree'
-        }
-      ]
-    })
+    const RADIO_GROUP = [
+      {
+        name: '对象数组',
+        value: 'array'
+      },
+      {
+        name: '树结构',
+        value: 'tree'
+      }
+    ]
 
-    watchEffect(() => {
-      const index = state.dataType.findIndex(({ value }) => value === props.modelValue)
-      state.checkedIndex = index > -1 ? index : 0
-    })
+    const dataSourceType = ref(props.modelValue)
 
-    const handleChange = () => {
-      if (props.editable) {
-        return
-      }
-      emit('update:modelValue', state.value)
-    }
-    const selectDataType = (item, index) => {
-      if (props.editable) {
-        return
+    watch(
+      () => dataSourceType.value,
+      (newVal) => {
+        emit('update:modelValue', newVal)
       }
-      state.checkedIndex = index
-      emit('update:modelValue', item.value)
-    }
+    )
 
     return {
-      state,
-      selectDataType,
-      handleChange
+      RADIO_GROUP,
+      dataSourceType
     }
   }
 }
diff --git a/packages/plugins/help/package.json b/packages/plugins/help/package.json
index d9b56084b5..c2691c349d 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",
+  "version": "2.2.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/help/src/HelpIcon.vue b/packages/plugins/help/src/HelpIcon.vue
index 81fa646d18..964fb27fbc 100644
--- a/packages/plugins/help/src/HelpIcon.vue
+++ b/packages/plugins/help/src/HelpIcon.vue
@@ -22,17 +22,9 @@
             <span><svg-icon class="svg-icon" name="user-guide"></svg-icon>使用手册</span
             ><icon-fillet-external-link class="icon-fillet-external-link" />
           </a>
-          <tiny-tooltip v-model="state.showTooltip" :manual="true" effect="light" placement="right-end">
-            <template #content>
-              <div>
-                <span>{{ toolTipContent }}</span>
-                <svg-icon name="close" class="help-plugin-tooltip-close" @click="closeToolTip"></svg-icon>
-              </div>
-            </template>
-            <div class="help-plugin-box-item" @click="toShowStep">
-              <span><svg-icon class="svg-icon" name="beginner-guide"></svg-icon>新手引导</span>
-            </div>
-          </tiny-tooltip>
+          <div class="help-plugin-box-item" @click="toShowStep">
+            <span><svg-icon class="svg-icon" name="beginner-guide"></svg-icon>新手引导</span>
+          </div>
         </div>
         <div class="help-plugin-box-ques">
           <div class="help-plugin-box-title help-plugin-box-ques-title">{{ questionTitle }}</div>
@@ -61,7 +53,7 @@
 
 <script>
 import { reactive, onMounted, ref } from 'vue'
-import { Guide, Tooltip, Popover } from '@opentiny/vue'
+import { Guide, Popover } from '@opentiny/vue'
 import { IconFilletExternalLink } from '@opentiny/vue-icon'
 import { useLayout, META_APP } from '@opentiny/tiny-engine-meta-register'
 
@@ -70,7 +62,6 @@ const GUIDE_STORAGE_KEY = 'tinyengine_guide'
 
 export default {
   components: {
-    TinyTooltip: Tooltip,
     TinyGuide: Guide,
     TinyPopover: Popover,
     IconFilletExternalLink: IconFilletExternalLink()
@@ -80,7 +71,6 @@ export default {
     const pluginState = getPluginState()
 
     const tinyGuideRef = ref()
-    const toolTipContent = '点击这里，再次查看新手指引'
     const helpTitle = '帮助与指引'
     const questionTitle = '常见问题'
     const courseUrl = 'https://opentiny.design/tiny-engine#/help-center/course/engine'
@@ -102,25 +92,8 @@ export default {
     const state = reactive({
       showStep: false,
       guideWidth: '360',
-      showTooltip: false,
       helpBox: false
     })
-
-    let toolTipTimer
-
-    const closeToolTip = () => {
-      state.showTooltip = false
-    }
-
-    const showToolTip = () => {
-      state.showTooltip = true
-
-      // 定时关闭toolTip
-      clearTimeout(toolTipTimer)
-      toolTipTimer = setTimeout(() => {
-        closeToolTip()
-      }, 8000)
-    }
     const closeHelpBox = () => {
       state.helpBox = false
     }
@@ -152,7 +125,6 @@ export default {
         beforeShow: () => {
           closeHelpBox()
           activePlugin(META_APP.Materials)
-          closeToolTip()
           pluginState.pluginEvent = 'none'
         }
       },
@@ -226,7 +198,6 @@ export default {
         },
         destroy: () => {
           pluginState.pluginEvent = 'all'
-          showToolTip()
           window.localStorage.setItem(GUIDE_STORAGE_KEY, GUIDE_VERSION)
         }
       }
@@ -243,14 +214,12 @@ export default {
 
     return {
       tinyGuideRef,
-      toolTipContent,
       helpTitle,
       questionTitle,
       questionList,
       courseUrl,
       domData,
       state,
-      closeToolTip,
       closeHelpBox,
       openHelpBox,
       toShowStep
@@ -260,10 +229,6 @@ export default {
 </script>
 
 <style scoped lang="less">
-.help-plugin-tooltip-close {
-  margin-left: 20px;
-  cursor: pointer;
-}
 .help-plugin-reference {
   display: flex;
 }
diff --git a/packages/plugins/i18n/package.json b/packages/plugins/i18n/package.json
index c7a64ee8ce..3d18363dfb 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",
+  "version": "2.2.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/materials/package.json b/packages/plugins/materials/package.json
index e8da29fba4..066efc9352 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",
+  "version": "2.2.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/materials/src/composable/useResource.js b/packages/plugins/materials/src/composable/useResource.js
index a4febd8c60..2c7a2f43bc 100644
--- a/packages/plugins/materials/src/composable/useResource.js
+++ b/packages/plugins/materials/src/composable/useResource.js
@@ -38,12 +38,25 @@ const appSchemaState = reactive({
   materialsDeps: { scripts: [], styles: new Set() }
 })
 
+function goPage(pageId) {
+  if (!pageId) {
+    return
+  }
+
+  const url = new URL(window.location)
+
+  url.searchParams.set('pageid', pageId)
+  window.history.pushState({}, '', url)
+  usePage().postLocationHistoryChanged({ pageId })
+}
+
 const initPage = (pageInfo) => {
   try {
     if (pageInfo.meta) {
       const { occupier } = pageInfo.meta
 
       useLayout().layoutState.pageStatus = getCanvasStatus(occupier)
+      goPage(pageInfo.meta?.id)
     } else {
       useLayout().layoutState.pageStatus = {
         state: 'empty',
@@ -54,12 +67,6 @@ const initPage = (pageInfo) => {
     pageInfo.id = pageInfo.meta?.id
   } catch (error) {
     console.log(error) // eslint-disable-line
-  } finally {
-    const url = new URL(window.location)
-
-    url.searchParams.set('pageid', pageInfo.id)
-    window.history.pushState({}, '', url)
-    usePage().postLocationHistoryChanged({ pageId: pageInfo.id })
   }
 
   const { id, meta, ...pageSchema } = pageInfo
diff --git a/packages/plugins/materials/src/meta/block/src/BlockGroupPanel.vue b/packages/plugins/materials/src/meta/block/src/BlockGroupPanel.vue
index 10fc5afa39..4136e3ab9e 100644
--- a/packages/plugins/materials/src/meta/block/src/BlockGroupPanel.vue
+++ b/packages/plugins/materials/src/meta/block/src/BlockGroupPanel.vue
@@ -166,6 +166,7 @@ export default {
               message: '添加区块成功',
               type: 'success'
             })
+            useBlock().isRefresh.value = true
           })
         })
         .catch((error) => {
diff --git a/packages/plugins/page/package.json b/packages/plugins/page/package.json
index f84e65d0da..be046df7f4 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",
+  "version": "2.2.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/page/src/PageGeneral.vue b/packages/plugins/page/src/PageGeneral.vue
index 2bd5655225..92577ef3c5 100644
--- a/packages/plugins/page/src/PageGeneral.vue
+++ b/packages/plugins/page/src/PageGeneral.vue
@@ -32,7 +32,7 @@
         prop="parentId"
       >
         <tiny-select
-          v-model="pageSettingState.currentPageData.parentId"
+          v-model="pageParentId"
           value-field="id"
           render-type="tree"
           :tree-op="treeFolderOp"
@@ -94,7 +94,17 @@ export default {
   setup() {
     const { pageSettingState, changeTreeData, STATIC_PAGE_GROUP_ID } = usePage()
     const ROOT_ID = pageSettingState.ROOT_ID
-    const oldParentId = ref(pageSettingState.currentPageData.parentId)
+
+    const pageParentId = computed({
+      get() {
+        return String(pageSettingState.currentPageData.parentId)
+      },
+      set(value) {
+        pageSettingState.currentPageData.parentId = value
+      }
+    })
+
+    const oldParentId = ref(pageParentId.value)
 
     watchEffect(() => {
       oldParentId.value = pageSettingState.oldParentId
@@ -102,7 +112,7 @@ export default {
 
     const currentRoute = computed(() => {
       let route = pageSettingState.currentPageData.route || ''
-      let parentId = pageSettingState.currentPageData.parentId
+      let parentId = pageParentId
 
       while (parentId !== ROOT_ID) {
         const parent = pageSettingState.treeDataMapping[parentId]
@@ -233,6 +243,7 @@ export default {
       pageRules,
       folderRules,
       pageSettingState,
+      pageParentId,
       generalForm,
       validGeneralForm,
       treeFolderOp,
diff --git a/packages/plugins/page/src/composable/usePage.js b/packages/plugins/page/src/composable/usePage.js
index 3463548cdb..dd0a537d88 100644
--- a/packages/plugins/page/src/composable/usePage.js
+++ b/packages/plugins/page/src/composable/usePage.js
@@ -75,6 +75,9 @@ const isTemporaryPage = reactive({
   saved: false
 })
 
+const STATIC_PAGE_GROUP_ID = 0
+const COMMON_PAGE_GROUP_ID = 1
+
 const generateCssString = (pageOptions, materialsOptions) => {
   if (!pageOptions?.pageBaseStyle?.className || !pageOptions?.pageBaseStyle?.style) {
     return ''
@@ -151,10 +154,21 @@ const isCurrentDataSame = () => {
   return isEqual
 }
 
+const getParentNode = (parentId) => {
+  return parentId === pageSettingState.ROOT_ID
+    ? { id: pageSettingState.ROOT_ID, children: pageSettingState.pages[STATIC_PAGE_GROUP_ID].data }
+    : pageSettingState.treeDataMapping[parentId]
+}
+
 const changeTreeData = (newParentId, oldParentId) => {
-  if (newParentId && oldParentId && newParentId !== oldParentId) {
-    const folderData = pageSettingState.treeDataMapping[newParentId]
-    const parentData = pageSettingState.treeDataMapping[oldParentId]
+  if (newParentId && oldParentId && String(newParentId) !== String(oldParentId)) {
+    const folderData = getParentNode(newParentId)
+    const parentData = getParentNode(oldParentId)
+
+    if (!folderData || !parentData) {
+      return
+    }
+
     const currentPageDataId = pageSettingState.currentPageData.id
     const curDataIndex = parentData.children?.findIndex?.(({ id }) => id === currentPageDataId)
 
@@ -187,9 +201,6 @@ const resetPageData = () => {
 // 判断当前页面内容是否有修改
 const isChangePageData = () => !isEqual(pageSettingState.currentPageData, pageSettingState.currentPageDataCopy)
 
-const STATIC_PAGE_GROUP_ID = 0
-const COMMON_PAGE_GROUP_ID = 1
-
 /**
  *
  * @typedef {Object} PageData
diff --git a/packages/plugins/robot/package.json b/packages/plugins/robot/package.json
index f18afc8e03..0e88f5c051 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",
+  "version": "2.2.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/robot/src/Main.vue b/packages/plugins/robot/src/Main.vue
index 32ebf94cb5..6a14e9dde8 100644
--- a/packages/plugins/robot/src/Main.vue
+++ b/packages/plugins/robot/src/Main.vue
@@ -231,11 +231,8 @@ export default {
         .post('/app-center/api/ai/chat', getSendSeesionProcess(), { timeout: 600000 })
         .then((res) => {
           const { originalResponse, schema, replyWithoutCode } = res
-          const responseMessage = getAiRespMessage(
-            originalResponse.choices?.[0]?.message.role,
-            originalResponse.choices?.[0]?.message.content
-          )
-          const respDisplayMessage = getAiRespMessage(originalResponse.choices?.[0]?.message.role, replyWithoutCode)
+          const responseMessage = getAiRespMessage(originalResponse.role, originalResponse.content)
+          const respDisplayMessage = getAiRespMessage(originalResponse.role, replyWithoutCode)
           sessionProcess.messages.push(responseMessage)
           sessionProcess.displayMessages.push(respDisplayMessage)
           messages.value[messages.value.length - 1].content = replyWithoutCode
diff --git a/packages/plugins/robot/src/js/robotSetting.js b/packages/plugins/robot/src/js/robotSetting.js
index c4bee9ca29..69352d92f2 100644
--- a/packages/plugins/robot/src/js/robotSetting.js
+++ b/packages/plugins/robot/src/js/robotSetting.js
@@ -15,7 +15,7 @@ import { getMetaApi, META_SERVICE } from '@opentiny/tiny-engine-meta-register'
 
 export const AIModelOptions = [
   { label: 'ChatGPT：gpt-3.5-turbo', value: 'gpt-3.5-turbo', manufacturer: 'openai' },
-  { label: '文心一言：ERNIE-4.0-8k', value: 'ERNIE-4.0-8k', manufacturer: 'baiduai' }
+  { label: '文心一言：ERNIE-4.0-8K', value: 'ERNIE-4.0-8K', manufacturer: 'baiduai' }
 ]
 
 // 这里存放的是aichat的响应式数据
diff --git a/packages/plugins/schema/package.json b/packages/plugins/schema/package.json
index 9a8ea76a37..e3844397df 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",
+  "version": "2.2.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/script/package.json b/packages/plugins/script/package.json
index 3be0a4927d..54aa86cb1d 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",
+  "version": "2.2.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/script/src/Main.vue b/packages/plugins/script/src/Main.vue
index dc11acb28d..282e955231 100644
--- a/packages/plugins/script/src/Main.vue
+++ b/packages/plugins/script/src/Main.vue
@@ -59,12 +59,11 @@ export default {
         enabled: false
       },
       placeholder: `// ✅ 函数声明可以保存
-      \n function topLevelFunction(){ \n
-      \u200B \u200B const message = 'hello tiny-engine.' \n
+       function topLevelFunction(){ 
+      \u200B \u200B const message = 'hello tiny-engine.' 
       \u200B \u200B console.log(message) 
-      \n }
-      \n 
-      // ❌ 顶层/常规 变量声明 \n const someVariable = 42 \n
+      } \n 
+      // ❌ 顶层/常规 变量声明 \n const someVariable = 42 
       // ❌ 表达式 \n const result = someVariable + 10`,
 
       // 禁用滚动条边边一直显示的边框
@@ -175,4 +174,8 @@ export default {
     margin-left: 5px;
   }
 }
+
+:deep(.monaco-editor .editorPlaceholder) {
+  font-size: 12px !important;
+}
 </style>
diff --git a/packages/plugins/state/package.json b/packages/plugins/state/package.json
index 607dddeb19..aa4797adc7 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",
+  "version": "2.2.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/tree/package.json b/packages/plugins/tree/package.json
index 9d492dbe4d..bcb3f7ac81 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",
+  "version": "2.2.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/tutorial/package.json b/packages/plugins/tutorial/package.json
index 41999d1526..8f8e23d661 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",
+  "version": "2.2.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/register/package.json b/packages/register/package.json
index 819fc19033..d18a815d65 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",
+  "version": "2.2.0",
   "description": "",
   "type": "module",
   "main": "dist/index.js",
diff --git a/packages/settings/design/package.json b/packages/settings/design/package.json
index cfc86d106c..ef5cc6b925 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",
+  "version": "2.2.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/settings/events/package.json b/packages/settings/events/package.json
index 78fea806dd..774df78079 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",
+  "version": "2.2.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/settings/panel/package.json b/packages/settings/panel/package.json
index 07dca8d660..1e18541635 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",
+  "version": "2.2.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/settings/props/package.json b/packages/settings/props/package.json
index 67bd97d37e..da95c9e768 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",
+  "version": "2.2.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/settings/styles/package.json b/packages/settings/styles/package.json
index a8eb022353..362ad8c9ff 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",
+  "version": "2.2.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/svgs/package.json b/packages/svgs/package.json
index 6dd64f4074..6b2f9526ea 100644
--- a/packages/svgs/package.json
+++ b/packages/svgs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-svgs",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/theme/base/package.json b/packages/theme/base/package.json
index 4305875b68..eebc56b1ba 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",
+  "version": "2.2.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/theme/dark/package.json b/packages/theme/dark/package.json
index e1c8397eaa..956cb0cb4a 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",
+  "version": "2.2.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/theme/light/package.json b/packages/theme/light/package.json
index cbd4c8bb55..1043cfc56f 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",
+  "version": "2.2.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/breadcrumb/package.json b/packages/toolbars/breadcrumb/package.json
index d5428730e4..9c9c8bd79c 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",
+  "version": "2.2.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/clean/package.json b/packages/toolbars/clean/package.json
index 1253d7a342..aadd624a49 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",
+  "version": "2.2.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/collaboration/package.json b/packages/toolbars/collaboration/package.json
index 1e0d0da387..50c76b17ae 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",
+  "version": "2.2.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/fullscreen/package.json b/packages/toolbars/fullscreen/package.json
index 5276560c4c..a6faf8bcdf 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",
+  "version": "2.2.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/generate-code/package.json b/packages/toolbars/generate-code/package.json
index 2d1676f80a..8bf067eee2 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",
+  "version": "2.2.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/lang/package.json b/packages/toolbars/lang/package.json
index 361ed87bab..e76a5ba5c2 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",
+  "version": "2.2.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/layout/package.json b/packages/toolbars/layout/package.json
index 708820805a..f685903b17 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",
+  "version": "2.2.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/lock/package.json b/packages/toolbars/lock/package.json
index 7380259af8..8ea5d67119 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",
+  "version": "2.2.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/logo/package.json b/packages/toolbars/logo/package.json
index c9ac87bd7d..cb920bec7d 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",
+  "version": "2.2.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/logout/package.json b/packages/toolbars/logout/package.json
index 5ba4d109a7..f95dbdc601 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",
+  "version": "2.2.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/media/package.json b/packages/toolbars/media/package.json
index d6ebe61e4d..c2a1f7cee2 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",
+  "version": "2.2.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/preview/package.json b/packages/toolbars/preview/package.json
index c96ef11fec..440cab9c3c 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",
+  "version": "2.2.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/redoundo/package.json b/packages/toolbars/redoundo/package.json
index 4e70f7cd9c..942b45d14b 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",
+  "version": "2.2.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/refresh/package.json b/packages/toolbars/refresh/package.json
index cfeeb9c0e6..db16b7f943 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",
+  "version": "2.2.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/save/package.json b/packages/toolbars/save/package.json
index 6cd164315a..9123443511 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",
+  "version": "2.2.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/setting/package.json b/packages/toolbars/setting/package.json
index 7200d61af2..e88a879bf7 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",
+  "version": "2.2.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/view-setting/package.json b/packages/toolbars/view-setting/package.json
index 94e9757245..60030e9daa 100644
--- a/packages/toolbars/view-setting/package.json
+++ b/packages/toolbars/view-setting/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-view-setting",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/utils/package.json b/packages/utils/package.json
index 953529c311..f56abc4196 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-utils",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/vue-generator/package.json b/packages/vue-generator/package.json
index e660947936..11c435f92e 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",
+  "version": "2.2.0",
   "publishConfig": {
     "access": "public"
   },
@@ -53,8 +53,8 @@
     "winston": "^3.10.0"
   },
   "peerDependencies": {
-    "@babel/parser": "^7.18.13",
     "@babel/generator": "^7.18.13",
+    "@babel/parser": "^7.18.13",
     "@babel/traverse": "^7.18.13"
   }
 }
diff --git a/packages/webcomponent/package.json b/packages/webcomponent/package.json
index 2e25249ae7..5727ab99a0 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",
+  "version": "2.2.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/scripts/updateTemplate.mjs b/scripts/updateTemplate.mjs
new file mode 100644
index 0000000000..e35847408f
--- /dev/null
+++ b/scripts/updateTemplate.mjs
@@ -0,0 +1,109 @@
+import fs from 'fs-extra'
+import path from 'node:path'
+import { fileURLToPath } from 'node:url'
+import Logger from './logger.mjs'
+import pkg from '../packages/design-core/package.json' assert { type: 'json' }
+
+const logger = new Logger('updateTemplate')
+
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = path.dirname(__filename)
+
+const templateSrcPath = path.resolve(__dirname, '../designer-demo')
+const templateDistPath = path.resolve(__dirname, '../packages/engine-cli/template/designer')
+
+const ignoreFolder = ['node_modules', 'dist', 'temp', 'tmp']
+
+const filter = (src, _dest) => {
+  if (ignoreFolder.some((item) => src.includes(item))) {
+    return false
+  }
+  return true
+}
+
+async function copyTemplate() {
+  const templateBackupPath = path.resolve(templateDistPath, '../designer_backup')
+  if (await fs.pathExists(templateBackupPath)) {
+    await fs.remove(templateBackupPath)
+  }
+  // 先备份原目录
+  if (await fs.pathExists(templateDistPath)) {
+    await fs.move(templateDistPath, templateBackupPath)
+  }
+  try {
+    // 删除cli template内容
+    if (await fs.pathExists(templateDistPath)) {
+      await fs.remove(templateDistPath)
+    }
+    // 复制designer-demo
+    await fs.copy(templateSrcPath, templateDistPath, { filter })
+    await fs.remove(templateBackupPath)
+  } catch (error) {
+    logger.error(error)
+    // 复制错误时恢复
+    if (await fs.pathExists(templateBackupPath)) {
+      await fs.move(templateBackupPath, templateDistPath)
+    }
+  } finally {
+    if (await fs.pathExists(templateBackupPath)) {
+      await fs.remove(templateBackupPath)
+    }
+  }
+}
+
+async function updatePkgJson() {
+  const { version } = pkg
+  const pkgJsonPath = path.resolve(templateDistPath, 'package.json')
+  if ((await fs.pathExists(pkgJsonPath)) === false) {
+    return
+  }
+  const pkgData = await fs.readJSON(pkgJsonPath)
+  pkgData.version = '0.0.0'
+
+  const defaultScripts = {
+    dev: "concurrently 'pnpm:serve:mock' 'pnpm:serve:frontend'",
+    'serve:frontend': 'cross-env VITE_THEME=light vite',
+    'serve:mock': 'node node_modules/@opentiny/tiny-engine-mock/dist/app.js',
+    'build:alpha': 'cross-env NODE_OPTIONS=--max-old-space-size=8192 VITE_THEME=light vite build --mode alpha',
+    build: 'cross-env NODE_OPTIONS=--max-old-space-size=8192 VITE_THEME=light vite build --mode prod'
+  }
+
+  Object.entries(defaultScripts).forEach(([name, value]) => {
+    pkgData.scripts[name] = value
+  })
+
+  pkgData.devDependencies['concurrently'] = '^8.2.0'
+
+  const updateDependencyVersions = (deps) => {
+    Object.keys(deps)
+      .filter((name) => name.includes('@opentiny/tiny-engine'))
+      .forEach((name) => {
+        deps[name] = version
+      })
+  }
+  updateDependencyVersions(pkgData.dependencies)
+  updateDependencyVersions(pkgData.devDependencies)
+
+  await fs.writeJSON(pkgJsonPath, pkgData, { spaces: 2 })
+}
+
+async function modifyViteConfig() {
+  const viteConfigPath = path.resolve(templateDistPath, 'vite.config.js')
+  if (await fs.exists(viteConfigPath)) {
+    const fileContent = await fs.readFile(viteConfigPath, { encoding: 'utf-8' })
+    const aliasRegexp = /useSourceAlias: *true/
+    if (aliasRegexp.test(fileContent)) {
+      const newFileContent = fileContent.replace(aliasRegexp, 'useSourceAlias: false')
+      await fs.writeFile(viteConfigPath, newFileContent)
+    }
+  }
+}
+
+// 同步design-demo代码到CLI模板，避免模板未更新或版本号未修改
+async function main() {
+  await copyTemplate()
+  await updatePkgJson()
+  await modifyViteConfig()
+}
+
+main()