From 277be2f11e0ca4ba8df9b7d60b20fa7598d1f7f3 Mon Sep 17 00:00:00 2001
From: chilingling <26962197+chilingling@users.noreply.github.com>
Date: Thu, 4 Jul 2024 20:06:11 -0700
Subject: [PATCH 01/40] fix(vue-generator): fix globalstate codegen error
 (#547)

---
 packages/vue-generator/package.json           |  2 +-
 .../src/plugins/genGlobalState.js             | 10 ++---
 .../expected/appdemo01/src/stores/index.js    |  1 +
 .../appdemo01/src/stores/testState.js         | 27 +++++++++++++
 .../test/testcases/generator/mockData.js      | 38 ++++++++++++++++++-
 5 files changed, 71 insertions(+), 7 deletions(-)
 create mode 100644 packages/vue-generator/test/testcases/generator/expected/appdemo01/src/stores/testState.js

diff --git a/packages/vue-generator/package.json b/packages/vue-generator/package.json
index 427979437..8db5f80a9 100644
--- a/packages/vue-generator/package.json
+++ b/packages/vue-generator/package.json
@@ -47,7 +47,7 @@
     "fs-extra": "^10.0.1",
     "prettier": "^2.6.1",
     "vite": "^4.3.7",
-    "vite-plugin-static-copy": "^1.0.4",
+    "vite-plugin-static-copy": "^0.16.0",
     "vitest": "^1.4.0",
     "winston": "^3.10.0"
   },
