@qin-ui/antd-vue-pro 1.0.13 → 1.0.14

package/es/form/index.js

@@ -15868,7 +15868,7 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
                         ref: (el) => setFormItemRef(el, field),
                         class: field.className,
                         style: field.style,
-                        name: getPath(field.key) ? unref(toPath)(getPath(field.key)) : "",
+                        name: _ctx.path ? unref(toPath)(getPath(field.key)) : getPath(field.key),
                         path: getPath(field.key)
                       }), createSlots({
                         default: withCtx(() => [
@@ -15922,7 +15922,12 @@ const generateFieldMap = (fields, prePath = "", preFieldPath = "", fieldMap = {}
       fieldMap[path] = { field, fieldPath };
     }
     if (field.fields) {
-      generateFieldMap(field.fields, path, `${fieldPath}.fields`, fieldMap);
+      generateFieldMap(
+        field.fields,
+        path,
+        `${fieldPath}.fields`,
+        fieldMap
+      );
     }
   });
   return fieldMap;
@@ -16010,6 +16015,8 @@ const useFormData = (initFormData) => {
   const formData = ref(initFormData);
   const activePath = ref(null);
   const getFormData = (path) => {
+    if (!path)
+      return void 0;
     return get$1(formData.value, path);
   };
   const setFormData = (path, value) => {
@@ -16032,10 +16039,10 @@ const useFormData = (initFormData) => {
   };
   return { formData, getFormData, setFormData, activePath };
 };
-const useForm = (initFormData, initFields) => {
+const useForm = (initFormData = {}, initFields = []) => {
   return {
-    ...useFormData(initFormData || {}),
-    ...useFields(initFields || [])
+    ...useFormData(initFormData),
+    ...useFields(initFields)
   };
 };
 const isFunctionString = (param) => {

package/es/index.d.ts

@@ -20,7 +20,6 @@ import { ExtractPropTypes } from 'vue';
 import { FieldData } from 'ant-design-vue/es/form/interface';
 import type { FormItemProps } from 'ant-design-vue';
 import { FormLabelAlign } from 'ant-design-vue/es/form/interface';
-import type { FunctionalComponent } from 'vue';
 import { HTMLAttributes } from 'vue';
 import { InjectionKey } from 'vue';
 import type { InputNumberProps } from 'ant-design-vue';
@@ -69,7 +68,7 @@ declare type __VLS_WithTemplateSlots_2<T, S> = T & {
     };
 };
 
-export declare type AppendField = (path: string, field: Field) => void;
+export declare type AppendField = (path: string | undefined, field: Field) => void;
 
 /**
  * @description js箭头函数字符串正则
@@ -179,9 +178,9 @@ export declare type CommandTrigger = 'onInit' | 'onUpdateValue' | 'onBlur' | 'on
 /**
  * @type {Object} Common - 公共字段类型
  */
-declare interface Common {
+declare interface Common<D extends FormData_2 = FormData_2> {
     /** 标识key */
-    key?: string;
+    key?: keyof D & string;
     /** 中文名称 */
     label?: SlotComponentType;
     /** 插槽，可包含formItem插槽和component插槽 */
@@ -228,15 +227,15 @@ export declare type Condition = {
     disabled?: boolean;
 };
 
-export declare type ContainerComponent = FunctionalComponent<Pick<RenderProps, 'path'>> | DefineComponent<Pick<RenderProps, 'path'>>;
+export declare type ContainerComponent = Component<DefaultProps>;
 
 export declare const ContainerFragment: __VLS_WithTemplateSlots_2<DefineComponent<{
     component: {
-        type: PropType<any>;
+        type: PropType<ContainerComponent>;
     };
 }, {}, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, VNodeProps & AllowedComponentProps & ComponentCustomProps, Readonly<ExtractPropTypes<{
     component: {
-        type: PropType<any>;
+        type: PropType<ContainerComponent>;
     };
 }>>, {}, {}>, {
     default?(_: {}): any;
@@ -257,7 +256,7 @@ declare const _default_2: __VLS_WithTemplateSlots<DefineComponent<{
         type: PropType<string>;
     };
     size: {
-        type: PropType<"small" | "middle" | "large">;
+        type: PropType<"middle" | "small" | "large">;
     };
     disabled: {
         type: PropType<boolean>;
@@ -434,7 +433,7 @@ declare const _default_2: __VLS_WithTemplateSlots<DefineComponent<{
         type: PropType<string>;
     };
     size: {
-        type: PropType<"small" | "middle" | "large">;
+        type: PropType<"middle" | "small" | "large">;
     };
     disabled: {
         type: PropType<boolean>;
@@ -599,20 +598,25 @@ declare const _default_2: __VLS_WithTemplateSlots<DefineComponent<{
     default?(_: {}): any;
 }>;
 
-export declare type DeleteField = (path: string) => void;
+declare type DefaultProps = {
+    path?: string;
+    [key: string]: any;
+};
+
+export declare type DeleteField = (path?: string) => void;
 
 /**
  * @type {string} Expression - 表达式字符串 需要是一个js表达式字符串或者一个函数字符串，表达式的执行结果或者函数的返回值将作为结果返回
  */
 export declare type Expression = string;
 
-export declare type Field = FieldType[keyof FieldType] & Omit<FormItemProps, 'label'> & ColProps & Common;
+export declare type Field<D extends FormData_2 = FormData_2> = FieldType[keyof FieldType] & Omit<FormItemProps, 'label'> & ColProps & Common<D>;
 
 declare type FieldAttrsType = {
     [key in keyof FieldType]: FieldType[key] & Pick<Common, 'slots' | 'componentStyle' | 'componentClassName' | 'componentContainer' | 'autoCommand'>;
 };
 
-export declare type Fields = Array<Field>;
+export declare type Fields<D extends FormData_2 = FormData_2> = Array<Field<D>>;
 
 declare type FieldSlot<T extends string> = Partial<Record<T, SlotComponentType>>;
 
@@ -703,13 +707,15 @@ export declare type FieldType = {
     } & Record<string, any>;
 };
 
-export declare type Form = ReturnType<UseFields> & ReturnType<UseFormData>;
+export declare type Form<D extends FormData_2 = FormData_2> = ReturnType<UseFormData<D>> & ReturnType<UseFields>;
 
 export declare const FORM_DATA: InjectionKey<Record<string, any>>;
 
 export declare const FORM_ITEM_SLOT_KEYS: readonly ["label", "extra", "help"];
 
-declare type FormData_2 = Record<string, any>;
+declare type FormData_2 = {
+    [key: string]: any;
+};
 export { FormData_2 as FormData }
 
 /**
@@ -717,13 +723,13 @@ export { FormData_2 as FormData }
  */
 export declare const FunctionRegexp: RegExp;
 
-export declare type GetField = (path: string) => Field | undefined;
+export declare type GetField = (path?: string) => Field | undefined;
 
-export declare type GetFieldPath = (path: string) => string | undefined;
+export declare type GetFieldPath = (path?: string) => string | undefined;
 
-export declare type GetFormData = (path: string) => DeepReadonly<any>;
+export declare type GetFormData = (path?: string) => DeepReadonly<any>;
 
-export declare type GetParentField = (path: string) => Field | undefined;
+export declare type GetParentField = (path?: string) => Field | undefined;
 
 export declare type Grid = boolean | RowProps;
 
@@ -846,7 +852,7 @@ declare type Option_2 = {
 
 export declare type Options = Array<Option_2>;
 
-export declare type PrependField = (path: string, field: Field) => void;
+export declare type PrependField = (path: string | undefined, field: Field) => void;
 
 export declare const ProComponentProvider: SFCWithInstall<{
     new (...args: any[]): {
@@ -969,7 +975,7 @@ export declare const ProForm: SFCWithInstall<{
             autoCommandDisabled?: boolean | undefined;
             readonly prefixCls?: string | undefined;
             readonly name?: string | undefined;
-            readonly size?: "small" | "middle" | "large" | undefined;
+            readonly size?: "middle" | "small" | "large" | undefined;
             readonly disabled?: boolean | undefined;
             readonly labelCol?: (Partial<ExtractPropTypes<{
                 span: (StringConstructor | NumberConstructor)[];
@@ -1126,7 +1132,7 @@ export declare const ProForm: SFCWithInstall<{
                 type: PropType<string>;
             };
             size: {
-                type: PropType<"small" | "middle" | "large">;
+                type: PropType<"middle" | "small" | "large">;
             };
             disabled: {
                 type: PropType<boolean>;
@@ -1331,7 +1337,7 @@ export declare const ProForm: SFCWithInstall<{
             type: PropType<string>;
         };
         size: {
-            type: PropType<"small" | "middle" | "large">;
+            type: PropType<"middle" | "small" | "large">;
         };
         disabled: {
             type: PropType<boolean>;
@@ -1512,7 +1518,7 @@ export declare const ProForm: SFCWithInstall<{
         type: PropType<string>;
     };
     size: {
-        type: PropType<"small" | "middle" | "large">;
+        type: PropType<"middle" | "small" | "large">;
     };
     disabled: {
         type: PropType<boolean>;
@@ -1706,16 +1712,9 @@ export declare type Refs = {
 
 /**
  * @description 自定义组件
- * @example (renderProps, ctx) => h('div', ctx.attrs)
+ * @example (p, ctx) => h('div', ctx.attrs)
  */
-export declare type RenderComponentType = FunctionalComponent<RenderProps> | DefineComponent<RenderProps>;
-
-declare type RenderProps = {
-    path: string;
-    value: unknown;
-    'onUpdate:value': (val: unknown) => void;
-    [key: string]: any;
-};
+export declare type RenderComponentType = Component<VModelProps & DefaultProps>;
 
 /**
  * @type {object} Rule - 逻辑运行规则
@@ -1749,9 +1748,9 @@ export declare type RuleType = 'value' | 'hidden' | 'disabled' | 'options' | 'va
 
 declare type SelectSlots = FieldSlot<keyof InstanceType<typeof Select>['$slots']>;
 
-export declare type SetField = (path: string, field: Field | ((preField: ReturnType<GetField>) => Field)) => void;
+export declare type SetField = (path: string | undefined, field: Field | ((preField: ReturnType<GetField>) => Field)) => void;
 
-export declare type SetFormData = (path: string, value: any | ((preValue: DeepReadonly<any>) => any)) => void;
+export declare type SetFormData = (path: string | undefined, value: any | ((preValue: DeepReadonly<any>) => any)) => void;
 
 declare type SFCWithInstall<T> = T & Plugin_2;
 
@@ -1772,7 +1771,7 @@ export declare const SlotComponent: DefineComponent<{
     };
 }>>, {}, {}>;
 
-export declare type SlotComponentType = string | VNode | FunctionalComponent<Pick<RenderProps, 'path'>>;
+export declare type SlotComponentType = string | Component<DefaultProps>;
 
 declare type SwitchSlots = FieldSlot<'checkedChildren' | 'unCheckedChildren'>;
 
@@ -1823,7 +1822,7 @@ export declare type UseFields = (initFields: Fields) => {
 
 export declare const useFields: UseFields;
 
-export declare type UseForm = <T extends FormData_2>(initFormData?: T, initFields?: Fields) => Form;
+export declare type UseForm<T extends FormData_2 = FormData_2> = <D extends T = T>(initFormData?: Partial<D>, initFields?: Fields<D>) => Form<D>;
 
 export declare const useForm: UseForm;
 
@@ -1832,9 +1831,9 @@ export declare const useForm: UseForm;
  * @param {array} initFormData - 初始化表单数据
  * @returns {Object}
  */
-export declare type UseFormData = (initFormData: FormData_2) => {
+export declare type UseFormData<D extends FormData_2 = FormData_2> = (initFormData: Partial<D>) => {
     /** 表单数据Ref */
-    formData: Ref<FormData_2>;
+    formData: Ref<D | FormData_2>;
     /** 获取指定字段数据路径的值 */
     getFormData: GetFormData;
     /** 设置指定字段数据路径的值 */
@@ -1849,4 +1848,9 @@ export declare const useInitProps: () => {
     getInitProps: (field: Field) => Record<string, any>;
 };
 
+declare type VModelProps = {
+    value: unknown;
+    'onUpdate:value': (val: unknown) => void;
+};
+
 export { }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qin-ui/antd-vue-pro",
-  "version": "1.0.13",
+  "version": "1.0.14",
   "description": "二次封装antd vue组件",
   "type": "module",
   "main": "",