opentiny · wenmine · Jan 26, 2025 · Jan 25, 2025 · Jan 26, 2025 · Jan 26, 2025
diff --git a/designer-demo/package.json b/designer-demo/package.json
@@ -1,7 +1,7 @@
 {
   "name": "designer-demo",
   "private": true,
-  "version": "2.2.0-rc.0",
+  "version": "2.2.0-rc.1",
   "type": "module",
   "scripts": {
     "dev": "cross-env VITE_THEME=light vite",

diff --git a/mockServer/package.json b/mockServer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-mock",
-  "version": "2.2.0-rc.0",
+  "version": "2.2.0-rc.1",
   "publishConfig": {
     "access": "public"
   },

diff --git a/package.json b/package.json
@@ -19,7 +19,8 @@
     "pub:prerelease": "pnpm run build:plugin && pnpm run build:alpha && pnpm lerna version prerelease --preid beta --no-push --yes && lerna publish from-package --pre-dist-tag beta --yes",
     "setup": "node ./scripts/setup.js",
     "splitMaterials": "node ./scripts/splitMaterials.mjs",
-    "buildMaterials": "node ./scripts/buildMaterials.mjs"
+    "buildMaterials": "node ./scripts/buildMaterials.mjs",
+    "updateTemplate": "node ./scripts/updateTemplate.mjs"
   },
   "devDependencies": {
     "@babel/eslint-parser": "^7.21.3",

diff --git a/packages/block-compiler/package.json b/packages/block-compiler/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-block-compiler",
-  "version": "2.2.0-rc.0",
+  "version": "2.2.0-rc.1",
   "publishConfig": {
     "access": "public"
   },

diff --git a/packages/blockToWebComponentTemplate/package.json b/packages/blockToWebComponentTemplate/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-block-build",
-  "version": "2.2.0-rc.0",
+  "version": "2.2.0-rc.1",
   "description": "translate block to webcomponent template",
   "main": "./dist/web-components.es.js",
   "type": "module",

diff --git a/packages/build/vite-config/package.json b/packages/build/vite-config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-vite-config",
-  "version": "2.2.0-rc.0",
+  "version": "2.2.0-rc.1",
   "description": "",
   "type": "module",
   "main": "./index.js",

diff --git a/packages/build/vite-plugin-meta-comments/package.json b/packages/build/vite-plugin-meta-comments/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-vite-plugin-meta-comments",
-  "version": "2.2.0-rc.0",
+  "version": "2.2.0-rc.1",
   "description": "",
   "type": "module",
   "main": "dist/index.cjs",

diff --git a/packages/builtinComponent/package.json b/packages/builtinComponent/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-builtin-component",
-  "version": "2.2.0-rc.0",
+  "version": "2.2.0-rc.1",
   "description": "",
   "main": "dist/index.mjs",
   "module": "dist/index.mjs",

diff --git a/packages/canvas/package.json b/packages/canvas/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-canvas",
-  "version": "2.2.0-rc.0",
+  "version": "2.2.0-rc.1",
   "publishConfig": {
     "access": "public"
   },

diff --git a/packages/common/package.json b/packages/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-common",
-  "version": "2.2.0-rc.0",
+  "version": "2.2.0-rc.1",
   "publishConfig": {
     "access": "public"
   },

diff --git a/packages/configurator/package.json b/packages/configurator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-configurator",
-  "version": "2.2.0-rc.0",
+  "version": "2.2.0-rc.1",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.js",

diff --git a/packages/design-core/package.json b/packages/design-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine",
-  "version": "2.2.0-rc.0",
+  "version": "2.2.0-rc.1",
   "type": "module",
   "description": "TinyEngine enables developers to customize low-code platforms, build low-bit platforms online in real time, and support secondary development or integration of low-bit platform capabilities.",
   "homepage": "https://opentiny.design/tiny-engine",

diff --git a/packages/engine-cli/package.json b/packages/engine-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-cli",
-  "version": "2.2.0-rc.0",
+  "version": "2.2.0-rc.1",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

diff --git a/packages/engine-cli/template/designer/package.json b/packages/engine-cli/template/designer/package.json
@@ -1,20 +1,20 @@
 {
-  "name": "designer-demo-template",
+  "name": "designer-demo",
   "private": true,
   "version": "0.0.0",
   "type": "module",
   "scripts": {
     "dev": "concurrently 'pnpm:serve:mock' 'pnpm:serve:frontend'",
-    "serve:frontend": "cross-env VITE_THEME=light vite",
-    "serve:mock": "node node_modules/@opentiny/tiny-engine-mock/dist/app.js",
     "build:alpha": "cross-env NODE_OPTIONS=--max-old-space-size=8192 VITE_THEME=light vite build --mode alpha",
-    "build": "cross-env NODE_OPTIONS=--max-old-space-size=8192 VITE_THEME=light vite build --mode prod"
+    "build": "cross-env NODE_OPTIONS=--max-old-space-size=8192 VITE_THEME=light vite build --mode prod",
+    "serve:frontend": "cross-env VITE_THEME=light vite",
+    "serve:mock": "node node_modules/@opentiny/tiny-engine-mock/dist/app.js"
   },
   "dependencies": {
-    "@opentiny/tiny-engine": "^2.1.0",
-    "@opentiny/tiny-engine-theme-dark": "^2.1.0",
-    "@opentiny/tiny-engine-theme-light": "^2.1.0",
-    "@opentiny/tiny-engine-utils": "^2.1.0",
+    "@opentiny/tiny-engine": "2.2.0-rc.1",
+    "@opentiny/tiny-engine-theme-dark": "2.2.0-rc.1",
+    "@opentiny/tiny-engine-theme-light": "2.2.0-rc.1",
+    "@opentiny/tiny-engine-utils": "2.2.0-rc.1",
     "@opentiny/vue": "~3.14.0",
     "@opentiny/vue-design-smb": "~3.14.0",
     "@opentiny/vue-icon": "~3.14.0",
@@ -25,11 +25,11 @@
     "vue": "^3.4.21"
   },
   "devDependencies": {
-    "@opentiny/tiny-engine-mock": "^2.1.0",
-    "@opentiny/tiny-engine-vite-config": "^2.1.0",
+    "@opentiny/tiny-engine-mock": "2.2.0-rc.1",
+    "@opentiny/tiny-engine-vite-config": "2.2.0-rc.1",
     "@vitejs/plugin-vue": "^5.1.2",
     "cross-env": "^7.0.3",
-    "concurrently": "^8.2.0",
-    "vite": "^5.4.2"
+    "vite": "^5.4.2",
+    "concurrently": "^8.2.0"
   }
 }
diff --git a/packages/engine-cli/template/designer/registry.js b/packages/engine-cli/template/designer/registry.js
@@ -101,7 +101,20 @@ export default {
     Lang,
     ViewSetting
   ],
-  plugins: [Materials, Tree, Page, Block, Datasource, Bridge, I18n, Script, State, Schema, Help, Robot],
+  plugins: [
+    Materials,
+    Tree,
+    Page,
+    [Block, { options: { ...Block.options, mergeCategoriesAndGroups: true } }],
+    Datasource,
+    Bridge,
+    I18n,
+    Script,
+    State,
+    Schema,
+    Help,
+    Robot
+  ],
   dsls: [{ id: 'engine.dsls.dslvue' }],
   settings: [Props, Styles, Events],
   canvas: Canvas

diff --git a/packages/engine-cli/template/designer/vite.config.js b/packages/engine-cli/template/designer/vite.config.js
@@ -7,6 +7,7 @@ export default defineConfig((configEnv) => {
     viteConfigEnv: configEnv,
     root: __dirname,
     iconDirs: [path.resolve(__dirname, './node_modules/@opentiny/tiny-engine/assets/')],
+    useSourceAlias: false,
     envDir: './env'
   })
 

diff --git a/packages/i18n/package.json b/packages/i18n/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-i18n-host",
-  "version": "2.2.0-rc.0",
+  "version": "2.2.0-rc.1",
   "publishConfig": {
     "access": "public"
   },

diff --git a/packages/layout/package.json b/packages/layout/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-layout",
-  "version": "2.2.0-rc.0",
+  "version": "2.2.0-rc.1",
   "scripts": {
     "build": "vite build"
   },

diff --git a/packages/plugins/block/package.json b/packages/plugins/block/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-block",
-  "version": "2.2.0-rc.0",
+  "version": "2.2.0-rc.1",
   "publishConfig": {
     "access": "public"
   },

diff --git a/packages/plugins/bridge/package.json b/packages/plugins/bridge/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-bridge",
-  "version": "2.2.0-rc.0",
+  "version": "2.2.0-rc.1",
   "publishConfig": {
     "access": "public"
   },

diff --git a/packages/plugins/datasource/package.json b/packages/plugins/datasource/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-datasource",
-  "version": "2.2.0-rc.0",
+  "version": "2.2.0-rc.1",
   "publishConfig": {
     "access": "public"
   },

diff --git a/packages/plugins/help/package.json b/packages/plugins/help/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-help",
-  "version": "2.2.0-rc.0",
+  "version": "2.2.0-rc.1",
   "publishConfig": {
     "access": "public"
   },

diff --git a/packages/plugins/i18n/package.json b/packages/plugins/i18n/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-i18n",
-  "version": "2.2.0-rc.0",
+  "version": "2.2.0-rc.1",
   "publishConfig": {
     "access": "public"
   },

diff --git a/packages/plugins/materials/package.json b/packages/plugins/materials/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-materials",
-  "version": "2.2.0-rc.0",
+  "version": "2.2.0-rc.1",
   "publishConfig": {
     "access": "public"
   },

diff --git a/packages/plugins/page/package.json b/packages/plugins/page/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-page",
-  "version": "2.2.0-rc.0",
+  "version": "2.2.0-rc.1",
   "publishConfig": {
     "access": "public"
   },

diff --git a/packages/plugins/robot/package.json b/packages/plugins/robot/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-robot",
-  "version": "2.2.0-rc.0",
+  "version": "2.2.0-rc.1",
   "publishConfig": {
     "access": "public"
   },

diff --git a/packages/plugins/schema/package.json b/packages/plugins/schema/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-schema",
-  "version": "2.2.0-rc.0",
+  "version": "2.2.0-rc.1",
   "publishConfig": {
     "access": "public"
   },

diff --git a/packages/plugins/script/package.json b/packages/plugins/script/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-script",
-  "version": "2.2.0-rc.0",
+  "version": "2.2.0-rc.1",
   "publishConfig": {
     "access": "public"
   },

diff --git a/packages/plugins/state/package.json b/packages/plugins/state/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-state",
-  "version": "2.2.0-rc.0",
+  "version": "2.2.0-rc.1",
   "publishConfig": {
     "access": "public"
   },

diff --git a/packages/plugins/tree/package.json b/packages/plugins/tree/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-tree",
-  "version": "2.2.0-rc.0",
+  "version": "2.2.0-rc.1",
   "publishConfig": {
     "access": "public"
   },

diff --git a/packages/plugins/tutorial/package.json b/packages/plugins/tutorial/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-plugin-tutorial",
-  "version": "2.2.0-rc.0",
+  "version": "2.2.0-rc.1",
   "publishConfig": {
     "access": "public"
   },

diff --git a/packages/register/package.json b/packages/register/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-meta-register",
-  "version": "2.2.0-rc.0",
+  "version": "2.2.0-rc.1",
   "description": "",
   "type": "module",
   "main": "dist/index.js",

diff --git a/packages/settings/design/package.json b/packages/settings/design/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-setting-design",
-  "version": "2.2.0-rc.0",
+  "version": "2.2.0-rc.1",
   "publishConfig": {
     "access": "public"
   },

diff --git a/packages/settings/events/package.json b/packages/settings/events/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-setting-events",
-  "version": "2.2.0-rc.0",
+  "version": "2.2.0-rc.1",
   "publishConfig": {
     "access": "public"
   },

diff --git a/packages/settings/panel/package.json b/packages/settings/panel/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-settings-panel",
-  "version": "2.2.0-rc.0",
+  "version": "2.2.0-rc.1",
   "publishConfig": {
     "access": "public"
   },

diff --git a/packages/settings/props/package.json b/packages/settings/props/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-setting-props",
-  "version": "2.2.0-rc.0",
+  "version": "2.2.0-rc.1",
   "publishConfig": {
     "access": "public"
   },

diff --git a/packages/settings/styles/package.json b/packages/settings/styles/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-setting-styles",
-  "version": "2.2.0-rc.0",
+  "version": "2.2.0-rc.1",
   "publishConfig": {
     "access": "public"
   },

diff --git a/packages/svgs/package.json b/packages/svgs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-svgs",
-  "version": "2.2.0-rc.0",
+  "version": "2.2.0-rc.1",
   "publishConfig": {
     "access": "public"
   },

diff --git a/packages/theme/base/package.json b/packages/theme/base/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-theme-base",
-  "version": "2.2.0-rc.0",
+  "version": "2.2.0-rc.1",
   "publishConfig": {
     "access": "public"
   },

diff --git a/packages/theme/dark/package.json b/packages/theme/dark/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-theme-dark",
-  "version": "2.2.0-rc.0",
+  "version": "2.2.0-rc.1",
   "publishConfig": {
     "access": "public"
   },

diff --git a/packages/theme/light/package.json b/packages/theme/light/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-theme-light",
-  "version": "2.2.0-rc.0",
+  "version": "2.2.0-rc.1",
   "publishConfig": {
     "access": "public"
   },

diff --git a/packages/toolbars/breadcrumb/package.json b/packages/toolbars/breadcrumb/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-breadcrumb",
-  "version": "2.2.0-rc.0",
+  "version": "2.2.0-rc.1",
   "publishConfig": {
     "access": "public"
   },

diff --git a/packages/toolbars/clean/package.json b/packages/toolbars/clean/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine-toolbar-clean",
-  "version": "2.2.0-rc.0",
+  "version": "2.2.0-rc.1",
   "publishConfig": {
     "access": "public"
   },