Merge pull request #1085 from opentiny/release-v2.2.0-merge

Release v2.2.0 merge
opentiny · Jan 26, 2025 · a2883f1 · a2883f1
2 parents 5b9d61a + 1edcfad
commit a2883f1
Show file tree

Hide file tree

Showing 85 changed files with 365 additions and 228 deletions.
diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml
@@ -26,20 +26,19 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: 18
-          cache: 'pnpm'
           registry-url: 'https://registry.npmjs.org'
 
       - name: Install dependencies
         run: pnpm install
 
       - name: Run Build
-        run: pnpm run build:plugin && pnpm run build:alpha > build-alpha.log 2>&1
+        run: pnpm run build:plugin && pnpm run build:alpha > /tmp/build-alpha.log 2>&1
 
       - name: Upload build logs
         uses: actions/upload-artifact@v4
         with:
           name: build-alpha-log
-          path: build-alpha.log
+          path: /tmp/build-alpha.log
 
       - name: Parse Publish tag
         id: parse_tag
@@ -74,4 +73,4 @@ jobs:
       - name: Publish package to npm
         run: pnpm lerna publish from-package --dist-tag ${{steps.parse_tag.outputs.dist_tag}} --yes
         env:
-          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
diff --git a/designer-demo/package.json b/designer-demo/package.json
@@ -1,7 +1,7 @@
 {
   "name": "designer-demo",
   "private": true,
-  "version": "2.1.0",
+  "version": "2.2.0",
   "type": "module",
   "scripts": {
     "dev": "cross-env VITE_THEME=light vite",

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

diff --git a/mockServer/src/mock/get/app-center/v1/apps/schema/918.json b/mockServer/src/mock/get/app-center/v1/apps/schema/918.json
@@ -2093,7 +2093,7 @@
           "package": "axios",
           "destructuring": false,
           "exportName": "axios",
-          "cdnLink": "https://unpkg.com/browse/[email protected]/dist/esm/axios.min.js"
+          "cdnLink": "https://unpkg.com/[email protected]/dist/esm/axios.min.js"
         }
       },
       {

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.1.0",
+  "version": "2.2.0",
   "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.1.0",
+  "version": "2.2.0",
   "description": "translate block to webcomponent template",
   "main": "./dist/web-components.es.js",
   "type": "module",

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

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

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

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

diff --git a/packages/canvas/render/src/canvas-function/custom-renderer.ts b/packages/canvas/render/src/canvas-function/custom-renderer.ts
@@ -7,6 +7,7 @@ function defaultRenderer(schema, refreshKey, entry, active, isPage = true) {
   const rootChildrenSchema = {
     id: 0,
     componentName: 'div',
+    componentType: 'PageSection',
     // 手动添加一个唯一的属性，后续在画布选中此节点时方便处理额外的逻辑。由于没有修改schema，不会影响出码
     props: { ...schema.props, 'data-id': 'root-container', 'data-page-active': active },
     children: schema.children

diff --git a/packages/canvas/render/src/material-function/handle-scoped-css.ts b/packages/canvas/render/src/material-function/handle-scoped-css.ts
@@ -2,5 +2,5 @@ import postcss from 'postcss'
 import scopedPlugin from './scope-css-plugin'
 
 export function handleScopedCss(id: string, content: string) {
-  return postcss([scopedPlugin(id)]).process(content)
+  return postcss([scopedPlugin(id)]).process(content, { from: undefined })
 }
diff --git a/packages/canvas/render/src/material-function/page-getter.ts b/packages/canvas/render/src/material-function/page-getter.ts
@@ -50,6 +50,7 @@ export const wrapPageComponent = (pageId: string) => {
         () => active.value,
         (activeValue) => {
           if (!activeValue) {
+            asyncData.value = null
             updateSchema()
           }
         }

diff --git a/packages/canvas/render/src/render.ts b/packages/canvas/render/src/render.ts
@@ -82,7 +82,7 @@ const checkGroup = (componentName) => configure[componentName]?.nestingRule?.chi
 const clickCapture = (componentName) => configure[componentName]?.clickCapture !== false
 
 const getBindProps = (schema, scope, context, pageContext) => {
-  const { id, componentName } = schema
+  const { id, componentName, componentType } = schema
   const invalidity = configure[componentName]?.invalidity || []
 
   if (componentName === 'CanvasPlaceholder') {
@@ -120,7 +120,7 @@ const getBindProps = (schema, scope, context, pageContext) => {
   delete bindProps.className
 
   // 使画布中元素可拖拽
-  if (active) {
+  if (active && !['PageStart', 'PageSection'].includes(componentType)) {
     bindProps.draggable = true
   }
 

diff --git a/packages/canvas/route-bar/src/CanvasRouteBar.vue b/packages/canvas/route-bar/src/CanvasRouteBar.vue
@@ -65,16 +65,20 @@ watch(
     }
     const ancestors = (await getAncestors(value, true)) || []
 
-    routes.value = ancestors.concat(value).map((id) => {
-      const { route, isPage } = pageSettingState.treeDataMapping[id]
-      return {
-        id,
-        route: route
-          .replace(/\/+/g, '/') // 替换连续的 '/' 为单个 '/'
-          .replace(/^\/|\/$/g, ''), // 去掉开头和结尾的 '/'
-        isPage
-      }
-    })
+    routes.value = ancestors
+      .concat(value)
+      .map((id) => pageSettingState.treeDataMapping[id])
+      .filter((item) => Boolean(item))
+      .map((pageData) => {
+        const { id, route, isPage } = pageData
+        return {
+          id,
+          route: route
+            .replace(/\/+/g, '/') // 替换连续的 '/' 为单个 '/'
+            .replace(/^\/|\/$/g, ''), // 去掉开头和结尾的 '/'
+          isPage
+        }
+      })
   },
   { immediate: true }
 )

diff --git a/packages/common/component/BlockHistoryList.vue b/packages/common/component/BlockHistoryList.vue
@@ -1,5 +1,5 @@
 <template>
-  <tiny-grid v-if="history.length" :data="history" height="300">
+  <tiny-grid v-if="history.length" :data="history" row-id="id" height="300">
     <tiny-grid-column v-if="isBlockManage" field="version" title="版本号">
       <template v-slot="data">
         {{ data.row.version }}

diff --git a/packages/common/component/SvgButton.vue b/packages/common/component/SvgButton.vue
@@ -1,5 +1,5 @@
 <template>
-  <span class="svg-button" :class="{ 'svg-button-hover': hoverBgColor }" @click="$emit('click', $event)">
+  <span class="svg-button" :class="{ 'svg-button-hover': hoverBgColor }" @click="handleClick($event)">
     <tiny-tooltip effect="light" :content="tips" :placement="placement">
       <component :is="name" v-if="isTinyIcon" />
       <svg-icon v-else :name="name"></svg-icon>
@@ -34,11 +34,17 @@ export default {
     }
   },
   emits: ['click'],
-  setup(props) {
+  setup(props, { emit }) {
     const isTinyIcon = computed(() => props.name.toLowerCase().indexOf('icon') === 0)
 
+    const handleClick = (event) => {
+      event.target.blur()
+      emit('click', event)
+    }
+
     return {
-      isTinyIcon
+      isTinyIcon,
+      handleClick
     }
   }
 }

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

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

diff --git a/packages/configurator/src/radio-group-configurator/RadioGroupConfigurator.vue b/packages/configurator/src/radio-group-configurator/RadioGroupConfigurator.vue
@@ -75,4 +75,10 @@ export default {
 }
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+.meta-radio-group-container {
+  :deep(.tiny-radio-button__inner.tiny-radio-button__inner.tiny-radio-button__inner) {
+    padding: 5px 16px;
+  }
+}
+</style>
diff --git a/packages/design-core/package.json b/packages/design-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/tiny-engine",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "type": "module",
   "description": "TinyEngine enables developers to customize low-code platforms, build low-bit platforms online in real time, and support secondary development or integration of low-bit platform capabilities.",
   "homepage": "https://opentiny.design/tiny-engine",
@@ -76,7 +76,6 @@
     "@opentiny/tiny-engine-toolbar-fullscreen": "workspace:*",
     "@opentiny/tiny-engine-toolbar-generate-code": "workspace:*",
     "@opentiny/tiny-engine-toolbar-lang": "workspace:*",
-    "@opentiny/tiny-engine-toolbar-view-setting": "workspace:*",
     "@opentiny/tiny-engine-toolbar-layout": "workspace:*",
     "@opentiny/tiny-engine-toolbar-lock": "workspace:*",
     "@opentiny/tiny-engine-toolbar-logo": "workspace:*",
@@ -87,6 +86,7 @@
     "@opentiny/tiny-engine-toolbar-refresh": "workspace:*",
     "@opentiny/tiny-engine-toolbar-save": "workspace:*",
     "@opentiny/tiny-engine-toolbar-setting": "workspace:*",
+    "@opentiny/tiny-engine-toolbar-view-setting": "workspace:*",
     "@opentiny/tiny-engine-utils": "workspace:*",
     "@opentiny/tiny-engine-vite-plugin-meta-comments": "workspace:*",
     "@opentiny/tiny-engine-webcomponent-core": "workspace:*",

diff --git a/packages/design-core/src/preview/src/preview/importMap.json b/packages/design-core/src/preview/src/preview/importMap.json
@@ -10,7 +10,7 @@
     "axios": "${VITE_CDN_DOMAIN}/[email protected]/dist/esm/axios.js",
     "@opentiny/tiny-engine-webcomponent-core": "${VITE_CDN_DOMAIN}/@opentiny/tiny-engine-webcomponent-core@1/dist/tiny-engine-webcomponent-core.es.js",
     "@opentiny/tiny-engine-i18n-host": "${VITE_CDN_DOMAIN}/@opentiny/tiny-engine-i18n-host@1/dist/lowcode-design-i18n-host.es.js",
-    "@opentiny/tiny-engine-builtin-component": "${VITE_CDN_DOMAIN}/@opentiny/tiny-engine-builtin-component@^2.0.0/dist/index.js",
+    "@opentiny/tiny-engine-builtin-component": "${VITE_CDN_DOMAIN}/@opentiny/tiny-engine-builtin-component@^2.0.0/dist/index.mjs",
     "vue-demi": "${VITE_CDN_DOMAIN}/[email protected]/lib/index.mjs",
     "pinia": "${VITE_CDN_DOMAIN}/[email protected]/dist/pinia.esm-browser.js",
     "@opentiny/vue": "${VITE_CDN_DOMAIN}/@opentiny/vue-runtime@${opentinyVueVersion}/dist3/tiny-vue-pc.mjs",

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

diff --git a/packages/engine-cli/template/designer/package.json b/packages/engine-cli/template/designer/package.json
@@ -1,20 +1,20 @@
 {
-  "name": "designer-demo-template",
+  "name": "designer-demo",
   "private": true,
   "version": "0.0.0",
   "type": "module",
   "scripts": {
     "dev": "concurrently 'pnpm:serve:mock' 'pnpm:serve:frontend'",
-    "serve:frontend": "cross-env VITE_THEME=light vite",
-    "serve:mock": "node node_modules/@opentiny/tiny-engine-mock/dist/app.js",
     "build:alpha": "cross-env NODE_OPTIONS=--max-old-space-size=8192 VITE_THEME=light vite build --mode alpha",
-    "build": "cross-env NODE_OPTIONS=--max-old-space-size=8192 VITE_THEME=light vite build --mode prod"
+    "build": "cross-env NODE_OPTIONS=--max-old-space-size=8192 VITE_THEME=light vite build --mode prod",
+    "serve:frontend": "cross-env VITE_THEME=light vite",
+    "serve:mock": "node node_modules/@opentiny/tiny-engine-mock/dist/app.js"
   },
   "dependencies": {
-    "@opentiny/tiny-engine": "^2.1.0",
-    "@opentiny/tiny-engine-theme-dark": "^2.1.0",
-    "@opentiny/tiny-engine-theme-light": "^2.1.0",
-    "@opentiny/tiny-engine-utils": "^2.1.0",
+    "@opentiny/tiny-engine": "2.2.0",
+    "@opentiny/tiny-engine-theme-dark": "2.2.0",
+    "@opentiny/tiny-engine-theme-light": "2.2.0",
+    "@opentiny/tiny-engine-utils": "2.2.0",
     "@opentiny/vue": "~3.20.0",
     "@opentiny/vue-design-smb": "~3.20.0",
     "@opentiny/vue-icon": "~3.20.0",
@@ -25,11 +25,11 @@
     "vue": "^3.4.21"
   },
   "devDependencies": {
-    "@opentiny/tiny-engine-mock": "^2.1.0",
-    "@opentiny/tiny-engine-vite-config": "^2.1.0",
+    "@opentiny/tiny-engine-mock": "2.2.0",
+    "@opentiny/tiny-engine-vite-config": "2.2.0",
     "@vitejs/plugin-vue": "^5.1.2",
     "cross-env": "^7.0.3",
-    "concurrently": "^8.2.0",
-    "vite": "^5.4.2"
+    "vite": "^5.4.2",
+    "concurrently": "^8.2.0"
   }
 }
diff --git a/packages/engine-cli/template/designer/registry.js b/packages/engine-cli/template/designer/registry.js
@@ -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.1.0",
+  "version": "2.2.0",
   "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.1.0",
+  "version": "2.2.0",
   "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.1.0",
+  "version": "2.2.0",
   "publishConfig": {
     "access": "public"
   },