@aplus-frontend/ui 0.1.8 → 0.1.10

package/lib/src/ap-form/ap-form-item.vue.d.ts

@@ -1,141 +1,34 @@
-import { ApFormItemProps, ApFormItemSlots, ApFormColProps } from './interface';
-import { DefineComponent, ComponentOptionsMixin, PublicProps, ExtractPropTypes, PropType, HTMLAttributes, ComponentProvideOptions } from 'vue';
-import { VueTypeValidableDef, VueTypeDef } from '../../node_modules/vue-types';
-import { ColSize } from 'ant-design-vue/es/grid';
-import { FormLabelAlign } from 'ant-design-vue/es/form/interface';
-import { RuleObject } from 'ant-design-vue/es/form';
+import { ApFormItemProps, ApFormItemSlots } from './interface';
+import { DefineComponent, ComponentOptionsMixin, PublicProps, ExtractPropTypes, PropType } from 'vue';
 declare function onFieldBlur(): void;
 declare function onFieldChange(): void;
 declare function clearValidate(): void;
 declare function resetField(): void;
 declare function getFieldValue(): any;
 declare function __VLS_template(): Readonly<ApFormItemSlots> & ApFormItemSlots;
-declare const __VLS_component: DefineComponent<ApFormItemProps, {
+declare const __VLS_component: DefineComponent<__VLS_WithDefaults<__VLS_TypePropsToOption<ApFormItemProps>, {
+    hasFeedback: boolean;
+    colon: undefined;
+    autoLink: boolean;
+    required: undefined;
+    validateFirst: undefined;
+    bordered: boolean;
+    valuePropName: string;
+}>, {
     onFieldBlur: typeof onFieldBlur;
     onFieldChange: typeof onFieldChange;
     clearValidate: typeof clearValidate;
     resetField: typeof resetField;
     getFieldValue: typeof getFieldValue;
-}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly<Partial< ExtractPropTypes<{
-    htmlFor: StringConstructor;
-    prefixCls: StringConstructor;
-    label: VueTypeValidableDef<any>;
-    help: VueTypeValidableDef<any>;
-    extra: VueTypeValidableDef<any>;
-    labelCol: {
-        type: PropType<Partial< ExtractPropTypes<{
-            span: (StringConstructor | NumberConstructor)[];
-            order: (StringConstructor | NumberConstructor)[];
-            offset: (StringConstructor | NumberConstructor)[];
-            push: (StringConstructor | NumberConstructor)[];
-            pull: (StringConstructor | NumberConstructor)[];
-            xs: {
-                type: PropType<string | number | ColSize>;
-                default: string | number | ColSize;
-            };
-            sm: {
-                type: PropType<string | number | ColSize>;
-                default: string | number | ColSize;
-            };
-            md: {
-                type: PropType<string | number | ColSize>;
-                default: string | number | ColSize;
-            };
-            lg: {
-                type: PropType<string | number | ColSize>;
-                default: string | number | ColSize;
-            };
-            xl: {
-                type: PropType<string | number | ColSize>;
-                default: string | number | ColSize;
-            };
-            xxl: {
-                type: PropType<string | number | ColSize>;
-                default: string | number | ColSize;
-            };
-            prefixCls: StringConstructor;
-            flex: (StringConstructor | NumberConstructor)[];
-        }>> & HTMLAttributes>;
-    };
-    wrapperCol: {
-        type: PropType<Partial< ExtractPropTypes<{
-            span: (StringConstructor | NumberConstructor)[];
-            order: (StringConstructor | NumberConstructor)[];
-            offset: (StringConstructor | NumberConstructor)[];
-            push: (StringConstructor | NumberConstructor)[];
-            pull: (StringConstructor | NumberConstructor)[];
-            xs: {
-                type: PropType<string | number | ColSize>;
-                default: string | number | ColSize;
-            };
-            sm: {
-                type: PropType<string | number | ColSize>;
-                default: string | number | ColSize;
-            };
-            md: {
-                type: PropType<string | number | ColSize>;
-                default: string | number | ColSize;
-            };
-            lg: {
-                type: PropType<string | number | ColSize>;
-                default: string | number | ColSize;
-            };
-            xl: {
-                type: PropType<string | number | ColSize>;
-                default: string | number | ColSize;
-            };
-            xxl: {
-                type: PropType<string | number | ColSize>;
-                default: string | number | ColSize;
-            };
-            prefixCls: StringConstructor;
-            flex: (StringConstructor | NumberConstructor)[];
-        }>> & HTMLAttributes>;
-    };
-    hasFeedback: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-    colon: {
-        type: BooleanConstructor;
-        default: any;
-    };
-    labelAlign: PropType<FormLabelAlign>;
-    prop: {
-        type: PropType<string | number | (string | number)[]>;
-    };
-    name: {
-        type: PropType<string | number | (string | number)[]>;
-    };
-    rules: PropType< RuleObject | RuleObject[]>;
-    autoLink: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-    required: {
-        type: BooleanConstructor;
-        default: any;
-    };
-    validateFirst: {
-        type: BooleanConstructor;
-        default: any;
-    };
-    validateStatus: VueTypeDef<string>;
-    validateTrigger: {
-        type: PropType<string | string[]>;
-    };
-    messageVariables: {
-        type: PropType<Record<string, string>>;
-    };
-    hidden: BooleanConstructor;
-    noStyle: BooleanConstructor;
-    tooltip: StringConstructor;
-}>> & Partial< ApFormColProps> & {
-    bordered?: boolean;
-    valuePropName?: string;
-    initialValue?: any;
-    _signal?: number;
-} & {}>, {
+}, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly< ExtractPropTypes<__VLS_WithDefaults<__VLS_TypePropsToOption<ApFormItemProps>, {
+    hasFeedback: boolean;
+    colon: undefined;
+    autoLink: boolean;
+    required: undefined;
+    validateFirst: undefined;
+    bordered: boolean;
+    valuePropName: string;
+}>>>, {
     required: boolean;
     bordered: boolean;
     colon: boolean;
@@ -143,11 +36,28 @@ declare const __VLS_component: DefineComponent<ApFormItemProps, {
     autoLink: boolean;
     validateFirst: boolean;
     valuePropName: string;
-}, {}, {}, {}, string, ComponentProvideOptions, false, {}>;
+}, {}>;
 declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, ReturnType<typeof __VLS_template>>;
 export default _default;
+type __VLS_WithDefaults<P, D> = {
+    [K in keyof Pick<P, keyof P>]: K extends keyof D ? __VLS_Prettify<P[K] & {
+        default: D[K];
+    }> : P[K];
+};
+type __VLS_Prettify<T> = {
+    [K in keyof T]: T[K];
+} & {};
 type __VLS_WithTemplateSlots<T, S> = T & {
     new (): {
         $slots: S;
     };
 };
+type __VLS_NonUndefinedable<T> = T extends undefined ? never : T;
+type __VLS_TypePropsToOption<T> = {
+    [K in keyof T]-?: {} extends Pick<T, K> ? {
+        type: PropType<__VLS_NonUndefinedable<T[K]>>;
+    } : {
+        type: PropType<T[K]>;
+        required: true;
+    };
+};

package/lib/src/ap-form/ap-form-item.vue.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),h=require("ant-design-vue"),w=require("ant-design-vue/es/theme/internal"),c=require("lodash-unified"),z=require("./constant.js"),A=require("@ant-design/icons-vue");require("../config-provider/index.js");const R=require("./context.js");require("./style/ap-form-item.css");const j=require("../config-provider/hooks/use-namespace.js"),D=e.defineComponent({name:"ApFormItem",__name:"ap-form-item",props:{htmlFor:{},prefixCls:{},label:{},help:{},extra:{},labelCol:{},wrapperCol:{},hasFeedback:{type:Boolean,default:!1},colon:{type:Boolean,default:void 0},labelAlign:{},prop:{},name:{},rules:{},autoLink:{type:Boolean,default:!0},required:{type:Boolean,default:void 0},validateFirst:{type:Boolean,default:void 0},validateStatus:{},validateTrigger:{},messageVariables:{},hidden:{type:Boolean},noStyle:{type:Boolean},tooltip:{},span:{},order:{},offset:{},push:{},pull:{},xs:{},sm:{},md:{},lg:{},xl:{},xxl:{},flex:{},bordered:{type:Boolean,default:!1},valuePropName:{default:"value"},initialValue:{},_signal:{}},setup(B,{expose:g}){var y,F;const t=B,r=e.useSlots(),{model:u,updateModel:i,internalInstance:s}=R.useInjectForm(),{m:f,b:C}=j.useNamespace("ap-form-item"),d=e.ref(!1),n=e.ref(),[,V]=w.useToken();e.onMounted(()=>{s==null||s.registerField({name:t.name,initialValue:t.initialValue})});const m=e.computed(()=>t.name?c.isArray(t.name)?t.name.reduce((o,l)=>o==null?void 0:o[l],e.unref(u)):u==null?void 0:u.value[t.name]:null),p=e.ref((F=(y=r.default)==null?void 0:y.call(r))==null?void 0:F[0]);e.watch(()=>{var o;return(o=r.default)==null?void 0:o.call(r)},o=>{p.value=o==null?void 0:o[0]});function k(o){i==null||i(t.name,o)}function q(){d.value=!0}function N(){d.value=!1}const v=e.computed(()=>{var l,a;if(!t.name)return(l=r.default())==null?void 0:l[0];const o=e.unref(p);return o?e.cloneVNode(o,{[t.valuePropName]:e.unref(m),[`onUpdate:${t.valuePropName}`]:k,bordered:t.bordered?!1:(a=o==null?void 0:o.props)==null?void 0:a.bordered,onFocus:q,onBlur:N}):null});function x(){var o;(o=n.value)==null||o.onFieldBlur()}function P(){var o;(o=n.value)==null||o.onFieldChange()}function S(){var o;(o=n.value)==null||o.clearValidate()}function _(){var o;(o=n.value)==null||o.resetField()}function I(){return e.unref(m)}return g({onFieldBlur:x,onFieldChange:P,clearValidate:S,resetField:_,getFieldValue:I}),(o,l)=>(e.openBlock(),e.createBlock(e.unref(h.Form).Item,e.mergeProps({ref_key:"formItemRef",ref:n},e.unref(c.omit)(t,[...e.unref(z.apFormItemColPropKeys),"tooltip"]),{class:{[e.unref(f)("bordered")]:o.bordered,[e.unref(f)("focused")]:o.bordered&&d.value,[e.unref(C)()]:!0},colon:o.bordered?!1:t.colon}),e.createSlots({default:e.withCtx(()=>[v.value?(e.openBlock(),e.createBlock(e.resolveDynamicComponent(v.value),{key:0})):e.createCommentVNode("",!0)]),_:2},[t.tooltip?{name:"tooltip",fn:e.withCtx(({class:a})=>[e.createElementVNode("span",{class:e.normalizeClass(a)},[e.createVNode(e.unref(h.Tooltip),{title:t.tooltip},{default:e.withCtx(()=>[e.createVNode(e.unref(A.QuestionCircleOutlined),{style:e.normalizeStyle({color:e.unref(V).colorPrimary})},null,8,["style"])]),_:1},8,["title"])],2)]),key:"0"}:void 0,e.renderList(e.unref(c.omit)(r,"default"),(a,b)=>({name:b,fn:e.withCtx(T=>[e.renderSlot(o.$slots,b,e.normalizeProps(e.guardReactiveProps(T||{})))])}))]),1040,["class","colon"]))}});exports.default=D;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),c=require("ant-design-vue"),w=require("ant-design-vue/es/theme/internal"),f=require("lodash-unified"),z=require("./constant.js"),A=require("@ant-design/icons-vue");require("../config-provider/index.js");const R=require("./context.js");require("./style/ap-form-item.css");const j=require("../config-provider/hooks/use-namespace.js"),D=e.defineComponent({name:"ApFormItem",__name:"ap-form-item",props:{htmlFor:{},prefixCls:{},label:{},help:{},extra:{},labelCol:{},wrapperCol:{},hasFeedback:{type:Boolean,default:!1},colon:{type:Boolean,default:void 0},labelAlign:{},prop:{},name:{},rules:{},autoLink:{type:Boolean,default:!0},required:{type:Boolean,default:void 0},validateFirst:{type:Boolean,default:void 0},validateStatus:{},validateTrigger:{},messageVariables:{},hidden:{type:Boolean},noStyle:{type:Boolean},tooltip:{},span:{},order:{},offset:{},push:{},pull:{},xs:{},sm:{},md:{},lg:{},xl:{},xxl:{},flex:{},bordered:{type:Boolean,default:!1},valuePropName:{default:"value"},initialValue:{},_signal:{}},setup(g,{expose:B}){var b,h;const t=g,l=e.useSlots(),{model:u,updateModel:i,internalInstance:s}=R.useInjectForm(),{m,b:C}=j.useNamespace("ap-form-item"),d=e.ref(!1),r=e.ref(),[,V]=w.useToken();e.onMounted(()=>{s==null||s.registerField({name:t.name,initialValue:t.initialValue})});const p=e.computed(()=>t.name?f.isArray(t.name)?t.name.reduce((o,n)=>o==null?void 0:o[n],e.unref(u)):u==null?void 0:u.value[t.name]:null),v=e.ref((h=(b=l.default)==null?void 0:b.call(l))==null?void 0:h[0]);e.watch(()=>{var o;return(o=l.default)==null?void 0:o.call(l)},o=>{v.value=o==null?void 0:o[0]});function k(o){i==null||i(t.name,o)}function N(){d.value=!0}function q(){d.value=!1}const y=e.computed(()=>{var n,a;if(!t.name)return(n=l.default())==null?void 0:n[0];const o=e.unref(v);return o?e.cloneVNode(o,{[t.valuePropName]:e.unref(p),[`onUpdate:${t.valuePropName}`]:k,bordered:t.bordered?!1:(a=o==null?void 0:o.props)==null?void 0:a.bordered,onFocus:N,onBlur:q}):null});function x(){var o;(o=r.value)==null||o.onFieldBlur()}function P(){var o;(o=r.value)==null||o.onFieldChange()}function S(){var o;(o=r.value)==null||o.clearValidate()}function I(){var o;(o=r.value)==null||o.resetField()}function T(){return e.unref(p)}return B({onFieldBlur:x,onFieldChange:P,clearValidate:S,resetField:I,getFieldValue:T}),(o,n)=>(e.openBlock(),e.createBlock(e.unref(c.Form).Item,e.mergeProps({ref_key:"formItemRef",ref:r},e.unref(f.omit)(t,[...e.unref(z.apFormItemColPropKeys),"tooltip","label"]),{class:{[e.unref(m)("bordered")]:o.bordered,[e.unref(m)("focused")]:o.bordered&&d.value,[e.unref(C)()]:!0},colon:o.bordered?!1:t.colon}),e.createSlots({default:e.withCtx(()=>[y.value?(e.openBlock(),e.createBlock(e.resolveDynamicComponent(y.value),{key:0})):e.createCommentVNode("",!0)]),_:2},[t.tooltip?{name:"tooltip",fn:e.withCtx(({class:a})=>[e.createElementVNode("span",{class:e.normalizeClass(a)},[e.createVNode(e.unref(c.Tooltip),{title:t.tooltip},{default:e.withCtx(()=>[e.createVNode(e.unref(A.QuestionCircleOutlined),{style:e.normalizeStyle({color:e.unref(V).colorPrimary})},null,8,["style"])]),_:1},8,["title"])],2)]),key:"0"}:void 0,o.label?{name:"label",fn:e.withCtx(()=>[e.createVNode(e.unref(c.Typography).Text,{ellipsis:{tooltip:o.label},content:o.label},null,8,["ellipsis","content"])]),key:"1"}:void 0,e.renderList(e.unref(f.omit)(l,"default"),(a,F)=>({name:F,fn:e.withCtx(_=>[e.renderSlot(o.$slots,F,e.normalizeProps(e.guardReactiveProps(_||{})))])}))]),1040,["class","colon"]))}});exports.default=D;

