From 5ea78adea68ea21caaf13ff9f8dcb008a1ad78cc Mon Sep 17 00:00:00 2001 From: Hexqi Date: Wed, 19 Feb 2025 14:08:38 +0800 Subject: [PATCH 1/5] chore: update version v2.3.0-rc.0 (#1130) --- designer-demo/package.json | 2 +- mockServer/package.json | 2 +- packages/block-compiler/package.json | 2 +- packages/blockToWebComponentTemplate/package.json | 2 +- packages/build/vite-config/package.json | 2 +- packages/build/vite-plugin-meta-comments/package.json | 2 +- packages/builtinComponent/package.json | 2 +- packages/canvas/package.json | 2 +- packages/common/package.json | 2 +- packages/configurator/package.json | 2 +- packages/design-core/package.json | 4 ++-- packages/engine-cli/package.json | 2 +- packages/engine-cli/template/designer/package.json | 8 ++++---- packages/i18n/package.json | 2 +- packages/layout/package.json | 2 +- packages/plugins/block/package.json | 2 +- packages/plugins/bridge/package.json | 2 +- packages/plugins/datasource/package.json | 2 +- packages/plugins/help/package.json | 2 +- packages/plugins/i18n/package.json | 2 +- packages/plugins/materials/package.json | 2 +- packages/plugins/page/package.json | 2 +- packages/plugins/robot/package.json | 2 +- packages/plugins/schema/package.json | 2 +- packages/plugins/script/package.json | 2 +- packages/plugins/state/package.json | 2 +- packages/plugins/tree/package.json | 2 +- packages/plugins/tutorial/package.json | 2 +- packages/register/package.json | 2 +- packages/settings/design/package.json | 2 +- packages/settings/events/package.json | 2 +- packages/settings/panel/package.json | 2 +- packages/settings/props/package.json | 2 +- packages/settings/styles/package.json | 2 +- packages/svgs/package.json | 2 +- packages/theme/base/package.json | 2 +- packages/toolbars/breadcrumb/package.json | 2 +- packages/toolbars/clean/package.json | 2 +- packages/toolbars/collaboration/package.json | 2 +- packages/toolbars/fullscreen/package.json | 2 +- packages/toolbars/generate-code/package.json | 2 +- packages/toolbars/lang/package.json | 2 +- packages/toolbars/layout/package.json | 2 +- packages/toolbars/lock/package.json | 2 +- packages/toolbars/logo/package.json | 2 +- packages/toolbars/logout/package.json | 2 +- packages/toolbars/media/package.json | 2 +- packages/toolbars/preview/package.json | 2 +- packages/toolbars/redoundo/package.json | 2 +- packages/toolbars/refresh/package.json | 2 +- packages/toolbars/save/package.json | 2 +- packages/toolbars/setting/package.json | 2 +- packages/toolbars/themeSwitch/package.json | 2 +- packages/toolbars/view-setting/package.json | 2 +- packages/utils/package.json | 2 +- packages/vue-generator/package.json | 2 +- packages/webcomponent/package.json | 2 +- 57 files changed, 61 insertions(+), 61 deletions(-) diff --git a/designer-demo/package.json b/designer-demo/package.json index 01a739937b..4173b2fea1 100644 --- a/designer-demo/package.json +++ b/designer-demo/package.json @@ -1,7 +1,7 @@ { "name": "designer-demo", "private": true, - "version": "2.2.0", + "version": "2.3.0-rc.0", "type": "module", "scripts": { "dev": "cross-env vite", diff --git a/mockServer/package.json b/mockServer/package.json index eed0f6bea4..3774b5b49f 100644 --- a/mockServer/package.json +++ b/mockServer/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-mock", - "version": "2.2.0", + "version": "2.3.0-rc.0", "publishConfig": { "access": "public" }, diff --git a/packages/block-compiler/package.json b/packages/block-compiler/package.json index 58a7dc9e2d..ba23739df9 100644 --- a/packages/block-compiler/package.json +++ b/packages/block-compiler/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-block-compiler", - "version": "2.2.0", + "version": "2.3.0-rc.0", "publishConfig": { "access": "public" }, diff --git a/packages/blockToWebComponentTemplate/package.json b/packages/blockToWebComponentTemplate/package.json index be31465c85..15cfaedff6 100644 --- a/packages/blockToWebComponentTemplate/package.json +++ b/packages/blockToWebComponentTemplate/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-block-build", - "version": "2.2.0", + "version": "2.3.0-rc.0", "description": "translate block to webcomponent template", "main": "./dist/web-components.es.js", "type": "module", diff --git a/packages/build/vite-config/package.json b/packages/build/vite-config/package.json index 707ad0b50f..cbd3d715fa 100644 --- a/packages/build/vite-config/package.json +++ b/packages/build/vite-config/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-vite-config", - "version": "2.2.0", + "version": "2.3.0-rc.0", "description": "", "type": "module", "main": "./index.js", diff --git a/packages/build/vite-plugin-meta-comments/package.json b/packages/build/vite-plugin-meta-comments/package.json index d8bef26392..0d6beddc56 100644 --- a/packages/build/vite-plugin-meta-comments/package.json +++ b/packages/build/vite-plugin-meta-comments/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-vite-plugin-meta-comments", - "version": "2.2.0", + "version": "2.3.0-rc.0", "description": "", "type": "module", "main": "dist/index.cjs", diff --git a/packages/builtinComponent/package.json b/packages/builtinComponent/package.json index 2ac55c378d..f14f7060e6 100644 --- a/packages/builtinComponent/package.json +++ b/packages/builtinComponent/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-builtin-component", - "version": "2.2.0", + "version": "2.3.0-rc.0", "description": "", "main": "dist/index.mjs", "module": "dist/index.mjs", diff --git a/packages/canvas/package.json b/packages/canvas/package.json index 717f10b4bc..d70a203292 100644 --- a/packages/canvas/package.json +++ b/packages/canvas/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-canvas", - "version": "2.2.0", + "version": "2.3.0-rc.0", "publishConfig": { "access": "public" }, diff --git a/packages/common/package.json b/packages/common/package.json index 856bc97a25..5b2abc267c 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-common", - "version": "2.2.0", + "version": "2.3.0-rc.0", "publishConfig": { "access": "public" }, diff --git a/packages/configurator/package.json b/packages/configurator/package.json index d851bdcb05..8863814d99 100644 --- a/packages/configurator/package.json +++ b/packages/configurator/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-configurator", - "version": "2.2.0", + "version": "2.3.0-rc.0", "description": "", "main": "dist/index.js", "module": "dist/index.js", diff --git a/packages/design-core/package.json b/packages/design-core/package.json index c6b8ffca40..6266e965ab 100644 --- a/packages/design-core/package.json +++ b/packages/design-core/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine", - "version": "2.2.0", + "version": "2.3.0-rc.0", "type": "module", "description": "TinyEngine enables developers to customize low-code platforms, build low-bit platforms online in real time, and support secondary development or integration of low-bit platform capabilities.", "homepage": "https://opentiny.design/tiny-engine", @@ -70,7 +70,6 @@ "@opentiny/tiny-engine-theme-base": "workspace:*", "@opentiny/tiny-engine-toolbar-breadcrumb": "workspace:*", "@opentiny/tiny-engine-toolbar-clean": "workspace:*", - "@opentiny/tiny-engine-toolbar-theme-switch": "workspace:*", "@opentiny/tiny-engine-toolbar-collaboration": "workspace:*", "@opentiny/tiny-engine-toolbar-fullscreen": "workspace:*", "@opentiny/tiny-engine-toolbar-generate-code": "workspace:*", @@ -85,6 +84,7 @@ "@opentiny/tiny-engine-toolbar-refresh": "workspace:*", "@opentiny/tiny-engine-toolbar-save": "workspace:*", "@opentiny/tiny-engine-toolbar-setting": "workspace:*", + "@opentiny/tiny-engine-toolbar-theme-switch": "workspace:*", "@opentiny/tiny-engine-toolbar-view-setting": "workspace:*", "@opentiny/tiny-engine-utils": "workspace:*", "@opentiny/tiny-engine-vite-plugin-meta-comments": "workspace:*", diff --git a/packages/engine-cli/package.json b/packages/engine-cli/package.json index e304604947..42a882a89f 100644 --- 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", + "version": "2.3.0-rc.0", "description": "", "main": "dist/index.js", "scripts": { diff --git a/packages/engine-cli/template/designer/package.json b/packages/engine-cli/template/designer/package.json index d70e332018..0a601f880e 100644 --- a/packages/engine-cli/template/designer/package.json +++ b/packages/engine-cli/template/designer/package.json @@ -11,8 +11,8 @@ "serve:mock": "node node_modules/@opentiny/tiny-engine-mock/dist/app.js" }, "dependencies": { - "@opentiny/tiny-engine": "2.2.0", - "@opentiny/tiny-engine-utils": "2.2.0", + "@opentiny/tiny-engine": "2.3.0-rc.0", + "@opentiny/tiny-engine-utils": "2.3.0-rc.0", "@opentiny/vue": "~3.20.0", "@opentiny/vue-design-smb": "~3.20.0", "@opentiny/vue-icon": "~3.20.0", @@ -23,8 +23,8 @@ "vue": "^3.4.21" }, "devDependencies": { - "@opentiny/tiny-engine-mock": "2.2.0", - "@opentiny/tiny-engine-vite-config": "2.2.0", + "@opentiny/tiny-engine-mock": "2.3.0-rc.0", + "@opentiny/tiny-engine-vite-config": "2.3.0-rc.0", "@vitejs/plugin-vue": "^5.1.2", "cross-env": "^7.0.3", "vite": "^5.4.2", diff --git a/packages/i18n/package.json b/packages/i18n/package.json index bea832163e..2f46ff1fd9 100644 --- a/packages/i18n/package.json +++ b/packages/i18n/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-i18n-host", - "version": "2.2.0", + "version": "2.3.0-rc.0", "publishConfig": { "access": "public" }, diff --git a/packages/layout/package.json b/packages/layout/package.json index ad2821f2dc..3aab255cb4 100644 --- a/packages/layout/package.json +++ b/packages/layout/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-layout", - "version": "2.2.0", + "version": "2.3.0-rc.0", "scripts": { "build": "vite build" }, diff --git a/packages/plugins/block/package.json b/packages/plugins/block/package.json index 4f5db9ef03..a12bbc5b78 100644 --- a/packages/plugins/block/package.json +++ b/packages/plugins/block/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-plugin-block", - "version": "2.2.0", + "version": "2.3.0-rc.0", "publishConfig": { "access": "public" }, diff --git a/packages/plugins/bridge/package.json b/packages/plugins/bridge/package.json index ce40ae42e9..d252c8e239 100644 --- a/packages/plugins/bridge/package.json +++ b/packages/plugins/bridge/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-plugin-bridge", - "version": "2.2.0", + "version": "2.3.0-rc.0", "publishConfig": { "access": "public" }, diff --git a/packages/plugins/datasource/package.json b/packages/plugins/datasource/package.json index 176916e289..1f284c0b0a 100644 --- a/packages/plugins/datasource/package.json +++ b/packages/plugins/datasource/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-plugin-datasource", - "version": "2.2.0", + "version": "2.3.0-rc.0", "publishConfig": { "access": "public" }, diff --git a/packages/plugins/help/package.json b/packages/plugins/help/package.json index c2691c349d..edffbc7a7f 100644 --- a/packages/plugins/help/package.json +++ b/packages/plugins/help/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-plugin-help", - "version": "2.2.0", + "version": "2.3.0-rc.0", "publishConfig": { "access": "public" }, diff --git a/packages/plugins/i18n/package.json b/packages/plugins/i18n/package.json index 3d18363dfb..49899c9b8e 100644 --- a/packages/plugins/i18n/package.json +++ b/packages/plugins/i18n/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-plugin-i18n", - "version": "2.2.0", + "version": "2.3.0-rc.0", "publishConfig": { "access": "public" }, diff --git a/packages/plugins/materials/package.json b/packages/plugins/materials/package.json index 066efc9352..510a66aff8 100644 --- a/packages/plugins/materials/package.json +++ b/packages/plugins/materials/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-plugin-materials", - "version": "2.2.0", + "version": "2.3.0-rc.0", "publishConfig": { "access": "public" }, diff --git a/packages/plugins/page/package.json b/packages/plugins/page/package.json index be046df7f4..1b0bec6569 100644 --- a/packages/plugins/page/package.json +++ b/packages/plugins/page/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-plugin-page", - "version": "2.2.0", + "version": "2.3.0-rc.0", "publishConfig": { "access": "public" }, diff --git a/packages/plugins/robot/package.json b/packages/plugins/robot/package.json index 0e88f5c051..c638e9b1bc 100644 --- a/packages/plugins/robot/package.json +++ b/packages/plugins/robot/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-plugin-robot", - "version": "2.2.0", + "version": "2.3.0-rc.0", "publishConfig": { "access": "public" }, diff --git a/packages/plugins/schema/package.json b/packages/plugins/schema/package.json index e3844397df..e911c704d0 100644 --- a/packages/plugins/schema/package.json +++ b/packages/plugins/schema/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-plugin-schema", - "version": "2.2.0", + "version": "2.3.0-rc.0", "publishConfig": { "access": "public" }, diff --git a/packages/plugins/script/package.json b/packages/plugins/script/package.json index 54aa86cb1d..5513a1d370 100644 --- a/packages/plugins/script/package.json +++ b/packages/plugins/script/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-plugin-script", - "version": "2.2.0", + "version": "2.3.0-rc.0", "publishConfig": { "access": "public" }, diff --git a/packages/plugins/state/package.json b/packages/plugins/state/package.json index aa4797adc7..7567b6863a 100644 --- a/packages/plugins/state/package.json +++ b/packages/plugins/state/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-plugin-state", - "version": "2.2.0", + "version": "2.3.0-rc.0", "publishConfig": { "access": "public" }, diff --git a/packages/plugins/tree/package.json b/packages/plugins/tree/package.json index bcb3f7ac81..7e3ede1dc0 100644 --- a/packages/plugins/tree/package.json +++ b/packages/plugins/tree/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-plugin-tree", - "version": "2.2.0", + "version": "2.3.0-rc.0", "publishConfig": { "access": "public" }, diff --git a/packages/plugins/tutorial/package.json b/packages/plugins/tutorial/package.json index 8f8e23d661..71289898a2 100644 --- a/packages/plugins/tutorial/package.json +++ b/packages/plugins/tutorial/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-plugin-tutorial", - "version": "2.2.0", + "version": "2.3.0-rc.0", "publishConfig": { "access": "public" }, diff --git a/packages/register/package.json b/packages/register/package.json index d18a815d65..433144ce60 100644 --- a/packages/register/package.json +++ b/packages/register/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-meta-register", - "version": "2.2.0", + "version": "2.3.0-rc.0", "description": "", "type": "module", "main": "dist/index.js", diff --git a/packages/settings/design/package.json b/packages/settings/design/package.json index ef5cc6b925..211153c563 100644 --- a/packages/settings/design/package.json +++ b/packages/settings/design/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-setting-design", - "version": "2.2.0", + "version": "2.3.0-rc.0", "publishConfig": { "access": "public" }, diff --git a/packages/settings/events/package.json b/packages/settings/events/package.json index 774df78079..2b7024af5c 100644 --- a/packages/settings/events/package.json +++ b/packages/settings/events/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-setting-events", - "version": "2.2.0", + "version": "2.3.0-rc.0", "publishConfig": { "access": "public" }, diff --git a/packages/settings/panel/package.json b/packages/settings/panel/package.json index 1e18541635..dda67108f5 100644 --- a/packages/settings/panel/package.json +++ b/packages/settings/panel/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-settings-panel", - "version": "2.2.0", + "version": "2.3.0-rc.0", "publishConfig": { "access": "public" }, diff --git a/packages/settings/props/package.json b/packages/settings/props/package.json index da95c9e768..f4066710ea 100644 --- a/packages/settings/props/package.json +++ b/packages/settings/props/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-setting-props", - "version": "2.2.0", + "version": "2.3.0-rc.0", "publishConfig": { "access": "public" }, diff --git a/packages/settings/styles/package.json b/packages/settings/styles/package.json index 362ad8c9ff..410595c90e 100644 --- a/packages/settings/styles/package.json +++ b/packages/settings/styles/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-setting-styles", - "version": "2.2.0", + "version": "2.3.0-rc.0", "publishConfig": { "access": "public" }, diff --git a/packages/svgs/package.json b/packages/svgs/package.json index 6b2f9526ea..b232d04ab5 100644 --- a/packages/svgs/package.json +++ b/packages/svgs/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-svgs", - "version": "2.2.0", + "version": "2.3.0-rc.0", "publishConfig": { "access": "public" }, diff --git a/packages/theme/base/package.json b/packages/theme/base/package.json index eebc56b1ba..1eddb3696b 100644 --- a/packages/theme/base/package.json +++ b/packages/theme/base/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-theme-base", - "version": "2.2.0", + "version": "2.3.0-rc.0", "publishConfig": { "access": "public" }, diff --git a/packages/toolbars/breadcrumb/package.json b/packages/toolbars/breadcrumb/package.json index 9c9c8bd79c..2875571ea4 100644 --- a/packages/toolbars/breadcrumb/package.json +++ b/packages/toolbars/breadcrumb/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-toolbar-breadcrumb", - "version": "2.2.0", + "version": "2.3.0-rc.0", "publishConfig": { "access": "public" }, diff --git a/packages/toolbars/clean/package.json b/packages/toolbars/clean/package.json index aadd624a49..5b594a522d 100644 --- a/packages/toolbars/clean/package.json +++ b/packages/toolbars/clean/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-toolbar-clean", - "version": "2.2.0", + "version": "2.3.0-rc.0", "publishConfig": { "access": "public" }, diff --git a/packages/toolbars/collaboration/package.json b/packages/toolbars/collaboration/package.json index 50c76b17ae..a29896409d 100644 --- a/packages/toolbars/collaboration/package.json +++ b/packages/toolbars/collaboration/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-toolbar-collaboration", - "version": "2.2.0", + "version": "2.3.0-rc.0", "publishConfig": { "access": "public" }, diff --git a/packages/toolbars/fullscreen/package.json b/packages/toolbars/fullscreen/package.json index a6faf8bcdf..cef2726b33 100644 --- a/packages/toolbars/fullscreen/package.json +++ b/packages/toolbars/fullscreen/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-toolbar-fullscreen", - "version": "2.2.0", + "version": "2.3.0-rc.0", "publishConfig": { "access": "public" }, diff --git a/packages/toolbars/generate-code/package.json b/packages/toolbars/generate-code/package.json index 8bf067eee2..c8058d2841 100644 --- a/packages/toolbars/generate-code/package.json +++ b/packages/toolbars/generate-code/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-toolbar-generate-code", - "version": "2.2.0", + "version": "2.3.0-rc.0", "publishConfig": { "access": "public" }, diff --git a/packages/toolbars/lang/package.json b/packages/toolbars/lang/package.json index e76a5ba5c2..f8eaae6e9c 100644 --- a/packages/toolbars/lang/package.json +++ b/packages/toolbars/lang/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-toolbar-lang", - "version": "2.2.0", + "version": "2.3.0-rc.0", "publishConfig": { "access": "public" }, diff --git a/packages/toolbars/layout/package.json b/packages/toolbars/layout/package.json index f685903b17..e372b45fb6 100644 --- a/packages/toolbars/layout/package.json +++ b/packages/toolbars/layout/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-toolbar-layout", - "version": "2.2.0", + "version": "2.3.0-rc.0", "publishConfig": { "access": "public" }, diff --git a/packages/toolbars/lock/package.json b/packages/toolbars/lock/package.json index 8ea5d67119..74622af719 100644 --- a/packages/toolbars/lock/package.json +++ b/packages/toolbars/lock/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-toolbar-lock", - "version": "2.2.0", + "version": "2.3.0-rc.0", "publishConfig": { "access": "public" }, diff --git a/packages/toolbars/logo/package.json b/packages/toolbars/logo/package.json index cb920bec7d..77e0ad083d 100644 --- a/packages/toolbars/logo/package.json +++ b/packages/toolbars/logo/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-toolbar-logo", - "version": "2.2.0", + "version": "2.3.0-rc.0", "publishConfig": { "access": "public" }, diff --git a/packages/toolbars/logout/package.json b/packages/toolbars/logout/package.json index f95dbdc601..73fd0c37af 100644 --- a/packages/toolbars/logout/package.json +++ b/packages/toolbars/logout/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-toolbar-logout", - "version": "2.2.0", + "version": "2.3.0-rc.0", "publishConfig": { "access": "public" }, diff --git a/packages/toolbars/media/package.json b/packages/toolbars/media/package.json index c2a1f7cee2..d910bb38d8 100644 --- a/packages/toolbars/media/package.json +++ b/packages/toolbars/media/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-toolbar-media", - "version": "2.2.0", + "version": "2.3.0-rc.0", "publishConfig": { "access": "public" }, diff --git a/packages/toolbars/preview/package.json b/packages/toolbars/preview/package.json index 440cab9c3c..fc5e25fb44 100644 --- a/packages/toolbars/preview/package.json +++ b/packages/toolbars/preview/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-toolbar-preview", - "version": "2.2.0", + "version": "2.3.0-rc.0", "publishConfig": { "access": "public" }, diff --git a/packages/toolbars/redoundo/package.json b/packages/toolbars/redoundo/package.json index 942b45d14b..c1887a5e95 100644 --- a/packages/toolbars/redoundo/package.json +++ b/packages/toolbars/redoundo/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-toolbar-redoundo", - "version": "2.2.0", + "version": "2.3.0-rc.0", "publishConfig": { "access": "public" }, diff --git a/packages/toolbars/refresh/package.json b/packages/toolbars/refresh/package.json index db16b7f943..4ac2bad644 100644 --- a/packages/toolbars/refresh/package.json +++ b/packages/toolbars/refresh/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-toolbar-refresh", - "version": "2.2.0", + "version": "2.3.0-rc.0", "publishConfig": { "access": "public" }, diff --git a/packages/toolbars/save/package.json b/packages/toolbars/save/package.json index 9123443511..54ea379cbc 100644 --- a/packages/toolbars/save/package.json +++ b/packages/toolbars/save/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-toolbar-save", - "version": "2.2.0", + "version": "2.3.0-rc.0", "publishConfig": { "access": "public" }, diff --git a/packages/toolbars/setting/package.json b/packages/toolbars/setting/package.json index e88a879bf7..f94f5adaff 100644 --- a/packages/toolbars/setting/package.json +++ b/packages/toolbars/setting/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-toolbar-setting", - "version": "2.2.0", + "version": "2.3.0-rc.0", "publishConfig": { "access": "public" }, diff --git a/packages/toolbars/themeSwitch/package.json b/packages/toolbars/themeSwitch/package.json index 7f1ff81907..3854e6a380 100644 --- a/packages/toolbars/themeSwitch/package.json +++ b/packages/toolbars/themeSwitch/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-toolbar-theme-switch", - "version": "2.2.0", + "version": "2.3.0-rc.0", "publishConfig": { "access": "public" }, diff --git a/packages/toolbars/view-setting/package.json b/packages/toolbars/view-setting/package.json index 60030e9daa..c3ae0c9464 100644 --- a/packages/toolbars/view-setting/package.json +++ b/packages/toolbars/view-setting/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-toolbar-view-setting", - "version": "2.2.0", + "version": "2.3.0-rc.0", "publishConfig": { "access": "public" }, diff --git a/packages/utils/package.json b/packages/utils/package.json index f56abc4196..775167f170 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-utils", - "version": "2.2.0", + "version": "2.3.0-rc.0", "publishConfig": { "access": "public" }, diff --git a/packages/vue-generator/package.json b/packages/vue-generator/package.json index 11c435f92e..d28536ca8e 100644 --- a/packages/vue-generator/package.json +++ b/packages/vue-generator/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-dsl-vue", - "version": "2.2.0", + "version": "2.3.0-rc.0", "publishConfig": { "access": "public" }, diff --git a/packages/webcomponent/package.json b/packages/webcomponent/package.json index 5727ab99a0..d5b1bc6f7e 100644 --- a/packages/webcomponent/package.json +++ b/packages/webcomponent/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-webcomponent-core", - "version": "2.2.0", + "version": "2.3.0-rc.0", "publishConfig": { "access": "public" }, From cc2e062015c54ca672eb54036c082af0628e674a Mon Sep 17 00:00:00 2001 From: chilingling <26962197+chilingling@users.noreply.github.com> Date: Wed, 26 Feb 2025 12:32:32 +0800 Subject: [PATCH 2/5] fix: add slots fail (#1141) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复 insert 方法因为 referTargetNode 找不到引起的报错，导致 slot 插槽增加失败 --- .../canvas/DesignCanvas/src/api/useCanvas.js | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/packages/canvas/DesignCanvas/src/api/useCanvas.js b/packages/canvas/DesignCanvas/src/api/useCanvas.js index 5ca4b33020..07b1fad6c7 100644 --- a/packages/canvas/DesignCanvas/src/api/useCanvas.js +++ b/packages/canvas/DesignCanvas/src/api/useCanvas.js @@ -472,14 +472,28 @@ const operationTypeMap = { // 筛选出来新增的和修改的 const changedChildren = newChildren.filter(({ id }) => !deletedIdsSet.has(id)) - changedChildren.forEach((childItem, index) => { + changedChildren.forEach((childItem) => { // 新增 if (!originChildrenSet.has(childItem.id)) { + const newChildIndex = newChildren.findIndex(({ id }) => id === childItem.id) + let position = 'after' + let referTargetNodeId = null + + // 1. 新节点 index === 0 （在最前面），插入位置为 before，插入到第一个 + // 2. 新节点 index > 0，插入到 index -1 节点的后面。 + // 3. 默认情况（index === -1）：插入到数组最后一个节点。（position: after，referTargetNodeId: nuLl） + if (newChildIndex === 0) { + position = 'before' + } else if (newChildIndex !== -1) { + position = 'after' + referTargetNodeId = newChildren[newChildIndex - 1]?.id + } + operationTypeMap.insert({ parentId: id, newNodeData: childItem, - position: 'after', - referTargetNodeId: changedChildren?.[index]?.id + position, + referTargetNodeId }) return } From 2860d1c9bbb6bdab9798735f7e6b34d409f710d1 Mon Sep 17 00:00:00 2001 From: Gene Date: Wed, 26 Feb 2025 16:48:30 +0800 Subject: [PATCH 3/5] fix: title content lost when dragging from outline tree (#1149) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复拖拽Header组件会导致内容消失的 bug --- packages/plugins/tree/src/Main.vue | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/plugins/tree/src/Main.vue b/packages/plugins/tree/src/Main.vue index 8a0e0b7fa0..9756f93931 100644 --- a/packages/plugins/tree/src/Main.vue +++ b/packages/plugins/tree/src/Main.vue @@ -43,7 +43,6 @@ import { PluginPanel, SvgButton } from '@opentiny/tiny-engine-common' import { constants } from '@opentiny/tiny-engine-utils' import { useCanvas, useMaterial, useLayout, useMessage } from '@opentiny/tiny-engine-meta-register' import { extend } from '@opentiny/vue-renderless/common/object' -import { typeOf } from '@opentiny/vue-renderless/common/type' import DraggableTree from './DraggableTree.vue' const { PAGE_STATUS } = constants @@ -72,12 +71,8 @@ export default { item.show = pageState.nodesStatus[item.id] !== false item.showEye = !item.show const child = item.children - if (typeOf(child) !== 'array') { - delete item.children - } else { - if (item.children.length) { - translateChild(item.children) - } + if (Array.isArray(child)) { + translateChild(item.children) } }) From 9b3bb55d8837d1c4867bdbcd7530acda36ba4ac5 Mon Sep 17 00:00:00 2001 From: lisong <53158783+SonyLeo@users.noreply.github.com> Date: Thu, 27 Feb 2025 20:31:20 +0800 Subject: [PATCH 4/5] fix: insert logic and multi node insert issue (#1150) --- .../canvas/DesignCanvas/src/api/useCanvas.js | 9 ++-- packages/canvas/container/src/container.js | 1 - packages/canvas/container/src/keyboard.js | 43 ++++++++-------- packages/canvas/container/src/utils.js | 50 ++++++++++++------- 4 files changed, 55 insertions(+), 48 deletions(-) diff --git a/packages/canvas/DesignCanvas/src/api/useCanvas.js b/packages/canvas/DesignCanvas/src/api/useCanvas.js index 07b1fad6c7..67fe01fa9b 100644 --- a/packages/canvas/DesignCanvas/src/api/useCanvas.js +++ b/packages/canvas/DesignCanvas/src/api/useCanvas.js @@ -317,15 +317,13 @@ const operationTypeMap = { // 4. 根据position参数选择插入位置 let index = parentNode.children.indexOf(referenceNode) - if (index === -1 && referTargetNodeId) { - index = parentNode.children.length - } // 5. 插入节点的逻辑 const childrenNode = toRaw(referenceNode) switch (position) { case 'before': - parentNode.children.unshift(newNodeData) + index = index === -1 ? 0 : index + parentNode.children.splice(index, 0, newNodeData) break case 'out': if (childrenNode) { @@ -337,7 +335,8 @@ const operationTypeMap = { parentNode.children.splice(index + 1, 0, newNodeData) break default: - parentNode.children.push(newNodeData) + index = index === -1 ? parentNode.children.length : index + 1 + parentNode.children.splice(index, 0, newNodeData) break } diff --git a/packages/canvas/container/src/container.js b/packages/canvas/container/src/container.js index 738f68864b..723e9de3f9 100644 --- a/packages/canvas/container/src/container.js +++ b/packages/canvas/container/src/container.js @@ -328,7 +328,6 @@ const getRect = (element) => { } return element.getBoundingClientRect() } - const insertAfter = ({ parent, node, data }) => { if (!data.id) { data.id = utils.guid() diff --git a/packages/canvas/container/src/keyboard.js b/packages/canvas/container/src/keyboard.js index d43651abad..46ede12052 100644 --- a/packages/canvas/container/src/keyboard.js +++ b/packages/canvas/container/src/keyboard.js @@ -10,11 +10,11 @@ * */ -import { getCurrent, insertNode, selectNode, POSITION, removeNodeById, allowInsert, getConfigure } from './container' +import { ref } from 'vue' import { useHistory, useCanvas, getMetaApi, META_APP } from '@opentiny/tiny-engine-meta-register' +import { getCurrent, insertNode, selectNode, POSITION, removeNodeById, allowInsert, getConfigure } from './container' import { copyObject } from '../../common' import { getClipboardSchema, setClipboardSchema } from './utils' -import { ref, toRaw } from 'vue' const KEY_S = 83 const KEY_Y = 89 @@ -102,38 +102,35 @@ const handleClipboardCut = (event, schema) => { } } -const handleClipboardPaste = (node, schema, parent) => { - if (node?.componentName && schema?.componentName && allowInsert(getConfigure(schema.componentName), node)) { - insertNode({ parent, node: schema, data: { ...node } }, POSITION.IN) - } else { - insertNode({ parent, node: schema, data: { ...node } }, POSITION.BOTTOM) - } -} +const handleClipboardPaste = (nodeList, schema, parent) => { + if (!nodeList.length) return -const handleMultiNodesPaste = (node, schema, parent) => { - if (multiSelectedStates.value.length === 1) { - handleClipboardPaste(node, schema, parent) - return - } - - const selectedStates = multiSelectedStates.value.map(({ schema, parent }) => { - return { node: copyObject(schema), schema: toRaw(schema), parent: toRaw(parent) } + nodeList.forEach((node) => { + if (node?.componentName && schema?.componentName && allowInsert(getConfigure(schema.componentName), node)) { + insertNode({ parent, node: schema, data: node }, POSITION.IN) + } else { + insertNode({ parent, node: schema, data: node }, POSITION.BOTTOM) + } }) +} - selectedStates.forEach(({ node, schema, parent }) => { - handleClipboardPaste(node, schema, parent) - }) +const handleCopyEvent = (event) => { + const selectedNodes = multiSelectedStates.value.map(({ schema }) => copyObject(schema)) + + const dataToCopy = JSON.stringify(selectedNodes) + setClipboardSchema(event, dataToCopy) } const handlerClipboardEvent = (event) => { const { schema, parent } = getCurrent() - const node = getClipboardSchema(event) + const nodeList = getClipboardSchema(event) + switch (event.type) { case 'copy': - setClipboardSchema(event, copyObject(schema)) + handleCopyEvent(event) break case 'paste': - handleMultiNodesPaste(node, schema, parent) + handleClipboardPaste(nodeList, schema, parent) break case 'cut': handleClipboardCut(event, schema) diff --git a/packages/canvas/container/src/utils.js b/packages/canvas/container/src/utils.js index c070b98708..239c8f99f5 100644 --- a/packages/canvas/container/src/utils.js +++ b/packages/canvas/container/src/utils.js @@ -13,41 +13,53 @@ /** * 复制节点的schema对象到剪切板，以String形式保存 * @param {*} event ClipboardEvent - * @param {*} node 节点的schema对象 + * @param {*} nodeStr 节点列表的字符串 * @return 复制的剪切板的String */ -export const setClipboardSchema = (event, node) => { - let text - - if (typeof node === 'object') { - text = JSON.stringify(node) - } else { - text = String(node) +export const setClipboardSchema = (event, nodeStr) => { + if (typeof nodeStr !== 'string' || !nodeStr.trim()) { + return null } - event.clipboardData.setData('text/plain', text) + // 将 nodeStr 存储到剪贴板 + event.clipboardData.setData('text/plain', nodeStr) event.preventDefault() - return text + return nodeStr } const translateStringToSchema = (clipText) => { - if (!clipText) { - return null + if (typeof clipText !== 'string' || !clipText.trim()) { + return [] } - let data - try { - data = JSON.parse(clipText) - if (!data || !data.componentName) { - data = null + const parsedData = JSON.parse(clipText) + + // 如果是数组且每个项都有 componentName + if (Array.isArray(parsedData) && parsedData.every((item) => item && item.componentName)) { + return parsedData + } else if (!Array.isArray(parsedData) && parsedData.componentName) { + // 如果解析结果不是数组，将其转为数组 + return [parsedData] } } catch (error) { - data = null + // eslint-disable-next-line no-console + console.warn('剪贴板数据解析失败，转换为文本组件:', error) } - return data + // 如果 JSON 解析失败或不符合格式，默认返回一个文本组件 + return [ + { + componentName: 'Text', + props: { + style: 'display: inline-block;', + text: clipText, + className: 'component-base-style' + }, + children: [] + } + ] } /** From ddee711eb5a502b9f64b45ca0e750b77c8693e88 Mon Sep 17 00:00:00 2001 From: lichunn <269031597@qq.com> Date: Mon, 3 Mar 2025 18:27:10 -0800 Subject: [PATCH 5/5] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=9A=97=E8=89=B2?= =?UTF-8?q?=E4=B8=BB=E9=A2=98=E9=83=A8=E5=88=86=E4=B8=8D=E5=85=BC=E5=AE=B9?= =?UTF-8?q?=E7=9A=84=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datasource/src/DataSourceRecordList.vue | 1 + .../plugins/datasource/src/styles/vars.less | 1 + packages/theme/base/src/component-common.less | 20 +++++++++++++++++-- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/packages/plugins/datasource/src/DataSourceRecordList.vue b/packages/plugins/datasource/src/DataSourceRecordList.vue index 2fda437b1a..62bc7c3023 100644 --- a/packages/plugins/datasource/src/DataSourceRecordList.vue +++ b/packages/plugins/datasource/src/DataSourceRecordList.vue @@ -605,6 +605,7 @@ export default { margin-left: 8px; &:hover { text-decoration: underline; + color: var(--te-datasource-common-text-color-primary-hover); } color: var(--te-datasource-common-text-color-primary); .icon-download { diff --git a/packages/plugins/datasource/src/styles/vars.less b/packages/plugins/datasource/src/styles/vars.less index e8f6ebb549..9ad31dcb19 100644 --- a/packages/plugins/datasource/src/styles/vars.less +++ b/packages/plugins/datasource/src/styles/vars.less @@ -17,6 +17,7 @@ --te-datasource-common-text-color-weaken: var(--te-common-text-weaken); --te-datasource-common-bg-color-hover: var(--te-common-bg-container); --te-datasource-common-text-color-primary: var(--te-common-text-primary); + --te-datasource-common-text-color-primary-hover: var(--te-common-text-primary); --te-datasource-icon-bg-color-hover: var(--te-common-bg-container); --te-datasource-common-color-error: var(--te-common-color-error); --te-datasource-description-text-color-warning: var(--te-common-color-warning); diff --git a/packages/theme/base/src/component-common.less b/packages/theme/base/src/component-common.less index caf0ce1c4a..0a72277c03 100644 --- a/packages/theme/base/src/component-common.less +++ b/packages/theme/base/src/component-common.less @@ -90,7 +90,7 @@ &.tiny-input-prefix .tiny-input__inner { padding: 0 8px 0 30px; } - .tiny-input__inner { + .tiny-input__inner.tiny-input__inner { border-radius: var(--te-base-border-radius-1); padding: 0 8px 0 12px; height: 24px; @@ -460,6 +460,7 @@ padding: 20px; border-radius: var(--te-base-border-radius-1); box-shadow: 0 0 10px 0 var(--te-base-box-shadow-rgba-1); + background-color: var(--te-common-bg-container); .tiny-modal__header { padding: 0; font-size: var(--te-base-font-size-1); @@ -468,12 +469,14 @@ position: relative; .tiny-modal__title { font-weight: var(--te-base-font-weight-bold); + color: var(--te-common-text-primary); } .tiny-modal__close-btn { top: -4px; right: -4px; + color: var(--te-common-icon-primary); &:hover { - color: var(--te-common-icon-primary); + fill: var(--te-common-icon-hover); } } } @@ -1011,6 +1014,7 @@ border-radius: var(--te-base-border-radius-1); border-color: var(--te-common-border-default); color: var(--te-common-text-primary); + background-color: transparent; &:hover { border-color: var(--te-common-border-active); } @@ -1022,6 +1026,10 @@ background: var(--te-common-bg-disabled); color: var(--te-common-text-disabled); } + &::before, + &::after { + background-color: transparent; + } } // 指引弹窗 @@ -1031,6 +1039,14 @@ .shepherd-arrow:before { background-color: var(--te-common-bg-popover); } + .shepherd-content .shepherd-text, + .shepherd-arrow:before { + background-color: var(--te-common-bg-popover); + } + .shepherd-content .shepherd-footer, + .shepherd-arrow:before { + background-color: var(--te-common-bg-popover); + } &.shepherd-has-title[data-popper-placement^='bottom'], &.shepherd-has-title[data-popper-placement^='top'], &.shepherd-has-title[data-popper-placement^='left'],