@aplus-frontend/ui 0.1.8 → 0.1.9

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

@@ -1,16 +1,16 @@
-import { isVNode as y, defineComponent as P, createPropsRestProxy as C, useSlots as h, watch as k, shallowRef as R, computed as S, unref as n, createVNode as b, mergeProps as i, openBlock as a, createBlock as m, withCtx as B, createElementBlock as N, Fragment as j, renderList as x, resolveDynamicComponent as v } from "vue";
-import { Col as F, Row as _ } from "ant-design-vue";
-import { pick as D, isBoolean as I } from "lodash-unified";
+import { isVNode as C, defineComponent as h, useSlots as w, watch as k, shallowRef as _, computed as P, unref as n, createVNode as R, mergeProps as c, openBlock as a, createBlock as u, withCtx as S, createElementBlock as b, Fragment as x, renderList as B, resolveDynamicComponent as N } from "vue";
+import { Col as j, Row as v } from "ant-design-vue";
+import { pick as F, isBoolean as D, omit as I } from "lodash-unified";
 import { apFormItemColPropKeys as O } from "../constant.mjs";
 import { genRealChildren as d, buildColSpan as V, getStringName as $ } from "./helper.mjs";
 import "../../config-provider/index.mjs";
 import "../style/ap-form-item-group.css";
 import { isDef as A } from "../../utils/index.mjs";
 import { useNamespace as E } from "../../config-provider/hooks/use-namespace.mjs";
