chore: Resolve merge conflicts

2024-07-31 21:26:54 +08:00
parent 4074a88c13
commit 082847c441
44 changed files with 772 additions and 475 deletions
--- a/packages/@core/ui-kit/layout-ui/package.json
+++ b/packages/@core/ui-kit/layout-ui/package.json
@@ -42,6 +42,6 @@
    "@vben-core/shadcn-ui": "workspace:*",
    "@vben-core/typings": "workspace:*",
    "@vueuse/core": "^10.11.0",
-    "vue": "^3.4.34"
+    "vue": "^3.4.35"
  }
 }
--- a/packages/@core/ui-kit/menu-ui/package.json
+++ b/packages/@core/ui-kit/menu-ui/package.json
@@ -43,6 +43,6 @@
    "@vben-core/shared": "workspace:*",
    "@vben-core/typings": "workspace:*",
    "@vueuse/core": "^10.11.0",
-    "vue": "^3.4.34"
+    "vue": "^3.4.35"
  }
 }
--- a/packages/@core/ui-kit/shadcn-ui/package.json
+++ b/packages/@core/ui-kit/shadcn-ui/package.json
@@ -50,6 +50,6 @@
    "class-variance-authority": "^0.7.0",
    "lucide-vue-next": "^0.417.0",
    "radix-vue": "^1.9.2",
-    "vue": "^3.4.34"
+    "vue": "^3.4.35"
  }
 }
--- a/packages/@core/ui-kit/tabs-ui/package.json
+++ b/packages/@core/ui-kit/tabs-ui/package.json
@@ -41,6 +41,6 @@
    "@vben-core/icons": "workspace:*",
    "@vben-core/shadcn-ui": "workspace:*",
    "@vben-core/typings": "workspace:*",
-    "vue": "^3.4.34"
+    "vue": "^3.4.35"
  }
 }