Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin

2024-09-11 17:15:41 +08:00
parent 0c11427217 8f6bf6add3
commit fb4c125117
30 changed files with 376 additions and 338 deletions
--- a/packages/effects/common-ui/package.json
+++ b/packages/effects/common-ui/package.json
@@ -41,7 +41,7 @@
    "vue": "^3.5.4",
    "vue-codemirror6": "^1.3.4",
    "vue-json-pretty": "^2.4.0",
-    "vue-router": "^4.4.3"
+    "vue-router": "^4.4.4"
  },
  "devDependencies": {
    "@types/qrcode": "^1.5.5"
--- a/packages/effects/common-ui/src/components/ellipsis-text/ellipsis-text.vue
+++ b/packages/effects/common-ui/src/components/ellipsis-text/ellipsis-text.vue
@@ -116,7 +116,7 @@ function handleExpand() {
          ref="ellipsis"
          :class="{
            '!cursor-pointer': expand,
-            ['inline-block truncate']: line === 1,
+            ['block truncate']: line === 1,
            [$style.ellipsisMultiLine]: line > 1,
          }"
          :style="{
--- a/packages/effects/hooks/package.json
+++ b/packages/effects/hooks/package.json
@@ -26,7 +26,7 @@
    "@vben/types": "workspace:*",
    "@vben/utils": "workspace:*",
    "vue": "^3.5.4",
-    "vue-router": "^4.4.3",
+    "vue-router": "^4.4.4",
    "watermark-js-plus": "^1.5.6"
  }
 }
--- a/packages/effects/layouts/package.json
+++ b/packages/effects/layouts/package.json
@@ -37,6 +37,6 @@
    "@vben/utils": "workspace:*",
    "@vueuse/core": "^11.0.3",
    "vue": "^3.5.4",
-    "vue-router": "^4.4.3"
+    "vue-router": "^4.4.4"
  }
 }