diff --git a/packages/vue-generator/src/plugins/genGlobalState.js b/packages/vue-generator/src/plugins/genGlobalState.js
index 4c640d6a4..324f698a7 100644
--- a/packages/vue-generator/src/plugins/genGlobalState.js
+++ b/packages/vue-generator/src/plugins/genGlobalState.js
@@ -44,8 +44,8 @@ function genDependenciesPlugin(options = {}) {
           .map((item) => {
             let [key, value] = item
 
-            if (value === '') {
-              value = "''"
+            if (typeof value === 'string') {
+              value = `'${value}'`
             }
 
             if (value && typeof value === 'object') {
@@ -57,19 +57,19 @@ function genDependenciesPlugin(options = {}) {
           .join(',')} })`
 
         const getterExpression = Object.entries(getters)
-          .filter((item) => item.value?.type === 'JSFunction')
+          .filter((item) => item[1]?.type === 'JSFunction')
           .map(([key, value]) => `${key}: ${value.value}`)
           .join(',')
 
         const actionExpressions = Object.entries(actions)
-          .filter((item) => item.value?.type === 'JSFunction')
+          .filter((item) => item[1]?.type === 'JSFunction')
           .map(([key, value]) => `${key}: ${value.value}`)
           .join(',')
 
         const storeFiles = `
          ${importStatement}
          export const ${id} = defineStore({
-           id: ${id},
+           id: '${id}',
            state: ${stateExpression},
            getters: { ${getterExpression} },
            actions: { ${actionExpressions} }
diff --git a/packages/vue-generator/test/testcases/generator/expected/appdemo01/src/stores/index.js b/packages/vue-generator/test/testcases/generator/expected/appdemo01/src/stores/index.js
index e69de29bb..380fa26bf 100644
--- a/packages/vue-generator/test/testcases/generator/expected/appdemo01/src/stores/index.js
+++ b/packages/vue-generator/test/testcases/generator/expected/appdemo01/src/stores/index.js
@@ -0,0 +1 @@
+export { testState } from './testState'
diff --git a/packages/vue-generator/test/testcases/generator/expected/appdemo01/src/stores/testState.js b/packages/vue-generator/test/testcases/generator/expected/appdemo01/src/stores/testState.js
new file mode 100644
index 000000000..c2312435e
--- /dev/null
+++ b/packages/vue-generator/test/testcases/generator/expected/appdemo01/src/stores/testState.js
@@ -0,0 +1,27 @@
+import { defineStore } from 'pinia'
+export const testState = defineStore({
+  id: 'testState',
+  state: () => ({
+    name: 'testName',
+    license: '',
+    age: 18,
+    food: ['apple', 'orange', 'banana', 19],
+    desc: { description: 'hello world', money: 100, other: '', rest: ['a', 'b', 'c', 20] }
+  }),
+  getters: {
+    getAge: function getAge() {
+      return this.age
+    },
+    getName: function getName() {
+      return this.name
+    }
+  },
+  actions: {
+    setAge: function setAge(age) {
+      this.age = age
+    },
+    setName: function setName(name) {
+      this.name = name
+    }
+  }
+})
diff --git a/packages/vue-generator/test/testcases/generator/mockData.js b/packages/vue-generator/test/testcases/generator/mockData.js
index 6067bbb55..71bdd356f 100644
--- a/packages/vue-generator/test/testcases/generator/mockData.js
+++ b/packages/vue-generator/test/testcases/generator/mockData.js
@@ -676,7 +676,43 @@ export const appSchemaDemo01 = {
       value: 'function dataHanlder(res){\n return res;\n}'
     }
   },
-  globalState: [],
+  globalState: [
+    {
+      id: 'testState',
+      state: {
+        name: 'testName',
+        license: '',
+        age: 18,
+        food: ['apple', 'orange', 'banana', 19],
+        desc: {
+          description: 'hello world',
+          money: 100,
+          other: '',
+          rest: ['a', 'b', 'c', 20]
+        }
+      },
+      getters: {
+        getAge: {
+          type: 'JSFunction',
+          value: 'function getAge() {\n return this.age \n}'
+        },
+        getName: {
+          type: 'JSFunction',
+          value: 'function getName() {\n return this.name \n}'
+        }
+      },
+      actions: {
+        setAge: {
+          type: 'JSFunction',
+          value: 'function setAge(age) {\n this.age = age; \n}'
+        },
+        setName: {
+          type: 'JSFunction',
+          value: 'function setName(name) {\n this.name = name; \n}'
+        }
+      }
+    }
+  ],
   utils: [
     {
       name: 'axios',

From 91d3ae108c90fc4071ee381105eac6cc0af07b0e Mon Sep 17 00:00:00 2001
From: chilingling <26962197+chilingling@users.noreply.github.com>
Date: Thu, 4 Jul 2024 23:03:32 -0700
Subject: [PATCH 02/40] fix(material): add componentsMap to app Schema after
 material build (#527)

---
 scripts/buildMaterials.mjs | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/scripts/buildMaterials.mjs b/scripts/buildMaterials.mjs
index 01e768b19..100636460 100644
--- a/scripts/buildMaterials.mjs
+++ b/scripts/buildMaterials.mjs
@@ -12,7 +12,10 @@ const materialsDir = 'materials'
 const bundlePath = path.join(process.cwd(), '/packages/design-core/public/mock/bundle.json')
 // mockServer应用数据
 const appInfoPath = path.join(process.cwd(), '/mockServer/src/services/appinfo.json')
+const appSchemaPath = path.join(process.cwd(), 'mockServer/src/mock/get/app-center/v1/apps/schema/918.json')
+
 const appInfo = fsExtra.readJSONSync(appInfoPath)
+const appSchema = fsExtra.readJSONSync(appSchemaPath)
 
 const connection = new MysqlConnection()
 
@@ -22,6 +25,7 @@ const connection = new MysqlConnection()
 const write = (bundle) => {
   fsExtra.outputJSONSync(bundlePath, bundle, { spaces: 2 })
   fsExtra.outputJSONSync(appInfoPath, appInfo, { spaces: 2 })
+  fsExtra.outputJSONSync(appSchemaPath, appSchema, { spaces: 2 })
 }
 
 /**
@@ -95,6 +99,7 @@ const generateComponents = () => {
       }
       const { components = [], snippets = [], blocks = [] } = bundle.data.materials
       const componentsMap = []
+      const packagesMap = []
       const appInfoBlocksLabels = appInfo.blockHistories.map((item) => item.label)
 
       files.forEach((file) => {
@@ -151,8 +156,26 @@ const generateComponents = () => {
 
         appInfo.materialHistory.components = componentsMap
 
-        write(bundle)
+        const { package: packageName = '', version = '', exportName = '' } = npm || {}
+
+        const mapItem = {
+          componentName: component,
+          package: packageName,
+          version,
+          exportName
+        }
+
+        if (typeof npm.destructuring === 'boolean') {
+          mapItem.destructuring = npm.destructuring
+        }
+
+        if (npm.package) {
+          packagesMap.push(mapItem)
+        }
       })
+
+      appSchema.data.componentsMap = packagesMap
+      write(bundle)
     })
 
     logger.success('物料资产包构建成功')

From e651dffa2b654ff652405ae5f57cba06b75fe6bd Mon Sep 17 00:00:00 2001
From: chilingling <26962197+chilingling@users.noreply.github.com>
Date: Fri, 5 Jul 2024 02:36:09 -0700
Subject: [PATCH 03/40] fix: slot params missing double quote (#605)

* fix: slot params missing double quote

* fix: exclude nodemodule test case
---
 .../generator/vue/sfc/generateAttribute.js    |   2 +-
 .../test/testcases/sfc/case06/case06.test.js  |  12 ++
 .../testcases/sfc/case06/components-map.json  |   9 ++
 .../sfc/case06/expected/slotTest.vue          |  54 +++++++
 .../testcases/sfc/case06/page.schema.json     | 143 ++++++++++++++++++
 packages/vue-generator/vite.config.mjs        |   2 +-
 6 files changed, 220 insertions(+), 2 deletions(-)
 create mode 100644 packages/vue-generator/test/testcases/sfc/case06/case06.test.js
 create mode 100644 packages/vue-generator/test/testcases/sfc/case06/components-map.json
 create mode 100644 packages/vue-generator/test/testcases/sfc/case06/expected/slotTest.vue
 create mode 100644 packages/vue-generator/test/testcases/sfc/case06/page.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 91af6b922..d4d7d0aa2 100644
--- a/packages/vue-generator/src/generator/vue/sfc/generateAttribute.js
+++ b/packages/vue-generator/src/generator/vue/sfc/generateAttribute.js
@@ -229,7 +229,7 @@ export const handleSlotBindAttrHook = (schemaData) => {
   let paramsValue = ''
 
   if (Array.isArray(params)) {
-    paramsValue = `={ ${params.join(',')} }`
+    paramsValue = `="{ ${params.join(',')} }"`
   } else if (typeof params === 'string') {
     paramsValue = `="${params}"`
   }
diff --git a/packages/vue-generator/test/testcases/sfc/case06/case06.test.js b/packages/vue-generator/test/testcases/sfc/case06/case06.test.js
new file mode 100644
index 000000000..f3df325d0
--- /dev/null
+++ b/packages/vue-generator/test/testcases/sfc/case06/case06.test.js
@@ -0,0 +1,12 @@
+import { expect, test } from 'vitest'
+import { genSFCWithDefaultPlugin } from '@/generator/vue/sfc'
+import schema from './page.schema.json'
+import componentsMap from './components-map.json'
+import { formatCode } from '@/utils/formatCode'
+
+test('should generate slot declaration correctly', async () => {
+  const res = genSFCWithDefaultPlugin(schema, componentsMap)
+  const formattedCode = formatCode(res, 'vue')
+
+  await expect(formattedCode).toMatchFileSnapshot('./expected/slotTest.vue')
+})
diff --git a/packages/vue-generator/test/testcases/sfc/case06/components-map.json b/packages/vue-generator/test/testcases/sfc/case06/components-map.json
new file mode 100644
index 000000000..eda806752
--- /dev/null
+++ b/packages/vue-generator/test/testcases/sfc/case06/components-map.json
@@ -0,0 +1,9 @@
+[
+  {
+    "componentName": "TinyTree",
+    "exportName": "Tree",
+    "package": "@opentiny/vue",
+    "version": "^3.10.0",
+    "destructuring": true
+  }
+]
diff --git a/packages/vue-generator/test/testcases/sfc/case06/expected/slotTest.vue b/packages/vue-generator/test/testcases/sfc/case06/expected/slotTest.vue
new file mode 100644
index 000000000..a0ce30ad3
--- /dev/null
+++ b/packages/vue-generator/test/testcases/sfc/case06/expected/slotTest.vue
@@ -0,0 +1,54 @@
+<template>
+  <div>
+    <tiny-tree
+      :data="[
+        { label: '一级 1', children: [{ label: '二级 1-1', children: [{ label: '三级 1-1-1' }] }] },
+        {
+          label: '一级 2',
+          children: [
+            { label: '二级 2-1', children: [{ label: '三级 2-1-1' }] },
+            { label: '二级 2-2', children: [{ label: '三级 2-2-1' }] }
+          ]
+        }
+      ]"
+    >
+      <template #default="{ data }">
+        <span>{{ data.label }}</span></template
+      ></tiny-tree
+    >
+    <tiny-tree
+      :data="[
+        { label: '一级 1', children: [{ label: '二级 1-1', children: [{ label: '三级 1-1-1' }] }] },
+        {
+          label: '一级 2',
+          children: [
+            { label: '二级 2-1', children: [{ label: '三级 2-1-1' }] },
+            { label: '二级 2-2', children: [{ label: '三级 2-2-1' }] }
+          ]
+        }
+      ]"
+    >
+      <template #default="data">
+        <span>{{ data.label }}</span></template
+      ></tiny-tree
+    >
+  </div>
+</template>
+
+<script setup>
+import { Tree as TinyTree } from '@opentiny/vue'
+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({})
+wrap({ state })
+</script>
+<style scoped></style>
diff --git a/packages/vue-generator/test/testcases/sfc/case06/page.schema.json b/packages/vue-generator/test/testcases/sfc/case06/page.schema.json
new file mode 100644
index 000000000..7b5ec4ff0
--- /dev/null
+++ b/packages/vue-generator/test/testcases/sfc/case06/page.schema.json
@@ -0,0 +1,143 @@
+{
+  "state": {},
+  "methods": {},
+  "componentName": "Page",
+  "fileName": "createVm",
+  "css": "",
+  "props": {},
+  "lifeCycles": {},
+  "children": [
+    {
+      "componentName": "TinyTree",
+      "props": {
+        "data": [
+          {
+            "label": "一级 1",
+            "children": [
+              {
+                "label": "二级 1-1",
+                "children": [
+                  {
+                    "label": "三级 1-1-1"
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "label": "一级 2",
+            "children": [
+              {
+                "label": "二级 2-1",
+                "children": [
+                  {
+                    "label": "三级 2-1-1"
+                  }
+                ]
+              },
+              {
+                "label": "二级 2-2",
+                "children": [
+                  {
+                    "label": "三级 2-2-1"
+                  }
+                ]
+              }
+            ]
+          }
+        ]
+      },
+      "id": "33f52342",
+      "children": [
+        {
+          "componentName": "Template",
+          "props": {
+            "slot": {
+              "name": "default",
+              "params": ["data"]
+            }
+          },
+          "children": [
+            {
+              "componentName": "Text",
+              "props": {
+                "text": {
+                  "type": "JSExpression",
+                  "value": "data.label"
+                }
+              },
+              "id": "c225d165"
+            }
+          ],
+          "id": "415d5f65"
+        }
+      ]
+    },
+    {
+      "componentName": "TinyTree",
+      "props": {
+        "data": [
+          {
+            "label": "一级 1",
+            "children": [
+              {
+                "label": "二级 1-1",
+                "children": [
+                  {
+                    "label": "三级 1-1-1"
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "label": "一级 2",
+            "children": [
+              {
+                "label": "二级 2-1",
+                "children": [
+                  {
+                    "label": "三级 2-1-1"
+                  }
+                ]
+              },
+              {
+                "label": "二级 2-2",
+                "children": [
+                  {
+                    "label": "三级 2-2-1"
+                  }
+                ]
+              }
+            ]
+          }
+        ]
+      },
+      "id": "33f52342",
+      "children": [
+        {
+          "componentName": "Template",
+          "props": {
+            "slot": {
+              "name": "default",
+              "params": "data"
+            }
+          },
+          "children": [
+            {
+              "componentName": "Text",
+              "props": {
+                "text": {
+                  "type": "JSExpression",
+                  "value": "data.label"
+                }
+              },
+              "id": "c225d165"
+            }
+          ],
+          "id": "415d5f65"
+        }
+      ]
+    }
+  ]
+}
diff --git a/packages/vue-generator/vite.config.mjs b/packages/vue-generator/vite.config.mjs
index 60005cb53..3c1256679 100644
--- a/packages/vue-generator/vite.config.mjs
+++ b/packages/vue-generator/vite.config.mjs
@@ -17,7 +17,7 @@ import { viteStaticCopy } from 'vite-plugin-static-copy'
 // https://vitejs.dev/config/
 export default defineConfig({
   test: {
-    exclude: ['**/result/**'],
+    exclude: ['**/result/**', 'node_modules'],
     watchExclude: ['**/result/**']
   },
   resolve: {

From 66268d3ec36d03018c00232df8b9c98cd24834ac Mon Sep 17 00:00:00 2001
From: yeser <631300329@qq.com>
Date: Fri, 19 Jul 2024 17:45:52 +0800
Subject: [PATCH 04/40] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DonMouseover?=
 =?UTF-8?q?=E6=8B=BC=E5=86=99=E9=94=99=E8=AF=AF=20(#662)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/canvas/src/components/render/render.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/canvas/src/components/render/render.js b/packages/canvas/src/components/render/render.js
index 0dbcf8b12..4277f059b 100644
--- a/packages/canvas/src/components/render/render.js
+++ b/packages/canvas/src/components/render/render.js
@@ -558,7 +558,7 @@ const getBindProps = (schema, scope) => {
     ...parseData(schema.props, scope),
     [DESIGN_UIDKEY]: id,
     [DESIGN_TAGKEY]: componentName,
-    onMoseover: stopEvent,
+    onMouseover: stopEvent,
     onFocus: stopEvent
   }
   if (scope) {

From 2c27f9141a9aec2246278912b302ba6746b65161 Mon Sep 17 00:00:00 2001
From: chilingling <26962197+chilingling@users.noreply.github.com>
Date: Sun, 21 Jul 2024 19:55:37 -0700
Subject: [PATCH 05/40] fix: esbuild install failed on node v16 (#668)

* fix: esbuild install failed on nodev16

* fix: esbuild install failed on nodev16
---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index 8586040b0..228895296 100644
--- a/package.json
+++ b/package.json
@@ -24,6 +24,7 @@
     "buildMaterials": "node ./scripts/buildMaterials.mjs"
   },
   "devDependencies": {
+    "esbuild": "^0.21.5",
     "@babel/eslint-parser": "^7.21.3",
     "@esbuild-plugins/node-globals-polyfill": "^0.2.3",
     "@esbuild-plugins/node-modules-polyfill": "^0.2.2",

From 732bed97955c0db8ba5aa8c1d117ef2132929a53 Mon Sep 17 00:00:00 2001
From: chilingling <26962197+chilingling@users.noreply.github.com>
Date: Mon, 22 Jul 2024 00:17:17 -0700
Subject: [PATCH 06/40] fix: builtin components can't generate import statement
 with genSFCWithDefaultPlugin method (#656)

---
 packages/vue-generator/src/generator/vue/sfc/genSetupSFC.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/vue-generator/src/generator/vue/sfc/genSetupSFC.js b/packages/vue-generator/src/generator/vue/sfc/genSetupSFC.js
index 2e04f7b13..29d07a55d 100644
--- a/packages/vue-generator/src/generator/vue/sfc/genSetupSFC.js
+++ b/packages/vue-generator/src/generator/vue/sfc/genSetupSFC.js
@@ -1,3 +1,4 @@
+import { BUILTIN_COMPONENTS_MAP } from '@/constant'
 import { getImportMap } from './parseImport'
 import {
   genTemplateByHook,
@@ -259,7 +260,10 @@ export const genSFCWithDefaultPlugin = (schema, componentsMap, config = {}) => {
     }
   }
 
-  return generateSFCFile(schema, componentsMap, newConfig)
+  // 兼容单独调用的场景，单独调用时，这里会默认加上 builtInComponents
+  const compsMapWithBuiltIn = [...componentsMap, ...BUILTIN_COMPONENTS_MAP]
+
+  return generateSFCFile(schema, compsMapWithBuiltIn, newConfig)
 }
 
 export default generateSFCFile

From fec563dda35c416b0001a72149937add50874027 Mon Sep 17 00:00:00 2001
From: chilingling <26962197+chilingling@users.noreply.github.com>
Date: Mon, 22 Jul 2024 01:14:26 -0700
Subject: [PATCH 07/40] fix: esbuild install failed on nodev16 (#671)

* fix: esbuild install failed on nodev16

* fix: esbuild install failed on nodev16

* fix: remove deps on root pkg.json
---
 package.json                      | 3 ---
 packages/design-core/package.json | 1 +
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 228895296..87392ddb0 100644
--- a/package.json
+++ b/package.json
@@ -24,10 +24,7 @@
     "buildMaterials": "node ./scripts/buildMaterials.mjs"
   },
   "devDependencies": {
-    "esbuild": "^0.21.5",
     "@babel/eslint-parser": "^7.21.3",
-    "@esbuild-plugins/node-globals-polyfill": "^0.2.3",
-    "@esbuild-plugins/node-modules-polyfill": "^0.2.2",
     "@types/node": "^18.0.0",
     "@vitejs/plugin-vue": "^4.2.3",
     "@vitejs/plugin-vue-jsx": "^3.1.0",
diff --git a/packages/design-core/package.json b/packages/design-core/package.json
index 0c6a1234d..41fe12f7f 100644
--- a/packages/design-core/package.json
+++ b/packages/design-core/package.json
@@ -107,6 +107,7 @@
     "assert": "^2.0.0",
     "buffer": "^6.0.3",
     "cross-env": "^7.0.3",
+    "esbuild": "^0.21.5",
     "esbuild-plugin-copy": "^2.1.1",
     "eslint": "^8.38.0",
     "eslint-plugin-vue": "^8.0.0",

From fd164a1cd22bb4f60ca988ccc553639f3f0524b6 Mon Sep 17 00:00:00 2001
From: chilingling <26962197+chilingling@users.noreply.github.com>
Date: Mon, 22 Jul 2024 01:28:30 -0700
Subject: [PATCH 08/40] fix(preview): multiple nested blocks cannot preview
 #663 (#665)

---
 .../design-core/src/preview/src/preview/Preview.vue | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/packages/design-core/src/preview/src/preview/Preview.vue b/packages/design-core/src/preview/src/preview/Preview.vue
index 04f797bb0..3a16bb278 100644
--- a/packages/design-core/src/preview/src/preview/Preview.vue
+++ b/packages/design-core/src/preview/src/preview/Preview.vue
@@ -86,11 +86,17 @@ export default {
         .map((name) => fetchBlockSchema(name))
 
       const schemaList = await Promise.allSettled(promiseList)
+      const extraList = []
 
       schemaList.forEach((item) => {
         if (item.status === 'fulfilled' && item.value?.[0]?.content) {
           res.push(item.value[0].content)
-          res.push(...getBlocksSchema(item.value[0].content, blockSet))
+          extraList.push(getBlocksSchema(item.value[0].content, blockSet))
+        }
+      })
+      ;(await Promise.allSettled(extraList)).forEach((item) => {
+        if (item.status === 'fulfilled' && item.value) {
+          res.push(...item.value)
         }
       })
 
@@ -136,11 +142,10 @@ export default {
         },
         ...(blocks || []).map((blockSchema) => {
           return {
-            panelName: blockSchema.fileName,
+            panelName: `${blockSchema.fileName}.vue`,
             panelValue:
               genSFCWithDefaultPlugin(blockSchema, appData?.componentsMap || [], { blockRelativePath: './' }) || '',
-            panelType: 'vue',
-            index: true
+            panelType: 'vue'
           }
         })
       ]

From a383421c38498c7f78e49343c69e4db689bf615c Mon Sep 17 00:00:00 2001
From: chilingling <26962197+chilingling@users.noreply.github.com>
Date: Tue, 23 Jul 2024 04:10:35 -0700
Subject: [PATCH 09/40] fix(material): add missing componentsMap to mockServer
 (#701)

---
 .../get/app-center/v1/apps/schema/918.json    | 35 +++++++++++++++++++
 packages/design-core/public/mock/bundle.json  | 32 ++++++++---------
 2 files changed, 49 insertions(+), 18 deletions(-)

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 e5351b18e..17656258e 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
@@ -1918,6 +1918,13 @@
         "destructuring": true,
         "version": "0.1.17"
       },
+      {
+        "componentName": "TinyCheckbox",
+        "package": "@opentiny/vue",
+        "exportName": "Checkbox",
+        "destructuring": true,
+        "version": "3.14.0"
+      },
       {
         "componentName": "TinySelect",
         "package": "@opentiny/vue",
@@ -1974,6 +1981,34 @@
         "destructuring": true,
         "version": "0.1.16"
       },
+      {
+        "componentName": "TinyCollapse",
+        "package": "@opentiny/vue",
+        "exportName": "Collapse",
+        "destructuring": true,
+        "version": "3.14.0"
+      },
+      {
+        "componentName": "TinyCollapseItem",
+        "package": "@opentiny/vue",
+        "exportName": "CollapseItem",
+        "destructuring": true,
+        "version": "3.14.0"
+      },
+      {
+        "componentName": "TinyBreadcrumb",
+        "package": "@opentiny/vue",
+        "exportName": "Breadcrumb",
+        "destructuring": true,
+        "version": "3.14.0"
+      },
+      {
+        "componentName": "TinyBreadcrumbItem",
+        "package": "@opentiny/vue",
+        "exportName": "BreadcrumbItem",
+        "destructuring": true,
+        "version": "3.14.0"
+      },
       {
         "componentName": "ElInput",
         "package": "element-plus",
diff --git a/packages/design-core/public/mock/bundle.json b/packages/design-core/public/mock/bundle.json
index 2fa58678f..6a45e5dd0 100644
--- a/packages/design-core/public/mock/bundle.json
+++ b/packages/design-core/public/mock/bundle.json
@@ -23,7 +23,8 @@
             "script": "https://npm.onmicrosoft.cn/element-plus@2.4.2/dist/index.full.mjs",
             "css": "https://npm.onmicrosoft.cn/element-plus@2.4.2/dist/index.css",
             "dependencies": null,
-            "exportName": "ElInput"
+            "exportName": "ElInput",
+            "destructuring": true
           },
           "group": "表单组件",
           "category": "element-plus",
@@ -303,7 +304,8 @@
             "script": "https://npm.onmicrosoft.cn/element-plus@2.4.2/dist/index.full.mjs",
             "css": "https://npm.onmicrosoft.cn/element-plus@2.4.2/dist/index.css",
             "dependencies": null,
-            "exportName": "ElButton"
+            "exportName": "ElButton",
+            "destructuring": true
           },
           "group": "基础组件",
           "category": "element-plus",
@@ -624,6 +626,7 @@
             "script": "https://npm.onmicrosoft.cn/element-plus@2.4.2/dist/index.full.mjs",
             "css": "https://npm.onmicrosoft.cn/element-plus@2.4.2/dist/index.css",
             "dependencies": null,
+            "destructuring": true,
             "exportName": "ElForm"
           },
           "group": "表单组件",
@@ -1081,6 +1084,7 @@
             "script": "https://npm.onmicrosoft.cn/element-plus@2.4.2/dist/index.full.mjs",
             "css": "https://npm.onmicrosoft.cn/element-plus@2.4.2/dist/index.css",
             "dependencies": null,
+            "destructuring": true,
             "exportName": "ElFormItem"
           },
           "group": "表单组件",
@@ -1431,6 +1435,7 @@
             "script": "https://npm.onmicrosoft.cn/element-plus@2.4.2/dist/index.full.mjs",
             "css": "https://npm.onmicrosoft.cn/element-plus@2.4.2/dist/index.css",
             "dependencies": null,
+            "destructuring": true,
             "exportName": "ElTable"
           },
           "group": "数据展示",
@@ -2669,6 +2674,7 @@
             "script": "https://npm.onmicrosoft.cn/element-plus@2.4.2/dist/index.full.mjs",
             "css": "https://npm.onmicrosoft.cn/element-plus@2.4.2/dist/index.css",
             "dependencies": null,
+            "destructuring": true,
             "exportName": "ElTableColumn"
           },
           "group": "表单组件",
@@ -8901,7 +8907,7 @@
           "devMode": "proCode",
           "npm": {
             "package": "@opentiny/vue",
-            "exportName": "Select",
+            "exportName": "Breadcrumb",
             "version": "",
             "destructuring": true
           },
@@ -14007,20 +14013,10 @@
               "schema": {
                 "componentName": "TinyBreadcrumb",
                 "props": {
-                  "options": [
-                    {
-                      "to": "{ path: '/' }",
-                      "label": "首页"
-                    },
-                    {
-                      "to": "{ path: '/breadcrumb' }",
-                      "label": "产品"
-                    },
-                    {
-                      "replace": "true",
-                      "label": "软件"
-                    }
-                  ]
+                  "options": {
+                    "type": "JSExpression",
+                    "value": "[{to: { path: '/' },label: '首页'},{to: { path: '/breadcrumb' },label: '产品'},{'replace': true,'label': '软件'}]"
+                  }
                 }
               }
             },
@@ -14275,7 +14271,7 @@
               "schema": {
                 "componentName": "TinyTimeLine",
                 "props": {
-                  "active": "2",
+                  "active": 2,
                   "data": [
                     {
                       "name": "已下单"

From 0d36f2d34409173731a8a1a7620ca91cc94eea83 Mon Sep 17 00:00:00 2001
From: chilingling <26962197+chilingling@users.noreply.github.com>
Date: Sun, 28 Jul 2024 23:36:18 -0700
Subject: [PATCH 10/40] fix(setting): fix bindEvent dialog visible can't work
 on tinyvue 3.17 (#715)

---
 packages/settings/events/src/components/BindEventsDialog.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/settings/events/src/components/BindEventsDialog.vue b/packages/settings/events/src/components/BindEventsDialog.vue
index e7fbc838e..079f2e8d2 100644
--- a/packages/settings/events/src/components/BindEventsDialog.vue
+++ b/packages/settings/events/src/components/BindEventsDialog.vue
@@ -1,6 +1,6 @@
 <template>
   <tiny-dialog-box
-    v-show="dialogVisible"
+    :visible="dialogVisible"
     title="事件绑定"
     width="50%"
     :append-to-body="true"

From 3a204624af39d68d365a1a24e1c4dfb3ce7368ce Mon Sep 17 00:00:00 2001
From: wenmine <wwmmail@foxmail.com>
Date: Tue, 6 Aug 2024 14:54:32 +0800
Subject: [PATCH 11/40] feat(download-code): support download zip for not
 support browsers (#703)

* feat(download-code): support download zip for not support browsers

* feat(download-code): support download zip for not support browsers - review

* feat(download-code): support download zip for not support browsers - review
---
 packages/design-core/package.json |  1 -
 packages/utils/package.json       |  4 +-
 packages/utils/src/fs/fszip.js    | 67 +++++++++++++++++++++++++++++++
 packages/utils/src/fs/index.js    | 45 +++++++++++++++------
 4 files changed, 102 insertions(+), 15 deletions(-)
 create mode 100644 packages/utils/src/fs/fszip.js

diff --git a/packages/design-core/package.json b/packages/design-core/package.json
index 41fe12f7f..8294b9030 100644
--- a/packages/design-core/package.json
+++ b/packages/design-core/package.json
@@ -89,7 +89,6 @@
     "eslint-linter-browserify": "8.57.0",
     "file-saver": "^2.0.5",
     "html2canvas": "^1.4.1",
-    "jszip": "^3.10.1",
     "monaco-editor": "0.33.0",
     "prettier": "2.7.1",
     "sortablejs": "^1.14.0",
diff --git a/packages/utils/package.json b/packages/utils/package.json
index 1e19faed8..afebc991b 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -30,7 +30,9 @@
     "vite": "^4.3.7",
     "vitest": "^1.4.0"
   },
-  "dependencies": {},
+  "dependencies": {
+    "jszip": "^3.10.1"
+  },
   "peerDependencies": {
     "@opentiny/vue-renderless": "^3.14.0",
     "vue": "^3.4.15"
diff --git a/packages/utils/src/fs/fszip.js b/packages/utils/src/fs/fszip.js
new file mode 100644
index 000000000..4efca735d
--- /dev/null
+++ b/packages/utils/src/fs/fszip.js
@@ -0,0 +1,67 @@
+/**
+ * Copyright (c) 2023 - present TinyEngine Authors.
+ * Copyright (c) 2023 - present Huawei Cloud Computing Technologies Co., Ltd.
+ *
+ * Use of this source code is governed by an MIT-style license.
+ *
+ * THE OPEN SOURCE SOFTWARE IN THIS PRODUCT IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL,
+ * BUT WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR FITNESS FOR
+ * A PARTICULAR PURPOSE. SEE THE APPLICABLE LICENSES FOR MORE DETAILS.
+ *
+ */
+
+// browser File System Access API encapsulation
+import JSZIP from 'jszip'
+
+/**
+ * 下载文件到本地
+ * @param {Blob} blobData 文件二进制数据
+ * @param {string} fileName 文件名
+ */
+export function saveAs(blobData, fileName) {
+  const zipLink = document.createElement('a')
+  zipLink.download = fileName
+  zipLink.style.display = 'none'
+  zipLink.href = URL.createObjectURL(blobData)
+  document.body.appendChild(zipLink)
+  zipLink.click()
+  document.body.removeChild(zipLink)
+}
+
+/**
+ * 创建一个zip
+ */
+export const createZip = () => {
+  return new JSZIP()
+}
+
+/**
+ * 往zip里面写入文件夹和文件
+ * @param {Array<FileInfo>} filesInfo 文件信息
+ *          FileInfo.filePath 文件相对路径，以'/'相连
+ *          FileInfo.fileContent 文件内容
+ * @param {ZipExtraInfo} ZipExtraInfo zip额外信息
+ *  {string} zipName 打出来的zip名称
+ *  {JSZIP} zipHandle 创建好的zip句柄，可以不传，不传就用新的
+ */
+export const writeZip = (filesInfo, { zipHandle, zipName } = {}) => {
+  let zip = zipHandle
+  if (!zipHandle) {
+    zip = createZip()
+  }
+  filesInfo.forEach(({ filePath, fileContent }) => {
+    const file = filePath.split('/')
+    const fileName = file.pop()
+    const path = file.join('/')
+    if (path) {
+      zip.folder(path).file(fileName, fileContent)
+    } else {
+      zip.file(fileName, fileContent)
+    }
+  })
+  // 把打包的内容异步转成blob二进制格式
+  return zip.generateAsync({ type: 'blob' }).then((content) => {
+    // content就是blob数据
+    saveAs(content, `${zipName}.zip`)
+  })
+}
diff --git a/packages/utils/src/fs/index.js b/packages/utils/src/fs/index.js
index 2cb2bf54a..26b5656ea 100644
--- a/packages/utils/src/fs/index.js
+++ b/packages/utils/src/fs/index.js
@@ -1,17 +1,23 @@
 /**
-* Copyright (c) 2023 - present TinyEngine Authors.
-* Copyright (c) 2023 - present Huawei Cloud Computing Technologies Co., Ltd.
-*
-* Use of this source code is governed by an MIT-style license.
-*
-* THE OPEN SOURCE SOFTWARE IN THIS PRODUCT IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL,
-* BUT WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR FITNESS FOR
-* A PARTICULAR PURPOSE. SEE THE APPLICABLE LICENSES FOR MORE DETAILS.
-*
-*/
+ * Copyright (c) 2023 - present TinyEngine Authors.
+ * Copyright (c) 2023 - present Huawei Cloud Computing Technologies Co., Ltd.
+ *
+ * Use of this source code is governed by an MIT-style license.
+ *
+ * THE OPEN SOURCE SOFTWARE IN THIS PRODUCT IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL,
+ * BUT WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR FITNESS FOR
+ * A PARTICULAR PURPOSE. SEE THE APPLICABLE LICENSES FOR MORE DETAILS.
+ *
+ */
 
 // browser File System Access API encapsulation
 
+import { createZip, writeZip } from './fszip'
+
+// 支持file system api的条件：存在这个方法 && 不处于iframe中
+export const isSupportFileSystemAccess =
+  Object.prototype.hasOwnProperty.call(window, 'showDirectoryPicker') && window.self === window.top
+
 /**
  * 获取用户选择并授权的文件夹根路径
  * @param {*} options
@@ -20,7 +26,7 @@
  */
 export const getUserBaseDirHandle = async (options = {}) => {
   if (!window.showOpenFilePicker) {
-    throw new Error('不支持的浏览器!')
+    return createZip()
   }
   const dirHandle = await window.showDirectoryPicker({ mode: 'readwrite', ...options })
   return dirHandle
@@ -166,16 +172,29 @@ export const writeFile = async (handle, { filePath, fileContent }) => {
  * @param {Array<FileInfo>} filesInfo 文件信息
  *          FileInfo.filePath 文件相对路径
  *          FileInfo.fileContent 文件内容
+ * @param {Boolean} supportZipCache 是否支持zip缓存，zip缓存可能会导致文件不能及时更新，默认不缓存
+ *
  */
-export const writeFiles = async (baseDirHandle, filesInfo) => {
+export const writeFiles = async (
+  baseDirHandle,
+  filesInfo,
+  zipName = 'tiny-engine-generate-code',
+  supportZipCache = false
+) => {
   if (!filesInfo?.length) {
     return
   }
 
+  if (!isSupportFileSystemAccess) {
+    const zipInfo = { zipName, zipHandle: supportZipCache && baseDirHandle }
+    await writeZip(filesInfo, zipInfo)
+    return
+  }
+
   let directoryHandle = baseDirHandle
   if (!directoryHandle) {
     directoryHandle = await window.showDirectoryPicker({ mode: 'readwrite' })
   }
 
-  await Promise.all(filesInfo.map((fileInfo) => writeFile(baseDirHandle, fileInfo)))
+  await Promise.all(filesInfo.map((fileInfo) => writeFile(directoryHandle, fileInfo)))
 }

From a442108e2b279a7c34f791342b2aa6afe842db36 Mon Sep 17 00:00:00 2001
From: Hexqi <wu_12556@126.com>
Date: Wed, 7 Aug 2024 09:42:28 +0800
Subject: [PATCH 12/40] docs: update milestone (#728)

* docs: update milestone

* fix: tab
---
 README.md       | 6 +++---
 README.zh-CN.md | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 57af470d1..37515208c 100644
--- a/README.md
+++ b/README.md
@@ -88,9 +88,9 @@ gantt
 dateFormat YYYY-MM-DD
 axisFormat %Y-%m-%d
 
-	1.0.0-beta.x version	:active,2023-09-25, 2024-03-31
-	1.0.0-rc	version    :       2024-04-01, 2024-06-30
-	1.0.0 version   :          2024-07-01, 2024-07-31
+1.0.0-beta.x version : 2023-09-25, 2024-05-20
+1.0.0-rc version(refactor version) : 2024-10-01
+1.0.0 version : 2024-11-01
 
 ```
 
diff --git a/README.zh-CN.md b/README.zh-CN.md
index 747f286c8..636ad668c 100644
--- a/README.zh-CN.md
+++ b/README.zh-CN.md
@@ -84,13 +84,13 @@ pnpm run build:alpha  或 build:prod
 ## 里程碑
 
 ```mermaid
-gantt
+gantt 
 dateFormat YYYY-MM-DD
 axisFormat %Y-%m-%d
 
-	1.0.0-beta.x version	:active,2023-09-25, 2024-03-31
-	1.0.0-rc	version    :       2024-04-01, 2024-06-30
-	1.0.0 version   :          2024-07-01, 2024-07-31
+1.0.0-beta.x version : 2023-09-25, 2024-05-20
+1.0.0-rc version(refactor version) : 2024-10-01
+1.0.0 version : 2024-11-01
 
 ```
 

From 1ed91983b0d352b0d7e23a0fd70fca45c2002939 Mon Sep 17 00:00:00 2001
From: chilingling <26962197+chilingling@users.noreply.github.com>
Date: Tue, 13 Aug 2024 10:14:56 +0800
Subject: [PATCH 13/40] fix: abaolute canvas init inlineStyle should be string
 (#730)

---
 packages/canvas/src/components/container/container.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/canvas/src/components/container/container.js b/packages/canvas/src/components/container/container.js
index 333db29a8..89e6c3c8a 100644
--- a/packages/canvas/src/components/container/container.js
+++ b/packages/canvas/src/components/container/container.js
@@ -716,11 +716,7 @@ export const onMouseUp = () => {
       if (absolute) {
         targetNode.node = getSchema()
         data.props = data.props || {}
-        data.props.style = {
-          position: 'absolute',
-          top: dragState.mouse.y + 'px',
-          left: dragState.mouse.x + 'px'
-        }
+        data.props.style = `position: absolute; top: ${dragState.mouse.y}px; left: ${dragState.mouse.x}px`
       }
 
       insertNode(targetNode, position)

From 59eaf035bbb6117c46747ac6a09aa1d18d55eac3 Mon Sep 17 00:00:00 2001
From: wenmine <wwmmail@foxmail.com>
Date: Fri, 16 Aug 2024 10:30:47 +0800
Subject: [PATCH 14/40] fix(download): Optimize download logic and adapt to
 iframe (#739)

* fix(download): Optimize download logic and adapt to iframe
---
 packages/utils/src/fs/fszip.js | 14 +++++++-------
 packages/utils/src/fs/index.js |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/utils/src/fs/fszip.js b/packages/utils/src/fs/fszip.js
index 4efca735d..d97654081 100644
--- a/packages/utils/src/fs/fszip.js
+++ b/packages/utils/src/fs/fszip.js
@@ -19,13 +19,13 @@ import JSZIP from 'jszip'
  * @param {string} fileName 文件名
  */
 export function saveAs(blobData, fileName) {
-  const zipLink = document.createElement('a')
-  zipLink.download = fileName
-  zipLink.style.display = 'none'
-  zipLink.href = URL.createObjectURL(blobData)
-  document.body.appendChild(zipLink)
-  zipLink.click()
-  document.body.removeChild(zipLink)
+  const downloadLink = document.createElement('a')
+  downloadLink.download = fileName
+  downloadLink.style.display = 'none'
+  downloadLink.href = URL.createObjectURL(blobData)
+  document.body.appendChild(downloadLink)
+  downloadLink.click()
+  document.body.removeChild(downloadLink)
 }
 
 /**
diff --git a/packages/utils/src/fs/index.js b/packages/utils/src/fs/index.js
index 26b5656ea..ecf7ecc73 100644
--- a/packages/utils/src/fs/index.js
+++ b/packages/utils/src/fs/index.js
@@ -25,7 +25,7 @@ export const isSupportFileSystemAccess =
  * @returns dirHandle 目录句柄
  */
 export const getUserBaseDirHandle = async (options = {}) => {
-  if (!window.showOpenFilePicker) {
+  if (!isSupportFileSystemAccess) {
     return createZip()
   }
   const dirHandle = await window.showDirectoryPicker({ mode: 'readwrite', ...options })
@@ -81,8 +81,8 @@ export async function getFileHandle(baseDirHandle, filePath, { create = false }
  * @returns fileHandle 文件句柄
  */
 export const getUserFileHandle = async (options = {}) => {
-  if (!window.showOpenFilePicker) {
-    throw new Error('不支持的浏览器!')
+  if (!isSupportFileSystemAccess) {
+    throw new Error('不支持的浏览器或处于iframe中')
   }
   const [fileHandle] = await window.showOpenFilePicker({ mode: 'readwrite', ...options })
   return fileHandle

From 871463f1859fb922c4d63099201aec920d191055 Mon Sep 17 00:00:00 2001
From: chilingling <26962197+chilingling@users.noreply.github.com>
Date: Sat, 24 Aug 2024 20:46:37 +0800
Subject: [PATCH 15/40] feat(cdn): change cdn from onmicrosoft to unpkg (#750)

---
 .../vite.config.js                            |  2 +-
 packages/design-core/.env.alpha               |  2 +-
 packages/design-core/.env.development         |  2 +-
 packages/design-core/.env.prod                |  2 +-
 packages/design-core/public/mock/bundle.json  | 24 +++++++++----------
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/packages/blockToWebComponentTemplate/vite.config.js b/packages/blockToWebComponentTemplate/vite.config.js
index ddbf655c3..9ad6a1861 100644
--- a/packages/blockToWebComponentTemplate/vite.config.js
+++ b/packages/blockToWebComponentTemplate/vite.config.js
@@ -43,7 +43,7 @@ export default defineConfig(({ command, mode }) => {
   }
 
   const vuePluginConfig = {}
-  const styleLinks = ['https://npm.onmicrosoft.cn/@opentiny/vue-theme@3.14/index.css']
+  const styleLinks = ['https://unpkg.com/@opentiny/vue-theme@3.14/index.css']
 
   config.publicDir = false
 
diff --git a/packages/design-core/.env.alpha b/packages/design-core/.env.alpha
index 1816a0471..6cd7ceea6 100644
--- a/packages/design-core/.env.alpha
+++ b/packages/design-core/.env.alpha
@@ -1,7 +1,7 @@
 # alpha mode, used by the "build:alpha" script
 
 NODE_ENV=production
-VITE_CDN_DOMAIN=https://npm.onmicrosoft.cn
+VITE_CDN_DOMAIN=https://unpkg.com
 VITE_LOCAL_IMPORT_MAPS=false
 VITE_LOCAL_BUNDLE_DEPS=false
 # VITE_ORIGIN=
diff --git a/packages/design-core/.env.development b/packages/design-core/.env.development
index 98c505478..e02fbee0f 100644
--- a/packages/design-core/.env.development
+++ b/packages/design-core/.env.development
@@ -1,7 +1,7 @@
 # development mode, used by the "vite" command
 
 NODE_ENV=development
-VITE_CDN_DOMAIN=https://npm.onmicrosoft.cn
+VITE_CDN_DOMAIN=https://unpkg.com
 VITE_LOCAL_IMPORT_MAPS=false
 VITE_LOCAL_BUNDLE_DEPS=false
 # request data via alpha service
diff --git a/packages/design-core/.env.prod b/packages/design-core/.env.prod
index 04b27fbc3..8768ec32c 100644
--- a/packages/design-core/.env.prod
+++ b/packages/design-core/.env.prod
@@ -1,7 +1,7 @@
 # prod mode, used by the "build:prod" script
 
 NODE_ENV=production
-VITE_CDN_DOMAIN=https://npm.onmicrosoft.cn
+VITE_CDN_DOMAIN=https://unpkg.com
 VITE_LOCAL_IMPORT_MAPS=false
 VITE_LOCAL_BUNDLE_DEPS=false
 #VITE_ORIGIN=
diff --git a/packages/design-core/public/mock/bundle.json b/packages/design-core/public/mock/bundle.json
index 6a45e5dd0..1405e91bd 100644
--- a/packages/design-core/public/mock/bundle.json
+++ b/packages/design-core/public/mock/bundle.json
@@ -20,8 +20,8 @@
           "npm": {
             "package": "element-plus",
             "version": "2.4.2",
-            "script": "https://npm.onmicrosoft.cn/element-plus@2.4.2/dist/index.full.mjs",
-            "css": "https://npm.onmicrosoft.cn/element-plus@2.4.2/dist/index.css",
+            "script": "https://unpkg.com/element-plus@2.4.2/dist/index.full.mjs",
+            "css": "https://unpkg.com/element-plus@2.4.2/dist/index.css",
             "dependencies": null,
             "exportName": "ElInput",
             "destructuring": true
@@ -301,8 +301,8 @@
           "npm": {
             "package": "element-plus",
             "version": "2.4.2",
-            "script": "https://npm.onmicrosoft.cn/element-plus@2.4.2/dist/index.full.mjs",
-            "css": "https://npm.onmicrosoft.cn/element-plus@2.4.2/dist/index.css",
+            "script": "https://unpkg.com/element-plus@2.4.2/dist/index.full.mjs",
+            "css": "https://unpkg.com/element-plus@2.4.2/dist/index.css",
             "dependencies": null,
             "exportName": "ElButton",
             "destructuring": true
@@ -623,8 +623,8 @@
           "npm": {
             "package": "element-plus",
             "version": "2.4.2",
-            "script": "https://npm.onmicrosoft.cn/element-plus@2.4.2/dist/index.full.mjs",
-            "css": "https://npm.onmicrosoft.cn/element-plus@2.4.2/dist/index.css",
+            "script": "https://unpkg.com/element-plus@2.4.2/dist/index.full.mjs",
+            "css": "https://unpkg.com/element-plus@2.4.2/dist/index.css",
             "dependencies": null,
             "destructuring": true,
             "exportName": "ElForm"
@@ -1081,8 +1081,8 @@
           "npm": {
             "package": "element-plus",
             "version": "2.4.2",
-            "script": "https://npm.onmicrosoft.cn/element-plus@2.4.2/dist/index.full.mjs",
-            "css": "https://npm.onmicrosoft.cn/element-plus@2.4.2/dist/index.css",
+            "script": "https://unpkg.com/element-plus@2.4.2/dist/index.full.mjs",
+            "css": "https://unpkg.com/element-plus@2.4.2/dist/index.css",
             "dependencies": null,
             "destructuring": true,
             "exportName": "ElFormItem"
@@ -1432,8 +1432,8 @@
           "npm": {
             "package": "element-plus",
             "version": "2.4.2",
-            "script": "https://npm.onmicrosoft.cn/element-plus@2.4.2/dist/index.full.mjs",
-            "css": "https://npm.onmicrosoft.cn/element-plus@2.4.2/dist/index.css",
+            "script": "https://unpkg.com/element-plus@2.4.2/dist/index.full.mjs",
+            "css": "https://unpkg.com/element-plus@2.4.2/dist/index.css",
             "dependencies": null,
             "destructuring": true,
             "exportName": "ElTable"
@@ -2671,8 +2671,8 @@
           "npm": {
             "package": "element-plus",
             "version": "2.4.2",
-            "script": "https://npm.onmicrosoft.cn/element-plus@2.4.2/dist/index.full.mjs",
-            "css": "https://npm.onmicrosoft.cn/element-plus@2.4.2/dist/index.css",
+            "script": "https://unpkg.com/element-plus@2.4.2/dist/index.full.mjs",
+            "css": "https://unpkg.com/element-plus@2.4.2/dist/index.css",
             "dependencies": null,
             "destructuring": true,
             "exportName": "ElTableColumn"

From c2187245436bedace094f6a194d5d919a337e601 Mon Sep 17 00:00:00 2001
From: Gene <Pacify.98@gmail.com>
Date: Sat, 24 Aug 2024 21:43:53 +0800
Subject: [PATCH 16/40] =?UTF-8?q?fix:=20=E9=9A=90=E8=97=8F=E7=94=BB?=
 =?UTF-8?q?=E5=B8=83=E6=A0=B9=E8=8A=82=E7=82=B9=E7=9A=84=E5=8C=85=E8=A3=B9?=
 =?UTF-8?q?=E5=85=83=E7=B4=A0=E7=9A=84=E6=93=8D=E4=BD=9C=E9=80=89=E9=A1=B9?=
 =?UTF-8?q?=20(#492)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/canvas/src/components/container/CanvasAction.vue | 5 ++++-
 packages/canvas/src/components/render/RenderMain.js       | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/canvas/src/components/container/CanvasAction.vue b/packages/canvas/src/components/container/CanvasAction.vue
index c5d6a66aa..ec2164da0 100644
--- a/packages/canvas/src/components/container/CanvasAction.vue
+++ b/packages/canvas/src/components/container/CanvasAction.vue
@@ -229,7 +229,10 @@ export default {
     }
 
     const showAction = computed(() => {
-      const { parent } = getCurrent()
+      const { schema, parent } = getCurrent()
+      if (schema?.props?.['data-id'] === 'root-container') {
+        return false
+      }
       return !props.resize && parent && parent?.type !== 'JSSlot'
     })
 
diff --git a/packages/canvas/src/components/render/RenderMain.js b/packages/canvas/src/components/render/RenderMain.js
index 6081d487e..93a39622b 100644
--- a/packages/canvas/src/components/render/RenderMain.js
+++ b/packages/canvas/src/components/render/RenderMain.js
@@ -379,7 +379,8 @@ export default {
     // 渲染画布增加根节点，与出码和预览保持一致
     const rootChildrenSchema = {
       componentName: 'div',
-      props: schema.props,
+      // 手动添加一个唯一的属性，后续在画布选中此节点时方便处理额外的逻辑。由于没有修改schema，不会影响出码
+      props: { ...schema.props, 'data-id': 'root-container' },
       children: schema.children
     }
 

From 76c23b767b8eeb3c6880d29e47f5300f836b7a31 Mon Sep 17 00:00:00 2001
From: yaoyun8 <142570291+yaoyun8@users.noreply.github.com>
Date: Sat, 24 Aug 2024 06:46:45 -0700
Subject: [PATCH 17/40] fix(script): translate log (#549)

* fix: translate log

* Update scripts/connection.mjs

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update scripts/connection.mjs

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update scripts/connection.mjs

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

---------

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
---
 scripts/buildMaterials.mjs | 22 +++++++++++-----------
 scripts/connection.mjs     | 24 ++++++++++++------------
 scripts/splitMaterials.mjs |  4 ++--
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/scripts/buildMaterials.mjs b/scripts/buildMaterials.mjs
index 100636460..dd6e4e9f7 100644
--- a/scripts/buildMaterials.mjs
+++ b/scripts/buildMaterials.mjs
@@ -40,13 +40,13 @@ const validateComponent = (file, component) => {
   const requiredList = requiredFields.filter((field) => !fields.includes(field))
 
   if (requiredList.length) {
-    logger.error(`组件文件 ${file} 缺少必要字段：${requiredList.join('、')}。`)
+    logger.error(`missing required fields: ${requiredList.join(',')} at ${file}.`)
 
     return false
   }
 
   if (!component.npm) {
-    logger.warn(`组件文件 ${file} 缺少 npm 字段，出码时将不能通过import语句导入组件。`)
+    logger.warn(`missing the \`npm\` field, and it cannot be imported when coding at ${file}.`)
 
     return false
   }
@@ -66,7 +66,7 @@ const validateBlock = (file, block) => {
   const requiredList = requiredFields.filter((field) => !fields.includes(field))
 
   if (requiredList.length) {
-    logger.error(`区块文件 ${file} 缺少必要字段：${requiredList.join('、')}。`)
+    logger.error(`missing required fields: ${requiredList.join(',')} at ${file}.`)
 
     return false
   }
@@ -84,7 +84,7 @@ const generateComponents = () => {
   try {
     fg([`${materialsDir}/**/*.json`]).then((files) => {
       if (!files.length) {
-        logger.warn('物料文件夹为空，请先执行`pnpm splitMaterials`命令拆分物料资产包')
+        logger.warn('please execute `pnpm splitMaterials` first to split the materials.')
       }
 
       const bundle = {
@@ -108,7 +108,7 @@ const generateComponents = () => {
         if (!material) {
           const fileFullPath = path.join(process.cwd(), file)
 
-          logger.error(`文件格式有误 (${fileFullPath})`)
+          logger.error(`incorrect file format at ${fileFullPath}.`)
 
           return
         }
@@ -178,9 +178,9 @@ const generateComponents = () => {
       write(bundle)
     })
 
-    logger.success('物料资产包构建成功')
+    logger.success('materials built.')
   } catch (error) {
-    logger.error(`物料资产包构建失败：${error}`)
+    logger.error(`failed to build materials: ${error}.`)
   }
 }
 
@@ -189,13 +189,13 @@ const watcher = chokidar.watch(`${materialsDir}/**/*.json`, { ignoreInitial: tru
 
 watcher.on('all', (event, file) => {
   const eventMap = {
-    add: '新增',
-    change: '更新',
-    unlink: '删除'
+    add: 'added',
+    change: 'changed',
+    unlink: 'deleted'
   }
   const fileFullPath = path.join(process.cwd(), file)
 
-  logger.info(`${eventMap[event]}组件文件 (${fileFullPath})`)
+  logger.info(`${fileFullPath} ${eventMap[event]}, rebuilding materials...`)
 
   // 监听物料文件变化，更新物料资产包
   generateComponents()
diff --git a/scripts/connection.mjs b/scripts/connection.mjs
index 016f85689..a06c5623e 100644
--- a/scripts/connection.mjs
+++ b/scripts/connection.mjs
@@ -38,10 +38,10 @@ class MysqlConnection {
     return new Promise((resolve, reject) => {
       this.connection.connect((error) => {
         if (error) {
-          logger.warn('未能连接到数据库，请查看数据库配置是否正确')
+          logger.warn('unable to connect to the database, please check the database configuration is correct.')
           reject()
         } else {
-          logger.success('数据库连接成功')
+          logger.success('database connected.')
           this.connected = true
           resolve()
         }
@@ -100,11 +100,11 @@ class MysqlConnection {
    * @returns boolean 校验组件字段是否失败，false-有字段出错
    */
   isValid(component, file) {
-    const longtextFields = ['name', 'npm', 'snippets', 'schema_fragment', 'configure', 'component_metadata']
+    const longTextFields = ['name', 'npm', 'snippets', 'schema_fragment', 'configure', 'component_metadata']
 
     return Object.entries(component).every(([key, value]) => {
-      if (longtextFields.includes(key) && value !== null && typeof value !== 'object') {
-        logger.error(`"${key}" 的值不是有效的JSON (${file})`)
+      if (longTextFields.includes(key) && value !== null && typeof value !== 'object') {
+        logger.error(`the value of "${key}" is not valid JSON at ${file}.`)
 
         return false
       }
@@ -193,10 +193,10 @@ class MysqlConnection {
 
     this.query(sqlContent, component.component)
       .then(() => {
-        logger.success(`组件 ${component.component} 数据更新成功`)
+        logger.success(`${component.component} updated.`)
       })
       .catch((error) => {
-        logger.error(`组件 ${component.component} 数据更新失败 ${error}`)
+        logger.error(`failed to update ${component.component}: ${error}.`)
       })
   }
 
@@ -322,11 +322,11 @@ class MysqlConnection {
       .then((result) => {
         const id = result.insertId
 
-        logger.success(`组件 ${component.component} 数据新增成功`)
+        logger.success(`${component.component} added.`)
         this.relationMaterialHistory(id)
       })
       .catch((error) => {
-        logger.success(`组件 ${component.component} 数据新增失败：${error}`)
+        logger.error(`add ${component.component} failed：${error}.`)
       })
   }
 
@@ -344,7 +344,7 @@ class MysqlConnection {
         }
       })
       .catch((error) => {
-        logger.success(`查询组件 ${component.component} 失败：${error}`)
+        logger.error(`query ${component.component} failed：${error}.`)
       })
   }
 
@@ -395,11 +395,11 @@ class MysqlConnection {
     return new Promise((resolve, reject) => {
       this.query(sqlContent)
         .then((result) => {
-          logger.success(`表 ${componentsTableName} 创建成功`)
+          logger.success(`table ${componentsTableName} created.`)
           resolve(result)
         })
         .catch((error) => {
-          logger.success(`表 ${componentsTableName} 创建失败：${error}`)
+          logger.error(`create table ${componentsTableName} failed：${error}.`)
           reject(error)
         })
     })
diff --git a/scripts/splitMaterials.mjs b/scripts/splitMaterials.mjs
index e81143c0b..867fb73d7 100644
--- a/scripts/splitMaterials.mjs
+++ b/scripts/splitMaterials.mjs
@@ -51,9 +51,9 @@ const splitMaterials = () => {
       fs.outputJsonSync(blockPath, block, { spaces: 2 })
     })
 
-    logger.success('拆分物料资产包完成')
+    logger.success('materials splitted.')
   } catch (error) {
-    logger.error(`拆分物料资产包失败： ${error}`)
+    logger.error(`failed to split materials: ${error}.`)
   }
 }
 

From c35c34e03672f2e6db0885e2bd0756dc5238d09e Mon Sep 17 00:00:00 2001
From: chilingling <26962197+chilingling@users.noreply.github.com>
Date: Tue, 3 Sep 2024 15:02:37 +0800
Subject: [PATCH 18/40] fix: reset spacing cannot generate correct source code
 (#657)

---
 .../styles/src/components/spacing/SpacingGroup.vue     |  2 +-
 .../styles/src/components/spacing/SpacingSetting.vue   | 10 +++++-----
 packages/settings/styles/src/js/parser.js              |  6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/settings/styles/src/components/spacing/SpacingGroup.vue b/packages/settings/styles/src/components/spacing/SpacingGroup.vue
index 9379bcee4..aee7a1792 100644
--- a/packages/settings/styles/src/components/spacing/SpacingGroup.vue
+++ b/packages/settings/styles/src/components/spacing/SpacingGroup.vue
@@ -429,7 +429,7 @@ export default {
 
         properties[name] = {
           value,
-          text: value === 'auto' ? 'auto' : String(Number.parseInt(value || 0)), // 界面 box 中显示的数值
+          text: value === 'auto' ? 'auto' : String(Number.parseInt(value) || 0), // 界面 box 中显示的数值
           setting: Boolean(value) // 属性是否已设置值
         }
       })
diff --git a/packages/settings/styles/src/components/spacing/SpacingSetting.vue b/packages/settings/styles/src/components/spacing/SpacingSetting.vue
index af11937bd..1e950ae87 100644
--- a/packages/settings/styles/src/components/spacing/SpacingSetting.vue
+++ b/packages/settings/styles/src/components/spacing/SpacingSetting.vue
@@ -61,6 +61,10 @@ export default {
       props.property.value?.indexOf('px') > -1 ? Number.parseInt(props.property.value) : props.property.value
     )
 
+    const updateStyle = (value) => {
+      emit('update', { [props.property.name]: value })
+    }
+
     const sliderChange = () => {
       if (sliderFlag) {
         updateStyle(`${sliderValue.value}px`)
@@ -83,11 +87,7 @@ export default {
 
     const reset = () => {
       sliderFlag = false
-      updateStyle('')
-    }
-
-    const updateStyle = (value) => {
-      emit('update', { [props.property.name]: value })
+      updateStyle(null)
     }
 
     const inputChange = (property) => {
diff --git a/packages/settings/styles/src/js/parser.js b/packages/settings/styles/src/js/parser.js
index b56a9f668..ee54e7d82 100644
--- a/packages/settings/styles/src/js/parser.js
+++ b/packages/settings/styles/src/js/parser.js
@@ -231,7 +231,7 @@ export const stringify = (originParseList, styleObject, config = {}) => {
         if (key.includes('comment')) {
           str += `${value.value}\n`
         } else {
-          str += `${key}: ${value.value};\n`
+          str += `${key}: ${value.value === '' ? "''" : value.value};\n`
         }
       }
     } else {
@@ -249,7 +249,7 @@ export const stringify = (originParseList, styleObject, config = {}) => {
       // 在 styleObject  的，可能有改动，所以需要用 styleObject 拼接
       for (const [key, value] of Object.entries(styleObject[item.selectors].rules)) {
         if (![null, undefined].includes(value)) {
-          str += `${key}: ${value};\n`
+          str += `${key}: ${value === '' ? "''" : value};\n`
         }
       }
     }
@@ -266,7 +266,7 @@ export const stringify = (originParseList, styleObject, config = {}) => {
     str += `${selector} {\n`
 
     for (const [declKey, declValue] of Object.entries(value.rules)) {
-      str += `${declKey}: ${declValue};\n`
+      str += `${declKey}: ${declValue === '' ? "''" : declValue};\n`
     }
 
     str += '}\n'

From 9ccfc9fa8a947710dc17e77485bdc0aa298fd230 Mon Sep 17 00:00:00 2001
From: chilingling <26962197+chilingling@users.noreply.github.com>
Date: Wed, 4 Sep 2024 20:39:49 -0700
Subject: [PATCH 19/40] fix: jsx slot modelvalue can't update value (#734)

* fix: jsx slot modelvalue can't update value

* fix: add unit test for updateModel event
---
 packages/vue-generator/.eslintrc.cjs          |   5 +-
 .../src/generator/vue/sfc/genSetupSFC.js      |   4 +-
 .../generator/vue/sfc/generateAttribute.js    |  25 +++
 .../sfc/slotModelValue/components-map.json    |  23 +++
 .../expected/slotModelValueTest.vue           |  96 +++++++++++
 .../sfc/slotModelValue/page.schema.json       | 150 ++++++++++++++++++
 .../sfc/slotModelValue/slotModel.test.js      |  12 ++
 7 files changed, 313 insertions(+), 2 deletions(-)
 create mode 100644 packages/vue-generator/test/testcases/sfc/slotModelValue/components-map.json
 create mode 100644 packages/vue-generator/test/testcases/sfc/slotModelValue/expected/slotModelValueTest.vue
 create mode 100644 packages/vue-generator/test/testcases/sfc/slotModelValue/page.schema.json
 create mode 100644 packages/vue-generator/test/testcases/sfc/slotModelValue/slotModel.test.js

diff --git a/packages/vue-generator/.eslintrc.cjs b/packages/vue-generator/.eslintrc.cjs
index 0131b38e3..94ab4fed2 100644
--- a/packages/vue-generator/.eslintrc.cjs
+++ b/packages/vue-generator/.eslintrc.cjs
@@ -1,3 +1,5 @@
+const { rules } = require('../../.eslintrc')
+
 /* eslint-env node */
 require('@rushstack/eslint-patch/modern-module-resolution')
 
@@ -17,5 +19,6 @@ module.exports = {
     }
   },
   // 忽略 expected 中的内容
-  ignorePatterns: ['**/**/expected/*', '**/**.ts']
+  ignorePatterns: ['**/**/expected/*', '**/**.ts'],
+  rules
 }
diff --git a/packages/vue-generator/src/generator/vue/sfc/genSetupSFC.js b/packages/vue-generator/src/generator/vue/sfc/genSetupSFC.js
index 29d07a55d..ff8ac1a53 100644
--- a/packages/vue-generator/src/generator/vue/sfc/genSetupSFC.js
+++ b/packages/vue-generator/src/generator/vue/sfc/genSetupSFC.js
@@ -19,7 +19,8 @@ import {
   handleI18nAttrHook,
   handleObjBindAttrHook,
   handleEventAttrHook,
-  handleTinyIconPropsHook
+  handleTinyIconPropsHook,
+  handleJsxModelValueUpdate
 } from './generateAttribute'
 import {
   GEN_SCRIPT_HOOKS,
@@ -213,6 +214,7 @@ export const genSFCWithDefaultPlugin = (schema, componentsMap, config = {}) => {
 
   const defaultAttributeHook = [
     handleTinyGrid,
+    handleJsxModelValueUpdate,
     handleConditionAttrHook,
     handleLoopAttrHook,
     handleSlotBindAttrHook,
diff --git a/packages/vue-generator/src/generator/vue/sfc/generateAttribute.js b/packages/vue-generator/src/generator/vue/sfc/generateAttribute.js
index d4d7d0aa2..9b623ca76 100644
--- a/packages/vue-generator/src/generator/vue/sfc/generateAttribute.js
+++ b/packages/vue-generator/src/generator/vue/sfc/generateAttribute.js
@@ -515,3 +515,28 @@ export const handleBindUtilsHooks = (schemaData, globalHooks, config) => {
     }
   })
 }
+
+/**
+ * 为 modelvalue 绑定自动生成 onUpdate:modelValue 事件绑定
+ * @param {*} schemaData
+ * @param {*} globalHooks
+ * @param {*} config
+ */
+export const handleJsxModelValueUpdate = (schemaData, globalHooks, config) => {
+  const { schema: { props = {} } = {} } = schemaData || {}
+  const isJSX = config.isJSX
+
+  if (!isJSX) {
+    return
+  }
+
+  const propsEntries = Object.entries(props)
+  const modelValue = propsEntries.find(([_key, value]) => value?.type === JS_EXPRESSION && value?.model === true)
+  const hasUpdateModelValue = propsEntries.find(([key]) => isOn(key) && key.startsWith(`onUpdate:${modelValue?.[0]}`))
+
+  // jsx 形式的 modelvalue, 如果 schema 没有声明，出码需要同时声明 onUpdate:modelValue，否则更新失效
+  if (modelValue && !hasUpdateModelValue) {
+    // 添加 onUpdate:modelKey 事件，让后续钩子生成 对应的事件声明
+    props[`onUpdate:${modelValue?.[0]}`] = { type: JS_EXPRESSION, value: `(value) => ${modelValue[1].value}=value` }
+  }
+}
diff --git a/packages/vue-generator/test/testcases/sfc/slotModelValue/components-map.json b/packages/vue-generator/test/testcases/sfc/slotModelValue/components-map.json
new file mode 100644
index 000000000..88f776526
--- /dev/null
+++ b/packages/vue-generator/test/testcases/sfc/slotModelValue/components-map.json
@@ -0,0 +1,23 @@
+[
+  {
+    "componentName": "TinyGrid",
+    "exportName": "Grid",
+    "package": "@opentiny/vue",
+    "version": "^3.10.0",
+    "destructuring": true
+  },
+  {
+    "componentName": "TinyNumeric",
+    "exportName": "Numeric",
+    "package": "@opentiny/vue",
+    "version": "^3.10.0",
+    "destructuring": true
+  },
+  {
+    "componentName": "TinyInput",
+    "exportName": "Input",
+    "package": "@opentiny/vue",
+    "version": "^3.10.0",
+    "destructuring": true
+  }
+]
diff --git a/packages/vue-generator/test/testcases/sfc/slotModelValue/expected/slotModelValueTest.vue b/packages/vue-generator/test/testcases/sfc/slotModelValue/expected/slotModelValueTest.vue
new file mode 100644
index 000000000..7d5e5f083
--- /dev/null
+++ b/packages/vue-generator/test/testcases/sfc/slotModelValue/expected/slotModelValueTest.vue
@@ -0,0 +1,96 @@
+<template>
+  <div>
+    <div>
+      <tiny-grid
+        :editConfig="{ trigger: 'click', mode: 'cell', showStatus: true }"
+        :columns="state.columns"
+        :data="[
+          {
+            id: '1',
+            name: 'GFD科技有限公司',
+            city: '福州',
+            employees: 800,
+            created_date: '2014-04-30 00:56:00',
+            boole: false
+          },
+          {
+            id: '2',
+            name: 'WWW科技有限公司',
+            city: '深圳',
+            employees: 300,
+            created_date: '2016-07-08 12:36:22',
+            boole: true
+          }
+        ]"
+      ></tiny-grid>
+    </div>
+  </div>
+</template>
+
+<script setup lang="jsx">
+import { Grid as TinyGrid, Numeric as TinyNumeric, Input as TinyInput } from '@opentiny/vue'
+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({
+  columns: [
+    { type: 'index', width: 60 },
+    { type: 'selection', width: 60 },
+    {
+      field: 'employees',
+      title: '员工数',
+      slots: {
+        default: ({ row, column, rowIndex }, h) => (
+          <div>
+            <TinyNumeric
+              allow-empty={true}
+              placeholder="请输入"
+              controlsPosition="right"
+              step={1}
+              modelValue={row.employees}
+              onChange={(...eventArgs) => onChangeNumber(eventArgs, row, column, rowIndex)}
+              onUpdate:modelValue={(value) => (row.employees = value)}
+            ></TinyNumeric>
+          </div>
+        )
+      }
+    },
+    { field: 'created_date', title: '创建日期' },
+    {
+      field: 'city',
+      title: '城市',
+      slots: {
+        default: ({ row, column, rowIndex }, h) => (
+          <div>
+            <TinyInput
+              placeholder="请输入"
+              modelValue={row.city}
+              onChange={(...eventArgs) => onChangeInput(eventArgs, row, column, rowIndex)}
+              onUpdate:modelValue={(value) => (row.city = value)}
+            ></TinyInput>
+          </div>
+        )
+      }
+    }
+  ]
+})
+wrap({ state })
+
+const onChangeInput = wrap(function onChangeInput(eventArgs, args0, args1, args2) {
+  console.log('onChangeInput', eventArgs)
+})
+const onChangeNumber = wrap(function onChangeNumber(eventArgs, args0, args1, args2) {
+  console.log('onChangeNumber', eventArgs)
+})
+
+wrap({ onChangeInput, onChangeNumber })
+</script>
+<style scoped></style>
diff --git a/packages/vue-generator/test/testcases/sfc/slotModelValue/page.schema.json b/packages/vue-generator/test/testcases/sfc/slotModelValue/page.schema.json
new file mode 100644
index 000000000..e5da94f0c
--- /dev/null
+++ b/packages/vue-generator/test/testcases/sfc/slotModelValue/page.schema.json
@@ -0,0 +1,150 @@
+{
+  "state": {},
+  "methods": {
+    "onChangeInput": {
+      "type": "JSFunction",
+      "value": "function onChangeInput(eventArgs,args0,args1,args2) {\n  console.log('onChangeInput', eventArgs);\n}"
+    },
+    "onChangeNumber": {
+      "type": "JSFunction",
+      "value": "function onChangeNumber(eventArgs, args0, args1, args2) {\n  console.log('onChangeNumber', eventArgs)\n}"
+    }
+  },
+  "componentName": "Page",
+  "css": "",
+  "props": {},
+  "lifeCycles": {},
+  "children": [
+    {
+      "componentName": "div",
+      "props": {},
+      "id": "85375559",
+      "children": [
+        {
+          "componentName": "TinyGrid",
+          "props": {
+            "editConfig": {
+              "trigger": "click",
+              "mode": "cell",
+              "showStatus": true
+            },
+            "columns": [
+              {
+                "type": "index",
+                "width": 60
+              },
+              {
+                "type": "selection",
+                "width": 60
+              },
+              {
+                "field": "employees",
+                "title": "员工数",
+                "slots": {
+                  "default": {
+                    "type": "JSSlot",
+                    "value": [
+                      {
+                        "componentName": "div",
+                        "id": "44523622",
+                        "children": [
+                          {
+                            "componentName": "TinyNumeric",
+                            "props": {
+                              "allow-empty": true,
+                              "placeholder": "请输入",
+                              "controlsPosition": "right",
+                              "step": 1,
+                              "modelValue": {
+                                "type": "JSExpression",
+                                "value": "row.employees",
+                                "model": true
+                              },
+                              "onChange": {
+                                "type": "JSExpression",
+                                "value": "this.onChangeNumber",
+                                "params": ["row", "column", "rowIndex"]
+                              }
+                            },
+                            "id": "62166343"
+                          }
+                        ]
+                      }
+                    ],
+                    "params": ["row", "column", "rowIndex"]
+                  }
+                }
+              },
+              {
+                "field": "created_date",
+                "title": "创建日期"
+              },
+              {
+                "field": "city",
+                "title": "城市",
+                "slots": {
+                  "default": {
+                    "type": "JSSlot",
+                    "value": [
+                      {
+                        "componentName": "div",
+                        "id": "66326314",
+                        "children": [
+                          {
+                            "componentName": "TinyInput",
+                            "props": {
+                              "placeholder": "请输入",
+                              "modelValue": {
+                                "type": "JSExpression",
+                                "value": "row.city",
+                                "model": true
+                              },
+                              "onChange": {
+                                "type": "JSExpression",
+                                "value": "this.onChangeInput",
+                                "params": ["row", "column", "rowIndex"]
+                              }
+                            },
+                            "id": "22396a2a"
+                          }
+                        ]
+                      }
+                    ],
+                    "params": ["row", "column", "rowIndex"]
+                  }
+                }
+              }
+            ],
+            "data": [
+              {
+                "id": "1",
+                "name": "GFD科技有限公司",
+                "city": "福州",
+                "employees": 800,
+                "created_date": "2014-04-30 00:56:00",
+                "boole": false
+              },
+              {
+                "id": "2",
+                "name": "WWW科技有限公司",
+                "city": "深圳",
+                "employees": 300,
+                "created_date": "2016-07-08 12:36:22",
+                "boole": true
+              }
+            ]
+          },
+          "id": "63623253"
+        }
+      ]
+    }
+  ],
+  "dataSource": {
+    "list": []
+  },
+  "utils": [],
+  "bridge": [],
+  "inputs": [],
+  "outputs": [],
+  "fileName": "slotModelValueTest"
+}
diff --git a/packages/vue-generator/test/testcases/sfc/slotModelValue/slotModel.test.js b/packages/vue-generator/test/testcases/sfc/slotModelValue/slotModel.test.js
new file mode 100644
index 000000000..c1e48b6f0
--- /dev/null
+++ b/packages/vue-generator/test/testcases/sfc/slotModelValue/slotModel.test.js
@@ -0,0 +1,12 @@
+import { expect, test } from 'vitest'
+import { genSFCWithDefaultPlugin } from '@/generator/vue/sfc'
+import schema from './page.schema.json'
+import componentsMap from './components-map.json'
+import { formatCode } from '@/utils/formatCode'
+
+test('should generate onUpdate:modelValue event', async () => {
+  const res = genSFCWithDefaultPlugin(schema, componentsMap)
+  const formattedCode = formatCode(res, 'vue')
+
+  await expect(formattedCode).toMatchFileSnapshot('./expected/slotModelValueTest.vue')
+})

From 50f968f27dfd27c95ef95cbe005614e80d92aebd Mon Sep 17 00:00:00 2001
From: chilingling <26962197+chilingling@users.noreply.github.com>
Date: Mon, 9 Sep 2024 19:08:50 -0700
Subject: [PATCH 20/40] fix(canvas): absolute dnd update position to schema.
 close #664 (#751)

---
 .../src/components/container/container.js       | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/packages/canvas/src/components/container/container.js b/packages/canvas/src/components/container/container.js
index 89e6c3c8a..ac9ccf8b0 100644
--- a/packages/canvas/src/components/container/container.js
+++ b/packages/canvas/src/components/container/container.js
@@ -185,6 +185,8 @@ export const dragEnd = () => {
   if (element && canvasState.type === 'absolute') {
     data.props = data.props || {}
     data.props.style = element.style.cssText
+
+    getController().addHistory()
   }
 
   // 重置拖拽状态
@@ -541,6 +543,8 @@ const setHoverRect = (element, data) => {
   return undefined
 }
 
+let moveUpdateTimer = null
+
 // 绝对布局
 const absoluteMove = (event, element) => {
   const { clientX, clientY } = event
@@ -572,6 +576,19 @@ const absoluteMove = (event, element) => {
       element.style.height = `${clientY - y}px`
     }
   }
+
+  clearTimeout(moveUpdateTimer)
+
+  const { data } = dragState
+  data.props = data.props || {}
+
+  // 防抖更新位置信息到 schema
+  moveUpdateTimer = setTimeout(() => {
+    data.props.style = element.style.cssText
+
+    getController().addHistory()
+  }, 100)
+
   updateRect()
 }
 

From 603be3bdb9ba8741c8eb6299331927fc29ba3fb9 Mon Sep 17 00:00:00 2001
From: bwrong <ibwrong@foxmail.com>
Date: Wed, 11 Sep 2024 11:06:43 +0800
Subject: [PATCH 21/40] =?UTF-8?q?fix(generate-vue):=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=87=BA=E7=A0=81=E6=96=87=E4=BB=B6=E9=80=89=E6=8B=A9=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E6=89=93=E5=8C=85=E5=90=8E=E6=A0=B7=E5=BC=8F=E4=B8=A2?=
 =?UTF-8?q?=E5=A4=B1=E9=97=AE=E9=A2=98=20(#789)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: wangwenbing <11535041@qq.com>
---
 packages/toolbars/generate-vue/vite.config.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/toolbars/generate-vue/vite.config.js b/packages/toolbars/generate-vue/vite.config.js
index 090e11278..6cbf0ad06 100644
--- a/packages/toolbars/generate-vue/vite.config.js
+++ b/packages/toolbars/generate-vue/vite.config.js
@@ -28,6 +28,9 @@ export default defineConfig({
       formats: ['es']
     },
     rollupOptions: {
+      output: {
+        banner: 'import "./style.css"'
+      },
       external: ['vue', /@opentiny\/tiny-engine.*/, /@opentiny\/vue.*/, /^prettier.*/]
     }
   }

From 5fa99f8a8e1f35f4bf08345b452aa2fbf89f9155 Mon Sep 17 00:00:00 2001
From: chilingling <26962197+chilingling@users.noreply.github.com>
Date: Fri, 13 Sep 2024 01:16:44 -0700
Subject: [PATCH 22/40] fix(stylePanel): fix setting border-radius could not
 work on first time (#481)

---
 .../src/components/border/BorderGroup.vue     | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/settings/styles/src/components/border/BorderGroup.vue b/packages/settings/styles/src/components/border/BorderGroup.vue
index 298ddc78f..901552c13 100644
--- a/packages/settings/styles/src/components/border/BorderGroup.vue
+++ b/packages/settings/styles/src/components/border/BorderGroup.vue
@@ -290,9 +290,7 @@ export default {
     const state = reactive({
       showModal: false,
       activedRadius: RADIUS_SETTING.Single,
-      activedBorder: BORDER_SETTING.All,
-      // 标记是否从 props 来的更新
-      isUpdateFromProps: false
+      activedBorder: BORDER_SETTING.All
     })
 
     const { setPosition } = useModal()
@@ -336,12 +334,13 @@ export default {
     watch(
       () => props.style,
       () => {
-        state.isUpdateFromProps = true
-        borderRadius.BorderRadius = parseInt(props.style.borderRadius || 0)
-        borderRadius.BorderTopLeftRadius = parseInt(props.style.borderTopLeftRadius || 0)
-        borderRadius.BorderTopRightRadius = parseInt(props.style.borderTopRightRadius || 0)
-        borderRadius.BorderBottomLeftRadius = parseInt(props.style.borderBottomLeftRadius || 0)
-        borderRadius.BorderBottomRightRadius = parseInt(props.style.borderBottomRightRadius || 0)
+        borderRadius.BorderRadius = parseInt(props.style[BORDER_RADIUS_PROPERTY.BorderRadius] || 0)
+        borderRadius.BorderTopLeftRadius = parseInt(props.style[BORDER_RADIUS_PROPERTY.BorderTopLeftRadius] || 0)
+        borderRadius.BorderTopRightRadius = parseInt(props.style[BORDER_RADIUS_PROPERTY.BorderTopRightRadius] || 0)
+        borderRadius.BorderBottomLeftRadius = parseInt(props.style[BORDER_RADIUS_PROPERTY.BorderBottomLeftRadius] || 0)
+        borderRadius.BorderBottomRightRadius = parseInt(
+          props.style[BORDER_RADIUS_PROPERTY.BorderBottomRightRadius] || 0
+        )
       },
       { immediate: true }
     )
@@ -386,12 +385,13 @@ export default {
        * 1. 用户在 monacoEditor 更新了样式 border-radius: 9px 然后保存，该组件接收并同步改值
        * 2. 用户在 monacoEditor 删除了 border-radius: 9px 的样式，然后 watch 函数（props.style），重新计算得到值 0
        * 3. 0 更新后，会再触发改函数更新，导致自动加上了 border-radius: 0px 的样式
-       * 所以从 props 来的更新不需要再调用一遍 updateStyle（更新 props 数据）
+       * 所以从如果当前值为 0 且  props.style[BORDER_RADIUS_PROPERTY.BorderRadius] 不存在值，不需要触发更新
        */
-      if (state.isUpdateFromProps) {
-        state.isUpdateFromProps = false
+
+      if (!value && !props.style[BORDER_RADIUS_PROPERTY.BorderRadius]) {
         return
       }
+
       borderRadius.BorderRadius = value
 
       updateStyle({

From 2ce7c4a201e25baa347996afa0fcd5bc6ac11b0b Mon Sep 17 00:00:00 2001
From: Xie Jay <xiejay97@gmail.com>
Date: Wed, 18 Sep 2024 11:24:11 +0800
Subject: [PATCH 23/40] fix(common): fix verify required (#787)

---
 packages/common/component/ConfigItem.vue | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/packages/common/component/ConfigItem.vue b/packages/common/component/ConfigItem.vue
index c0fd195e7..1f46dc695 100644
--- a/packages/common/component/ConfigItem.vue
+++ b/packages/common/component/ConfigItem.vue
@@ -295,16 +295,13 @@ export default {
       result.message = typeof message === 'string' ? message : message?.[locale.value]
     }
 
+    const isEmptyInputValue = (value) => {
+      // 通过 value == null 做隐式类型转换
+      // 空值约定为 undefined | null | ''
+      return value == null || (typeOf(value) === TYPES.StringType && value.trim() === '')
+    }
     const verifyRequired = (value) => {
-      if (typeOf(value) === TYPES.BooleanType) {
-        return true
-      }
-
-      if (typeOf(value) === TYPES.StringType) {
-        return value.trim()
-      }
-
-      return value
+      return !isEmptyInputValue(value)
     }
 
     const verifyValue = (value = '', rules = []) => {

From 3a831bf833829f7e5de4851c4238c4e74402b769 Mon Sep 17 00:00:00 2001
From: chilingling <26962197+chilingling@users.noreply.github.com>
Date: Mon, 23 Sep 2024 23:37:47 -0700
Subject: [PATCH 24/40] fix: mixed lifeCyclesContent when empty lifecycles
 (#810)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

close #806
修复生命周期为空时，取当前页面schema生命周期值的 bug
---
 packages/common/component/LifeCycles.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/common/component/LifeCycles.vue b/packages/common/component/LifeCycles.vue
index c7abdcd28..fd8404fd4 100644
--- a/packages/common/component/LifeCycles.vue
+++ b/packages/common/component/LifeCycles.vue
@@ -129,7 +129,7 @@ export default {
     })
 
     watchEffect(() => {
-      state.bindLifeCycles = props.bindLifeCycles || useCanvas().canvasApi.value?.getSchema()?.lifeCycles || {}
+      state.bindLifeCycles = props.bindLifeCycles || {}
     })
 
     const searchLifeCyclesList = (value) => {

From e828de2970ee1858d93b1b6d2e2f430721e47ef6 Mon Sep 17 00:00:00 2001
From: chilingling <26962197+chilingling@users.noreply.github.com>
Date: Tue, 24 Sep 2024 20:03:34 -0700
Subject: [PATCH 25/40] fix: switch selected component event name list still
 show the origin one (#757)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: switch selected component event name list still show the origin one

修复画布切换选择组件后，高级面板事件列表仍然显示原组件事件列表的bug
close #747

* fix: handle potential undefined values in renderEventList

* fix: use locale instead of zh_CN attr
---
 .../events/src/components/BindEvents.vue      | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/packages/settings/events/src/components/BindEvents.vue b/packages/settings/events/src/components/BindEvents.vue
index aa8550f25..49ac91904 100644
--- a/packages/settings/events/src/components/BindEvents.vue
+++ b/packages/settings/events/src/components/BindEvents.vue
@@ -28,12 +28,12 @@
         </template>
         <ul class="bind-event-list">
           <li
-            v-for="(event, name) in state.componentEvents"
+            v-for="(event, name) in renderEventList"
             :key="name"
             :class="['bind-event-list-item', { 'bind-event-list-item-notallow': state.bindActions[name] }]"
             @click="openActionDialog({ eventName: name }, true)"
           >
-            <div>{{ name }}&nbsp;&nbsp;{{ event?.label?.zh_CN || name }}</div>
+            <div>{{ name }}&nbsp;&nbsp;{{ event?.label?.[locale] || name }}</div>
           </li>
         </ul>
       </tiny-popover>
@@ -43,7 +43,7 @@
         <div class="action-item bind-action-item">
           <div class="binding-name" @click="openActionDialog(action)">
             <div>
-              {{ action.eventName }}<span>{{ state.componentEvents[action.eventName].label.zh_CN }}</span>
+              {{ action.eventName }}<span>{{ renderEventList[action.eventName]?.label?.[locale] }}</span>
             </div>
             <div :class="{ linked: action.linked }">{{ action.linkedEventName }}</div>
             <span class="event-bind">{{ action.ref }}</span>
@@ -78,7 +78,7 @@
   <bind-events-dialog :eventBinding="state.eventBinding"></bind-events-dialog>
   <add-events-dialog
     :visible="state.showBindEventDialog"
-    :componentEvents="state.componentEvents"
+    :componentEvents="renderEventList"
     @closeDialog="handleToggleAddEventDialog(false)"
     @addEvent="handleAddEvent"
   ></add-events-dialog>
@@ -88,6 +88,7 @@
 import { computed, reactive, watchEffect } from 'vue'
 import { Popover, Button } from '@opentiny/vue'
 import { useCanvas, useModal, useLayout, useBlock, useResource } from '@opentiny/tiny-engine-controller'
+import i18n from '@opentiny/tiny-engine-controller/js/i18n'
 import { BlockLinkEvent, SvgButton } from '@opentiny/tiny-engine-common'
 import { iconHelpQuery, iconChevronDown } from '@opentiny/vue-icon'
 import BindEventsDialog, { open as openDialog } from './BindEventsDialog.vue'
@@ -112,6 +113,7 @@ export default {
     const { getBlockEvents, getCurrentBlock, removeEventLink } = useBlock()
     const { getMaterial } = useResource()
     const { confirm } = useModal()
+    const locale = i18n.global.locale.value
 
     const { highlightMethod } = getPluginApi(PLUGIN_NAME.PageController)
 
@@ -119,25 +121,25 @@ export default {
       eventName: '', // 事件名称
       eventBinding: null, // 事件绑定的处理方法对象
       componentEvent: {},
-      componentEvents: commonEvents,
+      customEvents: commonEvents,
       bindActions: {},
       showBindEventDialog: false
     })
 
     const isBlock = computed(() => Boolean(pageState.isBlock))
     const isEmpty = computed(() => Object.keys(state.bindActions).length === 0)
+    const renderEventList = computed(() => ({ ...state.componentEvent, ...state.customEvents }))
 
     watchEffect(() => {
       const componentName = pageState?.currentSchema?.componentName
       const componentSchema = getMaterial(componentName)
       state.componentEvent = componentSchema?.content?.schema?.events || componentSchema?.schema?.events || {}
-      Object.assign(state.componentEvents, state.componentEvent)
       const props = pageState?.currentSchema?.props || {}
       const keys = Object.keys(props)
       state.bindActions = {}
 
       // 遍历组件事件元数据
-      Object.entries(state.componentEvents).forEach(([eventName, componentEvent]) => {
+      Object.entries(renderEventList.value).forEach(([eventName, componentEvent]) => {
         // 查找组件已添加的事件
         if (keys.indexOf(eventName) > -1) {
           const event = props[eventName]
@@ -225,7 +227,7 @@ export default {
     const handleAddEvent = (params) => {
       const { eventName, eventDescription } = params
 
-      Object.assign(state.componentEvents, {
+      Object.assign(state.customEvents, {
         [eventName]: {
           label: {
             zh_CN: eventDescription
@@ -253,7 +255,9 @@ export default {
       openCodePanel,
       openActionDialog,
       handleAddEvent,
-      handleToggleAddEventDialog
+      handleToggleAddEventDialog,
+      renderEventList,
+      locale
     }
   }
 }

From eda10e58c847d571282889888e79b9b2a607ffcb Mon Sep 17 00:00:00 2001
From: tianxin <146069396+ianxinnew@users.noreply.github.com>
Date: Wed, 25 Sep 2024 20:37:06 +0800
Subject: [PATCH 26/40] fix:batch delete unintelligent (#795)

---
 packages/plugins/datasource/src/DataSourceRecordList.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/plugins/datasource/src/DataSourceRecordList.vue b/packages/plugins/datasource/src/DataSourceRecordList.vue
index 90685d17d..88f46960c 100644
--- a/packages/plugins/datasource/src/DataSourceRecordList.vue
+++ b/packages/plugins/datasource/src/DataSourceRecordList.vue
@@ -489,6 +489,7 @@ export default {
           grid.value.removeSelecteds()
           state.totalData = state.totalData.filter(({ _id }) => !selectedData.includes(_id))
           fetchData()
+          state.isBatchDeleteDisable = true
         }
       })
     }

From 0935220b77fef1a5d46e4f7f0f585a4ab33f93ba Mon Sep 17 00:00:00 2001
From: chilingling <26962197+chilingling@users.noreply.github.com>
Date: Fri, 27 Sep 2024 23:42:09 -0700
Subject: [PATCH 27/40] fix: mock block data response data missing data
 attribute (#818)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复 mockService 区块详情缺失 data 嵌套结构导致无法正确加载的 bug
---
 mockServer/src/services/block.js               | 3 ++-
 packages/controller/src/useResource.js         | 2 +-
 packages/plugins/block/src/Main.vue            | 7 ++++---
 packages/plugins/block/src/js/blockSetting.jsx | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/mockServer/src/services/block.js b/mockServer/src/services/block.js
index c8071fe10..f29c00ad6 100644
--- a/mockServer/src/services/block.js
+++ b/mockServer/src/services/block.js
@@ -72,7 +72,8 @@ export default class BlockService {
 
   async detail(blockId) {
     const result = await this.db.findOneAsync({ _id: blockId })
-    return result
+
+    return getResponseData(result)
   }
 
   async delete(blockId) {
diff --git a/packages/controller/src/useResource.js b/packages/controller/src/useResource.js
index 5df4dfa8d..b3d3afd98 100644
--- a/packages/controller/src/useResource.js
+++ b/packages/controller/src/useResource.js
@@ -293,7 +293,7 @@ const initBlock = async (blockId) => {
   const blockApi = getPluginApi(PLUGIN_NAME.BlockManage)
   const blockContent = await blockApi.getBlockById(blockId)
 
-  if (blockContent.public_scope_tenants.length) {
+  if (blockContent?.public_scope_tenants?.length) {
     blockContent.public_scope_tenants = blockContent.public_scope_tenants.map((e) => e.id)
   }
 
diff --git a/packages/plugins/block/src/Main.vue b/packages/plugins/block/src/Main.vue
index 337f756f1..f9b5cc35d 100644
--- a/packages/plugins/block/src/Main.vue
+++ b/packages/plugins/block/src/Main.vue
@@ -276,10 +276,11 @@ export default {
       boxVisibility.value = false
     }
     const editBlock = async (block) => {
-      const isEdite = true
+      const isEdit = true
+
       if (isSaved()) {
         await refreshBlockData(block)
-        useBlock().initBlock(block, {}, isEdite)
+        useBlock().initBlock(block, {}, isEdit)
         useLayout().closePlugin()
         closePanel()
         const url = new URL(window.location)
@@ -291,7 +292,7 @@ export default {
           message: '当前画布内容尚未保存，是否要继续切换?',
           exec: async () => {
             await refreshBlockData(block)
-            useBlock().initBlock(block, {}, isEdite)
+            useBlock().initBlock(block, {}, isEdit)
             useLayout().closePlugin()
             closePanel()
           }
diff --git a/packages/plugins/block/src/js/blockSetting.jsx b/packages/plugins/block/src/js/blockSetting.jsx
index 98680f88c..230072c1f 100644
--- a/packages/plugins/block/src/js/blockSetting.jsx
+++ b/packages/plugins/block/src/js/blockSetting.jsx
@@ -432,7 +432,7 @@ export const refreshBlockData = async (block = {}) => {
     const newBlock = await fetchBlockContent(block.id)
 
     if (newBlock) {
-      if (newBlock.public_scope_tenants.length) {
+      if (newBlock?.public_scope_tenants?.length) {
         newBlock.public_scope_tenants = newBlock.public_scope_tenants.map((e) => e.id)
       }
       Object.assign(block, newBlock)

From b72e7ea5e79f06bdf27619bc5bdc25a387b1b335 Mon Sep 17 00:00:00 2001
From: chilingling <26962197+chilingling@users.noreply.github.com>
Date: Fri, 27 Sep 2024 23:59:30 -0700
Subject: [PATCH 28/40] fix: page or block save update breadcrumb incorrectly
 (#820)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: page or block save update breadcrumb uncorrectly

1. 修复页面名称更新时，面包屑页名称没有同步更新的 bug
2. 修复区块保存更新时，强行切换当前画布到正在编辑区块的 bug
3. 修复区块保存更新时，如果画布不是当前编辑的区块，仍取截图的 bug

* fix: add handlePageUpdate mehtod missing params
---
 packages/controller/js/http.js                 | 13 +++++++++----
 packages/plugins/block/src/BlockSetting.vue    |  9 ++++++---
 packages/plugins/block/src/js/blockSetting.jsx |  9 ++++++++-
 packages/plugins/page/src/PageSetting.vue      |  3 ++-
 packages/toolbars/save/src/js/index.js         |  2 +-
 5 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/packages/controller/js/http.js b/packages/controller/js/http.js
index c3315a066..2ca39fe30 100644
--- a/packages/controller/js/http.js
+++ b/packages/controller/js/http.js
@@ -14,6 +14,7 @@ import { useHttp } from '@opentiny/tiny-engine-http'
 import usePage from '../src/usePage'
 import useCanvas from '../src/useCanvas'
 import useNotify from '../src/useNotify'
+import useBreadcrumb from '../src/useBreadcrumb'
 import { isVsCodeEnv } from './environments'
 import { generateRouter, generatePage } from './vscodeGenerateFile'
 
@@ -39,7 +40,7 @@ export const requestEvent = (url, params) => {
  * @returns { Promise }
  *
  */
-export const handlePageUpdate = (pageId, params, routerChange) => {
+export const handlePageUpdate = (pageId, params, routerChange, isCurEditPage) => {
   return http
     .post(`/app-center/api/pages/update/${pageId}`, params)
     .then((res) => {
@@ -60,14 +61,18 @@ export const handlePageUpdate = (pageId, params, routerChange) => {
         }
       }
 
-      if (routerChange) {
-        pageSettingState.updateTreeData()
-      }
+      pageSettingState.updateTreeData()
       pageSettingState.isNew = false
       useNotify({ message: '保存成功!', type: 'success' })
 
       // 更新 页面状态 标志
       setSaved(true)
+
+      if (isCurEditPage) {
+        const { setBreadcrumbPage } = useBreadcrumb()
+        setBreadcrumbPage([params.name])
+      }
+
       return res
     })
     .catch((err) => {
diff --git a/packages/plugins/block/src/BlockSetting.vue b/packages/plugins/block/src/BlockSetting.vue
index 3dc43e94b..8180127b9 100644
--- a/packages/plugins/block/src/BlockSetting.vue
+++ b/packages/plugins/block/src/BlockSetting.vue
@@ -78,7 +78,7 @@
 <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 { getGlobalConfig, useModal } from '@opentiny/tiny-engine-controller'
+import { getGlobalConfig, useModal, useBlock } from '@opentiny/tiny-engine-controller'
 import { BlockHistoryList, PluginSetting, CloseIcon, SvgButton } from '@opentiny/tiny-engine-common'
 import { previewBlock } from '@opentiny/tiny-engine-controller/js/preview'
 import { LifeCycles } from '@opentiny/tiny-engine-common'
@@ -212,8 +212,11 @@ export default {
           status,
           message,
           exec: async () => {
-            // 获取区块截图
-            block.screenshot = await getBlockBase64()
+            const currentId = useBlock().getCurrentBlock()?.id
+            if (block.id === currentId) {
+              // 获取区块截图
+              block.screenshot = await getBlockBase64()
+            }
             saveBlock(block)
           }
         })
diff --git a/packages/plugins/block/src/js/blockSetting.jsx b/packages/plugins/block/src/js/blockSetting.jsx
index 230072c1f..a90f279f7 100644
--- a/packages/plugins/block/src/js/blockSetting.jsx
+++ b/packages/plugins/block/src/js/blockSetting.jsx
@@ -659,7 +659,14 @@ const updateBlock = (block = {}) => {
   )
     .then((data) => {
       setSaved(true)
-      useBlock().initBlock(data, {}, true)
+
+      const currentId = useBlock().getCurrentBlock()?.id
+
+      // 如果是当前正在编辑的区块，需要同步更新画布
+      if (currentId === id) {
+        useBlock().initBlock(data, {}, true)
+      }
+
       // 弹出保存区块成功
       message({ message: '保存区块成功！', status: 'success' })
       // 本地生成区块服务
diff --git a/packages/plugins/page/src/PageSetting.vue b/packages/plugins/page/src/PageSetting.vue
index 4302459e7..168a09c7e 100644
--- a/packages/plugins/page/src/PageSetting.vue
+++ b/packages/plugins/page/src/PageSetting.vue
@@ -195,8 +195,9 @@ export default {
 
     const updatePage = (id, params) => {
       const routerChange = pageSettingState.currentPageDataCopy.route !== pageSettingState.currentPageData.route
+      const isCurEditPage = pageState?.currentPage?.id === id
 
-      return handlePageUpdate(id, params, routerChange)
+      return handlePageUpdate(id, params, routerChange, isCurEditPage)
     }
 
     const restorePage = (pageData) => {
diff --git a/packages/toolbars/save/src/js/index.js b/packages/toolbars/save/src/js/index.js
index 7346e0a38..a9872e565 100644
--- a/packages/toolbars/save/src/js/index.js
+++ b/packages/toolbars/save/src/js/index.js
@@ -51,7 +51,7 @@ const savePage = async (pageSchema) => {
   }
 
   isLoading.value = true
-  await handlePageUpdate(currentPage.id, { ...currentPage, ...params })
+  await handlePageUpdate(currentPage.id, { ...currentPage, ...params }, false, true)
   isLoading.value = false
 }
 

From 4cd3c3b8ea3b9425b974fc4ecf647063aa451148 Mon Sep 17 00:00:00 2001
From: zhengjg <zhengjinguangzjg@163.com>
Date: Sat, 28 Sep 2024 15:34:18 +0800
Subject: [PATCH 29/40] feat(vue-generator): add public floder, support image
 generation (#660)

* feat(vue-generator): add public floder, support image generation

* feat(vue-generator):  code add public floder, support image generation
---
 .../src/templates/vue-template/index.js       |  37 ++++++++++++++++++
 .../templateFiles/public/favicon.ico          | Bin 0 -> 12996 bytes
 2 files changed, 37 insertions(+)
 create mode 100644 packages/vue-generator/src/templates/vue-template/templateFiles/public/favicon.ico

diff --git a/packages/vue-generator/src/templates/vue-template/index.js b/packages/vue-generator/src/templates/vue-template/index.js
index b2a5ab9b4..ccd45337d 100644
--- a/packages/vue-generator/src/templates/vue-template/index.js
+++ b/packages/vue-generator/src/templates/vue-template/index.js
@@ -3,6 +3,7 @@ import genViteConfig from './templateFiles/genViteConfig'
 import getPackageJson from './templateFiles/packageJson'
 import gitIgnoreFile from './templateFiles/.gitignore?raw'
 import entryHTMLFile from './templateFiles/index.html?raw'
+import logoImage from './templateFiles/public/favicon.ico'
 import mainJSFile from './templateFiles/src/main.js?raw'
 import appVueFile from './templateFiles/src/App.vue?raw'
 import bridgeFile from './templateFiles/src/lowcodeConfig/bridge.js?raw'
@@ -32,6 +33,36 @@ const getTemplate = (schema, str) => {
   })
 }
 
+/**
+ * 图片的 base64 转 Blob 对象，用于生成本地图片
+ * @param {*} base64 String
+ * @returns Blob
+ */
+const base64ToBlob = (base64Data) => {
+  // Split base64
+  const arr = base64Data.split(',')
+  // Get MIME type
+  const mimeMatch = arr[0].match(/:(.*?);/)
+  if (!mimeMatch) {
+    throw new Error('Invalid base64 data')
+  }
+  const mime = mimeMatch[1]
+  // Decode base64 string
+  let raw
+  try {
+    raw = window.atob(arr[1])
+  } catch (e) {
+    throw new Error('Failed to decode base64 string')
+  }
+  const rawLength = raw.length
+  // Convert to Blob
+  const uInt8Array = new Uint8Array(rawLength)
+  for (let i = 0; i < rawLength; i++) {
+    uInt8Array[i] = raw.charCodeAt(i)
+  }
+  return new Blob([uInt8Array], { type: mime })
+}
+
 /**
  * get project template
  * @returns
@@ -67,6 +98,12 @@ export function generateTemplate(schema) {
       path: '.',
       fileContent: getTemplate(schema, entryHTMLFile)
     },
+    {
+      fileType: 'image/x-icon',
+      fileName: 'favicon.ico',
+      path: './public',
+      fileContent: base64ToBlob(logoImage)
+    },
     {
       fileType: 'js',
       fileName: 'main.js',
diff --git a/packages/vue-generator/src/templates/vue-template/templateFiles/public/favicon.ico b/packages/vue-generator/src/templates/vue-template/templateFiles/public/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..6271b2d8129adb150b3e8c51956cbe9e1c045c55
GIT binary patch
literal 12996
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
O(bG28s?>P$?Ee7CusRa}

literal 0
HcmV?d00001


From 452563a569903375af63cf72e6c5433f5900e5c1 Mon Sep 17 00:00:00 2001
From: betterdancing <liulinclear@163.com>
Date: Sat, 28 Sep 2024 17:09:28 +0800
Subject: [PATCH 30/40] =?UTF-8?q?fix(block):=20=E6=96=B0=E5=BB=BA=E5=8C=BA?=
 =?UTF-8?q?=E5=9D=97=E4=BF=9D=E5=AD=98=E5=90=8E=E5=8F=91=E5=B8=83=E5=8C=BA?=
 =?UTF-8?q?=E5=9D=97=EF=BC=8C=E5=8F=91=E5=B8=83=E6=97=A0=E6=95=88=20(#438)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(block): 新建区块保存后发布区块，发布无效

* fix: del useless null check

---------

Co-authored-by: chilingling <michaelchiling1024@gmail.com>
---
 packages/common/component/BlockDeployDialog.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/common/component/BlockDeployDialog.vue b/packages/common/component/BlockDeployDialog.vue
index 33aaf918e..ecb2a5a46 100644
--- a/packages/common/component/BlockDeployDialog.vue
+++ b/packages/common/component/BlockDeployDialog.vue
@@ -82,7 +82,7 @@ import {
   FormItem as TinyFormItem
 } from '@opentiny/vue'
 import { theme } from '@opentiny/tiny-engine-controller/adapter'
-import { useLayout, useNotify, useCanvas } from '@opentiny/tiny-engine-controller'
+import { useLayout, useNotify, useCanvas, useBlock } from '@opentiny/tiny-engine-controller'
 import { constants } from '@opentiny/tiny-engine-utils'
 import VueMonaco from './VueMonaco.vue'
 
@@ -163,7 +163,7 @@ export default {
         const { getEditBlock, publishBlock } = getPluginApi(PLUGIN_NAME.BlockManage)
         if (valid) {
           const params = {
-            block: getEditBlock(),
+            block: getEditBlock() || useBlock().getCurrentBlock(),
             is_compile: true,
             deploy_info: formState.deployInfo,
             version: formState.version,

From 4ea63abba72b40c76265cde7e8a8c48b92b5f8ac Mon Sep 17 00:00:00 2001
From: tianxin <146069396+ianxinnew@users.noreply.github.com>
Date: Sat, 28 Sep 2024 18:34:24 +0800
Subject: [PATCH 31/40] fix:table slot edit params should not get alert (#802)

* fix:table notch saving error message

* fix: change slotparams cause warning

* fix: change by review

* fix: typo parma -> param

---------

Co-authored-by: chilingling <michaelchiling1024@gmail.com>
---
 packages/common/component/MetaJsSlot.vue | 91 ++++++++++++++----------
 1 file changed, 52 insertions(+), 39 deletions(-)

diff --git a/packages/common/component/MetaJsSlot.vue b/packages/common/component/MetaJsSlot.vue
index 87af9ae50..a580f7b7f 100644
--- a/packages/common/component/MetaJsSlot.vue
+++ b/packages/common/component/MetaJsSlot.vue
@@ -17,13 +17,13 @@
           </div>
           <tiny-form-item
             :prop="paramsPropPath(index)"
-            :rules="[{ validator: parmasStringValidator, trigger: 'blur' }]"
+            :rules="[{ validator: paramsStringValidator, trigger: 'blur' }]"
             class="slot-name-form-item"
           >
             <tiny-input
               v-model="slot.params"
               class="use-slot-params"
-              @change="validParmas(slot, paramsPropPath(index))"
+              @change="validParams(paramsPropPath(index), slot)"
             ></tiny-input>
           </tiny-form-item>
         </div>
@@ -84,33 +84,41 @@ export default {
 
     const paramsPropPath = (index) => `${index}.params`
 
-    const parmasStringValidator = (rule, value, callback) => {
-      if (value && value.split(',').some((parma) => !verifyJsVarName(parma))) {
+    const paramsStringValidator = (rule, value, callback) => {
+      if (value && value.split(',').some((param) => !verifyJsVarName(param))) {
         callback(new Error('仅支持JavaScript中有效的变量名'))
       } else {
         callback()
       }
     }
 
-    const toggleSlot = (idx, { bind, name, params = '' }) => {
-      const slotInfo = {
-        [name]: {
-          type: 'JSSlot',
-          value: [
-            {
-              componentName: 'div'
-            }
-          ]
-        }
+    const updateSlotParams = (slotData) => {
+      emit('update:modelValue', slotData)
+
+      // 更新当前选中组件的根属性，不更新在jsslot中的数据非响应式
+      const [propsName] = path.split('.')
+      const schema = useProperties().getSchema()
+      schema.props[propsName] = JSON.parse(JSON.stringify(schema.props[propsName]))
+    }
+
+    const setSlotParams = ({ name, params = '' }) => {
+      if (!props.modelValue?.[name]) {
+        return
       }
 
-      const slotData = { ...slotInfo, ...(props.modelValue || {}) }
+      const slotData = { ...(props.modelValue || {}) }
 
       if (params.length) {
         slotData[name].params = params.split(',')
       } else {
         delete slotData[name].params
       }
+
+      updateSlotParams(slotData)
+    }
+
+    const toggleSlot = (idx, { bind, name, params = '' }) => {
+      // 原本绑定的，解除绑定
       if (bind) {
         useModal().confirm({
           title: '提示',
@@ -118,33 +126,39 @@ export default {
           status: 'info',
           exec: () => {
             slotList.value[idx].bind = false
-            delete slotData[name]
-            emit('update:modelValue', slotData)
-            const [propsName] = path.split('.')
-            const schema = useProperties().getSchema()
-            schema.props[propsName] = JSON.parse(JSON.stringify(schema.props[propsName]))
-          },
-          cancel: () => {}
+            const { [name]: _deleted, ...rest } = { ...(props.modelValue || {}) }
+            updateSlotParams(rest)
+          }
         })
-      } else {
-        slotList.value[idx].bind = true
+
+        return
       }
-      emit('update:modelValue', slotData)
 
-      // 更新当前选中组件的根属性，不根新在jsslot中的数据非响应式
-      const [propsName] = path.split('.')
-      const schema = useProperties().getSchema()
-      schema.props[propsName] = JSON.parse(JSON.stringify(schema.props[propsName]))
-    }
+      // 未绑定的，新增绑定
+      slotList.value[idx].bind = true
+
+      const slotInfo = {
+        [name]: {
+          type: 'JSSlot',
+          value: [
+            {
+              componentName: 'div'
+            }
+          ]
+        }
+      }
+
+      if (params.length) {
+        slotInfo[name].params = params.split(',')
+      }
 
-    const setParams = (slot) => {
-      slot.bind && toggleSlot(true, slot)
+      updateSlotParams({ ...(props.modelValue || {}), ...slotInfo })
     }
 
-    const validParmas = (slot, parmasPath) => {
-      slotRef.value.validateField([parmasPath], (tips) => {
-        if (!tips) {
-          setParams(slot)
+    const validParams = (paramsPath, slot) => {
+      slotRef.value.validateField([paramsPath], (error) => {
+        if (!error) {
+          slot.bind && setSlotParams(slot)
         }
       })
     }
@@ -159,9 +173,8 @@ export default {
       slotList,
       paramsPropPath,
       slotRef,
-      parmasStringValidator,
-      validParmas,
-      setParams,
+      paramsStringValidator,
+      validParams,
       state,
       componentsMap
     }

From aa79110d52c3e77f6e664c22983c93bd74d9406d Mon Sep 17 00:00:00 2001
From: chilingling <michaelchiling1024@gmail.com>
Date: Sat, 28 Sep 2024 04:00:10 -0700
Subject: [PATCH 32/40] release 1.0.0-rc.1 version

---
 mockServer/package.json                           | 4 ++--
 packages/blockToWebComponentTemplate/package.json | 2 +-
 packages/builtinComponent/package.json            | 2 +-
 packages/canvas/package.json                      | 2 +-
 packages/common/package.json                      | 2 +-
 packages/controller/package.json                  | 2 +-
 packages/design-core/package.json                 | 2 +-
 packages/http/package.json                        | 2 +-
 packages/i18n/package.json                        | 2 +-
 packages/plugins/block/package.json               | 2 +-
 packages/plugins/bridge/package.json              | 2 +-
 packages/plugins/data/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/tree/package.json                | 2 +-
 packages/plugins/tutorial/package.json            | 2 +-
 packages/settings/design/package.json             | 2 +-
 packages/settings/events/package.json             | 2 +-
 packages/settings/props/package.json              | 2 +-
 packages/settings/styles/package.json             | 2 +-
 packages/svgs/package.json                        | 3 +--
 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-vue/package.json       | 2 +-
 packages/toolbars/lang/package.json               | 2 +-
 packages/toolbars/layout/package.json             | 3 +--
 packages/toolbars/lock/package.json               | 2 +-
 packages/toolbars/logo/package.json               | 2 +-
 packages/toolbars/logout/package.json             | 3 +--
 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 +-
 48 files changed, 49 insertions(+), 52 deletions(-)

diff --git a/mockServer/package.json b/mockServer/package.json
index 7b51d4daf..2bd7bed3c 100644
--- a/mockServer/package.json
+++ b/mockServer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-mock",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "publishConfig": {
     "access": "public"
   },
@@ -25,7 +25,7 @@
     "lint": "eslint --fix ."
   },
   "dependencies": {
-    "@opentiny/tiny-engine-dsl-vue": "^1.0.3",
+    "@opentiny/tiny-engine-dsl-vue": "^1.0.4",
     "@seald-io/nedb": "^4.0.2",
     "fs-extra": "^11.1.1",
     "glob": "^10.3.4",
diff --git a/packages/blockToWebComponentTemplate/package.json b/packages/blockToWebComponentTemplate/package.json
index 4124d3074..6da63c41a 100644
--- a/packages/blockToWebComponentTemplate/package.json
+++ b/packages/blockToWebComponentTemplate/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-block-build",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "translate block to webcomponent template",
   "main": "./dist/web-components.es.js",
   "scripts": {
diff --git a/packages/builtinComponent/package.json b/packages/builtinComponent/package.json
index f25d3a77d..6eef264f7 100644
--- a/packages/builtinComponent/package.json
+++ b/packages/builtinComponent/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-builtin-component",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.js",
diff --git a/packages/canvas/package.json b/packages/canvas/package.json
index 962ac659c..d810d911f 100644
--- a/packages/canvas/package.json
+++ b/packages/canvas/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-canvas",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/common/package.json b/packages/common/package.json
index a2ced557c..45db1551b 100644
--- a/packages/common/package.json
+++ b/packages/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-common",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/controller/package.json b/packages/controller/package.json
index ac207b0d5..3c9d96922 100644
--- a/packages/controller/package.json
+++ b/packages/controller/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-controller",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/design-core/package.json b/packages/design-core/package.json
index 8294b9030..a3ca7a312 100644
--- a/packages/design-core/package.json
+++ b/packages/design-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine",
-  "version": "1.0.0-beta.4",
+  "version": "1.0.0-rc.1",
   "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",
   "keywords": [
diff --git a/packages/http/package.json b/packages/http/package.json
index d29ed81ca..088cb2ad5 100644
--- a/packages/http/package.json
+++ b/packages/http/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-http",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/i18n/package.json b/packages/i18n/package.json
index 445cf8fe2..dc04e369f 100644
--- a/packages/i18n/package.json
+++ b/packages/i18n/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-i18n-host",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/block/package.json b/packages/plugins/block/package.json
index f72f2f6e9..d883b3a39 100644
--- a/packages/plugins/block/package.json
+++ b/packages/plugins/block/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-block",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/bridge/package.json b/packages/plugins/bridge/package.json
index a6f185c69..0ebabdca0 100644
--- a/packages/plugins/bridge/package.json
+++ b/packages/plugins/bridge/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-bridge",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/data/package.json b/packages/plugins/data/package.json
index 52471f277..ee81efe00 100644
--- a/packages/plugins/data/package.json
+++ b/packages/plugins/data/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-data",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/datasource/package.json b/packages/plugins/datasource/package.json
index 6cd42bdaa..500d278ce 100644
--- a/packages/plugins/datasource/package.json
+++ b/packages/plugins/datasource/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-datasource",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/help/package.json b/packages/plugins/help/package.json
index ad07f9b95..ca2408ee1 100644
--- a/packages/plugins/help/package.json
+++ b/packages/plugins/help/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-help",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/i18n/package.json b/packages/plugins/i18n/package.json
index c52e897bd..97dbf8546 100644
--- a/packages/plugins/i18n/package.json
+++ b/packages/plugins/i18n/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-i18n",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/materials/package.json b/packages/plugins/materials/package.json
index 8d1ae26bb..ce11dcad3 100644
--- a/packages/plugins/materials/package.json
+++ b/packages/plugins/materials/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-materials",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/page/package.json b/packages/plugins/page/package.json
index 920cd5f4d..26c48babb 100644
--- a/packages/plugins/page/package.json
+++ b/packages/plugins/page/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-page",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/robot/package.json b/packages/plugins/robot/package.json
index acf0fe282..f6138c8eb 100644
--- a/packages/plugins/robot/package.json
+++ b/packages/plugins/robot/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-robot",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/schema/package.json b/packages/plugins/schema/package.json
index fdc8e0e5a..9e51f0c7a 100644
--- a/packages/plugins/schema/package.json
+++ b/packages/plugins/schema/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-schema",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/script/package.json b/packages/plugins/script/package.json
index f5e228667..95fcf77af 100644
--- a/packages/plugins/script/package.json
+++ b/packages/plugins/script/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-script",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/tree/package.json b/packages/plugins/tree/package.json
index 83b3fb825..b28f5d584 100644
--- a/packages/plugins/tree/package.json
+++ b/packages/plugins/tree/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-tree",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/tutorial/package.json b/packages/plugins/tutorial/package.json
index 7b06fa7e7..580614ffa 100644
--- a/packages/plugins/tutorial/package.json
+++ b/packages/plugins/tutorial/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-tutorial",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/settings/design/package.json b/packages/settings/design/package.json
index 63049b52e..6e6a12fa8 100644
--- a/packages/settings/design/package.json
+++ b/packages/settings/design/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-setting-design",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/settings/events/package.json b/packages/settings/events/package.json
index 7272f190b..01f1a6353 100644
--- a/packages/settings/events/package.json
+++ b/packages/settings/events/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-setting-events",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/settings/props/package.json b/packages/settings/props/package.json
index 0f62b56f4..0143bf3ce 100644
--- a/packages/settings/props/package.json
+++ b/packages/settings/props/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-setting-props",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/settings/styles/package.json b/packages/settings/styles/package.json
index d2efadfbd..df338b338 100644
--- a/packages/settings/styles/package.json
+++ b/packages/settings/styles/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-setting-styles",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/svgs/package.json b/packages/svgs/package.json
index ba718cc28..c5ba2e024 100644
--- a/packages/svgs/package.json
+++ b/packages/svgs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-svgs",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "publishConfig": {
     "access": "public"
   },
@@ -23,7 +23,6 @@
   "author": "OpenTiny Team",
   "license": "MIT",
   "homepage": "https://opentiny.design/tiny-engine",
-  "dependencies": {},
   "devDependencies": {
     "@vitejs/plugin-vue": "^4.2.3",
     "@vitejs/plugin-vue-jsx": "^3.1.0",
diff --git a/packages/theme/dark/package.json b/packages/theme/dark/package.json
index 6ed0f215a..a5e81bd9a 100644
--- a/packages/theme/dark/package.json
+++ b/packages/theme/dark/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-theme-dark",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/theme/light/package.json b/packages/theme/light/package.json
index 375eaf92e..f5514c555 100644
--- a/packages/theme/light/package.json
+++ b/packages/theme/light/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-theme-light",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/breadcrumb/package.json b/packages/toolbars/breadcrumb/package.json
index 8060d7254..058ee7ebb 100644
--- a/packages/toolbars/breadcrumb/package.json
+++ b/packages/toolbars/breadcrumb/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-breadcrumb",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/clean/package.json b/packages/toolbars/clean/package.json
index 103fd3e47..c2b0107d2 100644
--- a/packages/toolbars/clean/package.json
+++ b/packages/toolbars/clean/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-clean",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/collaboration/package.json b/packages/toolbars/collaboration/package.json
index f8c668d3f..a8a7480c3 100644
--- a/packages/toolbars/collaboration/package.json
+++ b/packages/toolbars/collaboration/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-collaboration",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/fullscreen/package.json b/packages/toolbars/fullscreen/package.json
index 3aeda8aa2..1cb5a60aa 100644
--- a/packages/toolbars/fullscreen/package.json
+++ b/packages/toolbars/fullscreen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-fullscreen",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/generate-vue/package.json b/packages/toolbars/generate-vue/package.json
index 23c53ddcb..24fbf4628 100644
--- a/packages/toolbars/generate-vue/package.json
+++ b/packages/toolbars/generate-vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-generate-vue",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/lang/package.json b/packages/toolbars/lang/package.json
index 979f4a089..88f5b194b 100644
--- a/packages/toolbars/lang/package.json
+++ b/packages/toolbars/lang/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-lang",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/layout/package.json b/packages/toolbars/layout/package.json
index ae36ff904..3c3c06009 100644
--- a/packages/toolbars/layout/package.json
+++ b/packages/toolbars/layout/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-layout",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "publishConfig": {
     "access": "public"
   },
@@ -23,7 +23,6 @@
   "author": "OpenTiny Team",
   "license": "MIT",
   "homepage": "https://opentiny.design/tiny-engine",
-  "dependencies": {},
   "devDependencies": {
     "@vitejs/plugin-vue": "^4.2.3",
     "@vitejs/plugin-vue-jsx": "^3.1.0",
diff --git a/packages/toolbars/lock/package.json b/packages/toolbars/lock/package.json
index d61ac9a5a..dbe094acd 100644
--- a/packages/toolbars/lock/package.json
+++ b/packages/toolbars/lock/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-checkinout",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/logo/package.json b/packages/toolbars/logo/package.json
index 111a71ccb..9e98b393d 100644
--- a/packages/toolbars/logo/package.json
+++ b/packages/toolbars/logo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-logo",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/logout/package.json b/packages/toolbars/logout/package.json
index 971fc8d46..0704d8da2 100644
--- a/packages/toolbars/logout/package.json
+++ b/packages/toolbars/logout/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-logout",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "publishConfig": {
     "access": "public"
   },
@@ -23,7 +23,6 @@
   "author": "OpenTiny Team",
   "license": "MIT",
   "homepage": "https://opentiny.design/tiny-engine",
-  "dependencies": {},
   "devDependencies": {
     "@vitejs/plugin-vue": "^4.2.3",
     "@vitejs/plugin-vue-jsx": "^3.1.0",
diff --git a/packages/toolbars/media/package.json b/packages/toolbars/media/package.json
index a77b8533d..66acc310e 100644
--- a/packages/toolbars/media/package.json
+++ b/packages/toolbars/media/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-media",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/preview/package.json b/packages/toolbars/preview/package.json
index 24f96775d..97e59a651 100644
--- a/packages/toolbars/preview/package.json
+++ b/packages/toolbars/preview/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-preview",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/redoundo/package.json b/packages/toolbars/redoundo/package.json
index 8e54f78da..5b621babd 100644
--- a/packages/toolbars/redoundo/package.json
+++ b/packages/toolbars/redoundo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-redoundo",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/refresh/package.json b/packages/toolbars/refresh/package.json
index 38bb6419d..431def747 100644
--- a/packages/toolbars/refresh/package.json
+++ b/packages/toolbars/refresh/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-refresh",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/save/package.json b/packages/toolbars/save/package.json
index 5b2089af3..568d68ef0 100644
--- a/packages/toolbars/save/package.json
+++ b/packages/toolbars/save/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-save",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/setting/package.json b/packages/toolbars/setting/package.json
index 327716baa..e9381f0bc 100644
--- a/packages/toolbars/setting/package.json
+++ b/packages/toolbars/setting/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-setting",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/utils/package.json b/packages/utils/package.json
index afebc991b..b7fd1974c 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-utils",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/vue-generator/package.json b/packages/vue-generator/package.json
index 8db5f80a9..bf39e30c6 100644
--- a/packages/vue-generator/package.json
+++ b/packages/vue-generator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-dsl-vue",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/webcomponent/package.json b/packages/webcomponent/package.json
index 6c6476fa5..bad31dbed 100644
--- a/packages/webcomponent/package.json
+++ b/packages/webcomponent/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-webcomponent-core",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "publishConfig": {
     "access": "public"
   },

From 8507b656833732d86265948ff366a0d392f21cd2 Mon Sep 17 00:00:00 2001
From: chilingling <26962197+chilingling@users.noreply.github.com>
Date: Mon, 30 Sep 2024 02:39:07 -0700
Subject: [PATCH 33/40] fix: save page updateTreeData error (#839)

---
 packages/controller/js/http.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/controller/js/http.js b/packages/controller/js/http.js
index 2ca39fe30..e4528350f 100644
--- a/packages/controller/js/http.js
+++ b/packages/controller/js/http.js
@@ -61,7 +61,8 @@ export const handlePageUpdate = (pageId, params, routerChange, isCurEditPage) =>
         }
       }
 
-      pageSettingState.updateTreeData()
+      // 更新页面管理的列表，如果不存在，说明还没有打开过页面管理面板
+      pageSettingState.updateTreeData?.()
       pageSettingState.isNew = false
       useNotify({ message: '保存成功!', type: 'success' })
 

From b568985860dc3da0d0a4fd5c5ee6f721703f2535 Mon Sep 17 00:00:00 2001
From: chilingling <26962197+chilingling@users.noreply.github.com>
Date: Tue, 15 Oct 2024 03:48:52 -0700
Subject: [PATCH 34/40] fix: change namespace 2 export module (#837)

* fix: change namespace 2 export module

* fix: add missing type params
---
 .../src/generator/generateApp.js              |  4 +-
 packages/vue-generator/src/index.d.ts         | 43 ++++++++++---------
 .../src/plugins/formatCodePlugin.js           |  2 +-
 .../src/plugins/genBlockPlugin.js             |  2 +-
 .../src/plugins/genDataSourcePlugin.js        |  2 +-
 .../src/plugins/genDependenciesPlugin.js      |  2 +-
 .../src/plugins/genGlobalState.js             |  2 +-
 .../src/plugins/genI18nPlugin.js              |  2 +-
 .../src/plugins/genPagePlugin.js              |  2 +-
 .../src/plugins/genRouterPlugin.js            |  2 +-
 .../src/plugins/genUtilsPlugin.js             |  2 +-
 .../src/plugins/parseSchemaPlugin.js          |  2 +-
 12 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/packages/vue-generator/src/generator/generateApp.js b/packages/vue-generator/src/generator/generateApp.js
index b602a1c9e..066181e46 100644
--- a/packages/vue-generator/src/generator/generateApp.js
+++ b/packages/vue-generator/src/generator/generateApp.js
@@ -15,8 +15,8 @@ import CodeGenerator from './codeGenerator'
 
 /**
  * 整体应用出码
- * @param {tinyEngineDslVue.IConfig} config
- * @returns {tinyEngineDslVue.codeGenInstance}
+ * @param {import('@opentiny/tiny-engine-dsl-vue').IConfig} config
+ * @returns {import('@opentiny/tiny-engine-dsl-vue').codeGenInstance}
  */
 
 export function generateApp(config = {}) {
diff --git a/packages/vue-generator/src/index.d.ts b/packages/vue-generator/src/index.d.ts
index 618b83bca..167700811 100644
--- a/packages/vue-generator/src/index.d.ts
+++ b/packages/vue-generator/src/index.d.ts
@@ -1,5 +1,8 @@
-declare namespace tinyEngineDslVue {
-  type defaultPlugins =
+declare module '@opentiny/tiny-engine-dsl-vue' {
+  export function generateCode(param: { pageInfo: any; componentsMap?: Array<any>; blocksData?: Array<any> }): {
+    [key: string]: any
+  }
+  export type defaultPlugins =
     | 'template'
     | 'block'
     | 'page'
@@ -12,9 +15,9 @@ declare namespace tinyEngineDslVue {
     | 'formatCode'
     | 'parseSchema'
 
-  type IPluginFun = (schema: IAppSchema, context: IContext) => void
+  export type IPluginFun = (schema: IAppSchema, context: IContext) => void
 
-  interface IConfig {
+  export interface IConfig {
     customPlugins?: {
       [key in defaultPlugins]?: IPluginFun
     } & {
@@ -26,7 +29,7 @@ declare namespace tinyEngineDslVue {
     customContext?: Record<string, any>
   }
 
-  interface IContext {
+  export interface IContext {
     config: Record<string, any>
     genResult: Array<IFile>
     genLogs: Array<any>
@@ -35,24 +38,24 @@ declare namespace tinyEngineDslVue {
 
   export function generateApp(config?: IConfig): codeGenInstance
 
-  interface codeGenInstance {
-    generate(IAppSchema): ICodeGenResult
+  export interface codeGenInstance {
+    generate(schema: IAppSchema): ICodeGenResult
   }
 
-  interface ICodeGenResult {
+  export interface ICodeGenResult {
     errors: Array<any>
     genResult: Array<IFile>
     genLogs: Array<any>
   }
 
-  interface IFile {
+  export interface IFile {
     fileType: string
     fileName: string
     path: string
     fileContent: string
   }
 
-  interface IAppSchema {
+  export interface IAppSchema {
     i18n: {
       en_US: Record<string, any>
       zh_CN: Record<string, any>
@@ -66,37 +69,37 @@ declare namespace tinyEngineDslVue {
     meta: IMetaInfo
   }
 
-  interface IUtilsItem {
+  export interface IUtilsItem {
     name: string
     type: 'npm' | 'function'
     content: object
   }
 
-  interface IDataSource {
+  export interface IDataSource {
     list: Array<{ id: number; name: string; data: object }>
     dataHandler?: IFuncType
     errorHandler?: IFuncType
     willFetch?: IFuncType
   }
 
-  interface IFuncType {
+  export interface IFuncType {
     type: 'JSFunction'
     value: string
   }
 
-  interface IExpressionType {
+  export interface IExpressionType {
     type: 'JSExpression'
     value: string
   }
 
-  interface IGlobalStateItem {
+  export interface IGlobalStateItem {
     id: string
     state: Record<string, any>
     actions: Record<string, IFuncType>
     getters: Record<string, IFuncType>
   }
 
-  interface IPageSchema {
+  export interface IPageSchema {
     componentName: 'Page' | 'Block'
     css: string
     fileName: string
@@ -120,7 +123,7 @@ declare namespace tinyEngineDslVue {
     }
   }
 
-  interface IFolderItem {
+  export interface IFolderItem {
     componentName: 'Folder'
     depth: number
     folderName: string
@@ -129,14 +132,14 @@ declare namespace tinyEngineDslVue {
     router: string
   }
 
-  interface ISchemaChildrenItem {
+  export interface ISchemaChildrenItem {
     children: Array<ISchemaChildrenItem>
     componentName: string
     id: string
     props: Record<string, any>
   }
 
-  interface IComponentMapItem {
+  export interface IComponentMapItem {
     componentName: string
     destructuring: boolean
     exportName?: string
@@ -144,7 +147,7 @@ declare namespace tinyEngineDslVue {
     version: string
   }
 
-  interface IMetaInfo {
+  export interface IMetaInfo {
     name: string
     description: string
   }
diff --git a/packages/vue-generator/src/plugins/formatCodePlugin.js b/packages/vue-generator/src/plugins/formatCodePlugin.js
index 5662c41bf..b55d2f500 100644
--- a/packages/vue-generator/src/plugins/formatCodePlugin.js
+++ b/packages/vue-generator/src/plugins/formatCodePlugin.js
@@ -29,7 +29,7 @@ function formatCode(options = {}) {
     description: 'transform block schema to code',
     /**
      * 格式化出码
-     * @param {tinyEngineDslVue.IAppSchema} schema
+     * @param {import('@opentiny/tiny-engine-dsl-vue').IAppSchema} schema
      * @returns
      */
     run(schema, context) {
diff --git a/packages/vue-generator/src/plugins/genBlockPlugin.js b/packages/vue-generator/src/plugins/genBlockPlugin.js
index f2b834fba..879847017 100644
--- a/packages/vue-generator/src/plugins/genBlockPlugin.js
+++ b/packages/vue-generator/src/plugins/genBlockPlugin.js
@@ -15,7 +15,7 @@ function genBlockPlugin(options = {}) {
     description: 'transform block schema to code',
     /**
      * 将区块 schema 转换成高代码
-     * @param {tinyEngineDslVue.IAppSchema} schema
+     * @param {import('@opentiny/tiny-engine-dsl-vue').IAppSchema} schema
      * @returns
      */
     run(schema) {
diff --git a/packages/vue-generator/src/plugins/genDataSourcePlugin.js b/packages/vue-generator/src/plugins/genDataSourcePlugin.js
index 0b8b0c74d..3c17badfe 100644
--- a/packages/vue-generator/src/plugins/genDataSourcePlugin.js
+++ b/packages/vue-generator/src/plugins/genDataSourcePlugin.js
@@ -15,7 +15,7 @@ function genDataSourcePlugin(options = {}) {
     description: 'transform schema to dataSource plugin',
     /**
      * 转换 dataSource
-     * @param {tinyEngineDslVue.IAppSchema} schema
+     * @param {import('@opentiny/tiny-engine-dsl-vue').IAppSchema} schema
      * @returns
      */
     run(schema) {
diff --git a/packages/vue-generator/src/plugins/genDependenciesPlugin.js b/packages/vue-generator/src/plugins/genDependenciesPlugin.js
index da84f3b7b..5bdb77a8b 100644
--- a/packages/vue-generator/src/plugins/genDependenciesPlugin.js
+++ b/packages/vue-generator/src/plugins/genDependenciesPlugin.js
@@ -63,7 +63,7 @@ function genDependenciesPlugin(options = {}) {
     description: 'transform dependencies to package.json',
     /**
      * 分析依赖，写入 package.json
-     * @param {tinyEngineDslVue.IAppSchema} schema
+     * @param {import('@opentiny/tiny-engine-dsl-vue').IAppSchema} schema
      * @returns
      */
     run(schema) {
diff --git a/packages/vue-generator/src/plugins/genGlobalState.js b/packages/vue-generator/src/plugins/genGlobalState.js
index 324f698a7..3e680a0c8 100644
--- a/packages/vue-generator/src/plugins/genGlobalState.js
+++ b/packages/vue-generator/src/plugins/genGlobalState.js
@@ -25,7 +25,7 @@ function genDependenciesPlugin(options = {}) {
     description: 'transform schema to globalState',
     /**
      * 转换 globalState
-     * @param {tinyEngineDslVue.IAppSchema} schema
+     * @param {import('@opentiny/tiny-engine-dsl-vue').IAppSchema} schema
      * @returns
      */
     run(schema) {
diff --git a/packages/vue-generator/src/plugins/genI18nPlugin.js b/packages/vue-generator/src/plugins/genI18nPlugin.js
index be5fd00fd..290adece7 100644
--- a/packages/vue-generator/src/plugins/genI18nPlugin.js
+++ b/packages/vue-generator/src/plugins/genI18nPlugin.js
@@ -17,7 +17,7 @@ function genI18nPlugin(options = {}) {
     description: 'transform i18n schema to i18n code plugin',
     /**
      * 将国际化 schema 转换成 i18n 高代码
-     * @param {tinyEngineDslVue.IAppSchema} schema
+     * @param {import('@opentiny/tiny-engine-dsl-vue').IAppSchema} schema
      * @returns
      */
     run(schema) {
diff --git a/packages/vue-generator/src/plugins/genPagePlugin.js b/packages/vue-generator/src/plugins/genPagePlugin.js
index 9f6fb4306..68b9c7115 100644
--- a/packages/vue-generator/src/plugins/genPagePlugin.js
+++ b/packages/vue-generator/src/plugins/genPagePlugin.js
@@ -15,7 +15,7 @@ function genPagePlugin(options = {}) {
     description: 'transform page schema to code',
     /**
      * 将页面 schema 转换成高代码
-     * @param {tinyEngineDslVue.IAppSchema} schema
+     * @param {import('@opentiny/tiny-engine-dsl-vue').IAppSchema} schema
      * @returns
      */
     run(schema) {
diff --git a/packages/vue-generator/src/plugins/genRouterPlugin.js b/packages/vue-generator/src/plugins/genRouterPlugin.js
index 1a92510f4..bccc98eae 100644
--- a/packages/vue-generator/src/plugins/genRouterPlugin.js
+++ b/packages/vue-generator/src/plugins/genRouterPlugin.js
@@ -36,7 +36,7 @@ function genRouterPlugin(options = {}) {
     description: 'transform router schema to router code plugin',
     /**
      * 根据页面生成路由配置
-     * @param {tinyEngineDslVue.IAppSchema} schema
+     * @param {import('@opentiny/tiny-engine-dsl-vue').IAppSchema} schema
      * @returns
      */
     run(schema) {
diff --git a/packages/vue-generator/src/plugins/genUtilsPlugin.js b/packages/vue-generator/src/plugins/genUtilsPlugin.js
index ba89c5265..2c7a1cdab 100644
--- a/packages/vue-generator/src/plugins/genUtilsPlugin.js
+++ b/packages/vue-generator/src/plugins/genUtilsPlugin.js
@@ -42,7 +42,7 @@ function genUtilsPlugin(options = {}) {
     description: 'transform utils schema to utils code',
     /**
      * 生成 utils 源码
-     * @param {tinyEngineDslVue.IAppSchema} schema
+     * @param {import('@opentiny/tiny-engine-dsl-vue').IAppSchema} schema
      * @returns
      */
     run(schema) {
diff --git a/packages/vue-generator/src/plugins/parseSchemaPlugin.js b/packages/vue-generator/src/plugins/parseSchemaPlugin.js
index 5e62f520b..1510c9c23 100644
--- a/packages/vue-generator/src/plugins/parseSchemaPlugin.js
+++ b/packages/vue-generator/src/plugins/parseSchemaPlugin.js
@@ -7,7 +7,7 @@ function parseSchema() {
 
     /**
      * 解析schema，预处理 schema
-     * @param {tinyEngineDslVue.IAppSchema} schema
+     * @param {import('@opentiny/tiny-engine-dsl-vue').IAppSchema} schema
      * @returns
      */
     run(schema) {

From 00cdbbab97345350131acc2a1bca2d22cc8cc3dd Mon Sep 17 00:00:00 2001
From: chilingling <26962197+chilingling@users.noreply.github.com>
Date: Mon, 21 Oct 2024 20:49:39 -0700
Subject: [PATCH 35/40] fix: blockName regexp incorrect (#852)

* fix: blockName regexp incorrect

* fix: change regexp by review

* fix: change by review

* fix: change by review comment
---
 packages/controller/js/verification.js | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/controller/js/verification.js b/packages/controller/js/verification.js
index 3276983d3..5bb5b5ff3 100644
--- a/packages/controller/js/verification.js
+++ b/packages/controller/js/verification.js
@@ -1,20 +1,20 @@
 /**
-* Copyright (c) 2023 - present TinyEngine Authors.
-* Copyright (c) 2023 - present Huawei Cloud Computing Technologies Co., Ltd.
-*
-* Use of this source code is governed by an MIT-style license.
-*
-* THE OPEN SOURCE SOFTWARE IN THIS PRODUCT IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL,
-* BUT WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR FITNESS FOR
-* A PARTICULAR PURPOSE. SEE THE APPLICABLE LICENSES FOR MORE DETAILS.
-*
-*/
+ * Copyright (c) 2023 - present TinyEngine Authors.
+ * Copyright (c) 2023 - present Huawei Cloud Computing Technologies Co., Ltd.
+ *
+ * Use of this source code is governed by an MIT-style license.
+ *
+ * THE OPEN SOURCE SOFTWARE IN THIS PRODUCT IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL,
+ * BUT WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR FITNESS FOR
+ * A PARTICULAR PURPOSE. SEE THE APPLICABLE LICENSES FOR MORE DETAILS.
+ *
+ */
 
 export const REGEXP_EVENT_NAME = /^[a-z]+([A-Z][a-z]*)*$/
 
 export const verifyEventName = (name) => REGEXP_EVENT_NAME.test(name)
 
-export const REGEXP_BLOCK_NAME = /^([A-Z][A-Za-z0-9]{2,})*?([A-Z][A-Za-z0-9]{2,})*?$/
+export const REGEXP_BLOCK_NAME = /^([A-Z][a-z0-9]*){2,}$/
 
 export const verifyBlockName = (string) => REGEXP_BLOCK_NAME.test(string)
 

From 119b9e8fe86f38b83a21f187d1f5beb2816bb4e3 Mon Sep 17 00:00:00 2001
From: chilingling <26962197+chilingling@users.noreply.github.com>
Date: Mon, 21 Oct 2024 20:49:49 -0700
Subject: [PATCH 36/40] fix: datasource remote result could not reshow again
 after edit (#847)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复远程数据源面板请求结果输入框在编辑之后，重新点击发送请求，如果请求结果一样，无法重新填充到请求结果输入框的
bug
---
 .../datasource/src/DataSourceRemoteDataResult.vue | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/packages/plugins/datasource/src/DataSourceRemoteDataResult.vue b/packages/plugins/datasource/src/DataSourceRemoteDataResult.vue
index c42eebd8b..24957b51b 100644
--- a/packages/plugins/datasource/src/DataSourceRemoteDataResult.vue
+++ b/packages/plugins/datasource/src/DataSourceRemoteDataResult.vue
@@ -10,7 +10,13 @@
       ></tiny-alert>
     </div>
     <div id="remote-data-editor" class="data-editor">
-      <monaco-editor ref="editor" :value="state.value" class="monaco-editor" :options="state.options" />
+      <monaco-editor
+        ref="editor"
+        :value="state.value"
+        class="monaco-editor"
+        :options="state.options"
+        @change="handleChange"
+      />
     </div>
   </div>
 </template>
@@ -68,10 +74,15 @@ export default {
       emit('copy', state.value)
     }
 
+    const handleChange = (val) => {
+      state.value = val
+    }
+
     return {
       state,
       copyData,
-      editor
+      editor,
+      handleChange
     }
   }
 }

From 12bfefc821d435bf69e7e02bf288b5fed633588f Mon Sep 17 00:00:00 2001
From: chilingling <michaelchiling1024@gmail.com>
Date: Tue, 22 Oct 2024 05:21:46 -0700
Subject: [PATCH 37/40] v1.0.0-rc.2

---
 mockServer/package.json                           | 4 ++--
 packages/blockToWebComponentTemplate/package.json | 2 +-
 packages/builtinComponent/package.json            | 2 +-
 packages/canvas/package.json                      | 2 +-
 packages/common/package.json                      | 2 +-
 packages/controller/package.json                  | 2 +-
 packages/design-core/package.json                 | 2 +-
 packages/http/package.json                        | 2 +-
 packages/i18n/package.json                        | 2 +-
 packages/plugins/block/package.json               | 2 +-
 packages/plugins/bridge/package.json              | 2 +-
 packages/plugins/data/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/tree/package.json                | 2 +-
 packages/plugins/tutorial/package.json            | 2 +-
 packages/settings/design/package.json             | 2 +-
 packages/settings/events/package.json             | 2 +-
 packages/settings/props/package.json              | 2 +-
 packages/settings/styles/package.json             | 2 +-
 packages/svgs/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-vue/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 +-
 48 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/mockServer/package.json b/mockServer/package.json
index 2bd7bed3c..070b5e3be 100644
--- a/mockServer/package.json
+++ b/mockServer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-mock",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "publishConfig": {
     "access": "public"
   },
@@ -25,7 +25,7 @@
     "lint": "eslint --fix ."
   },
   "dependencies": {
-    "@opentiny/tiny-engine-dsl-vue": "^1.0.4",
+    "@opentiny/tiny-engine-dsl-vue": "^1.0.5",
     "@seald-io/nedb": "^4.0.2",
     "fs-extra": "^11.1.1",
     "glob": "^10.3.4",
diff --git a/packages/blockToWebComponentTemplate/package.json b/packages/blockToWebComponentTemplate/package.json
index 6da63c41a..3e3ff8c07 100644
--- a/packages/blockToWebComponentTemplate/package.json
+++ b/packages/blockToWebComponentTemplate/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-block-build",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "translate block to webcomponent template",
   "main": "./dist/web-components.es.js",
   "scripts": {
diff --git a/packages/builtinComponent/package.json b/packages/builtinComponent/package.json
index 6eef264f7..9d1e68aee 100644
--- a/packages/builtinComponent/package.json
+++ b/packages/builtinComponent/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-builtin-component",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.js",
diff --git a/packages/canvas/package.json b/packages/canvas/package.json
index d810d911f..c8283367d 100644
--- a/packages/canvas/package.json
+++ b/packages/canvas/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-canvas",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/common/package.json b/packages/common/package.json
index 45db1551b..19df1f691 100644
--- a/packages/common/package.json
+++ b/packages/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-common",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/controller/package.json b/packages/controller/package.json
index 3c9d96922..0bb80ecd3 100644
--- a/packages/controller/package.json
+++ b/packages/controller/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-controller",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/design-core/package.json b/packages/design-core/package.json
index a3ca7a312..93139f820 100644
--- a/packages/design-core/package.json
+++ b/packages/design-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine",
-  "version": "1.0.0-rc.1",
+  "version": "1.0.0-rc.2",
   "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",
   "keywords": [
diff --git a/packages/http/package.json b/packages/http/package.json
index 088cb2ad5..ff0c302ef 100644
--- a/packages/http/package.json
+++ b/packages/http/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-http",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/i18n/package.json b/packages/i18n/package.json
index dc04e369f..20410624e 100644
--- a/packages/i18n/package.json
+++ b/packages/i18n/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-i18n-host",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/block/package.json b/packages/plugins/block/package.json
index d883b3a39..85e32b5e4 100644
--- a/packages/plugins/block/package.json
+++ b/packages/plugins/block/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-block",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/bridge/package.json b/packages/plugins/bridge/package.json
index 0ebabdca0..d79e4549c 100644
--- a/packages/plugins/bridge/package.json
+++ b/packages/plugins/bridge/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-bridge",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/data/package.json b/packages/plugins/data/package.json
index ee81efe00..374720fc3 100644
--- a/packages/plugins/data/package.json
+++ b/packages/plugins/data/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-data",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/datasource/package.json b/packages/plugins/datasource/package.json
index 500d278ce..dd6d3abf2 100644
--- a/packages/plugins/datasource/package.json
+++ b/packages/plugins/datasource/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-datasource",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/help/package.json b/packages/plugins/help/package.json
index ca2408ee1..f886335b3 100644
--- a/packages/plugins/help/package.json
+++ b/packages/plugins/help/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-help",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/i18n/package.json b/packages/plugins/i18n/package.json
index 97dbf8546..f4652767c 100644
--- a/packages/plugins/i18n/package.json
+++ b/packages/plugins/i18n/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-i18n",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/materials/package.json b/packages/plugins/materials/package.json
index ce11dcad3..e52e8e06e 100644
--- a/packages/plugins/materials/package.json
+++ b/packages/plugins/materials/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-materials",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/page/package.json b/packages/plugins/page/package.json
index 26c48babb..c1a768600 100644
--- a/packages/plugins/page/package.json
+++ b/packages/plugins/page/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-page",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/robot/package.json b/packages/plugins/robot/package.json
index f6138c8eb..a58d397a0 100644
--- a/packages/plugins/robot/package.json
+++ b/packages/plugins/robot/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-robot",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/schema/package.json b/packages/plugins/schema/package.json
index 9e51f0c7a..9d61f2e5b 100644
--- a/packages/plugins/schema/package.json
+++ b/packages/plugins/schema/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-schema",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/script/package.json b/packages/plugins/script/package.json
index 95fcf77af..1770f9682 100644
--- a/packages/plugins/script/package.json
+++ b/packages/plugins/script/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-script",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/tree/package.json b/packages/plugins/tree/package.json
index b28f5d584..4ec171a0e 100644
--- a/packages/plugins/tree/package.json
+++ b/packages/plugins/tree/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-tree",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/tutorial/package.json b/packages/plugins/tutorial/package.json
index 580614ffa..8197f814a 100644
--- a/packages/plugins/tutorial/package.json
+++ b/packages/plugins/tutorial/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-tutorial",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/settings/design/package.json b/packages/settings/design/package.json
index 6e6a12fa8..96842fbf8 100644
--- a/packages/settings/design/package.json
+++ b/packages/settings/design/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-setting-design",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/settings/events/package.json b/packages/settings/events/package.json
index 01f1a6353..458140774 100644
--- a/packages/settings/events/package.json
+++ b/packages/settings/events/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-setting-events",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/settings/props/package.json b/packages/settings/props/package.json
index 0143bf3ce..e4f6b5aa1 100644
--- a/packages/settings/props/package.json
+++ b/packages/settings/props/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-setting-props",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/settings/styles/package.json b/packages/settings/styles/package.json
index df338b338..1e18c7278 100644
--- a/packages/settings/styles/package.json
+++ b/packages/settings/styles/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-setting-styles",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/svgs/package.json b/packages/svgs/package.json
index c5ba2e024..74f5032a9 100644
--- a/packages/svgs/package.json
+++ b/packages/svgs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-svgs",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/theme/dark/package.json b/packages/theme/dark/package.json
index a5e81bd9a..87a839c90 100644
--- a/packages/theme/dark/package.json
+++ b/packages/theme/dark/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-theme-dark",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/theme/light/package.json b/packages/theme/light/package.json
index f5514c555..9d476d720 100644
--- a/packages/theme/light/package.json
+++ b/packages/theme/light/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-theme-light",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/breadcrumb/package.json b/packages/toolbars/breadcrumb/package.json
index 058ee7ebb..ac4e4d29f 100644
--- a/packages/toolbars/breadcrumb/package.json
+++ b/packages/toolbars/breadcrumb/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-breadcrumb",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/clean/package.json b/packages/toolbars/clean/package.json
index c2b0107d2..c6a242da7 100644
--- a/packages/toolbars/clean/package.json
+++ b/packages/toolbars/clean/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-clean",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/collaboration/package.json b/packages/toolbars/collaboration/package.json
index a8a7480c3..4bcefd5c6 100644
--- a/packages/toolbars/collaboration/package.json
+++ b/packages/toolbars/collaboration/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-collaboration",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/fullscreen/package.json b/packages/toolbars/fullscreen/package.json
index 1cb5a60aa..8ec64845c 100644
--- a/packages/toolbars/fullscreen/package.json
+++ b/packages/toolbars/fullscreen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-fullscreen",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/generate-vue/package.json b/packages/toolbars/generate-vue/package.json
index 24fbf4628..27efb4013 100644
--- a/packages/toolbars/generate-vue/package.json
+++ b/packages/toolbars/generate-vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-generate-vue",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/lang/package.json b/packages/toolbars/lang/package.json
index 88f5b194b..206226b8e 100644
--- a/packages/toolbars/lang/package.json
+++ b/packages/toolbars/lang/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-lang",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/layout/package.json b/packages/toolbars/layout/package.json
index 3c3c06009..4f0cac758 100644
--- a/packages/toolbars/layout/package.json
+++ b/packages/toolbars/layout/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-layout",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/lock/package.json b/packages/toolbars/lock/package.json
index dbe094acd..f1467b6b5 100644
--- a/packages/toolbars/lock/package.json
+++ b/packages/toolbars/lock/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-checkinout",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/logo/package.json b/packages/toolbars/logo/package.json
index 9e98b393d..8f82bbd51 100644
--- a/packages/toolbars/logo/package.json
+++ b/packages/toolbars/logo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-logo",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/logout/package.json b/packages/toolbars/logout/package.json
index 0704d8da2..d6634444c 100644
--- a/packages/toolbars/logout/package.json
+++ b/packages/toolbars/logout/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-logout",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/media/package.json b/packages/toolbars/media/package.json
index 66acc310e..5f23ed28a 100644
--- a/packages/toolbars/media/package.json
+++ b/packages/toolbars/media/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-media",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/preview/package.json b/packages/toolbars/preview/package.json
index 97e59a651..3c7998367 100644
--- a/packages/toolbars/preview/package.json
+++ b/packages/toolbars/preview/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-preview",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/redoundo/package.json b/packages/toolbars/redoundo/package.json
index 5b621babd..6190363d6 100644
--- a/packages/toolbars/redoundo/package.json
+++ b/packages/toolbars/redoundo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-redoundo",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/refresh/package.json b/packages/toolbars/refresh/package.json
index 431def747..da9ed5ff6 100644
--- a/packages/toolbars/refresh/package.json
+++ b/packages/toolbars/refresh/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-refresh",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/save/package.json b/packages/toolbars/save/package.json
index 568d68ef0..8692dc8cd 100644
--- a/packages/toolbars/save/package.json
+++ b/packages/toolbars/save/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-save",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/setting/package.json b/packages/toolbars/setting/package.json
index e9381f0bc..930a209ce 100644
--- a/packages/toolbars/setting/package.json
+++ b/packages/toolbars/setting/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-setting",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/utils/package.json b/packages/utils/package.json
index b7fd1974c..c601adf7f 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-utils",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/vue-generator/package.json b/packages/vue-generator/package.json
index bf39e30c6..6b9683a1e 100644
--- a/packages/vue-generator/package.json
+++ b/packages/vue-generator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-dsl-vue",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/webcomponent/package.json b/packages/webcomponent/package.json
index bad31dbed..51e8284e2 100644
--- a/packages/webcomponent/package.json
+++ b/packages/webcomponent/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-webcomponent-core",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "publishConfig": {
     "access": "public"
   },

From 42664eb2dba1053a0f46ec7f262f2c85bd7a45a5 Mon Sep 17 00:00:00 2001
From: lichunn <46984087+lichunn@users.noreply.github.com>
Date: Sat, 26 Oct 2024 01:29:52 -0700
Subject: [PATCH 38/40] fix:Popeditor configuration issue (#881)

---
 packages/design-core/public/mock/bundle.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/design-core/public/mock/bundle.json b/packages/design-core/public/mock/bundle.json
index 1405e91bd..84aa8be65 100644
--- a/packages/design-core/public/mock/bundle.json
+++ b/packages/design-core/public/mock/bundle.json
@@ -10544,7 +10544,7 @@
           "devMode": "proCode",
           "npm": {
             "package": "@opentiny/vue",
-            "exportName": "PopEditor",
+            "exportName": "Popeditor",
             "version": "",
             "destructuring": true
           },

From f152e32bb6d48874d9b578b4d45cc7107bd234a0 Mon Sep 17 00:00:00 2001
From: chilingling <26962197+chilingling@users.noreply.github.com>
Date: Wed, 30 Oct 2024 07:27:38 -0700
Subject: [PATCH 39/40] fix: parse template name error (#880)

* fix: parse template name error

* fix: add detection for test env
---
 .../src/plugins/genTemplatePlugin.js          |  2 +-
 .../src/templates/vue-template/index.js       | 33 +++++++++++++++----
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/packages/vue-generator/src/plugins/genTemplatePlugin.js b/packages/vue-generator/src/plugins/genTemplatePlugin.js
index a48089a7a..159c331af 100644
--- a/packages/vue-generator/src/plugins/genTemplatePlugin.js
+++ b/packages/vue-generator/src/plugins/genTemplatePlugin.js
@@ -18,7 +18,7 @@ function genTemplatePlugin(options = {}) {
         return
       }
 
-      const template = context?.template || 'default'
+      const template = options?.template || 'default'
 
       if (!template) {
         return
diff --git a/packages/vue-generator/src/templates/vue-template/index.js b/packages/vue-generator/src/templates/vue-template/index.js
index ccd45337d..3c9c229e6 100644
--- a/packages/vue-generator/src/templates/vue-template/index.js
+++ b/packages/vue-generator/src/templates/vue-template/index.js
@@ -41,25 +41,31 @@ const getTemplate = (schema, str) => {
 const base64ToBlob = (base64Data) => {
   // Split base64
   const arr = base64Data.split(',')
+
   // Get MIME type
   const mimeMatch = arr[0].match(/:(.*?);/)
+
   if (!mimeMatch) {
     throw new Error('Invalid base64 data')
   }
+
   const mime = mimeMatch[1]
   // Decode base64 string
   let raw
+
   try {
     raw = window.atob(arr[1])
   } catch (e) {
     throw new Error('Failed to decode base64 string')
   }
+
   const rawLength = raw.length
   // Convert to Blob
   const uInt8Array = new Uint8Array(rawLength)
   for (let i = 0; i < rawLength; i++) {
     uInt8Array[i] = raw.charCodeAt(i)
   }
+
   return new Blob([uInt8Array], { type: mime })
 }
 
@@ -68,7 +74,7 @@ const base64ToBlob = (base64Data) => {
  * @returns
  */
 export function generateTemplate(schema) {
-  return [
+  const res = [
     {
       fileType: 'md',
       fileName: 'README.md',
@@ -98,12 +104,6 @@ export function generateTemplate(schema) {
       path: '.',
       fileContent: getTemplate(schema, entryHTMLFile)
     },
-    {
-      fileType: 'image/x-icon',
-      fileName: 'favicon.ico',
-      path: './public',
-      fileContent: base64ToBlob(logoImage)
-    },
     {
       fileType: 'js',
       fileName: 'main.js',
@@ -159,4 +159,23 @@ export function generateTemplate(schema) {
       fileContent: httpEntryFile
     }
   ]
+
+  // FIXME: vitest 测试的时候得到的并不是 base64data，所以这里需要跳过文件的出码
+  if (process.env?.NODE_ENV !== 'test') {
+    try {
+      const faviconData = base64ToBlob(logoImage)
+
+      res.push({
+        fileType: 'image/x-icon',
+        fileName: 'favicon.ico',
+        path: './public',
+        fileContent: faviconData
+      })
+    } catch (error) {
+      // eslint-disable-next-line no-console
+      console.error('generate favicon.ico error', error)
+    }
+  }
+
+  return res
 }

From d90f0f2d536352364a8f1e470922b61261ecb7e9 Mon Sep 17 00:00:00 2001
From: chilingling <michaelchiling1024@gmail.com>
Date: Wed, 30 Oct 2024 07:37:00 -0700
Subject: [PATCH 40/40] v1.0.0

---
 mockServer/package.json                           | 4 ++--
 packages/blockToWebComponentTemplate/package.json | 2 +-
 packages/builtinComponent/package.json            | 2 +-
 packages/canvas/package.json                      | 2 +-
 packages/common/package.json                      | 2 +-
 packages/controller/package.json                  | 2 +-
 packages/design-core/package.json                 | 2 +-
 packages/http/package.json                        | 2 +-
 packages/i18n/package.json                        | 2 +-
 packages/plugins/block/package.json               | 2 +-
 packages/plugins/bridge/package.json              | 2 +-
 packages/plugins/data/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/tree/package.json                | 2 +-
 packages/plugins/tutorial/package.json            | 2 +-
 packages/settings/design/package.json             | 2 +-
 packages/settings/events/package.json             | 2 +-
 packages/settings/props/package.json              | 2 +-
 packages/settings/styles/package.json             | 2 +-
 packages/svgs/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-vue/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 +-
 48 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/mockServer/package.json b/mockServer/package.json
index 070b5e3be..01ebc83c0 100644
--- a/mockServer/package.json
+++ b/mockServer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-mock",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "publishConfig": {
     "access": "public"
   },
@@ -25,7 +25,7 @@
     "lint": "eslint --fix ."
   },
   "dependencies": {
-    "@opentiny/tiny-engine-dsl-vue": "^1.0.5",
+    "@opentiny/tiny-engine-dsl-vue": "^1.0.6",
     "@seald-io/nedb": "^4.0.2",
     "fs-extra": "^11.1.1",
     "glob": "^10.3.4",
diff --git a/packages/blockToWebComponentTemplate/package.json b/packages/blockToWebComponentTemplate/package.json
index 3e3ff8c07..cd7f0dc8f 100644
--- a/packages/blockToWebComponentTemplate/package.json
+++ b/packages/blockToWebComponentTemplate/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-block-build",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "translate block to webcomponent template",
   "main": "./dist/web-components.es.js",
   "scripts": {
diff --git a/packages/builtinComponent/package.json b/packages/builtinComponent/package.json
index 9d1e68aee..805d0a7f1 100644
--- a/packages/builtinComponent/package.json
+++ b/packages/builtinComponent/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-builtin-component",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.js",
diff --git a/packages/canvas/package.json b/packages/canvas/package.json
index c8283367d..264856880 100644
--- a/packages/canvas/package.json
+++ b/packages/canvas/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-canvas",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/common/package.json b/packages/common/package.json
index 19df1f691..b10f65934 100644
--- a/packages/common/package.json
+++ b/packages/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-common",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/controller/package.json b/packages/controller/package.json
index 0bb80ecd3..1bece1c15 100644
--- a/packages/controller/package.json
+++ b/packages/controller/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-controller",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/design-core/package.json b/packages/design-core/package.json
index 93139f820..29765bd5a 100644
--- a/packages/design-core/package.json
+++ b/packages/design-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine",
-  "version": "1.0.0-rc.2",
+  "version": "1.0.0",
   "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",
   "keywords": [
diff --git a/packages/http/package.json b/packages/http/package.json
index ff0c302ef..e242547fa 100644
--- a/packages/http/package.json
+++ b/packages/http/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-http",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/i18n/package.json b/packages/i18n/package.json
index 20410624e..6f217c7c8 100644
--- a/packages/i18n/package.json
+++ b/packages/i18n/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-i18n-host",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/block/package.json b/packages/plugins/block/package.json
index 85e32b5e4..eecc07ca4 100644
--- a/packages/plugins/block/package.json
+++ b/packages/plugins/block/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-block",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/bridge/package.json b/packages/plugins/bridge/package.json
index d79e4549c..0dc697b7a 100644
--- a/packages/plugins/bridge/package.json
+++ b/packages/plugins/bridge/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-bridge",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/data/package.json b/packages/plugins/data/package.json
index 374720fc3..a2d6470cc 100644
--- a/packages/plugins/data/package.json
+++ b/packages/plugins/data/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-data",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/datasource/package.json b/packages/plugins/datasource/package.json
index dd6d3abf2..0786551d6 100644
--- a/packages/plugins/datasource/package.json
+++ b/packages/plugins/datasource/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-datasource",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/help/package.json b/packages/plugins/help/package.json
index f886335b3..b33037c30 100644
--- a/packages/plugins/help/package.json
+++ b/packages/plugins/help/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-help",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/i18n/package.json b/packages/plugins/i18n/package.json
index f4652767c..f5aa936ac 100644
--- a/packages/plugins/i18n/package.json
+++ b/packages/plugins/i18n/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-i18n",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/materials/package.json b/packages/plugins/materials/package.json
index e52e8e06e..c9b28762d 100644
--- a/packages/plugins/materials/package.json
+++ b/packages/plugins/materials/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-materials",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/page/package.json b/packages/plugins/page/package.json
index c1a768600..f2db39b61 100644
--- a/packages/plugins/page/package.json
+++ b/packages/plugins/page/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-page",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/robot/package.json b/packages/plugins/robot/package.json
index a58d397a0..ff4f74fd3 100644
--- a/packages/plugins/robot/package.json
+++ b/packages/plugins/robot/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-robot",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/schema/package.json b/packages/plugins/schema/package.json
index 9d61f2e5b..45843d9a1 100644
--- a/packages/plugins/schema/package.json
+++ b/packages/plugins/schema/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-schema",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/script/package.json b/packages/plugins/script/package.json
index 1770f9682..b034a2d17 100644
--- a/packages/plugins/script/package.json
+++ b/packages/plugins/script/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-script",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/tree/package.json b/packages/plugins/tree/package.json
index 4ec171a0e..9c1fca2cb 100644
--- a/packages/plugins/tree/package.json
+++ b/packages/plugins/tree/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-tree",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/plugins/tutorial/package.json b/packages/plugins/tutorial/package.json
index 8197f814a..b0b1759d2 100644
--- a/packages/plugins/tutorial/package.json
+++ b/packages/plugins/tutorial/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-tutorial",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/settings/design/package.json b/packages/settings/design/package.json
index 96842fbf8..d6f51260b 100644
--- a/packages/settings/design/package.json
+++ b/packages/settings/design/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-setting-design",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/settings/events/package.json b/packages/settings/events/package.json
index 458140774..d0fa09793 100644
--- a/packages/settings/events/package.json
+++ b/packages/settings/events/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-setting-events",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/settings/props/package.json b/packages/settings/props/package.json
index e4f6b5aa1..45f712b49 100644
--- a/packages/settings/props/package.json
+++ b/packages/settings/props/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-setting-props",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/settings/styles/package.json b/packages/settings/styles/package.json
index 1e18c7278..3f9d2393b 100644
--- a/packages/settings/styles/package.json
+++ b/packages/settings/styles/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-setting-styles",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/svgs/package.json b/packages/svgs/package.json
index 74f5032a9..6776c0721 100644
--- a/packages/svgs/package.json
+++ b/packages/svgs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-svgs",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/theme/dark/package.json b/packages/theme/dark/package.json
index 87a839c90..ffb62ea1d 100644
--- a/packages/theme/dark/package.json
+++ b/packages/theme/dark/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-theme-dark",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/theme/light/package.json b/packages/theme/light/package.json
index 9d476d720..f1b2770c3 100644
--- a/packages/theme/light/package.json
+++ b/packages/theme/light/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-theme-light",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/breadcrumb/package.json b/packages/toolbars/breadcrumb/package.json
index ac4e4d29f..f1feee039 100644
--- a/packages/toolbars/breadcrumb/package.json
+++ b/packages/toolbars/breadcrumb/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-breadcrumb",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/clean/package.json b/packages/toolbars/clean/package.json
index c6a242da7..b94534eaf 100644
--- a/packages/toolbars/clean/package.json
+++ b/packages/toolbars/clean/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-clean",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/collaboration/package.json b/packages/toolbars/collaboration/package.json
index 4bcefd5c6..4ef4a7e20 100644
--- a/packages/toolbars/collaboration/package.json
+++ b/packages/toolbars/collaboration/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-collaboration",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/fullscreen/package.json b/packages/toolbars/fullscreen/package.json
index 8ec64845c..6050de0c7 100644
--- a/packages/toolbars/fullscreen/package.json
+++ b/packages/toolbars/fullscreen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-fullscreen",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/generate-vue/package.json b/packages/toolbars/generate-vue/package.json
index 27efb4013..6005336b7 100644
--- a/packages/toolbars/generate-vue/package.json
+++ b/packages/toolbars/generate-vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-generate-vue",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/lang/package.json b/packages/toolbars/lang/package.json
index 206226b8e..2e05d66be 100644
--- a/packages/toolbars/lang/package.json
+++ b/packages/toolbars/lang/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-lang",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/layout/package.json b/packages/toolbars/layout/package.json
index 4f0cac758..9b529e746 100644
--- a/packages/toolbars/layout/package.json
+++ b/packages/toolbars/layout/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-layout",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/lock/package.json b/packages/toolbars/lock/package.json
index f1467b6b5..84ff599a5 100644
--- a/packages/toolbars/lock/package.json
+++ b/packages/toolbars/lock/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-checkinout",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/logo/package.json b/packages/toolbars/logo/package.json
index 8f82bbd51..1cbc254f2 100644
--- a/packages/toolbars/logo/package.json
+++ b/packages/toolbars/logo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-logo",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/logout/package.json b/packages/toolbars/logout/package.json
index d6634444c..5e3ff5180 100644
--- a/packages/toolbars/logout/package.json
+++ b/packages/toolbars/logout/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-logout",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/media/package.json b/packages/toolbars/media/package.json
index 5f23ed28a..505dacd9f 100644
--- a/packages/toolbars/media/package.json
+++ b/packages/toolbars/media/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-media",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/preview/package.json b/packages/toolbars/preview/package.json
index 3c7998367..543bba48e 100644
--- a/packages/toolbars/preview/package.json
+++ b/packages/toolbars/preview/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-preview",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/redoundo/package.json b/packages/toolbars/redoundo/package.json
index 6190363d6..bc11a4d4f 100644
--- a/packages/toolbars/redoundo/package.json
+++ b/packages/toolbars/redoundo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-redoundo",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/refresh/package.json b/packages/toolbars/refresh/package.json
index da9ed5ff6..430615d6c 100644
--- a/packages/toolbars/refresh/package.json
+++ b/packages/toolbars/refresh/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-refresh",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/save/package.json b/packages/toolbars/save/package.json
index 8692dc8cd..b1a8b14cd 100644
--- a/packages/toolbars/save/package.json
+++ b/packages/toolbars/save/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-save",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/toolbars/setting/package.json b/packages/toolbars/setting/package.json
index 930a209ce..661b68adb 100644
--- a/packages/toolbars/setting/package.json
+++ b/packages/toolbars/setting/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-setting",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/utils/package.json b/packages/utils/package.json
index c601adf7f..853c62492 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-utils",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/vue-generator/package.json b/packages/vue-generator/package.json
index 6b9683a1e..90af5b3d6 100644
--- a/packages/vue-generator/package.json
+++ b/packages/vue-generator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-dsl-vue",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/webcomponent/package.json b/packages/webcomponent/package.json
index 51e8284e2..c311abad7 100644
--- a/packages/webcomponent/package.json
+++ b/packages/webcomponent/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-webcomponent-core",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "publishConfig": {
     "access": "public"
   },