package/lib/src/ap-form/ap-form-list.vue.d.ts

@@ -1,5 +1,5 @@
 import { ApFormListProps } from './interface';
-import { DefineComponent, ComponentOptionsMixin, PublicProps, ComponentProvideOptions } from 'vue';
+import { DefineComponent, ComponentOptionsMixin, PublicProps, ExtractPropTypes, PropType } from 'vue';
 type FormListField = {
     key: number;
     name: (string | number)[];
@@ -17,7 +17,7 @@ type ApFormListSlots = {
     }): any;
 };
 declare function __VLS_template(): Readonly<ApFormListSlots> & ApFormListSlots;
-declare const __VLS_component: DefineComponent<ApFormListProps, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly<ApFormListProps & {}>, {}, {}, {}, {}, string, ComponentProvideOptions, false, {}>;
+declare const __VLS_component: DefineComponent<__VLS_TypePropsToOption<ApFormListProps>, {}, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly< ExtractPropTypes<__VLS_TypePropsToOption<ApFormListProps>>>, {}, {}>;
 declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, ReturnType<typeof __VLS_template>>;
 export default _default;
 type __VLS_WithTemplateSlots<T, S> = T & {
@@ -25,3 +25,12 @@ type __VLS_WithTemplateSlots<T, S> = T & {
         $slots: S;
     };
 };
