@aplus-frontend/ui 7.17.1-beta.0 → 7.17.2

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

@@ -1,9 +1,10 @@
-import { isVNode as q, defineComponent as A, useSlots as E, shallowRef as L, ref as v, watch as G, computed as T, unref as l, cloneVNode as H, createVNode as o, mergeProps as m, createElementBlock as J, openBlock as h, Fragment as K, createBlock as w, createCommentVNode as Q, withCtx as c, renderSlot as B, resolveDynamicComponent as R, createTextVNode as X, toDisplayString as Y } from "vue";
-import { Button as b, Flex as Z, Space as ee, Drawer as te } from "@aplus-frontend/antdv";
-import { isBoolean as ie, isUndefined as ae, omit as le } from "lodash-unified";
+import { isVNode as A, defineComponent as E, computed as m, useSlots as L, shallowRef as G, ref as h, watch as H, unref as i, cloneVNode as J, createVNode as o, mergeProps as c, createElementBlock as K, openBlock as b, Fragment as Q, createBlock as w, createCommentVNode as B, withCtx as f, renderSlot as R, createTextVNode as X, toDisplayString as Y } from "vue";
+import { Button as F, Flex as Z, Space as ee, Drawer as te } from "@aplus-frontend/antdv";
+import { omit as ae, isBoolean as le, isUndefined as ie } from "lodash-unified";
+import "../../render/index.mjs";
 import "../../config-provider/index.mjs";
 import "../../hooks/index.mjs";
-import { getNumberPx as F, convertReactiveToRaw as ne } from "../../utils/index.mjs";
+import { getNumberPx as g, convertReactiveToRaw as ne } from "../../utils/index.mjs";
 import { getSingleVNode as oe } from "../../utils/slot.mjs";
 import "../ap-form.vue.mjs";
 import se from "../style/drawer-form.mjs";
@@ -11,10 +12,11 @@ import { useControllableValue as re } from "../../hooks/useControllableValue.mjs
 import { useLocale as ue } from "../../config-provider/hooks/use-locale.mjs";
 import { useNamespace as de } from "../../config-provider/hooks/use-namespace.mjs";
 import me from "../ap-form.vue2.mjs";
