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

2025-10-09 11:19:32 +08:00
parent 96a1232b1e 2ce161e585
commit 99dd3350f4
30 changed files with 175 additions and 45 deletions
--- a/packages/@core/ui-kit/form-ui/src/form-api.ts
+++ b/packages/@core/ui-kit/form-ui/src/form-api.ts
@@ -366,7 +366,7 @@ export class FormApi {
          isObject(obj[key]) &&
          !isDayjsObject(obj[key]) &&
          !isDate(obj[key])
-            ? fieldMergeFn(obj[key], value)
+            ? fieldMergeFn(value, obj[key])
            : value;
      }
      return true;