Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vben into dev

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

@@ -155,7 +155,11 @@ const computedSchema = computed(
           :rules="cSchema.rules"
         >
           <template #default="slotProps">
-            <slot v-bind="slotProps" :name="cSchema.fieldName"> </slot>
+            <slot
+              v-bind="slotProps"
+              :name="cSchema.slotName || cSchema.fieldName"
+            >
+            </slot>
           </template>
         </FormField>
       </template>

packages/@core/ui-kit/form-ui/src/types.ts

@@ -263,6 +263,8 @@ export interface FormSchema<
   renderComponentContent?: RenderComponentContentType;
   /** 字段规则 */
   rules?: FormSchemaRuleType;
+  /** 自定义插槽名，如果不指定则使用fieldName */
+  slotName?: string;
   /** 后缀 */
   suffix?: CustomRenderType;
 }

packages/@core/ui-kit/popup-ui/src/modal/modal-api.ts

@@ -124,6 +124,14 @@ export class ModalApi {
     return this.setState({ submitting: isLocked });
   }
 
+  modalLoading(loading: boolean) {
+    this.store.setState((prev) => ({
+      ...prev,
+      confirmLoading: loading,
+      loading,
+    }));
+  }
+
   /**
    * 取消操作
    */