+type __VLS_NonUndefinedable<T> = T extends undefined ? never : T;
+type __VLS_TypePropsToOption<T> = {
+    [K in keyof T]-?: {} extends Pick<T, K> ? {
+        type: PropType<__VLS_NonUndefinedable<T[K]>>;
+    } : {
+        type: PropType<T[K]>;
+        required: true;
+    };
+};

package/lib/src/ap-form/ap-form.vue.d.ts

@@ -1,13 +1,6 @@
 import { ApFormProps, RegistedFieldType, WatchFunc } from './interface';
-import { InternalNamePath, NamePath, ValidateOptions, FormLabelAlign, RuleObject, ValidateMessages, FieldData, ValidateErrorEntity } from 'ant-design-vue/es/form/interface';
-import { DefineComponent, ComponentOptionsMixin, PublicProps, ExtractPropTypes, PropType, HTMLAttributes, ComponentProvideOptions } from 'vue';
-import { VueTypeDef, VueTypeValidableDef } from '../../node_modules/vue-types';
-import { ColSize } from 'ant-design-vue/es/grid';
-import { ColSize } from 'ant-design-vue/es/grid/Col';
-import { RequiredMark } from 'ant-design-vue/es/form/Form';
-import { Options } from '../../node_modules/scroll-into-view-if-needed';
-import { ButtonSize } from 'ant-design-vue/es/button';
-import { Recordable } from '../type';
+import { InternalNamePath, NamePath, ValidateOptions, FormLabelAlign } from 'ant-design-vue/es/form/interface';
+import { DefineComponent, ComponentOptionsMixin, PublicProps, ExtractPropTypes, PropType } from 'vue';
 /**
  * 订阅事件
  */
