@aplus-frontend/ui 6.29.3 → 6.30.0

package/es/src/ap-form/drawer-form/index.vue.d.ts

@@ -7,7 +7,7 @@ import { RequiredMark } from '@aplus-frontend/antdv/es/form/Form';
 import { Options } from '../../../node_modules/scroll-into-view-if-needed';
 import { Recordable } from '../../type';
 import { VueTypeDef, VueTypeValidableDef } from '../../../node_modules/vue-types';
-import { ButtonSize } from '@aplus-frontend/antdv/es/config-provider';
+import { SizeType } from '@aplus-frontend/antdv/es/button';
 import { VueNode } from '@aplus-frontend/antdv/es/_util/type';
 import { ApFormProps, UpdateModelOptimizeFn, ApFormInternalInstance, WatchFunc, ApFormSubmitterConfig } from '..';
 import { OnCleanup } from '@vue/reactivity';
@@ -323,8 +323,8 @@ declare function __VLS_template(): {
                         default: string | string[];
                     };
                     size: {
-                        type: PropType<ButtonSize>;
-                        default: ButtonSize;
+                        type: PropType<SizeType>;
+                        default: SizeType;
                     };
                     disabled: {
                         type: BooleanConstructor;
@@ -355,15 +355,15 @@ declare function __VLS_template(): {
                         default: "filled" | "outlined" | "borderless" | "underlined";
                     };
                 }>> & Readonly<{}>, () => VueNode, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, PublicProps, {
-                    size: ButtonSize;
+                    size: SizeType;
                     onSubmit: (e: Event) => void;
                     disabled: boolean;
                     validateTrigger: string | string[];
-                    variant: "filled" | "outlined" | "borderless" | "underlined";
+                    onValuesChange: (changedValues: any, values: any) => void;
+                    onFieldsChange: (changedFields: FieldData[], allFields: FieldData[]) => void;
                     onFinish: (values: any) => void;
-                    validateMessages: ValidateMessages;
-                    requiredMark: "" | RequiredMark;
-                    colon: boolean;
+                    onFinishFailed: (errorInfo: ValidateErrorEntity<any>) => void;
+                    onValidate: (name: string | number | string[] | number[], status: boolean, errors: string[]) => void;
                     labelCol: Partial< ExtractPropTypes<{
                         span: (StringConstructor | NumberConstructor)[];
                         order: (StringConstructor | NumberConstructor)[];
@@ -397,8 +397,6 @@ declare function __VLS_template(): {
                         prefixCls: StringConstructor;
                         flex: (StringConstructor | NumberConstructor)[];
                     }>> & HTMLAttributes;
-                    labelAlign: FormLabelAlign;
-                    labelWrap: boolean;
                     wrapperCol: Partial< ExtractPropTypes<{
                         span: (StringConstructor | NumberConstructor)[];
                         order: (StringConstructor | NumberConstructor)[];
@@ -432,19 +430,21 @@ declare function __VLS_template(): {
                         prefixCls: StringConstructor;
                         flex: (StringConstructor | NumberConstructor)[];
                     }>> & HTMLAttributes;
-                    rules: {
-                        [k: string]: RuleObject | RuleObject[];
-                    };
-                    onValidate: (name: string | number | string[] | number[], status: boolean, errors: string[]) => void;
-                    onValuesChange: (changedValues: any, values: any) => void;
-                    onFieldsChange: (changedFields: FieldData[], allFields: FieldData[]) => void;
-                    onFinishFailed: (errorInfo: ValidateErrorEntity<any>) => void;
+                    colon: boolean;
+                    labelAlign: FormLabelAlign;
+                    labelWrap: boolean;
+                    requiredMark: "" | RequiredMark;
                     hideRequiredMark: boolean;
                     model: {
                         [key: string]: any;
                     };
+                    rules: {
+                        [k: string]: RuleObject | RuleObject[];
+                    };
+                    validateMessages: ValidateMessages;
                     validateOnRuleChange: boolean;
                     scrollToFirstError: boolean | Options<any>;
+                    variant: "filled" | "outlined" | "borderless" | "underlined";
                 }, true, {}, {}, GlobalComponents, GlobalDirectives, string, {}, any, ComponentProvideOptions, {
                     P: {};
                     B: {};
@@ -648,8 +648,8 @@ declare function __VLS_template(): {
                         default: string | string[];
                     };
                     size: {
-                        type: PropType<ButtonSize>;
-                        default: ButtonSize;
+                        type: PropType<SizeType>;
+                        default: SizeType;
                     };
                     disabled: {
                         type: BooleanConstructor;
@@ -680,15 +680,15 @@ declare function __VLS_template(): {
                         default: "filled" | "outlined" | "borderless" | "underlined";
                     };
                 }>> & Readonly<{}>, () => VueNode, {}, {}, {}, {
-                    size: ButtonSize;
+                    size: SizeType;
                     onSubmit: (e: Event) => void;
                     disabled: boolean;
                     validateTrigger: string | string[];
-                    variant: "filled" | "outlined" | "borderless" | "underlined";
+                    onValuesChange: (changedValues: any, values: any) => void;
+                    onFieldsChange: (changedFields: FieldData[], allFields: FieldData[]) => void;
                     onFinish: (values: any) => void;
-                    validateMessages: ValidateMessages;
-                    requiredMark: "" | RequiredMark;
-                    colon: boolean;
+                    onFinishFailed: (errorInfo: ValidateErrorEntity<any>) => void;
+                    onValidate: (name: string | number | string[] | number[], status: boolean, errors: string[]) => void;
                     labelCol: Partial< ExtractPropTypes<{
                         span: (StringConstructor | NumberConstructor)[];
                         order: (StringConstructor | NumberConstructor)[];
@@ -722,8 +722,6 @@ declare function __VLS_template(): {
                         prefixCls: StringConstructor;
                         flex: (StringConstructor | NumberConstructor)[];
                     }>> & HTMLAttributes;
-                    labelAlign: FormLabelAlign;
-                    labelWrap: boolean;
                     wrapperCol: Partial< ExtractPropTypes<{
                         span: (StringConstructor | NumberConstructor)[];
                         order: (StringConstructor | NumberConstructor)[];
@@ -757,19 +755,21 @@ declare function __VLS_template(): {
                         prefixCls: StringConstructor;
                         flex: (StringConstructor | NumberConstructor)[];
                     }>> & HTMLAttributes;
-                    rules: {
-                        [k: string]: RuleObject | RuleObject[];
-                    };
-                    onValidate: (name: string | number | string[] | number[], status: boolean, errors: string[]) => void;
-                    onValuesChange: (changedValues: any, values: any) => void;
-                    onFieldsChange: (changedFields: FieldData[], allFields: FieldData[]) => void;
-                    onFinishFailed: (errorInfo: ValidateErrorEntity<any>) => void;
+                    colon: boolean;
+                    labelAlign: FormLabelAlign;
+                    labelWrap: boolean;
+                    requiredMark: "" | RequiredMark;
                     hideRequiredMark: boolean;
                     model: {
                         [key: string]: any;
                     };
+                    rules: {
+                        [k: string]: RuleObject | RuleObject[];
+                    };
+                    validateMessages: ValidateMessages;
                     validateOnRuleChange: boolean;
                     scrollToFirstError: boolean | Options<any>;
+                    variant: "filled" | "outlined" | "borderless" | "underlined";
                 }> | null;
             };
             $slots: Readonly<{
@@ -1282,8 +1282,8 @@ declare const __VLS_component: DefineComponent<ApFormDrawerFormProps, {
                     default: string | string[];
                 };
                 size: {
-                    type: PropType<ButtonSize>;
-                    default: ButtonSize;
+                    type: PropType<SizeType>;
+                    default: SizeType;
                 };
                 disabled: {
                     type: BooleanConstructor;
@@ -1314,15 +1314,15 @@ declare const __VLS_component: DefineComponent<ApFormDrawerFormProps, {
                     default: "filled" | "outlined" | "borderless" | "underlined";
                 };
             }>> & Readonly<{}>, () => VueNode, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, PublicProps, {
-                size: ButtonSize;
+                size: SizeType;
                 onSubmit: (e: Event) => void;
                 disabled: boolean;
                 validateTrigger: string | string[];
-                variant: "filled" | "outlined" | "borderless" | "underlined";
+                onValuesChange: (changedValues: any, values: any) => void;
+                onFieldsChange: (changedFields: FieldData[], allFields: FieldData[]) => void;
                 onFinish: (values: any) => void;
-                validateMessages: ValidateMessages;
-                requiredMark: "" | RequiredMark;
-                colon: boolean;
+                onFinishFailed: (errorInfo: ValidateErrorEntity<any>) => void;
+                onValidate: (name: string | number | string[] | number[], status: boolean, errors: string[]) => void;
                 labelCol: Partial< ExtractPropTypes<{
                     span: (StringConstructor | NumberConstructor)[];
                     order: (StringConstructor | NumberConstructor)[];
@@ -1356,8 +1356,6 @@ declare const __VLS_component: DefineComponent<ApFormDrawerFormProps, {
                     prefixCls: StringConstructor;
                     flex: (StringConstructor | NumberConstructor)[];
                 }>> & HTMLAttributes;
-                labelAlign: FormLabelAlign;
-                labelWrap: boolean;
                 wrapperCol: Partial< ExtractPropTypes<{
                     span: (StringConstructor | NumberConstructor)[];
                     order: (StringConstructor | NumberConstructor)[];
@@ -1391,19 +1389,21 @@ declare const __VLS_component: DefineComponent<ApFormDrawerFormProps, {
                     prefixCls: StringConstructor;
                     flex: (StringConstructor | NumberConstructor)[];
                 }>> & HTMLAttributes;
-                rules: {
-                    [k: string]: RuleObject | RuleObject[];
-                };
-                onValidate: (name: string | number | string[] | number[], status: boolean, errors: string[]) => void;
-                onValuesChange: (changedValues: any, values: any) => void;
-                onFieldsChange: (changedFields: FieldData[], allFields: FieldData[]) => void;
-                onFinishFailed: (errorInfo: ValidateErrorEntity<any>) => void;
+                colon: boolean;
+                labelAlign: FormLabelAlign;
+                labelWrap: boolean;
+                requiredMark: "" | RequiredMark;
                 hideRequiredMark: boolean;
                 model: {
                     [key: string]: any;
                 };
+                rules: {
+                    [k: string]: RuleObject | RuleObject[];
+                };
+                validateMessages: ValidateMessages;
                 validateOnRuleChange: boolean;
                 scrollToFirstError: boolean | Options<any>;
+                variant: "filled" | "outlined" | "borderless" | "underlined";
             }, true, {}, {}, GlobalComponents, GlobalDirectives, string, {}, any, ComponentProvideOptions, {
                 P: {};
                 B: {};
@@ -1607,8 +1607,8 @@ declare const __VLS_component: DefineComponent<ApFormDrawerFormProps, {
                     default: string | string[];
                 };
                 size: {
-                    type: PropType<ButtonSize>;
-                    default: ButtonSize;
+                    type: PropType<SizeType>;
+                    default: SizeType;
                 };
                 disabled: {
                     type: BooleanConstructor;
@@ -1639,15 +1639,15 @@ declare const __VLS_component: DefineComponent<ApFormDrawerFormProps, {
                     default: "filled" | "outlined" | "borderless" | "underlined";
                 };
             }>> & Readonly<{}>, () => VueNode, {}, {}, {}, {
-                size: ButtonSize;
+                size: SizeType;
                 onSubmit: (e: Event) => void;
                 disabled: boolean;
                 validateTrigger: string | string[];
-                variant: "filled" | "outlined" | "borderless" | "underlined";
+                onValuesChange: (changedValues: any, values: any) => void;
+                onFieldsChange: (changedFields: FieldData[], allFields: FieldData[]) => void;
                 onFinish: (values: any) => void;
-                validateMessages: ValidateMessages;
-                requiredMark: "" | RequiredMark;
-                colon: boolean;
+                onFinishFailed: (errorInfo: ValidateErrorEntity<any>) => void;
+                onValidate: (name: string | number | string[] | number[], status: boolean, errors: string[]) => void;
                 labelCol: Partial< ExtractPropTypes<{
                     span: (StringConstructor | NumberConstructor)[];
                     order: (StringConstructor | NumberConstructor)[];
@@ -1681,8 +1681,6 @@ declare const __VLS_component: DefineComponent<ApFormDrawerFormProps, {
                     prefixCls: StringConstructor;
                     flex: (StringConstructor | NumberConstructor)[];
                 }>> & HTMLAttributes;
-                labelAlign: FormLabelAlign;
-                labelWrap: boolean;
                 wrapperCol: Partial< ExtractPropTypes<{
                     span: (StringConstructor | NumberConstructor)[];
                     order: (StringConstructor | NumberConstructor)[];
@@ -1716,19 +1714,21 @@ declare const __VLS_component: DefineComponent<ApFormDrawerFormProps, {
                     prefixCls: StringConstructor;
                     flex: (StringConstructor | NumberConstructor)[];
                 }>> & HTMLAttributes;
-                rules: {
-                    [k: string]: RuleObject | RuleObject[];
-                };
-                onValidate: (name: string | number | string[] | number[], status: boolean, errors: string[]) => void;
-                onValuesChange: (changedValues: any, values: any) => void;
-                onFieldsChange: (changedFields: FieldData[], allFields: FieldData[]) => void;
-                onFinishFailed: (errorInfo: ValidateErrorEntity<any>) => void;
+                colon: boolean;
+                labelAlign: FormLabelAlign;
+                labelWrap: boolean;
+                requiredMark: "" | RequiredMark;
                 hideRequiredMark: boolean;
                 model: {
                     [key: string]: any;
                 };
+                rules: {
+                    [k: string]: RuleObject | RuleObject[];
+                };
+                validateMessages: ValidateMessages;
                 validateOnRuleChange: boolean;
                 scrollToFirstError: boolean | Options<any>;
+                variant: "filled" | "outlined" | "borderless" | "underlined";
             }> | null;
         };
         $slots: Readonly<{

package/es/src/ap-form/item/index.vue.d.ts

@@ -16,11 +16,11 @@ declare function __VLS_template(): {
             $props: Partial<{
                 required: boolean;
                 hidden: boolean;
-                hasFeedback: boolean;
-                noStyle: boolean;
                 colon: boolean;
-                autoLink: boolean;
                 validateFirst: boolean;
+                autoLink: boolean;
+                hasFeedback: boolean;
+                noStyle: boolean;
             }> & Omit<{
                 readonly hidden: boolean;
                 readonly hasFeedback: boolean;
@@ -244,11 +244,11 @@ declare function __VLS_template(): {
             }>> & Readonly<{}>, () => any, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, {
                 required: boolean;
                 hidden: boolean;
-                hasFeedback: boolean;
-                noStyle: boolean;
                 colon: boolean;
-                autoLink: boolean;
                 validateFirst: boolean;
+                autoLink: boolean;
+                hasFeedback: boolean;
+                noStyle: boolean;
             }, {}, string, CustomSlotsType<{
                 help: any;
                 label: any;
@@ -278,11 +278,11 @@ declare function __VLS_template(): {
         } & Readonly<{
             required: boolean;
             hidden: boolean;
-            hasFeedback: boolean;
-            noStyle: boolean;
             colon: boolean;
-            autoLink: boolean;
             validateFirst: boolean;
+            autoLink: boolean;
+            hasFeedback: boolean;
+            noStyle: boolean;
         }> & Omit<Readonly< ExtractPropTypes<{
             htmlFor: StringConstructor;
             prefixCls: StringConstructor;
@@ -403,11 +403,11 @@ declare function __VLS_template(): {
             $props: Partial<{
                 required: boolean;
                 hidden: boolean;
-                hasFeedback: boolean;
-                noStyle: boolean;
                 colon: boolean;
-                autoLink: boolean;
                 validateFirst: boolean;
+                autoLink: boolean;
+                hasFeedback: boolean;
+                noStyle: boolean;
             }> & Omit<{
                 readonly hidden: boolean;
                 readonly hasFeedback: boolean;
@@ -631,11 +631,11 @@ declare function __VLS_template(): {
             }>> & Readonly<{}>, () => any, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, {
                 required: boolean;
                 hidden: boolean;
-                hasFeedback: boolean;
-                noStyle: boolean;
                 colon: boolean;
-                autoLink: boolean;
                 validateFirst: boolean;
+                autoLink: boolean;
+                hasFeedback: boolean;
+                noStyle: boolean;
             }, {}, string, CustomSlotsType<{
                 help: any;
                 label: any;
@@ -665,11 +665,11 @@ declare function __VLS_template(): {
         } & Readonly<{
             required: boolean;
             hidden: boolean;
-            hasFeedback: boolean;
-            noStyle: boolean;
             colon: boolean;
-            autoLink: boolean;
             validateFirst: boolean;
+            autoLink: boolean;
+            hasFeedback: boolean;
+            noStyle: boolean;
         }> & Omit<Readonly< ExtractPropTypes<{
             htmlFor: StringConstructor;
             prefixCls: StringConstructor;
@@ -810,11 +810,11 @@ declare const __VLS_component: DefineComponent<ApFormItemProps, {
         $props: Partial<{
             required: boolean;
             hidden: boolean;
-            hasFeedback: boolean;
-            noStyle: boolean;
             colon: boolean;
-            autoLink: boolean;
             validateFirst: boolean;
+            autoLink: boolean;
+            hasFeedback: boolean;
+            noStyle: boolean;
         }> & Omit<{
             readonly hidden: boolean;
             readonly hasFeedback: boolean;
@@ -1038,11 +1038,11 @@ declare const __VLS_component: DefineComponent<ApFormItemProps, {
         }>> & Readonly<{}>, () => any, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, {
             required: boolean;
             hidden: boolean;
-            hasFeedback: boolean;
-            noStyle: boolean;
             colon: boolean;
-            autoLink: boolean;
             validateFirst: boolean;
+            autoLink: boolean;
+            hasFeedback: boolean;
+            noStyle: boolean;
         }, {}, string, CustomSlotsType<{
             help: any;
             label: any;
@@ -1072,11 +1072,11 @@ declare const __VLS_component: DefineComponent<ApFormItemProps, {
     } & Readonly<{
         required: boolean;
         hidden: boolean;
-        hasFeedback: boolean;
-        noStyle: boolean;
         colon: boolean;
-        autoLink: boolean;
         validateFirst: boolean;
+        autoLink: boolean;
+        hasFeedback: boolean;
+        noStyle: boolean;
     }> & Omit<Readonly< ExtractPropTypes<{
         htmlFor: StringConstructor;
         prefixCls: StringConstructor;
@@ -1197,11 +1197,11 @@ declare const __VLS_component: DefineComponent<ApFormItemProps, {
         $props: Partial<{
             required: boolean;
             hidden: boolean;
-            hasFeedback: boolean;
-            noStyle: boolean;
             colon: boolean;
-            autoLink: boolean;
             validateFirst: boolean;
+            autoLink: boolean;
+            hasFeedback: boolean;
+            noStyle: boolean;
         }> & Omit<{
             readonly hidden: boolean;
             readonly hasFeedback: boolean;
@@ -1425,11 +1425,11 @@ declare const __VLS_component: DefineComponent<ApFormItemProps, {
         }>> & Readonly<{}>, () => any, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, {
             required: boolean;
             hidden: boolean;
-            hasFeedback: boolean;
-            noStyle: boolean;
             colon: boolean;
-            autoLink: boolean;
             validateFirst: boolean;
+            autoLink: boolean;
+            hasFeedback: boolean;
+            noStyle: boolean;
         }, {}, string, CustomSlotsType<{
             help: any;
             label: any;
@@ -1459,11 +1459,11 @@ declare const __VLS_component: DefineComponent<ApFormItemProps, {
     } & Readonly<{
         required: boolean;
         hidden: boolean;
-        hasFeedback: boolean;
-        noStyle: boolean;
         colon: boolean;
-        autoLink: boolean;
         validateFirst: boolean;
+        autoLink: boolean;
+        hasFeedback: boolean;
+        noStyle: boolean;
     }> & Omit<Readonly< ExtractPropTypes<{
         htmlFor: StringConstructor;
         prefixCls: StringConstructor;

package/es/src/ap-form/item/index.vue.mjs

@@ -1,7 +1,7 @@
 import { defineComponent as A, useSlots as D, ref as c, onMounted as L, computed as M, unref as t, cloneVNode as $, createBlock as v, openBlock as y, mergeProps as j, createSlots as q, withCtx as a, resolveDynamicComponent as E, renderList as K, createElementVNode as O, normalizeClass as Q, createVNode as s, normalizeStyle as U, renderSlot as Y, normalizeProps as G, guardReactiveProps as H } from "vue";
 import { Form as J, Tooltip as W, TypographyText as X } from "@aplus-frontend/antdv";
 import { useToken as Z } from "@aplus-frontend/antdv/es/theme/internal";
-import { isFunction as b, cloneDeep as ee, isArray as oe, omit as F } from "lodash-unified";
+import { isFunction as F, cloneDeep as ee, isArray as oe, omit as b } from "lodash-unified";
 import { apFormItemColPropKeys as te } from "../constant.mjs";
 import { QuestionCircleOutlined as le } from "@ant-design/icons-vue";
 import "../../config-provider/index.mjs";
@@ -56,16 +56,16 @@ const Ve = /* @__PURE__ */ A({
     customFilled: {}
   },
   setup(V, { expose: g }) {
-    const e = V, u = D(), { model: d, updateModel: B, internalInstance: h } = re(), { m, b: x } = ie("ap-form-item"), i = c(!1), r = c(), [, C] = Z();
+    const e = V, u = D(), { model: m, updateModel: B, internalInstance: h } = re(), { m: d, b: x } = ie("ap-form-item"), i = c(!1), r = c(), [, C] = Z();
     L(async () => {
-      let o = b(e.initialValue) ? e.initialValue() : e.initialValue;
+      let o = F(e.initialValue) ? e.initialValue() : e.initialValue;
       ae(o) && (o = await o), h?.registerField({
         name: e.name,
         initialValue: ee(o),
         transform: e.transform
       });
     });
-    const f = M(() => e.name ? oe(e.name) ? e.name.reduce((o, l) => o?.[l], t(d)) : d?.value[e.name] : null);
+    const f = M(() => e.name ? oe(e.name) ? e.name.reduce((o, l) => o?.[l], t(m)) : m?.value[e.name] : null);
     function k() {
       const o = u.default?.() || [];
       if (!e.name)
@@ -74,7 +74,7 @@ const Ve = /* @__PURE__ */ A({
       return l ? $(l, {
         [e.valuePropName]: t(f),
         [`onUpdate:${e.valuePropName}`]: N,
-        bordered: e.bordered ? !1 : l?.props?.bordered,
+        variant: e.bordered ? "borderless" : l?.props?.variant,
         onFocus: P,
         onBlur: I
       }) : null;
@@ -104,7 +104,7 @@ const Ve = /* @__PURE__ */ A({
       const l = t(f);
       if (!o || !e.transform)
         return l;
-      const n = b(e.transform) ? e.transform : e.transform.transformer;
+      const n = F(e.transform) ? e.transform : e.transform.transformer;
       return e.transform ? n(l) : l;
     }
     return g({
@@ -118,11 +118,11 @@ const Ve = /* @__PURE__ */ A({
         ref_key: "formItemRef",
         ref: r
       },
-      t(F)(e, [...t(te), "tooltip", "label", "description"]),
+      t(b)(e, [...t(te), "tooltip", "label", "description"]),
       {
         class: {
-          [t(m)("bordered")]: o.bordered,
-          [t(m)("focused")]: o.bordered && i.value,
+          [t(d)("bordered")]: o.bordered,
+          [t(d)("focused")]: o.bordered && i.value,
           [t(x)()]: !0
         },
         colon: o.bordered ? !1 : e.colon
@@ -168,7 +168,7 @@ const Ve = /* @__PURE__ */ A({
         ]),
         key: "1"
       } : void 0,
-      K(t(F)(u, "default"), (n, p) => ({
+      K(t(b)(u, "default"), (n, p) => ({
         name: p,
         fn: a((R) => [
           Y(o.$slots, p, G(H(R || {})))