From aa8d361bd2970676283c633018e1f73442e888b2 Mon Sep 17 00:00:00 2001 From: chilingling <26962197+chilingling@users.noreply.github.com> Date: Sat, 11 May 2024 02:43:33 -0700 Subject: [PATCH] feat(chore): update OpenTinyVue version (#457) * feat(chore): update OpenTinyVue version * feat(chore): update opentinyvue version * fix(breadcrumb): fix breadcrumb style after update opentiny vue version * feat(chore): change opentinyvue to peer dependencies * feat(builtinComponent): add vue to peerDependencies --- .../blockToWebComponentTemplate/package.json | 6 ++--- .../vite.config.js | 2 +- packages/builtinComponent/package.json | 4 ++- packages/canvas/package.json | 6 ++--- .../src/components/container/CanvasFooter.vue | 26 +++++-------------- packages/common/package.json | 6 ++--- packages/controller/package.json | 6 ++--- packages/design-core/canvas.html | 2 +- packages/design-core/package.json | 8 +++--- packages/design-core/src/DesignSettings.vue | 3 ++- .../src/preview/src/preview/importMap.js | 2 +- .../src/preview/src/preview/srcFiles/app.js | 4 +-- packages/design-core/vite.config.js | 2 +- packages/http/package.json | 2 +- packages/plugins/block/package.json | 6 ++--- packages/plugins/block/src/Main.vue | 5 +--- packages/plugins/bridge/package.json | 6 ++--- packages/plugins/data/package.json | 4 +-- packages/plugins/data/src/Main.vue | 8 ++---- packages/plugins/datasource/package.json | 6 ++--- packages/plugins/help/package.json | 4 +-- packages/plugins/i18n/package.json | 4 +-- packages/plugins/materials/package.json | 4 +-- .../materials/src/block/BlockGroup.vue | 2 +- packages/plugins/materials/src/block/Main.vue | 2 +- .../plugins/materials/src/component/Main.vue | 2 +- packages/plugins/page/package.json | 6 ++--- packages/plugins/robot/package.json | 6 ++--- packages/plugins/schema/package.json | 4 +-- packages/plugins/script/package.json | 6 ++--- packages/plugins/tree/package.json | 8 +++--- packages/plugins/tutorial/package.json | 2 +- packages/settings/design/package.json | 2 +- packages/settings/events/package.json | 6 ++--- packages/settings/props/package.json | 4 +-- packages/settings/styles/package.json | 4 +-- packages/svgs/package.json | 7 +++-- packages/theme/common/global.less | 2 ++ packages/toolbars/breadcrumb/package.json | 4 +-- packages/toolbars/clean/package.json | 4 +-- packages/toolbars/collaboration/package.json | 4 +-- packages/toolbars/fullscreen/package.json | 4 +-- packages/toolbars/generate-vue/package.json | 2 +- packages/toolbars/lang/package.json | 2 +- packages/toolbars/layout/package.json | 5 ++-- packages/toolbars/lock/package.json | 4 +-- packages/toolbars/logo/package.json | 4 +-- packages/toolbars/logout/package.json | 5 ++-- packages/toolbars/media/package.json | 6 ++--- packages/toolbars/preview/package.json | 4 +-- packages/toolbars/redoundo/package.json | 4 +-- packages/toolbars/refresh/package.json | 4 +-- packages/toolbars/save/package.json | 4 +-- packages/toolbars/setting/package.json | 4 +-- packages/utils/package.json | 5 ++-- 55 files changed, 119 insertions(+), 139 deletions(-) diff --git a/packages/blockToWebComponentTemplate/package.json b/packages/blockToWebComponentTemplate/package.json index c857539..4124d30 100644 --- a/packages/blockToWebComponentTemplate/package.json +++ b/packages/blockToWebComponentTemplate/package.json @@ -32,9 +32,9 @@ "dependencies": { "@opentiny/tiny-engine-i18n-host": "workspace:*", "@opentiny/tiny-engine-webcomponent-core": "workspace:*", - "@opentiny/vue": "~3.11.0", - "@opentiny/vue-icon": "~3.11.0", - "@opentiny/vue-theme": "~3.11.0", + "@opentiny/vue": "~3.14.0", + "@opentiny/vue-icon": "~3.14.0", + "@opentiny/vue-theme": "~3.14.0", "@vue/shared": "^3.3.11", "vue": "^3.4.15", "vue-i18n": "^9.9.0" diff --git a/packages/blockToWebComponentTemplate/vite.config.js b/packages/blockToWebComponentTemplate/vite.config.js index 446d005..ddbf655 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.11/index.css'] + const styleLinks = ['https://npm.onmicrosoft.cn/@opentiny/vue-theme@3.14/index.css'] config.publicDir = false diff --git a/packages/builtinComponent/package.json b/packages/builtinComponent/package.json index 92ff6b3..f25d3a7 100644 --- a/packages/builtinComponent/package.json +++ b/packages/builtinComponent/package.json @@ -20,12 +20,14 @@ "preview": "vite preview" }, "dependencies": { - "@opentiny/vue": "~3.10.0", "vite-plugin-css-injected-by-js": "^3.3.1" }, "devDependencies": { "@vitejs/plugin-vue": "^4.2.3", "@vitejs/plugin-vue-jsx": "^3.1.0", "vite": "^4.5.0" + }, + "peerDependencies": { + "vue": "^3.4.15" } } diff --git a/packages/canvas/package.json b/packages/canvas/package.json index 2725df3..962ac65 100644 --- a/packages/canvas/package.json +++ b/packages/canvas/package.json @@ -32,9 +32,6 @@ "@opentiny/tiny-engine-i18n-host": "workspace:*", "@opentiny/tiny-engine-utils": "workspace:*", "@opentiny/tiny-engine-webcomponent-core": "workspace:*", - "@opentiny/vue": "~3.10.0", - "@opentiny/vue-icon": "~3.10.0", - "@opentiny/vue-renderless": "~3.10.0", "@vue/babel-plugin-jsx": "1.1.1", "@vue/shared": "^3.3.4", "@vueuse/core": "^9.6.0" @@ -46,6 +43,9 @@ "vite": "^4.3.7" }, "peerDependencies": { + "@opentiny/vue": "^3.14.0", + "@opentiny/vue-icon": "^3.14.0", + "@opentiny/vue-renderless": "^3.14.0", "vue": "^3.4.15", "vue-i18n": "^9.9.0" } diff --git a/packages/canvas/src/components/container/CanvasFooter.vue b/packages/canvas/src/components/container/CanvasFooter.vue index 84293a9..6377cdb 100644 --- a/packages/canvas/src/components/container/CanvasFooter.vue +++ b/packages/canvas/src/components/container/CanvasFooter.vue @@ -17,7 +17,7 @@ export default { props: { data: { type: Array, - default: [] + default: () => [] } }, emits: ['click'] @@ -44,37 +44,23 @@ export default { li { width: unset !important; background: var(--ti-lowcode-breadcrumb-bg); - a { + .label { padding: 0 3px 0 16px; border-top: 0; color: var(--ti-lowcode-breadcrumb-color); transition: 0.3s; - &::after { - display: inline-block; - right: -6px; - border-left: 6px solid var(--ti-lowcode-breadcrumb-bg); - transition: 0.3s; - } - &::before { - display: inline-block; - right: -7px; - left: unset; - border-left: 6px solid var(--ti-lowcode-breadcrumb-icon-color); - transition: 0.3s; - z-index: 1; - } &:hover { - background: var(--ti-lowcode-breadcrumb-hover-bg); + cursor: pointer; &::after { - border-left-color: var(--ti-lowcode-breadcrumb-hover-bg); + border-left-color: var(--ti-steps-advanced-li-hover-bg-color); } } } - &:last-child a { + &:last-child .label { border-right: 0px solid var(--ti-lowcode-breadcrumb-color); border-radius: 0; } - &:first-child a { + &:first-child .label { border-right: 0px solid var(--ti-lowcode-breadcrumb-color); border-radius: 0; border-left: unset; diff --git a/packages/common/package.json b/packages/common/package.json index 1c70160..a2ced55 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -31,9 +31,6 @@ "@opentiny/tiny-engine-controller": "workspace:*", "@opentiny/tiny-engine-http": "workspace:*", "@opentiny/tiny-engine-utils": "workspace:*", - "@opentiny/vue": "~3.10.0", - "@opentiny/vue-icon": "~3.10.0", - "@opentiny/vue-renderless": "~3.10.0", "@vue/shared": "^3.3.4", "monaco-editor": "0.33.0", "prettier": "2.7.1", @@ -45,6 +42,9 @@ "vite": "^4.3.7" }, "peerDependencies": { + "@opentiny/vue": "^3.14.0", + "@opentiny/vue-icon": "^3.14.0", + "@opentiny/vue-renderless": "^3.14.0", "vue": "^3.4.15" } } diff --git a/packages/controller/package.json b/packages/controller/package.json index e5f5ed4..c3eab01 100644 --- a/packages/controller/package.json +++ b/packages/controller/package.json @@ -38,9 +38,6 @@ "@opentiny/tiny-engine-http": "workspace:*", "@opentiny/tiny-engine-i18n-host": "workspace:*", "@opentiny/tiny-engine-utils": "workspace:*", - "@opentiny/vue": "~3.10.0", - "@opentiny/vue-locale": "~3.10.0", - "@opentiny/vue-renderless": "~3.10.0", "@vue/shared": "^3.3.4", "css-tree": "^2.3.1", "eslint-linter-browserify": "8.57.0", @@ -53,6 +50,9 @@ "vite": "^4.3.7" }, "peerDependencies": { + "@opentiny/vue": "^3.14.0", + "@opentiny/vue-locale": "^3.14.0", + "@opentiny/vue-renderless": "^3.14.0", "vue": "^3.4.15", "vue-i18n": "^9.9.0" } diff --git a/packages/design-core/canvas.html b/packages/design-core/canvas.html index fedb111..609ca59 100644 --- a/packages/design-core/canvas.html +++ b/packages/design-core/canvas.html @@ -4,7 +4,7 @@ - +