-function G(o) {
-  return typeof o == "function" || Object.prototype.toString.call(o) === "[object Object]" && !y(o);
+function G(t) {
+  return typeof t == "function" || Object.prototype.toString.call(t) === "[object Object]" && !C(t);
 }
-const U = /* @__PURE__ */ P({
+const U = /* @__PURE__ */ h({
   name: "ApFormItemGroup",
   __name: "index",
   props: {
@@ -22,43 +22,38 @@ const U = /* @__PURE__ */ P({
     },
     wrap: {
       type: Boolean,
-      default: () => {
-      }
+      default: void 0
     },
     countPerRow: {
       default: 3
     }
   },
-  setup(o) {
+  setup(t) {
     const {
-      b: s
-    } = E("ap-form-item-group"), p = C(o, ["countPerRow", "gutter", "wrap"]);
-    console.log("restProps", p);
-    const l = h();
-    k(() => l.default(), (e) => {
-      u.value = d(e);
+      b: p
+    } = E("ap-form-item-group"), s = t, i = w();
+    k(() => i.default(), (o) => {
+      l.value = d(o);
     });
-    const u = R(d(l.default())), f = S(() => n(u).map((e, c) => {
-      const t = e.props, r = D(t, O), g = r != null && r.span ? {} : V(o.countPerRow), w = I(t.hidden) ? !!t.hidden : A(t.hidden);
+    const l = _(d(i.default())), f = P(() => n(l).map((o, m) => {
+      const e = o.props, r = F(e, O), g = r != null && r.span ? {} : V(s.countPerRow), y = D(e.hidden) ? !!e.hidden : A(e.hidden);
       return {
-        key: `${c}-${$(t.name)}`,
-        node: b(F, i(g, r, {
-          class: w ? s("col-hidden") : ""
-        }), G(e) ? e : {
-          default: () => [e]
+        key: `${m}-${$(e.name)}`,
+        node: R(j, c(g, r, {
+          class: y ? p("col-hidden") : ""
+        }), G(o) ? o : {
+          default: () => [o]
         })
       };
     }));
-    return (e, c) => (a(), m(n(_), i({
-      class: n(s)(),
-      gutter: e.gutter,
-      wrap: e.wrap
-    }, p), {
-      default: B(() => [(a(!0), N(j, null, x(f.value, (t) => (a(), m(v(t.node), {
-        key: t.key
+    return (o, m) => (a(), u(n(v), c({
+      class: n(p)()
+    }, n(I)(s, ["countPerRow"])), {
+      default: S(() => [(a(!0), b(x, null, B(f.value, (e) => (a(), u(N(e.node), {
+        key: e.key
       }))), 128))]),
       _: 1
-    }, 16, ["class", "gutter", "wrap"]));
+    }, 16, ["class"]));
   }
 });
 export {

package/es/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/es/src/ap-form/ap-form-item.vue.mjs

@@ -1,14 +1,14 @@
-import { defineComponent as q, useSlots as D, ref as f, onMounted as E, computed as g, unref as t, watch as K, cloneVNode as O, openBlock as h, createBlock as C, mergeProps as Q, createSlots as U, withCtx as i, resolveDynamicComponent as w, createCommentVNode as G, createElementVNode as H, normalizeClass as J, createVNode as V, normalizeStyle as M, renderList as W, renderSlot as X, normalizeProps as Y, guardReactiveProps as Z } from "vue";
-import { Form as ee, Tooltip as oe } from "ant-design-vue";
+import { defineComponent as q, useSlots as D, ref as f, onMounted as E, computed as h, unref as l, watch as K, cloneVNode as O, openBlock as C, createBlock as k, mergeProps as Q, createSlots as U, withCtx as i, resolveDynamicComponent as w, createCommentVNode as G, createElementVNode as H, normalizeClass as J, createVNode as p, normalizeStyle as M, renderList as W, renderSlot as X, normalizeProps as Y, guardReactiveProps as Z } from "vue";
+import { Form as ee, Tooltip as oe, Typography as le } from "ant-design-vue";
 import { useToken as te } from "ant-design-vue/es/theme/internal";
-import { isArray as le, omit as k } from "lodash-unified";
+import { isArray as ae, omit as V } from "lodash-unified";
 import { apFormItemColPropKeys as re } from "./constant.mjs";
-import { QuestionCircleOutlined as ae } from "@ant-design/icons-vue";
+import { QuestionCircleOutlined as ne } from "@ant-design/icons-vue";
 import "../config-provider/index.mjs";
-import { useInjectForm as ne } from "./context.mjs";
+import { useInjectForm as ie } from "./context.mjs";
 import "./style/ap-form-item.css";
 import { useNamespace as ue } from "../config-provider/hooks/use-namespace.mjs";
-const be = /* @__PURE__ */ q({
+const Be = /* @__PURE__ */ q({
   name: "ApFormItem",
   __name: "ap-form-item",
   props: {
@@ -52,84 +52,84 @@ const be = /* @__PURE__ */ q({
     _signal: {}
   },
   setup(N, { expose: P }) {
-    var F, b;
-    const o = N, l = D(), { model: u, updateModel: d, internalInstance: s } = ne(), { m: p, b: x } = ue("ap-form-item"), m = f(!1), r = f(), [, S] = te();
+    var F, B;
+    const o = N, t = D(), { model: u, updateModel: s, internalInstance: d } = ie(), { m: c, b: S } = ue("ap-form-item"), m = f(!1), a = f(), [, x] = te();
     E(() => {
-      s == null || s.registerField({
+      d == null || d.registerField({
         name: o.name,
         initialValue: o.initialValue
       });
     });
-    const c = g(() => o.name ? le(o.name) ? o.name.reduce((e, a) => e == null ? void 0 : e[a], t(u)) : u == null ? void 0 : u.value[o.name] : null), v = f((b = (F = l.default) == null ? void 0 : F.call(l)) == null ? void 0 : b[0]);
+    const y = h(() => o.name ? ae(o.name) ? o.name.reduce((e, r) => e == null ? void 0 : e[r], l(u)) : u == null ? void 0 : u.value[o.name] : null), v = f((B = (F = t.default) == null ? void 0 : F.call(t)) == null ? void 0 : B[0]);
     K(
       () => {
         var e;
-        return (e = l.default) == null ? void 0 : e.call(l);
+        return (e = t.default) == null ? void 0 : e.call(t);
       },
       (e) => {
         v.value = e == null ? void 0 : e[0];
       }
     );
-    function _(e) {
-      d == null || d(o.name, e);
+    function I(e) {
+      s == null || s(o.name, e);
     }
-    function I() {
+    function T() {
       m.value = !0;
     }
     function z() {
       m.value = !1;
     }
-    const y = g(() => {
-      var a, n;
+    const b = h(() => {
+      var r, n;
       if (!o.name)
-        return (a = l.default()) == null ? void 0 : a[0];
-      const e = t(v);
+        return (r = t.default()) == null ? void 0 : r[0];
+      const e = l(v);
       return e ? O(e, {
-        [o.valuePropName]: t(c),
-        [`onUpdate:${o.valuePropName}`]: _,
+        [o.valuePropName]: l(y),
+        [`onUpdate:${o.valuePropName}`]: I,
         bordered: o.bordered ? !1 : (n = e == null ? void 0 : e.props) == null ? void 0 : n.bordered,
-        onFocus: I,
+        onFocus: T,
         onBlur: z
       }) : null;
     });
     function A() {
       var e;
-      (e = r.value) == null || e.onFieldBlur();
+      (e = a.value) == null || e.onFieldBlur();
     }
     function R() {
       var e;
-      (e = r.value) == null || e.onFieldChange();
+      (e = a.value) == null || e.onFieldChange();
     }
-    function T() {
+    function _() {
       var e;
-      (e = r.value) == null || e.clearValidate();
+      (e = a.value) == null || e.clearValidate();
     }
     function L() {
       var e;
-      (e = r.value) == null || e.resetField();
+      (e = a.value) == null || e.resetField();
     }
     function $() {
-      return t(c);
+      return l(y);
     }
     return P({
       onFieldBlur: A,
       onFieldChange: R,
-      clearValidate: T,
+      clearValidate: _,
       resetField: L,
       getFieldValue: $
-    }), (e, a) => (h(), C(t(ee).Item, Q({
+    }), (e, r) => (C(), k(l(ee).Item, Q({
       ref_key: "formItemRef",
-      ref: r
-    }, t(k)(o, [...t(re), "tooltip"]), {
+      ref: a
+    }, l(V)(o, [...l(re), "tooltip", "label"]), {
       class: {
-        [t(p)("bordered")]: e.bordered,
-        [t(p)("focused")]: e.bordered && m.value,
-        [t(x)()]: !0
+        [l(c)("bordered")]: e.bordered,
+        [l(c)("focused")]: e.bordered && m.value,
+        [l(S)()]: !0
       },
       colon: e.bordered ? !1 : o.colon
     }), U({
       default: i(() => [
-        y.value ? (h(), C(w(y.value), { key: 0 })) : G("", !0)
+        b.value ? (C(), k(w(b.value), { key: 0 })) : G("", !0)
       ]),
       _: 2
     }, [
@@ -139,12 +139,12 @@ const be = /* @__PURE__ */ q({
           H("span", {
             class: J(n)
           }, [
-            V(t(oe), {
+            p(l(oe), {
               title: o.tooltip
             }, {
               default: i(() => [
-                V(t(ae), {
-                  style: M({ color: t(S).colorPrimary })
+                p(l(ne), {
+                  style: M({ color: l(x).colorPrimary })
                 }, null, 8, ["style"])
               ]),
               _: 1
@@ -153,15 +153,25 @@ const be = /* @__PURE__ */ q({
         ]),
         key: "0"
       } : void 0,
-      W(t(k)(l, "default"), (n, B) => ({
-        name: B,
+      e.label ? {
+        name: "label",
+        fn: i(() => [
+          p(l(le).Text, {
+            ellipsis: { tooltip: e.label },
+            content: e.label
+          }, null, 8, ["ellipsis", "content"])
+        ]),
+        key: "1"
+      } : void 0,
+      W(l(V)(t, "default"), (n, g) => ({
+        name: g,
         fn: i((j) => [
-          X(e.$slots, B, Y(Z(j || {})))
+          X(e.$slots, g, Y(Z(j || {})))
         ])
       }))
     ]), 1040, ["class", "colon"]));
   }
 });
 export {
-  be as default
+  Be as default
 };

package/es/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;
+    };
+};