-function x(s) {
-  return typeof s == "function" || Object.prototype.toString.call(s) === "[object Object]" && !q(s);
+import x from "../../render/render.mjs";
+function O(s) {
+  return typeof s == "function" || Object.prototype.toString.call(s) === "[object Object]" && !A(s);
 }
-const Se = /* @__PURE__ */ A({
+const Ie = /* @__PURE__ */ E({
   name: "ApFormDrawerForm",
   __name: "index",
   props: {
@@ -101,24 +103,24 @@ const Se = /* @__PURE__ */ A({
   },
   emits: ["update:open"],
   setup(s, {
-    expose: O,
-    emit: k
+    expose: k,
+    emit: W
   }) {
-    const t = s, f = E(), W = k, a = L(), r = v(), n = v(!1), {
-      value: P,
+    const t = s, P = m(() => ae(t, ["drawerProps", "open", "onUpdate:open", "title", "width", "onFinish", "submitter"])), p = L(), N = W, l = G(), r = h(), n = h(!1), {
+      value: S,
       updateValue: u
-    } = re(t, W, {
+    } = re(t, N, {
       valuePropName: "open",
       defaultValue: !1
     }), {
-      t: p
-    } = ue(), N = se("ap-form-drawer-form"), {
-      b: S
+      t: v
+    } = ue(), _ = se("ap-form-drawer-form"), {
+      b: I
     } = de("ap-form-drawer-form");
-    G(() => a.value, (e) => {
+    H(() => l.value, (e) => {
       e && r.value && (e.setFieldsValue?.(r.value), r.value = void 0);
     });
-    const d = T(() => {
+    const d = m(() => {
       const e = {
         onResize: () => {
         },
@@ -126,143 +128,150 @@ const Se = /* @__PURE__ */ A({
         maxWidth: window.innerWidth * 0.8,
         resizeOnOpen: !0
       };
-      return ie(t.resize) ? t.resize ? e : {} : {
+      return le(t.resize) ? t.resize ? e : {} : {
         minWidth: t.resize?.minWidth ?? e.minWidth,
         maxWidth: t.resize?.maxWidth ?? e.maxWidth,
         onResize: t.resize?.onResize ?? e.onResize,
-        resizeOnOpen: ae(t.resize?.resizeOnOpen) ? e.resizeOnOpen : t.resize.resizeOnOpen
+        resizeOnOpen: ie(t.resize?.resizeOnOpen) ? e.resizeOnOpen : t.resize.resizeOnOpen
       };
     });
-    function _() {
-      const e = l(d)?.minWidth;
+    function j() {
+      const e = i(d)?.minWidth;
       return !e || e && e < t.width ? t.width : e;
     }
-    const g = v(F(_()));
-    function I(e) {
+    const y = h(g(j()));
+    function U(e) {
       const {
-        resizeOnOpen: i,
-        onResize: C
+        resizeOnOpen: a,
+        onResize: T
       } = d.value;
-      i && (g.value = e, C?.(e));
+      a && (y.value = e, T?.(e));
     }
-    const y = oe(f.trigger), z = y ? H(y, {
-      onClick: () => {
-        u(!0);
-      }
-    }) : null, j = T(() => {
+    const z = m(() => {
+      const e = oe(p.trigger);
+      return e ? J(e, {
+        onClick: () => {
+          u(!0);
+        }
+      }) : null;
+    }), V = m(() => {
       const e = [];
       if (t.submitter === !1)
         return null;
       if (t.showCancel) {
-        let i;
-        e.push(o(b, {
-          onClick: V,
+        let a;
+        e.push(o(F, {
+          onClick: C,
           disabled: n.value
-        }, x(i = p("ap.common.cancelText")) ? i : {
-          default: () => [i]
+        }, O(a = v("ap.common.cancelText")) ? a : {
+          default: () => [a]
         }));
       }
-      return t.submitter?.resetButtonProps !== !1 && e.push(o(b, m(t.submitter?.resetButtonProps || {}, {
-        key: "submit",
+      return t.submitter?.resetButtonProps !== !1 && e.push(o(F, c(t.submitter?.resetButtonProps || {}, {
+        key: "reset",
         disabled: n.value,
-        onClick: U
+        onClick: M
       }), {
-        default: () => [t.submitter?.resetText || p("ap.common.resetText")]
-      })), t.submitter?.submitButtonProps !== !1 && e.push(o(b, m({
+        default: () => [t.submitter?.resetText || v("ap.common.resetText")]
+      })), t.submitter?.submitButtonProps !== !1 && e.push(o(F, c({
         type: "primary",
         key: "submit"
       }, t.submitter?.submitButtonProps || {}, {
         loading: n.value,
         onClick: D
       }), {
-        default: () => [t.submitter?.submitText || p("ap.common.okText")]
+        default: () => [t.submitter?.submitText || v("ap.common.okText")]
       })), o(Z, {
         justify: "flex-end"
       }, {
-        default: () => [f.submitter ? f.submitter(e) : o(ee, null, x(e) ? e : {
+        default: () => [p.submitter ? p.submitter(e) : o(ee, null, O(e) ? e : {
           default: () => [e]
         })]
       });
     });
-    function U() {
-      t.submitter !== !1 && (a.value?.resetFields(), t.submitter?.onReset?.());
+    function M() {
+      t.submitter !== !1 && (l.value?.resetFields(), t.submitter?.onReset?.());
     }
     async function D() {
       if (t.submitter !== !1)
         try {
-          const e = await a.value?.validateFieldsReturnTransformed();
+          const e = await l.value?.validateFieldsReturnTransformed();
           t.submitter?.onSubmit?.(), n.value = !0;
-          const i = t.onFinish?.(ne(e));
-          if (t.submitTimeout && i instanceof Promise) {
-            const $ = setTimeout(() => n.value = !1, t.submitTimeout);
-            i.finally(() => {
-              clearTimeout($), n.value = !1;
+          const a = t.onFinish?.(ne(e));
+          if (t.submitTimeout && a instanceof Promise) {
+            const q = setTimeout(() => n.value = !1, t.submitTimeout);
+            a.finally(() => {
+              clearTimeout(q), n.value = !1;
             });
           }
-          await i && u(!1);
+          await a && u(!1);
         } finally {
           n.value = !1;
         }
     }
-    function V() {
-      l(n) || u(!1);
+    function C() {
+      i(n) || u(!1);
     }
-    function M(e) {
-      !e && l(n) || u(e);
+    function $(e) {
+      !e && i(n) || u(e);
     }
-    return O({
+    return k({
       resetFields: async () => {
-        a.value?.resetFields();
+        l.value?.resetFields();
       },
       clearValidate: (e) => {
-        a.value?.clearValidate(e);
+        l.value?.clearValidate(e);
       },
-      validateFields: (e, i) => a.value?.validateFields(e, i),
-      getFieldsValue: (e) => a.value?.getFieldsValue(e),
-      validate: (e, i) => a.value?.validate(e, i),
-      scrollToField: (e, i = {}) => {
-        a.value?.scrollToField(e, i);
+      validateFields: (e, a) => l.value?.validateFields(e, a),
+      getFieldsValue: (e) => l.value?.getFieldsValue(e),
+      validate: (e, a) => l.value?.validate(e, a),
+      scrollToField: (e, a = {}) => {
+        l.value?.scrollToField(e, a);
       },
-      setFieldValue: (e, i) => {
-        a.value?.setFieldValue?.(e, i);
+      setFieldValue: (e, a) => {
+        l.value?.setFieldValue?.(e, a);
       },
       setFieldsValue: (e) => {
-        if (!a.value) {
+        if (!l.value) {
           r.value = e;
           return;
         }
-        a.value?.setFieldsValue?.(e);
+        l.value?.setFieldsValue?.(e);
       },
-      getInternalInstance: (e) => a.value?.getInternalInstance(e),
-      getFieldsValueTransformed: (e) => a.value?.getFieldsValueTransformed(e),
-      validateFieldsReturnTransformed: (e) => a.value?.validateFieldsReturnTransformed(e)
-    }), (e, i) => (h(), J(K, null, [o(l(te), m(e.drawerProps, {
-      open: l(P),
-      size: g.value,
-      "max-size": l(F)(d.value.maxWidth),
-      "min-size": l(F)(d.value.minWidth),
+      getInternalInstance: (e) => l.value?.getInternalInstance(e),
+      getFieldsValueTransformed: (e) => l.value?.getFieldsValueTransformed(e),
+      validateFieldsReturnTransformed: (e) => l.value?.validateFieldsReturnTransformed(e)
+    }), (e, a) => (b(), K(Q, null, [o(i(te), c(e.drawerProps, {
+      open: i(S),
+      size: y.value,
+      "max-size": i(g)(d.value.maxWidth),
+      "min-size": i(g)(d.value.minWidth),
       resizable: {
-        onResize: I
+        onResize: U
       },
-      class: [l(S)(), l(N)],
-      "onUpdate:open": M,
-      onCancel: V
+      class: [i(I)(), i(_)],
+      "onUpdate:open": $,
+      onCancel: C
     }), {
-      title: c(() => [B(e.$slots, "title", {}, () => [X(Y(t.title), 1)])]),
-      footer: c(() => [(h(), w(R(j.value)))]),
-      default: c(() => [o(me, m({
+      title: f(() => [R(e.$slots, "title", {}, () => [X(Y(t.title), 1)])]),
+      footer: f(() => [V.value ? (b(), w(i(x), {
+        key: 0,
+        node: V.value
+      }, null, 8, ["node"])) : B("", !0)]),
+      default: f(() => [o(me, c({
         ref_key: "formRef",
-        ref: a
-      }, l(le)(t, ["drawerProps", "open", "onUpdate:open", "title", "width", "onFinish", "submitter"])), {
-        default: c(() => [B(e.$slots, "default")]),
+        ref: l
+      }, P.value), {
+        default: f(() => [R(e.$slots, "default")]),
         _: 3
       }, 16)]),
       _: 3
-    }, 16, ["open", "size", "max-size", "min-size", "resizable", "class"]), l(z) ? (h(), w(R(l(z)), {
-      key: 0
-    })) : Q("", !0)], 64));
+    }, 16, ["open", "size", "max-size", "min-size", "resizable", "class"]), z.value ? (b(), w(i(x), {
+      key: 0,
+      node: z.value
+    }, null, 8, ["node"])) : B("", !0)], 64));
   }
 });
 export {
-  Se as default
+  Ie as default
 };

package/es/src/ap-form/hooks/use-regist-form.d.ts

@@ -0,0 +1,7 @@
+import { ApFormItemProps, ApFormListProps, ApFormSetProps } from '../interface';
+/**
+ * 表单项（列表、集合）注册
+ * @param props
+ */
+declare const useRegistForm: (props: ApFormItemProps | ApFormListProps | ApFormSetProps) => void;
+export default useRegistForm;

package/es/src/ap-form/hooks/use-regist-form.mjs

@@ -0,0 +1,24 @@
+import { isFunction as o, cloneDeep as r } from "lodash-unified";
+import { onMounted as l, onBeforeUnmount as m } from "vue";
+import { isPromise as u } from "../../utils/is.mjs";
+import { useInjectForm as s } from "../context.mjs";
+const V = (e) => {
+  let t = !1;
+  const { internalInstance: n } = s();
+  l(() => {
+    a();
+  }), m(() => {
+    t = !0;
+  });
+  async function a() {
+    let i = o(e.initialValue) ? e.initialValue() : e.initialValue;
+    u(i) && (i = await i), !t && n?.registerField({
+      name: e.name,
+      initialValue: r(i),
+      transform: e.transform
+    });
+  }
+};
+export {
+  V as default
+};

package/es/src/ap-form/interface.d.ts

@@ -171,8 +171,22 @@ export type ApFormListProps = {
     transform?: ApFormItemTransformType;
 };
 export type ApFormSearchFormProps = ApFormProps & {
+    /**
+     * 是否展开
+     * @deprecated 已废弃
+     */
     collapse?: boolean;
+    /**
+     * 默认情况下是否展开
+     * @deprecated 已废弃
+     */
     defaultCollapse?: boolean;
+    /**
+     * 展开关闭时的回调
+     * @deprecated 已废弃
+     * @param collapse
+     * @returns
+     */
     'onUpdate:collapse'?: (collapse?: boolean) => void;
     searchText?: string;
     resetText?: string;
@@ -180,6 +194,10 @@ export type ApFormSearchFormProps = ApFormProps & {
     onReset?: () => void;
     customReset?: boolean;
     extraInAction?: boolean;
+    /**
+     * 是否是强制展开的（即无法关闭）
+     * @deprecated 已废弃
+     */
     forceExpand?: boolean;
     countPerRow?: number;
     submitLoading?: boolean;

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

@@ -446,7 +446,7 @@ declare function __VLS_template(): {
                         default: string | number | ColSize;
                     };
                     xxl: {
-                        type: PropType<string | number | ColSize>;
+                        type: PropType<string | number | ** @type { [typeof __VLS_components.Render, typeof __VLS_components.Render, ] } */).ColSize>;
                         default: string | number | ColSize;
                     };
                     prefixCls: StringConstructor;
@@ -548,7 +548,7 @@ declare function __VLS_template(): {
                             default: string | number | ColSize;
                         };
                         xxl: {
-                            type: PropType<string | number | ColSize>;
+                            type: PropType<string | number | ** @type { [typeof __VLS_components.Render, typeof __VLS_components.Render, ] } */).ColSize>;
                             default: string | number | ColSize;
                         };
                         prefixCls: StringConstructor;
@@ -704,7 +704,7 @@ declare function __VLS_template(): {
                         default: string | number | ColSize;
                     };
                     xxl: {
-                        type: PropType<string | number | ColSize>;
+                        type: PropType<string | number | ** @type { [typeof __VLS_components.Render, typeof __VLS_components.Render, ] } */).ColSize>;
                         default: string | number | ColSize;
                     };
                     prefixCls: StringConstructor;
@@ -1241,7 +1241,7 @@ declare const __VLS_component: DefineComponent<ApFormItemProps, {
                     default: string | number | ColSize;
                 };
                 xxl: {
-                    type: PropType<string | number | ColSize>;
+                    type: PropType<string | number | ** @type { [typeof __VLS_components.Render, typeof __VLS_components.Render, ] } */).ColSize>;
                     default: string | number | ColSize;
                 };
                 prefixCls: StringConstructor;
@@ -1343,7 +1343,7 @@ declare const __VLS_component: DefineComponent<ApFormItemProps, {
                         default: string | number | ColSize;
                     };
                     xxl: {
-                        type: PropType<string | number | ColSize>;
+                        type: PropType<string | number | ** @type { [typeof __VLS_components.Render, typeof __VLS_components.Render, ] } */).ColSize>;
                         default: string | number | ColSize;
                     };
                     prefixCls: StringConstructor;
@@ -1499,7 +1499,7 @@ declare const __VLS_component: DefineComponent<ApFormItemProps, {
                     default: string | number | ColSize;
                 };
                 xxl: {
-                    type: PropType<string | number | ColSize>;
+                    type: PropType<string | number | ** @type { [typeof __VLS_components.Render, typeof __VLS_components.Render, ] } */).ColSize>;
                     default: string | number | ColSize;
                 };
                 prefixCls: StringConstructor;