@fangzhongya/fang-ui 0.0.29 → 0.0.31

package/dist/components/forms/index.d.ts

@@ -1,5 +1,6 @@
 import { CreateComponentPublicInstanceWithMixins, ExtractPropTypes, Component, Ref, ComponentOptionsMixin, PublicProps, GlobalComponents, GlobalDirectives, ComponentInternalInstance, VNodeProps, AllowedComponentProps, ComponentCustomProps, Slot, ComponentPublicInstance, ComponentOptionsBase, PropType, Reactive, ComponentProvideOptions, DebuggerEvent, nextTick, WatchOptions, WatchStopHandle, ShallowUnwrapRef, ComponentCustomProperties, Plugin } from 'vue';
-import { FormItemRule, FormItemProp, FormValidateCallback, FormValidationResult, FormItemContext } from 'element-plus/es/index';
+import { EpPropMergeType, Arrayable, EpPropFinalized } from 'element-plus/es/utils';
+import { FormItemRule, FormItemProp, FormValidateCallback, FormValidationResult, FormItemContext } from 'element-plus/es/components/form';
 import { OnCleanup } from '@vue/reactivity';
 declare const Forms: {
     new (...args: any[]): CreateComponentPublicInstanceWithMixins<Readonly< ExtractPropTypes<{
@@ -156,33 +157,33 @@ declare const Forms: {
             $props: Partial<{
                 readonly disabled: boolean;
                 readonly inline: boolean;
-                readonly labelWidth: string | number;
-                readonly labelPosition: "left" | "right" | "top";
+                readonly labelWidth: EpPropMergeType<readonly [StringConstructor, NumberConstructor], unknown, unknown>;
+                readonly labelPosition: EpPropMergeType<StringConstructor, "top" | "left" | "right", unknown>;
                 readonly inlineMessage: boolean;
-                readonly showMessage: boolean;
-                readonly requireAsteriskPosition: "left" | "right";
+                readonly showMessage: EpPropMergeType<BooleanConstructor, unknown, unknown>;
+                readonly requireAsteriskPosition: EpPropMergeType<StringConstructor, "left" | "right", unknown>;
                 readonly labelSuffix: string;
-                readonly validateOnRuleChange: boolean;
-                readonly scrollIntoViewOptions: boolean | Record<string, any>;
+                readonly validateOnRuleChange: EpPropMergeType<BooleanConstructor, unknown, unknown>;
+                readonly scrollIntoViewOptions: EpPropMergeType<readonly [ObjectConstructor, BooleanConstructor], unknown, unknown>;
                 readonly statusIcon: boolean;
                 readonly hideRequiredAsterisk: boolean;
                 readonly scrollToError: boolean;
             }> & Omit<{
                 readonly disabled: boolean;
-                readonly labelWidth: string | number;
-                readonly labelPosition: "left" | "right" | "top";
+                readonly labelWidth: EpPropMergeType<readonly [StringConstructor, NumberConstructor], unknown, unknown>;
+                readonly labelPosition: EpPropMergeType<StringConstructor, "left" | "right" | "top", unknown>;
                 readonly inlineMessage: boolean;
-                readonly showMessage: boolean;
-                readonly requireAsteriskPosition: "left" | "right";
+                readonly showMessage: EpPropMergeType<BooleanConstructor, unknown, unknown>;
+                readonly requireAsteriskPosition: EpPropMergeType<StringConstructor, "left" | "right", unknown>;
                 readonly labelSuffix: string;
                 readonly inline: boolean;
                 readonly statusIcon: boolean;
-                readonly validateOnRuleChange: boolean;
+                readonly validateOnRuleChange: EpPropMergeType<BooleanConstructor, unknown, unknown>;
                 readonly hideRequiredAsterisk: boolean;
                 readonly scrollToError: boolean;
-                readonly scrollIntoViewOptions: boolean | Record<string, any>;
-                readonly size?: ("" | "default" | "small" | "large") | undefined;
-                readonly rules?: Partial<Record<string, FormItemRule | FormItemRule[]>> | undefined;
+                readonly scrollIntoViewOptions: EpPropMergeType<readonly [ObjectConstructor, BooleanConstructor], unknown, unknown>;
+                readonly size?: EpPropMergeType<StringConstructor, "" | "default" | "small" | "large", unknown> | undefined;
+                readonly rules?: Partial<Record<string, Arrayable<FormItemRule>>> | undefined;
                 readonly model?: Record<string, any> | undefined;
                 onValidate?: ((prop: FormItemProp, isValid: boolean, message: string) => any) | undefined | undefined;
             } & VNodeProps & AllowedComponentProps & ComponentCustomProps, "disabled" | "labelWidth" | "labelPosition" | "inlineMessage" | "showMessage" | "requireAsteriskPosition" | "labelSuffix" | "inline" | "statusIcon" | "validateOnRuleChange" | "hideRequiredAsterisk" | "scrollToError" | "scrollIntoViewOptions">;
@@ -203,74 +204,25 @@ declare const Forms: {
             $options: ComponentOptionsBase<Readonly< ExtractPropTypes<{
                 readonly model: ObjectConstructor;
                 readonly rules: {
-                    readonly type: PropType<Partial<Record<string, FormItemRule | FormItemRule[]>>>;
+                    readonly type: PropType<Partial<Record<string, Arrayable<FormItemRule>>>>;
                     readonly required: false;
                     readonly validator: ((val: unknown) => boolean) | undefined;
                     __epPropKey: true;
                 };
-                readonly labelPosition: {
-                    readonly type: PropType<"left" | "right" | "top">;
-                    readonly required: false;
-                    readonly validator: ((val: unknown) => boolean) | undefined;
-                    __epPropKey: true;
-                } & {
-                    readonly default: "right";
-                };
-                readonly requireAsteriskPosition: {
-                    readonly type: PropType<"left" | "right">;
-                    readonly required: false;
-                    readonly validator: ((val: unknown) => boolean) | undefined;
-                    __epPropKey: true;
-                } & {
-                    readonly default: "left";
-                };
-                readonly labelWidth: {
-                    readonly type: PropType<string | number>;
-                    readonly required: false;
-                    readonly validator: ((val: unknown) => boolean) | undefined;
-                    __epPropKey: true;
-                } & {
-                    readonly default: "";
-                };
-                readonly labelSuffix: {
-                    readonly type: PropType<string>;
-                    readonly required: false;
-                    readonly validator: ((val: unknown) => boolean) | undefined;
-                    __epPropKey: true;
-                } & {
-                    readonly default: "";
-                };
+                readonly labelPosition: EpPropFinalized<StringConstructor, "top" | "left" | "right", unknown, "right", boolean>;
+                readonly requireAsteriskPosition: EpPropFinalized<StringConstructor, "left" | "right", unknown, "left", boolean>;
+                readonly labelWidth: EpPropFinalized<readonly [StringConstructor, NumberConstructor], unknown, unknown, "", boolean>;
+                readonly labelSuffix: EpPropFinalized<StringConstructor, unknown, unknown, "", boolean>;
                 readonly inline: BooleanConstructor;
                 readonly inlineMessage: BooleanConstructor;
                 readonly statusIcon: BooleanConstructor;
-                readonly showMessage: {
-                    readonly type: PropType<boolean>;
-                    readonly required: false;
-                    readonly validator: ((val: unknown) => boolean) | undefined;
-                    __epPropKey: true;
-                } & {
-                    readonly default: true;
-                };
-                readonly validateOnRuleChange: {
-                    readonly type: PropType<boolean>;
-                    readonly required: false;
-                    readonly validator: ((val: unknown) => boolean) | undefined;
-                    __epPropKey: true;
-                } & {
-                    readonly default: true;
-                };
+                readonly showMessage: EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
+                readonly validateOnRuleChange: EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
                 readonly hideRequiredAsterisk: BooleanConstructor;
                 readonly scrollToError: BooleanConstructor;
-                readonly scrollIntoViewOptions: {
-                    readonly type: PropType<boolean | Record<string, any>>;
-                    readonly required: false;
-                    readonly validator: ((val: unknown) => boolean) | undefined;
-                    __epPropKey: true;
-                } & {
-                    readonly default: true;
-                };
+                readonly scrollIntoViewOptions: EpPropFinalized<readonly [ObjectConstructor, BooleanConstructor], unknown, unknown, true, boolean>;
                 readonly size: {
-                    readonly type: PropType<"" | "default" | "small" | "large">;
+                    readonly type: PropType<EpPropMergeType<StringConstructor, "" | "small" | "default" | "large", unknown>>;
                     readonly required: false;
                     readonly validator: ((val: unknown) => boolean) | undefined;
                     __epPropKey: true;
@@ -280,9 +232,9 @@ declare const Forms: {
                 onValidate?: ((prop: FormItemProp, isValid: boolean, message: string) => any) | undefined;
             }, {
                 validate: (callback?: FormValidateCallback) => FormValidationResult;
-                validateField: (props?: FormItemProp | FormItemProp[], callback?: FormValidateCallback) => FormValidationResult;
-                resetFields: (props?: FormItemProp | FormItemProp[]) => void;
-                clearValidate: (props?: FormItemProp | FormItemProp[]) => void;
+                validateField: (props?: Arrayable<FormItemProp>, callback?: FormValidateCallback) => FormValidationResult;
+                resetFields: (props?: Arrayable<FormItemProp>) => void;
+                clearValidate: (props?: Arrayable<FormItemProp>) => void;
                 scrollToField: (prop: FormItemProp) => void;
                 getField: (prop: FormItemProp) => FormItemContext | undefined;
                 fields: Reactive< FormItemContext[]>;
@@ -291,14 +243,14 @@ declare const Forms: {
             }, string, {
                 readonly disabled: boolean;
                 readonly inline: boolean;
-                readonly labelWidth: string | number;
-                readonly labelPosition: "left" | "right" | "top";
+                readonly labelWidth: EpPropMergeType<readonly [StringConstructor, NumberConstructor], unknown, unknown>;
+                readonly labelPosition: EpPropMergeType<StringConstructor, "top" | "left" | "right", unknown>;
                 readonly inlineMessage: boolean;
-                readonly showMessage: boolean;
-                readonly requireAsteriskPosition: "left" | "right";
+                readonly showMessage: EpPropMergeType<BooleanConstructor, unknown, unknown>;
+                readonly requireAsteriskPosition: EpPropMergeType<StringConstructor, "left" | "right", unknown>;
                 readonly labelSuffix: string;
-                readonly validateOnRuleChange: boolean;
-                readonly scrollIntoViewOptions: boolean | Record<string, any>;
+                readonly validateOnRuleChange: EpPropMergeType<BooleanConstructor, unknown, unknown>;
+                readonly scrollIntoViewOptions: EpPropMergeType<readonly [ObjectConstructor, BooleanConstructor], unknown, unknown>;
                 readonly statusIcon: boolean;
                 readonly hideRequiredAsterisk: boolean;
                 readonly scrollToError: boolean;
@@ -325,88 +277,39 @@ declare const Forms: {
         } & Readonly<{
             readonly disabled: boolean;
             readonly inline: boolean;
-            readonly labelWidth: string | number;
-            readonly labelPosition: "left" | "right" | "top";
+            readonly labelWidth: EpPropMergeType<readonly [StringConstructor, NumberConstructor], unknown, unknown>;
+            readonly labelPosition: EpPropMergeType<StringConstructor, "top" | "left" | "right", unknown>;
             readonly inlineMessage: boolean;
-            readonly showMessage: boolean;
-            readonly requireAsteriskPosition: "left" | "right";
+            readonly showMessage: EpPropMergeType<BooleanConstructor, unknown, unknown>;
+            readonly requireAsteriskPosition: EpPropMergeType<StringConstructor, "left" | "right", unknown>;
             readonly labelSuffix: string;
-            readonly validateOnRuleChange: boolean;
-            readonly scrollIntoViewOptions: boolean | Record<string, any>;
+            readonly validateOnRuleChange: EpPropMergeType<BooleanConstructor, unknown, unknown>;
+            readonly scrollIntoViewOptions: EpPropMergeType<readonly [ObjectConstructor, BooleanConstructor], unknown, unknown>;
             readonly statusIcon: boolean;
             readonly hideRequiredAsterisk: boolean;
             readonly scrollToError: boolean;
         }> & Omit<Readonly< ExtractPropTypes<{
             readonly model: ObjectConstructor;
             readonly rules: {
-                readonly type: PropType<Partial<Record<string, FormItemRule | FormItemRule[]>>>;
+                readonly type: PropType<Partial<Record<string, Arrayable<FormItemRule>>>>;
                 readonly required: false;
                 readonly validator: ((val: unknown) => boolean) | undefined;
                 __epPropKey: true;
             };
-            readonly labelPosition: {
-                readonly type: PropType<"left" | "right" | "top">;
-                readonly required: false;
-                readonly validator: ((val: unknown) => boolean) | undefined;
-                __epPropKey: true;
-            } & {
-                readonly default: "right";
-            };
-            readonly requireAsteriskPosition: {
-                readonly type: PropType<"left" | "right">;
-                readonly required: false;
-                readonly validator: ((val: unknown) => boolean) | undefined;
-                __epPropKey: true;
-            } & {
-                readonly default: "left";
-            };
-            readonly labelWidth: {
-                readonly type: PropType<string | number>;
-                readonly required: false;
-                readonly validator: ((val: unknown) => boolean) | undefined;
-                __epPropKey: true;
-            } & {
-                readonly default: "";
-            };
-            readonly labelSuffix: {
-                readonly type: PropType<string>;
-                readonly required: false;
-                readonly validator: ((val: unknown) => boolean) | undefined;
-                __epPropKey: true;
-            } & {
-                readonly default: "";
-            };
+            readonly labelPosition: EpPropFinalized<StringConstructor, "top" | "left" | "right", unknown, "right", boolean>;
+            readonly requireAsteriskPosition: EpPropFinalized<StringConstructor, "left" | "right", unknown, "left", boolean>;
+            readonly labelWidth: EpPropFinalized<readonly [StringConstructor, NumberConstructor], unknown, unknown, "", boolean>;
+            readonly labelSuffix: EpPropFinalized<StringConstructor, unknown, unknown, "", boolean>;
             readonly inline: BooleanConstructor;
             readonly inlineMessage: BooleanConstructor;
             readonly statusIcon: BooleanConstructor;
-            readonly showMessage: {
-                readonly type: PropType<boolean>;
-                readonly required: false;
-                readonly validator: ((val: unknown) => boolean) | undefined;
-                __epPropKey: true;
-            } & {
-                readonly default: true;
-            };
-            readonly validateOnRuleChange: {
-                readonly type: PropType<boolean>;
-                readonly required: false;
-                readonly validator: ((val: unknown) => boolean) | undefined;
-                __epPropKey: true;
-            } & {
-                readonly default: true;
-            };
+            readonly showMessage: EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
+            readonly validateOnRuleChange: EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
             readonly hideRequiredAsterisk: BooleanConstructor;
             readonly scrollToError: BooleanConstructor;
-            readonly scrollIntoViewOptions: {
-                readonly type: PropType<boolean | Record<string, any>>;
-                readonly required: false;
-                readonly validator: ((val: unknown) => boolean) | undefined;
-                __epPropKey: true;
-            } & {
-                readonly default: true;
-            };
+            readonly scrollIntoViewOptions: EpPropFinalized<readonly [ObjectConstructor, BooleanConstructor], unknown, unknown, true, boolean>;
             readonly size: {
-                readonly type: PropType<"" | "default" | "small" | "large">;
+                readonly type: PropType<EpPropMergeType<StringConstructor, "" | "small" | "default" | "large", unknown>>;
                 readonly required: false;
                 readonly validator: ((val: unknown) => boolean) | undefined;
                 __epPropKey: true;
@@ -416,9 +319,9 @@ declare const Forms: {
             onValidate?: ((prop: FormItemProp, isValid: boolean, message: string) => any) | undefined;
         }, "disabled" | "labelWidth" | "labelPosition" | "inlineMessage" | "showMessage" | "validate" | "clearValidate" | "requireAsteriskPosition" | "labelSuffix" | "inline" | "statusIcon" | "validateOnRuleChange" | "hideRequiredAsterisk" | "scrollToError" | "scrollIntoViewOptions" | "validateField" | "resetFields" | "scrollToField" | "getField" | "fields"> & ShallowUnwrapRef<{
             validate: (callback?: FormValidateCallback) => FormValidationResult;
-            validateField: (props?: FormItemProp | FormItemProp[], callback?: FormValidateCallback) => FormValidationResult;
-            resetFields: (props?: FormItemProp | FormItemProp[]) => void;
-            clearValidate: (props?: FormItemProp | FormItemProp[]) => void;
+            validateField: (props?: Arrayable<FormItemProp>, callback?: FormValidateCallback) => FormValidationResult;
+            resetFields: (props?: Arrayable<FormItemProp>) => void;
+            clearValidate: (props?: Arrayable<FormItemProp>) => void;
             scrollToField: (prop: FormItemProp) => void;
             getField: (prop: FormItemProp) => FormItemContext | undefined;
             fields: Reactive< FormItemContext[]>;

package/dist/components/forms/src/index.cjs

@@ -2,9 +2,10 @@
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 const vue = require("vue");
 const data = require("./data.cjs");
-const index$2 = require("../../forms-div/index.cjs");
-const index$3 = require("../../forms-item/index.cjs");
-const elementPlus = require("element-plus");
+const index$3 = require("../../forms-div/index.cjs");
+const index$4 = require("../../forms-item/index.cjs");
+const index$2 = require("element-plus/es/components/form/index");
+const index$5 = require("element-plus/es/components/button/index");
 const index$1 = require("../../../hooks/cssname/index.cjs");
 const index = require("../../../hooks/inherit/index.cjs");
 const use = require("../../common/use.cjs");
@@ -68,7 +69,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
           ]),
           style: vue.normalizeStyle(vue.unref(styles))
         }, [
-          (vue.openBlock(), vue.createBlock(vue.unref(elementPlus.ElForm), vue.mergeProps(vue.unref(attrs).assem, {
+          (vue.openBlock(), vue.createBlock(vue.unref(index$2.ElForm), vue.mergeProps(vue.unref(attrs).assem, {
             key: props.list.length,
             class: [vue.unref(cs).z("elf"), props.labelPosition],
             model: vue.unref(dataForm),
@@ -93,7 +94,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                   ]),
                   style: vue.normalizeStyle(vue.unref(setStyles)(item))
                 }, [
-                  item?.isdiv ? (vue.openBlock(), vue.createBlock(vue.unref(index$2.FormsDiv), {
+                  item?.isdiv ? (vue.openBlock(), vue.createBlock(vue.unref(index$3.FormsDiv), {
                     key: 0,
                     listobj: item,
                     optionss: props.options,
@@ -109,7 +110,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                         ])
                       };
                     })
-                  ]), 1032, ["listobj", "optionss", "valueobj", "modelValue"])) : (vue.openBlock(), vue.createBlock(vue.unref(index$3.FormsItem), {
+                  ]), 1032, ["listobj", "optionss", "valueobj", "modelValue"])) : (vue.openBlock(), vue.createBlock(vue.unref(index$4.FormsItem), {
                     key: 1,
                     listobj: item,
                     optionss: props.options,
@@ -136,7 +137,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                 class: vue.normalizeClass([vue.unref(cs).z("li"), vue.unref(cs).z("buts")]),
                 style: vue.normalizeStyle(vue.unref(setStyles)({}))
               }, [
-                vue.createVNode(vue.unref(elementPlus.ElFormItem), {
+                vue.createVNode(vue.unref(index$2.ElFormItem), {
                   "label-width": props.butLeft
                 }, {
                   default: vue.withCtx(() => [
@@ -148,7 +149,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                     }, [
                       (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(vue.unref(buts), (item, index2) => {
                         return vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: index2 }, [
-                          !vue.unref(use.useHide)(item, vue.unref(dataForm)) ? (vue.openBlock(), vue.createBlock(vue.unref(elementPlus.ElButton), vue.mergeProps({
+                          !vue.unref(use.useHide)(item, vue.unref(dataForm)) ? (vue.openBlock(), vue.createBlock(vue.unref(index$5.ElButton), vue.mergeProps({
                             key: 0,
                             ref_for: true
                           }, item, {