@@ -24,7 +17,14 @@ declare function getInternalInstance(mark: string): {
 declare function __VLS_template(): {
     default?(_: {}): any;
 };
-declare const __VLS_component: DefineComponent<ApFormProps, {
+declare const __VLS_component: DefineComponent<__VLS_WithDefaults<__VLS_TypePropsToOption<ApFormProps>, {
+    layout: string;
+    hideRequiredMark: boolean;
+    colon: boolean;
+    labelAlign: string;
+    validateOnRuleChange: boolean;
+    validateTrigger: string;
+}>, {
     resetFields: () => Promise<void>;
     clearValidate: (name?: NamePath) => void;
     validateFields: (nameList?: NamePath[] | string, options?: ValidateOptions) => Promise<{
@@ -41,244 +41,42 @@ declare const __VLS_component: DefineComponent<ApFormProps, {
     setFieldValue: (key: any, newValue: any) => void;
     registerWatch: typeof registerWatch;
     getInternalInstance: typeof getInternalInstance;
-}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly<Omit<Partial< ExtractPropTypes<{
-    layout: VueTypeDef<string>;
-    labelCol: {
-        type: PropType<Partial< ExtractPropTypes<{
-            span: (StringConstructor | NumberConstructor)[];
-            order: (StringConstructor | NumberConstructor)[];
-            offset: (StringConstructor | NumberConstructor)[];
-            push: (StringConstructor | NumberConstructor)[];
-            pull: (StringConstructor | NumberConstructor)[];
-            xs: {
-                type: PropType<string | number | ColSize>;
-                default: string | number | ColSize;
-            };
-            sm: {
-                type: PropType<string | number | ColSize>;
-                default: string | number | ColSize;
-            };
-            md: {
-                type: PropType<string | number | ColSize>;
-                default: string | number | ColSize;
-            };
-            lg: {
-                type: PropType<string | number | ColSize>;
-                default: string | number | ColSize;
-            };
-            xl: {
-                type: PropType<string | number | ColSize>;
-                default: string | number | ColSize;
-            };
-            xxl: {
-                type: PropType<string | number | ColSize>;
-                default: string | number | ColSize;
-            };
-            prefixCls: StringConstructor;
-            flex: (StringConstructor | NumberConstructor)[];
-        }>> & HTMLAttributes>;
-        default: Partial< ExtractPropTypes<{
-            span: (StringConstructor | NumberConstructor)[];
-            order: (StringConstructor | NumberConstructor)[];
-            offset: (StringConstructor | NumberConstructor)[];
-            push: (StringConstructor | NumberConstructor)[];
-            pull: (StringConstructor | NumberConstructor)[];
-            xs: {
-                type: PropType<string | number | ColSize>;
-                default: string | number | ColSize;
-            };
-            sm: {
-                type: PropType<string | number | ColSize>;
-                default: string | number | ColSize;
-            };
-            md: {
-                type: PropType<string | number | ColSize>;
-                default: string | number | ColSize;
-            };
-            lg: {
-                type: PropType<string | number | ColSize>;
-                default: string | number | ColSize;
-            };
-            xl: {
-                type: PropType<string | number | ColSize>;
-                default: string | number | ColSize;
-            };
-            xxl: {
-                type: PropType<string | number | ColSize>;
-                default: string | number | ColSize;
-            };
-            prefixCls: StringConstructor;
-            flex: (StringConstructor | NumberConstructor)[];
-        }>> & HTMLAttributes;
-    };
-    wrapperCol: {
-        type: PropType<Partial< ExtractPropTypes<{
-            span: (StringConstructor | NumberConstructor)[];
-            order: (StringConstructor | NumberConstructor)[];
-            offset: (StringConstructor | NumberConstructor)[];
-            push: (StringConstructor | NumberConstructor)[];
-            pull: (StringConstructor | NumberConstructor)[];
-            xs: {
-                type: PropType<string | number | ColSize>;
-                default: string | number | ColSize;
-            };
-            sm: {
-                type: PropType<string | number | ColSize>;
-                default: string | number | ColSize;
-            };
-            md: {
-                type: PropType<string | number | ColSize>;
-                default: string | number | ColSize;
-            };
-            lg: {
-                type: PropType<string | number | ColSize>;
-                default: string | number | ColSize;
-            };
-            xl: {
-                type: PropType<string | number | ColSize>;
-                default: string | number | ColSize;
-            };
-            xxl: {
-                type: PropType<string | number | ColSize>;
-                default: string | number | ColSize;
-            };
-            prefixCls: StringConstructor;
-            flex: (StringConstructor | NumberConstructor)[];
-        }>> & HTMLAttributes>;
-        default: Partial< ExtractPropTypes<{
-            span: (StringConstructor | NumberConstructor)[];
-            order: (StringConstructor | NumberConstructor)[];
-            offset: (StringConstructor | NumberConstructor)[];
-            push: (StringConstructor | NumberConstructor)[];
-            pull: (StringConstructor | NumberConstructor)[];
-            xs: {
-                type: PropType<string | number | ColSize>;
-                default: string | number | ColSize;
-            };
-            sm: {
-                type: PropType<string | number | ColSize>;
-                default: string | number | ColSize;
-            };
-            md: {
-                type: PropType<string | number | ColSize>;
-                default: string | number | ColSize;
-            };
-            lg: {
-                type: PropType<string | number | ColSize>;
-                default: string | number | ColSize;
-            };
-            xl: {
-                type: PropType<string | number | ColSize>;
-                default: string | number | ColSize;
-            };
-            xxl: {
-                type: PropType<string | number | ColSize>;
-                default: string | number | ColSize;
-            };
-            prefixCls: StringConstructor;
-            flex: (StringConstructor | NumberConstructor)[];
-        }>> & HTMLAttributes;
-    };
-    colon: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-    labelAlign: {
-        type: PropType<FormLabelAlign>;
-        default: FormLabelAlign;
-    };
-    labelWrap: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-    prefixCls: StringConstructor;
-    requiredMark: {
-        type: PropType<"" | RequiredMark>;
-        default: "" | RequiredMark;
-    };
-    hideRequiredMark: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-    model: VueTypeValidableDef<{
-        [key: string]: any;
-    }> & {
-        default: () => {
-            [key: string]: any;
-        };
-    };
-    rules: {
-        type: PropType<{
-            [k: string]: RuleObject | RuleObject[];
-        }>;
-        default: {
-            [k: string]: RuleObject | RuleObject[];
-        };
-    };
-    validateMessages: {
-        type: PropType<ValidateMessages>;
-        default: ValidateMessages;
-    };
-    validateOnRuleChange: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-    scrollToFirstError: {
-        default: boolean | Options<any>;
-        type: PropType<boolean | Options<any>>;
-    };
-    onSubmit: {
-        type: PropType<(e: Event) => void>;
-        default: (e: Event) => void;
-    };
-    name: StringConstructor;
-    validateTrigger: {
-        type: PropType<string | string[]>;
-        default: string | string[];
-    };
-    size: {
-        type: PropType<ButtonSize>;
-        default: ButtonSize;
-    };
-    disabled: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-    onValuesChange: {
-        type: PropType<(changedValues: any, values: any) => void>;
-        default: (changedValues: any, values: any) => void;
-    };
-    onFieldsChange: {
-        type: PropType<(changedFields: FieldData[], allFields: FieldData[]) => void>;
-        default: (changedFields: FieldData[], allFields: FieldData[]) => void;
-    };
-    onFinish: {
-        type: PropType<(values: any) => void>;
-        default: (values: any) => void;
-    };
-    onFinishFailed: {
-        type: PropType<(errorInfo: ValidateErrorEntity<any>) => void>;
-        default: (errorInfo: ValidateErrorEntity<any>) => void;
-    };
-    onValidate: {
-        type: PropType<(name: string | number | string[] | number[], status: boolean, errors: string[]) => void>;
-        default: (name: string | number | string[] | number[], status: boolean, errors: string[]) => void;
-    };
-}>>, "model"> & {
-    initialValues?: Recordable;
-    onValuesChange?: (changedValues: Recordable, allValues: Recordable) => void;
-} & {}>, {
+}, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly< ExtractPropTypes<__VLS_WithDefaults<__VLS_TypePropsToOption<ApFormProps>, {
+    layout: string;
+    hideRequiredMark: boolean;
+    colon: boolean;
+    labelAlign: string;
+    validateOnRuleChange: boolean;
+    validateTrigger: string;
+}>>>, {
     layout: string;
     validateTrigger: string | string[];
     colon: boolean;
     labelAlign: FormLabelAlign;
     hideRequiredMark: boolean;
     validateOnRuleChange: boolean;
-}, {}, {}, {}, string, ComponentProvideOptions, false, {}>;
+}, {}>;
 declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, ReturnType<typeof __VLS_template>>;
 export default _default;
+type __VLS_WithDefaults<P, D> = {
+    [K in keyof Pick<P, keyof P>]: K extends keyof D ? __VLS_Prettify<P[K] & {
+        default: D[K];
+    }> : P[K];
+};
+type __VLS_Prettify<T> = {
+    [K in keyof T]: T[K];
+} & {};
 type __VLS_WithTemplateSlots<T, S> = T & {
     new (): {
         $slots: S;
     };
 };
+type __VLS_NonUndefinedable<T> = T extends undefined ? never : T;
+type __VLS_TypePropsToOption<T> = {
+    [K in keyof T]-?: {} extends Pick<T, K> ? {
+        type: PropType<__VLS_NonUndefinedable<T[K]>>;
+    } : {
+        type: PropType<T[K]>;
+        required: true;
+    };
+};

package/lib/src/ap-form/hooks/use-watch.d.ts

@@ -2,5 +2,5 @@ import { NamePath } from 'ant-design-vue/es/form/interface';
 import { ApFormExpose } from '../interface';
 import { Ref } from 'vue';
 type ApFormIns<T> = ApFormExpose<T>;
-declare const useWatch: <ValueType = any, StoreType = any>(name: NamePath, form?: Ref<ApFormIns<StoreType> | undefined>) => Ref<ValueType | undefined, ValueType | undefined>;
+declare const useWatch: <ValueType = any, StoreType = any>(name: NamePath, form?: Ref<ApFormIns<StoreType> | undefined>) => Ref<ValueType | undefined>;
 export default useWatch;

package/lib/src/ap-form/items/checkbox/index.vue.d.ts

@@ -1,13 +1,26 @@
 import { ApFormItemCheckboxProps } from '../interface';
-import { ApFormItemSlots, ApFormItemProps } from '../../interface';
-import { DefineComponent, ComponentOptionsMixin, PublicProps, ComponentProvideOptions } from 'vue';
+import { ApFormItemSlots } from '../../interface';
+import { DefineComponent, ComponentOptionsMixin, PublicProps, ExtractPropTypes, PropType } from 'vue';
 import { ApFieldCheckboxProps } from '../../../ap-field';
 type ApFormItemCheckboxSlots = Omit<ApFormItemSlots, 'default'>;
 declare function __VLS_template(): Readonly<ApFormItemCheckboxSlots> & ApFormItemCheckboxSlots;
-declare const __VLS_component: DefineComponent<ApFormItemCheckboxProps, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly<Omit< ApFormItemProps, "bordered"> & {
-    field?: Omit< ApFieldCheckboxProps, "value" | "onUpdate:value">;
-    disabled?: boolean;
-} & {}>, {
+declare const __VLS_component: DefineComponent<__VLS_WithDefaults<__VLS_TypePropsToOption<ApFormItemCheckboxProps>, {
+    hasFeedback: boolean;
+    colon: undefined;
+    autoLink: boolean;
+    required: undefined;
+    validateFirst: undefined;
+    disabled: boolean;
+    field: () => {};
+}>, {}, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly< ExtractPropTypes<__VLS_WithDefaults<__VLS_TypePropsToOption<ApFormItemCheckboxProps>, {
+    hasFeedback: boolean;
+    colon: undefined;
+    autoLink: boolean;
+    required: undefined;
+    validateFirst: undefined;
+    disabled: boolean;
+    field: () => {};
+}>>>, {
     disabled: boolean;
     required: boolean;
     field: Omit< ApFieldCheckboxProps, "value" | "onUpdate:value">;
@@ -15,11 +28,28 @@ declare const __VLS_component: DefineComponent<ApFormItemCheckboxProps, {}, {},
     hasFeedback: boolean;
     autoLink: boolean;
     validateFirst: boolean;
-}, {}, {}, {}, string, ComponentProvideOptions, false, {}>;
+}, {}>;
 declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, ReturnType<typeof __VLS_template>>;
 export default _default;
+type __VLS_WithDefaults<P, D> = {
+    [K in keyof Pick<P, keyof P>]: K extends keyof D ? __VLS_Prettify<P[K] & {
+        default: D[K];
+    }> : P[K];
+};
+type __VLS_Prettify<T> = {
+    [K in keyof T]: T[K];
+} & {};
 type __VLS_WithTemplateSlots<T, S> = T & {
     new (): {
         $slots: S;
     };
 };
+type __VLS_NonUndefinedable<T> = T extends undefined ? never : T;
+type __VLS_TypePropsToOption<T> = {
+    [K in keyof T]-?: {} extends Pick<T, K> ? {
+        type: PropType<__VLS_NonUndefinedable<T[K]>>;
+    } : {
+        type: PropType<T[K]>;
+        required: true;
+    };
+};