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
opentiny · May 11, 2024 · aa8d361 · aa8d361
1 parent 30cfeb1
commit aa8d361
Show file tree

Hide file tree

Showing 55 changed files with 119 additions and 139 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -4,7 +4,7 @@
     <meta charset="UTF-8" />
     <link rel="icon" href="/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <link href="%VITE_CDN_DOMAIN%/@opentiny/vue-theme@3.11/index.css" rel="stylesheet" />
+    <link href="%VITE_CDN_DOMAIN%/@opentiny/vue-theme@3.14/index.css" rel="stylesheet" />
     <style type="text/css">
       .loading-warp {
         display: flex;

diff --git a/packages/design-core/package.json b/packages/design-core/package.json
@@ -77,10 +77,10 @@
     "@opentiny/tiny-engine-toolbar-setting": "workspace:*",
     "@opentiny/tiny-engine-utils": "workspace:*",
     "@opentiny/tiny-engine-webcomponent-core": "workspace:*",
-    "@opentiny/vue": "~3.11.0",
-    "@opentiny/vue-design-smb": "~3.11.0",
-    "@opentiny/vue-renderless": "~3.11.0",
-    "@opentiny/vue-theme": "~3.11.0",
+    "@opentiny/vue": "~3.14.0",
+    "@opentiny/vue-design-smb": "~3.14.0",
+    "@opentiny/vue-renderless": "~3.14.0",
+    "@opentiny/vue-theme": "~3.14.0",
     "@vue/babel-plugin-jsx": "1.1.1",
     "@vue/repl": "^2.9.0",
     "@vueuse/core": "^9.6.0",

diff --git a/packages/design-core/src/DesignSettings.vue b/packages/design-core/src/DesignSettings.vue
@@ -68,7 +68,8 @@ export default {
     .tiny-tabs__content {
       flex: 1;
       overflow-y: scroll;
-      padding-top: 0;
+      padding: 0;
+      margin-top: 0;
     }
     .tiny-tabs__item {
       color: var(--ti-lowcode-setting-panel-tabs-item-title-color);

diff --git a/packages/design-core/src/preview/src/preview/importMap.js b/packages/design-core/src/preview/src/preview/importMap.js
@@ -17,7 +17,7 @@ import { VITE_CDN_DOMAIN } from '@opentiny/tiny-engine-controller/js/environment
 
 const importMap = {}
 
-const opentinyVueVersion = '~3.11'
+const opentinyVueVersion = '~3.14'
 
 const tinyVue3Imports = {
   // 推荐之后统一使用@opentiny/vue去引入依赖，兼容后续录入的组件来源于tiny-vue

diff --git a/packages/design-core/src/preview/src/preview/srcFiles/app.js b/packages/design-core/src/preview/src/preview/srcFiles/app.js
@@ -16,5 +16,5 @@ function addCss(href) {
   link.setAttribute('href', href)
   document.head.appendChild(link)
 }
-addCss('VITE_CDN_DOMAIN/@opentiny/vue-theme@3.11/index.css')
-addCss('VITE_CDN_DOMAIN/@opentiny/vue-theme-mobile@3.11/index.css')
+addCss('VITE_CDN_DOMAIN/@opentiny/vue-theme@3.14/index.css')
+addCss('VITE_CDN_DOMAIN/@opentiny/vue-theme-mobile@3.14/index.css')
diff --git a/packages/design-core/vite.config.js b/packages/design-core/vite.config.js
@@ -131,7 +131,7 @@ const config = {
 const importMapVersions = {
   prettier: '2.7.1',
   vue: '3.4.23',
-  tinyVue: '~3.11'
+  tinyVue: '~3.14'
 }
 
 const devAlias = {

diff --git a/packages/http/package.json b/packages/http/package.json
@@ -25,7 +25,6 @@
   "homepage": "https://opentiny.design/tiny-engine",
   "dependencies": {
     "@opentiny/tiny-engine-utils": "workspace:*",
-    "@opentiny/vue": "~3.10.0",
     "@vueuse/core": "^9.6.0",
     "axios": "^0.27.2",
     "axios-mock-adapter": "^1.21.5"
@@ -36,6 +35,7 @@
     "vite": "^4.3.7"
   },
   "peerDependencies": {
+    "@opentiny/vue": "^3.14.0",
     "vue": "^3.4.15"
   }
 }
diff --git a/packages/plugins/block/package.json b/packages/plugins/block/package.json
@@ -29,9 +29,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",
     "html2canvas": "^1.4.1",
     "pinyin-pro": "^3.13.0"
   },
@@ -41,6 +38,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/plugins/block/src/Main.vue b/packages/plugins/block/src/Main.vue
@@ -86,7 +86,6 @@
         <tiny-dropdown trigger="click" @item-click="changeType">
           <span>
             <span>{{ state.sortTypeLabel }}</span>
-            <icon-chevron-down class="ml8"></icon-chevron-down>
           </span>
           <template #dropdown>
             <tiny-dropdown-menu
@@ -118,7 +117,6 @@ import {
 import { PluginPanel, PluginBlockList, SvgButton, SaveNewBlock, LinkButton } from '@opentiny/tiny-engine-common'
 import { useBlock, useModal, useLayout, useCanvas, useHelp } from '@opentiny/tiny-engine-controller'
 import { constants } from '@opentiny/tiny-engine-utils'
-import { iconChevronDown } from '@opentiny/vue-icon'
 import BlockSetting, { openPanel, closePanel } from './BlockSetting.vue'
 import BlockGroupArrange from './BlockGroupArrange.vue'
 import CategoryEdit from './CategoryEdit.vue'
@@ -188,8 +186,7 @@ export default {
     CategoryEdit,
     PluginBlockList,
     TinyPopover,
-    TinyButton,
-    IconChevronDown: iconChevronDown()
+    TinyButton
   },
 
   setup() {

diff --git a/packages/plugins/bridge/package.json b/packages/plugins/bridge/package.json
@@ -27,16 +27,16 @@
     "@opentiny/tiny-engine-canvas": "workspace:*",
     "@opentiny/tiny-engine-common": "workspace:*",
     "@opentiny/tiny-engine-controller": "workspace:*",
-    "@opentiny/tiny-engine-http": "workspace:*",
-    "@opentiny/vue": "~3.10.0",
-    "@opentiny/vue-icon": "~3.10.0"
+    "@opentiny/tiny-engine-http": "workspace:*"
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "^4.2.3",
     "@vitejs/plugin-vue-jsx": "^3.1.0",
     "vite": "^4.3.7"
   },
   "peerDependencies": {
+    "@opentiny/vue": "^3.14.0",
+    "@opentiny/vue-icon": "^3.14.0",
     "vue": "^3.4.15"
   }
 }
diff --git a/packages/plugins/data/package.json b/packages/plugins/data/package.json
@@ -29,8 +29,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",
     "monaco-editor": "0.33.0"
   },
   "devDependencies": {
@@ -39,6 +37,8 @@
     "vite": "^4.3.7"
   },
   "peerDependencies": {
+    "@opentiny/vue": "^3.14.0",
+    "@opentiny/vue-icon": "^3.14.0",
     "vue": "^3.4.15"
   }
 }
diff --git a/packages/plugins/data/src/Main.vue b/packages/plugins/data/src/Main.vue
@@ -7,8 +7,7 @@
         <close-icon @close="closePanel"></close-icon>
       </div>
       <tiny-tabs v-model="activeName" @click="tabClick" tab-style="button-card">
-        <tiny-tab-item v-if="isBlock" :name="STATE.CURRENT_STATE" title="区块状态"></tiny-tab-item>
-        <tiny-tab-item v-else :name="STATE.CURRENT_STATE" title="页面状态"></tiny-tab-item>
+        <tiny-tab-item :name="STATE.CURRENT_STATE" :title="isBlock ? '区块状态' : '页面状态'"></tiny-tab-item>
         <tiny-tab-item :name="STATE.GLOBAL_STATE" title="应用状态"></tiny-tab-item>
       </tiny-tabs>
       <tiny-search
@@ -490,11 +489,8 @@ export default {
   }
 
   :deep(.tiny-tabs__content) {
-    height: calc(100% - 48px);
+    margin: 0;
     padding: 0;
-    & > div {
-      height: 100%;
-    }
   }
   :deep(.help-box) {
     position: absolute;

diff --git a/packages/plugins/datasource/package.json b/packages/plugins/datasource/package.json
@@ -29,9 +29,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",
     "axios": "^0.27.2",
     "vue-clipboard3": "^2.0.0",
@@ -43,6 +40,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/plugins/help/package.json b/packages/plugins/help/package.json
@@ -26,15 +26,15 @@
   "dependencies": {
     "@opentiny/tiny-engine-common": "workspace:*",
     "@opentiny/tiny-engine-controller": "workspace:*",
-    "@opentiny/tiny-engine-http": "workspace:*",
-    "@opentiny/vue": "~3.10.0"
+    "@opentiny/tiny-engine-http": "workspace:*"
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "^4.2.3",
     "@vitejs/plugin-vue-jsx": "^3.1.0",
     "vite": "^4.3.7"
   },
   "peerDependencies": {
+    "@opentiny/vue": "^3.14.0",
     "vue": "^3.4.15"
   }
 }
diff --git a/packages/plugins/i18n/package.json b/packages/plugins/i18n/package.json
@@ -28,8 +28,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",
     "vue-clipboard3": "^2.0.0"
   },
   "devDependencies": {
@@ -38,6 +36,8 @@
     "vite": "^4.3.7"
   },
   "peerDependencies": {
+    "@opentiny/vue": "^3.14.0",
+    "@opentiny/vue-icon": "^3.14.0",
     "vue": "^3.4.15"
   }
 }