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

packages/@core/ui-kit/form-ui/src/form-render/form-field.vue

@@ -264,7 +264,8 @@ function createComponentProps(slotProps: Record<string, any>) {
             <component
               :is="fieldComponent"
               :class="{
-                'border-destructive focus:border-destructive': isInValid,
+                'border-destructive focus:border-destructive hover:border-destructive/80':
+                  isInValid,
               }"
               v-bind="createComponentProps(slotProps)"
               :disabled="shouldDisabled"

packages/stores/package.json

@@ -23,7 +23,7 @@
     "@vben-core/shared": "workspace:*",
     "@vben-core/typings": "workspace:*",
     "pinia": "2.2.2",
-    "pinia-plugin-persistedstate": "^4.0.1",
+    "pinia-plugin-persistedstate": "^4.0.2",
     "vue": "^3.5.6",
     "vue-router": "^4.4.5"
   }

pnpm-lock.yaml

@@ -1227,8 +1227,13 @@ importers:
         specifier: 2.2.2
         version: 2.2.2(typescript@5.6.2)(vue@3.5.6(typescript@5.6.2))
       pinia-plugin-persistedstate:
+<<<<<<< HEAD
         specifier: ^4.0.1
         version: 4.0.1(pinia@2.2.2(typescript@5.6.2)(vue@3.5.6(typescript@5.6.2)))(rollup@4.21.3)(webpack-sources@3.2.3)
+=======
+        specifier: ^4.0.2
+        version: 4.0.2(pinia@2.2.2(typescript@5.6.2)(vue@3.5.6(typescript@5.6.2)))(rollup@4.21.3)
+>>>>>>> f25783933d2276ef78c6e864da27dae97e375d65
       vue:
         specifier: 3.5.6
         version: 3.5.6(typescript@5.6.2)
@@ -3725,12 +3730,12 @@ packages:
     engines: {node: '>=10'}
     deprecated: This functionality has been moved to @npmcli/fs
 
