@fangzhongya/fang-ui 0.0.30 → 0.0.31

package/dist/components/form-item/index.d.ts

@@ -1,5 +1,6 @@
 import { CreateComponentPublicInstanceWithMixins, Ref, ComponentOptionsMixin, PublicProps, GlobalComponents, GlobalDirectives, ComponentInternalInstance, VNodeProps, AllowedComponentProps, ComponentCustomProps, Slot, ComponentPublicInstance, ComponentOptionsBase, ExtractPropTypes, PropType, ComputedRef, ComponentProvideOptions, DebuggerEvent, nextTick, WatchOptions, WatchStopHandle, ShallowUnwrapRef, ComponentCustomProperties, Plugin } from 'vue';
-import { FormItemProp, FormItemRule, FormValidateCallback, FormValidationResult } from 'element-plus/es/index';
+import { EpPropMergeType, Arrayable, EpPropFinalized } from 'element-plus/es/utils';
+import { FormItemProp, FormItemRule, FormValidateCallback, FormValidationResult } from 'element-plus/es/components/form';
 import { OnCleanup } from '@vue/reactivity';
 declare const FormItem: {
     new (...args: any[]): CreateComponentPublicInstanceWithMixins<Readonly<{}> & Readonly<{}>, {
@@ -9,23 +10,23 @@ declare const FormItem: {
             $: ComponentInternalInstance;
             $data: {};
             $props: Partial<{
-                readonly required: boolean;
-                readonly labelWidth: string | number;
-                readonly labelPosition: "" | "left" | "right" | "top";
-                readonly inlineMessage: string | boolean;
-                readonly showMessage: boolean;
+                readonly required: EpPropMergeType<BooleanConstructor, unknown, unknown>;
+                readonly labelWidth: EpPropMergeType<readonly [StringConstructor, NumberConstructor], unknown, unknown>;
+                readonly labelPosition: EpPropMergeType<StringConstructor, "" | "top" | "left" | "right", unknown>;
+                readonly inlineMessage: EpPropMergeType<readonly [StringConstructor, BooleanConstructor], unknown, unknown>;
+                readonly showMessage: EpPropMergeType<BooleanConstructor, unknown, unknown>;
             }> & Omit<{
-                readonly labelWidth: string | number;
-                readonly labelPosition: "" | "left" | "right" | "top";
-                readonly inlineMessage: string | boolean;
-                readonly showMessage: boolean;
-                readonly size?: ("" | "default" | "small" | "large") | undefined;
+                readonly labelWidth: EpPropMergeType<readonly [StringConstructor, NumberConstructor], unknown, unknown>;
+                readonly labelPosition: EpPropMergeType<StringConstructor, "" | "left" | "right" | "top", unknown>;
+                readonly inlineMessage: EpPropMergeType<readonly [StringConstructor, BooleanConstructor], unknown, unknown>;
+                readonly showMessage: EpPropMergeType<BooleanConstructor, unknown, unknown>;
+                readonly size?: EpPropMergeType<StringConstructor, "" | "default" | "small" | "large", unknown> | undefined;
                 readonly label?: string | undefined;
-                readonly required?: boolean | undefined;
+                readonly required?: EpPropMergeType<BooleanConstructor, unknown, unknown> | undefined;
                 readonly error?: string | undefined;
-                readonly prop?: FormItemProp | undefined;
-                readonly rules?: ( FormItemRule | FormItemRule[]) | undefined;
-                readonly validateStatus?: ("" | "success" | "error" | "validating") | undefined;
+                readonly prop?: EpPropMergeType<(new (...args: any[]) => string | string[]) | (() => FormItemProp) | ((new (...args: any[]) => string | string[]) | (() => FormItemProp))[], unknown, unknown> | undefined;
+                readonly rules?: EpPropMergeType<(new (...args: any[]) => FormItemRule | FormItemRule[]) | (() => Arrayable<FormItemRule>) | ((new (...args: any[]) => FormItemRule | FormItemRule[]) | (() => Arrayable<FormItemRule>))[], unknown, unknown> | undefined;
+                readonly validateStatus?: EpPropMergeType<StringConstructor, "" | "success" | "error" | "validating", unknown> | undefined;
                 readonly for?: string | undefined;
             } & VNodeProps & AllowedComponentProps & ComponentCustomProps, "required" | "labelWidth" | "labelPosition" | "inlineMessage" | "showMessage">;
             $attrs: {
@@ -44,68 +45,33 @@ declare const FormItem: {
             $el: any;
             $options: ComponentOptionsBase<Readonly< ExtractPropTypes<{
                 readonly label: StringConstructor;
-                readonly labelWidth: {
-                    readonly type: PropType<string | number>;
-                    readonly required: false;
-                    readonly validator: ((val: unknown) => boolean) | undefined;
-                    __epPropKey: true;
-                } & {
-                    readonly default: "";
-                };
-                readonly labelPosition: {
-                    readonly type: PropType<"" | "left" | "right" | "top">;
-                    readonly required: false;
-                    readonly validator: ((val: unknown) => boolean) | undefined;
-                    __epPropKey: true;
-                } & {
-                    readonly default: "";
-                };
+                readonly labelWidth: EpPropFinalized<readonly [StringConstructor, NumberConstructor], unknown, unknown, "", boolean>;
+                readonly labelPosition: EpPropFinalized<StringConstructor, "" | "top" | "left" | "right", unknown, "", boolean>;
                 readonly prop: {
-                    readonly type: PropType<FormItemProp>;
-                    readonly required: false;
-                    readonly validator: ((val: unknown) => boolean) | undefined;
-                    __epPropKey: true;
-                };
-                readonly required: {
-                    readonly type: PropType<boolean>;
+                    readonly type: PropType<EpPropMergeType<(new (...args: any[]) => string | string[]) | (() => FormItemProp) | ((new (...args: any[]) => string | string[]) | (() => FormItemProp))[], unknown, unknown>>;
                     readonly required: false;
                     readonly validator: ((val: unknown) => boolean) | undefined;
                     __epPropKey: true;
-                } & {
-                    readonly default: undefined;
                 };
+                readonly required: EpPropFinalized<BooleanConstructor, unknown, unknown, undefined, boolean>;
                 readonly rules: {
-                    readonly type: PropType< FormItemRule | FormItemRule[]>;
+                    readonly type: PropType<EpPropMergeType<(new (...args: any[]) => FormItemRule | FormItemRule[]) | (() => Arrayable<FormItemRule>) | ((new (...args: any[]) => FormItemRule | FormItemRule[]) | (() => Arrayable<FormItemRule>))[], unknown, unknown>>;
                     readonly required: false;
                     readonly validator: ((val: unknown) => boolean) | undefined;
                     __epPropKey: true;
                 };
                 readonly error: StringConstructor;
                 readonly validateStatus: {
-                    readonly type: PropType<"" | "success" | "error" | "validating">;
+                    readonly type: PropType<EpPropMergeType<StringConstructor, "" | "error" | "success" | "validating", unknown>>;
                     readonly required: false;
                     readonly validator: ((val: unknown) => boolean) | undefined;
                     __epPropKey: true;
                 };
                 readonly for: StringConstructor;
-                readonly inlineMessage: {
-                    readonly type: PropType<string | boolean>;
-                    readonly required: false;
-                    readonly validator: ((val: unknown) => boolean) | undefined;
-                    __epPropKey: true;
-                } & {
-                    readonly default: "";
-                };
-                readonly showMessage: {
-                    readonly type: PropType<boolean>;
-                    readonly required: false;
-                    readonly validator: ((val: unknown) => boolean) | undefined;
-                    __epPropKey: true;
-                } & {
-                    readonly default: true;
-                };
+                readonly inlineMessage: EpPropFinalized<readonly [StringConstructor, BooleanConstructor], unknown, unknown, "", boolean>;
+                readonly showMessage: EpPropFinalized<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;
@@ -118,11 +84,11 @@ declare const FormItem: {
                 clearValidate: () => void;
                 resetField: () => void;
             }, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, Record<string, any>, string, {
-                readonly required: boolean;
-                readonly labelWidth: string | number;
-                readonly labelPosition: "" | "left" | "right" | "top";
-                readonly inlineMessage: string | boolean;
-                readonly showMessage: boolean;
+                readonly required: EpPropMergeType<BooleanConstructor, unknown, unknown>;
+                readonly labelWidth: EpPropMergeType<readonly [StringConstructor, NumberConstructor], unknown, unknown>;
+                readonly labelPosition: EpPropMergeType<StringConstructor, "" | "top" | "left" | "right", unknown>;
+                readonly inlineMessage: EpPropMergeType<readonly [StringConstructor, BooleanConstructor], unknown, unknown>;
+                readonly showMessage: EpPropMergeType<BooleanConstructor, unknown, unknown>;
             }, {}, string, {}, GlobalComponents, GlobalDirectives, string, ComponentProvideOptions> & {
                 beforeCreate?: (() => void) | (() => void)[];
                 created?: (() => void) | (() => void)[];
@@ -144,75 +110,40 @@ declare const FormItem: {
             $nextTick: nextTick;
             $watch<T extends string | ((...args: any) => any)>(source: T, cb: T extends (...args: any) => infer R ? (...args: [R, R, OnCleanup]) => any : (...args: [any, any, OnCleanup]) => any, options?: WatchOptions): WatchStopHandle;
         } & Readonly<{
-            readonly required: boolean;
-            readonly labelWidth: string | number;
-            readonly labelPosition: "" | "left" | "right" | "top";
-            readonly inlineMessage: string | boolean;
-            readonly showMessage: boolean;
+            readonly required: EpPropMergeType<BooleanConstructor, unknown, unknown>;
+            readonly labelWidth: EpPropMergeType<readonly [StringConstructor, NumberConstructor], unknown, unknown>;
+            readonly labelPosition: EpPropMergeType<StringConstructor, "" | "top" | "left" | "right", unknown>;
+            readonly inlineMessage: EpPropMergeType<readonly [StringConstructor, BooleanConstructor], unknown, unknown>;
+            readonly showMessage: EpPropMergeType<BooleanConstructor, unknown, unknown>;
         }> & Omit<Readonly< ExtractPropTypes<{
             readonly label: StringConstructor;
-            readonly labelWidth: {
-                readonly type: PropType<string | number>;
-                readonly required: false;
-                readonly validator: ((val: unknown) => boolean) | undefined;
-                __epPropKey: true;
-            } & {
-                readonly default: "";
-            };
-            readonly labelPosition: {
-                readonly type: PropType<"" | "left" | "right" | "top">;
-                readonly required: false;
-                readonly validator: ((val: unknown) => boolean) | undefined;
-                __epPropKey: true;
-            } & {
-                readonly default: "";
-            };
+            readonly labelWidth: EpPropFinalized<readonly [StringConstructor, NumberConstructor], unknown, unknown, "", boolean>;
+            readonly labelPosition: EpPropFinalized<StringConstructor, "" | "top" | "left" | "right", unknown, "", boolean>;
             readonly prop: {
-                readonly type: PropType<FormItemProp>;
-                readonly required: false;
-                readonly validator: ((val: unknown) => boolean) | undefined;
-                __epPropKey: true;
-            };
-            readonly required: {
-                readonly type: PropType<boolean>;
+                readonly type: PropType<EpPropMergeType<(new (...args: any[]) => string | string[]) | (() => FormItemProp) | ((new (...args: any[]) => string | string[]) | (() => FormItemProp))[], unknown, unknown>>;
                 readonly required: false;
                 readonly validator: ((val: unknown) => boolean) | undefined;
                 __epPropKey: true;
-            } & {
-                readonly default: undefined;
             };
+            readonly required: EpPropFinalized<BooleanConstructor, unknown, unknown, undefined, boolean>;
             readonly rules: {
-                readonly type: PropType< FormItemRule | FormItemRule[]>;
+                readonly type: PropType<EpPropMergeType<(new (...args: any[]) => FormItemRule | FormItemRule[]) | (() => Arrayable<FormItemRule>) | ((new (...args: any[]) => FormItemRule | FormItemRule[]) | (() => Arrayable<FormItemRule>))[], unknown, unknown>>;
                 readonly required: false;
                 readonly validator: ((val: unknown) => boolean) | undefined;
                 __epPropKey: true;
             };
             readonly error: StringConstructor;
             readonly validateStatus: {
-                readonly type: PropType<"" | "success" | "error" | "validating">;
+                readonly type: PropType<EpPropMergeType<StringConstructor, "" | "error" | "success" | "validating", unknown>>;
                 readonly required: false;
                 readonly validator: ((val: unknown) => boolean) | undefined;
                 __epPropKey: true;
             };
             readonly for: StringConstructor;
-            readonly inlineMessage: {
-                readonly type: PropType<string | boolean>;
-                readonly required: false;
-                readonly validator: ((val: unknown) => boolean) | undefined;
-                __epPropKey: true;
-            } & {
-                readonly default: "";
-            };
-            readonly showMessage: {
-                readonly type: PropType<boolean>;
-                readonly required: false;
-                readonly validator: ((val: unknown) => boolean) | undefined;
-                __epPropKey: true;
-            } & {
-                readonly default: true;
-            };
+            readonly inlineMessage: EpPropFinalized<readonly [StringConstructor, BooleanConstructor], unknown, unknown, "", boolean>;
+            readonly showMessage: EpPropFinalized<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;
@@ -251,6 +182,6 @@ declare const FormItem: {
 } & ComponentOptionsBase<Readonly<{}> & Readonly<{}>, {
     refEl: Ref<any, any>;
 }, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, {}, {}, string, {}, GlobalComponents, GlobalDirectives, string, ComponentProvideOptions> & VNodeProps & AllowedComponentProps & ComponentCustomProps & (new () => {
-    $slots: Partial<Record<string, (_: {}) => any>>;
+    $slots: Partial<Record<string, (_: any) => any>>;
 }) & Plugin;
 export { FormItem, FormItem as default };

package/dist/components/form-item/index.js

@@ -1,3 +1,4 @@
+/* empty css                 */
 import { withInstall } from "../../utils/vues/withInstall.js";
 import _sfc_main from "./src/index.js";
 const FormItem = withInstall(_sfc_main, "FormItem");

package/dist/components/form-item/index.scss

@@ -0,0 +1,5 @@
+@use '../css/common.scss' as *;
+
+$form-item: 'form-item';
+@include b($form-item) {
+}

package/dist/components/form-item/src/data.d.ts

@@ -1,8 +1,7 @@
 import { ExtractPublicPropTypes } from 'vue';
 /**
- * @title {h2} FormItem 表单子组件
+ * @title {h2} FormItem 输入框
  * @text 目前完全继承 element-plus 中 el-form-item
- * @text 必须在Form 表单下使用
  */
 export declare const dataProps: {};
 export type DataProps = ExtractPublicPropTypes<typeof dataProps>;

package/dist/components/form-item/src/index.cjs

@@ -2,41 +2,42 @@
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 const vue = require("vue");
 const data = require("./data.cjs");
-const index = require("../../../hooks/cssname/index.cjs");
-const index$1 = require("../../../hooks/locale/index.cjs");
-const elementPlus = require("element-plus");
+const index$1 = require("../../../hooks/cssname/index.cjs");
+const index$2 = require("../../../hooks/locale/index.cjs");
+const index = require("../../../hooks/inherit/index.cjs");
+const index$3 = require("element-plus/es/components/form/index");
 const _sfc_main = /* @__PURE__ */ vue.defineComponent({
   __name: "index",
   props: data.dataProps,
   emits: data.dataEmits,
   setup(__props, { expose: __expose, emit: __emit }) {
     const refEl = vue.ref();
-    const attrs = vue.useAttrs();
+    const attrs = index.useInherit(vue.useAttrs());
     const slots = vue.useSlots();
-    const cs = index.useCssName("form-item");
-    index$1.useLocale();
+    const cs = index$1.useCssName("form-item");
+    index$2.useLocale();
     __expose({
       ...data.dataExpose,
       refEl
     });
     return (_ctx, _cache) => {
-      return vue.openBlock(), vue.createElementBlock("div", {
-        class: vue.normalizeClass(vue.unref(cs).z())
-      }, [
-        vue.createVNode(vue.unref(elementPlus.ElFormItem), vue.mergeProps(vue.unref(attrs), {
+      return vue.openBlock(), vue.createElementBlock("div", vue.mergeProps({
+        class: vue.unref(cs).z()
+      }, vue.unref(attrs).root), [
+        vue.createVNode(vue.unref(index$3.ElFormItem), vue.mergeProps(vue.unref(attrs).assem, {
           ref_key: "refEl",
           ref: refEl
         }), vue.createSlots({ _: 2 }, [
           vue.renderList(Object.keys(vue.unref(slots)), (k, i) => {
             return {
               name: k,
-              fn: vue.withCtx(() => [
-                vue.renderSlot(_ctx.$slots, k)
+              fn: vue.withCtx((scope) => [
+                vue.renderSlot(_ctx.$slots, k, vue.normalizeProps(vue.guardReactiveProps(scope)))
               ])
             };
           })
         ]), 1040)
-      ], 2);
+      ], 16);
     };
   }
 });