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

2024-10-28 15:21:42 +08:00
parent 3be5f90e62 ad3963ff70
commit 9d908a2f40
48 changed files with 99 additions and 72 deletions
--- a/packages/@core/ui-kit/form-ui/src/form-render/form.vue
+++ b/packages/@core/ui-kit/form-ui/src/form-render/form.vue
@@ -81,7 +81,10 @@ const formCollapsed = computed(() => {
 });

 const computedSchema = computed(
-  (): ({ commonComponentProps: Record<string, any> } & FormSchema)[] => {
+  (): ({
+    commonComponentProps: Record<string, any>;
+    formFieldProps: Record<string, any>;
+  } & Omit<FormSchema, 'formFieldProps'>)[] => {
    const {
      componentProps = {},
      controlClass = '',