-  '@nuxt/kit@3.13.1':
-    resolution: {integrity: sha512-FkUL349lp/3nVfTIyws4UDJ3d2jyv5Pk1DC1HQUCOkSloYYMdbRcQAUcb4fe2TCLNWvHM+FhU8jnzGTzjALZYA==}
+  '@nuxt/kit@3.13.2':
+    resolution: {integrity: sha512-KvRw21zU//wdz25IeE1E5m/aFSzhJloBRAQtv+evcFeZvuroIxpIQuUqhbzuwznaUwpiWbmwlcsp5uOWmi4vwA==}
     engines: {node: ^14.18.0 || >=16.10.0}
 
-  '@nuxt/schema@3.13.1':
-    resolution: {integrity: sha512-ishbhzVGspjshG9AG0hYnKYY6LWXzCtua7OXV7C/DQ2yA7rRcy1xHpzKZUDbIRyxCHHCAcBd8jfHEUmEuhEPrA==}
+  '@nuxt/schema@3.13.2':
+    resolution: {integrity: sha512-CCZgpm+MkqtOMDEgF9SWgGPBXlQ01hV/6+2reDEpJuqFPGzV8HYKPBcIFvn7/z5ahtgutHLzjP71Na+hYcqSpw==}
     engines: {node: ^14.18.0 || >=16.10.0}
 
   '@one-ini/wasm@0.1.1':
@@ -8102,8 +8107,8 @@ packages:
     resolution: {integrity: sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==}
     engines: {node: '>=6'}
 
-  pinia-plugin-persistedstate@4.0.1:
-    resolution: {integrity: sha512-Gs2nhKUi6Rwhhc8PH9wvEAxfz4iZeJ/36qQv2ieYs94+zMozbGtMLIR4p9Aoim3c/PKf8J9orOz9n+f0ZF9CdA==}
+  pinia-plugin-persistedstate@4.0.2:
+    resolution: {integrity: sha512-KSApXsnGTrWKnAeHgEpYqtzeO84y4NH7uVM0/KMog+/oR2Py8p25tKjHQUmkcNNluzc0rJjFzlv2i5ZTdLeTXA==}
     peerDependencies:
       '@pinia/nuxt': '>=0.5.0'
       pinia: 2.2.2
@@ -9770,6 +9775,9 @@ packages:
   unimport@3.11.1:
     resolution: {integrity: sha512-DuB1Uoq01LrrXTScxnwOoMSlTXxyKcULguFxbLrMDFcE/CO0ZWHpEiyhovN0mycPt7K6luAHe8laqvwvuoeUPg==}
 
+  unimport@3.12.0:
+    resolution: {integrity: sha512-5y8dSvNvyevsnw4TBQkIQR1Rjdbb+XjVSwQwxltpnVZrStBvvPkMPcZrh1kg5kY77kpx6+D4Ztd3W6FOBH/y2Q==}
+
   unique-filename@1.1.1:
     resolution: {integrity: sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==}
 
@@ -13110,9 +13118,15 @@ snapshots:
       mkdirp: 1.0.4
       rimraf: 3.0.2
 
+<<<<<<< HEAD
   '@nuxt/kit@3.13.1(rollup@4.21.3)(webpack-sources@3.2.3)':
     dependencies:
       '@nuxt/schema': 3.13.1(rollup@4.21.3)(webpack-sources@3.2.3)
+=======
+  '@nuxt/kit@3.13.2(rollup@4.21.3)':
+    dependencies:
+      '@nuxt/schema': 3.13.2(rollup@4.21.3)
+>>>>>>> f25783933d2276ef78c6e864da27dae97e375d65
       c12: 1.11.2
       consola: 3.2.3
       defu: 6.1.4
@@ -13129,8 +13143,13 @@ snapshots:
       scule: 1.3.0
       semver: 7.6.3
       ufo: 1.5.4
+<<<<<<< HEAD
       unctx: 2.3.1(webpack-sources@3.2.3)
       unimport: 3.11.1(rollup@4.21.3)(webpack-sources@3.2.3)
+=======
+      unctx: 2.3.1
+      unimport: 3.12.0(rollup@4.21.3)
+>>>>>>> f25783933d2276ef78c6e864da27dae97e375d65
       untyped: 1.4.2
     transitivePeerDependencies:
       - magicast
@@ -13138,7 +13157,11 @@ snapshots:
       - supports-color
       - webpack-sources
 
+<<<<<<< HEAD
   '@nuxt/schema@3.13.1(rollup@4.21.3)(webpack-sources@3.2.3)':
+=======
+  '@nuxt/schema@3.13.2(rollup@4.21.3)':
+>>>>>>> f25783933d2276ef78c6e864da27dae97e375d65
     dependencies:
       compatx: 0.1.8
       consola: 3.2.3
@@ -13150,7 +13173,11 @@ snapshots:
       std-env: 3.7.0
       ufo: 1.5.4
       uncrypto: 0.1.3
+<<<<<<< HEAD
       unimport: 3.11.1(rollup@4.21.3)(webpack-sources@3.2.3)
+=======
+      unimport: 3.12.0(rollup@4.21.3)
+>>>>>>> f25783933d2276ef78c6e864da27dae97e375d65
       untyped: 1.4.2
     transitivePeerDependencies:
       - rollup
@@ -18112,9 +18139,15 @@ snapshots:
 
   pify@4.0.1: {}
 
+<<<<<<< HEAD
   pinia-plugin-persistedstate@4.0.1(pinia@2.2.2(typescript@5.6.2)(vue@3.5.6(typescript@5.6.2)))(rollup@4.21.3)(webpack-sources@3.2.3):
     dependencies:
       '@nuxt/kit': 3.13.1(rollup@4.21.3)(webpack-sources@3.2.3)
+=======
+  pinia-plugin-persistedstate@4.0.2(pinia@2.2.2(typescript@5.6.2)(vue@3.5.6(typescript@5.6.2)))(rollup@4.21.3):
+    dependencies:
+      '@nuxt/kit': 3.13.2(rollup@4.21.3)
+>>>>>>> f25783933d2276ef78c6e864da27dae97e375d65
       deep-pick-omit: 1.2.0
       defu: 6.1.4
       destr: 2.0.3
@@ -19889,7 +19922,11 @@ snapshots:
       - rollup
       - webpack-sources
 
+<<<<<<< HEAD
   unimport@3.11.1(rollup@4.21.3)(webpack-sources@3.2.3):
+=======
+  unimport@3.12.0(rollup@4.21.3):
+>>>>>>> f25783933d2276ef78c6e864da27dae97e375d65
     dependencies:
       '@rollup/pluginutils': 5.1.0(rollup@4.21.3)
       acorn: 8.12.1