@aplus-frontend/ui 7.19.0-beta.2 → 7.19.1

package/es/src/ap-form/ap-form.vue2.mjs

@@ -1,15 +1,15 @@
-import { defineComponent as re, reactive as oe, shallowRef as ne, ref as ie, unref as f, nextTick as le, toRaw as U, watch as ae, onWatcherCleanup as se, isVNode as ue, cloneVNode as ce, computed as fe, createBlock as b, openBlock as k, mergeProps as de, withCtx as E, renderSlot as N } from "vue";
+import { defineComponent as re, reactive as oe, shallowRef as ne, ref as ie, unref as f, nextTick as le, toRaw as R, watch as ae, onWatcherCleanup as se, isVNode as ue, cloneVNode as ce, computed as fe, createBlock as k, openBlock as E, mergeProps as de, withCtx as N, renderSlot as O } from "vue";
 import { Form as pe } from "@aplus-frontend/antdv";
 import { useUrlSearchParams as ge } from "@vueuse/core";
-import { isArray as R, cloneDeep as O, isEqual as me, omit as Fe } from "lodash-unified";
+import { isArray as P, cloneDeep as W, isEqual as me, omit as Fe } from "lodash-unified";
 import "../render/index.mjs";
 import { useDevWarning as he } from "../utils/warning.mjs";
 import { getRouteType as ye } from "../utils/index.mjs";
-import { INTERNAL_FORM_INSTANCE_MARK as W } from "./constant.mjs";
+import { INTERNAL_FORM_INSTANCE_MARK as j } from "./constant.mjs";
 import { useProvideForm as Ve } from "./context.mjs";
 import { useInjectFormProvider as Te } from "./provider/context.mjs";
-import { getModelValue as j } from "./utils/get.mjs";
-import { genParams as P, setToParams as S } from "./utils/params.mjs";
+import { getModelValue as S } from "./utils/get.mjs";
+import { genParams as B, setToParams as q } from "./utils/params.mjs";
 import ve from "./utils/set.mjs";
 import { transformValues as F } from "./utils/transform.mjs";
 import { isDef as h } from "../utils/is.mjs";
@@ -47,30 +47,30 @@ const Se = /* @__PURE__ */ re({
     syncToUrlPriority: { type: Boolean },
     autoFocusFirstInput: { type: Boolean }
   },
-  setup(q, { expose: x }) {
-    const r = q;
+  setup(x, { expose: D }) {
+    const r = x;
     function y(e, t, o = !0, i) {
-      if (R(e)) {
+      if (P(e)) {
         let l = n;
         for (let p = 0; p < e.length - 1; p++)
           e[p] in l || (l[e[p]] = {}), l = l[e[p]];
         i ? i(l, e[e.length - 1]) : l[e[e.length - 1]] = t;
       } else
         i ? i(n, e) : n[e] = t;
-      let A = R(e) ? e[0] : e;
+      let b = P(e) ? e[0] : e;
       if (o) {
-        const l = { [A]: n[A] };
+        const l = { [b]: n[b] };
         g.triggerFormChange(r.name, l), r.onValuesChange?.(l, n, e);
       }
       m();
     }
-    const a = ne(), V = ge(ye()), g = Te(), D = he("ApForm"), T = ie(
-      r.syncToUrl ? P(r.syncToUrl, V, "get") : {}
+    const a = ne(), V = ge(ye()), g = Te(), $ = he("ApForm"), T = ie(
+      r.syncToUrl ? B(r.syncToUrl, V, "get") : {}
     );
-    let s = O(B()), u = {};
-    const n = oe(B());
+    let s = W(M()), u = {};
+    const n = oe(M());
     let d = [];
-    function B() {
+    function M() {
       const e = r.initialValues || {};
       return r.syncToUrlPriority ? {
         ...e,
@@ -80,19 +80,19 @@ const Se = /* @__PURE__ */ re({
         ...e
       };
     }
-    function $(e) {
+    function K(e) {
       const t = F(
         e,
         u,
         c
       );
-      g.triggerFormFinish(r.name, e), r.syncToUrl && S(V, P(r.syncToUrl, t, "set")), r.onFinish?.(t);
+      g.triggerFormFinish(r.name, e), r.syncToUrl && q(V, B(r.syncToUrl, t, "set")), r.onFinish?.(t);
     }
-    const K = async () => {
+    const L = async () => {
       a.value?.resetFields(), await le(() => {
-        Object.keys(n).forEach((e) => delete n[e]), Object.assign(n, O(s)), m(), r.syncToUrl && S(
+        Object.keys(n).forEach((e) => delete n[e]), Object.assign(n, W(s)), m(), r.syncToUrl && q(
           V,
-          P(
+          B(
             r.syncToUrl,
             F(
               s,
@@ -103,9 +103,9 @@ const Se = /* @__PURE__ */ re({
           )
         );
       });
-    }, L = (e) => {
+    }, G = (e) => {
       a.value?.clearValidate(e);
-    }, G = (e, t) => a.value?.validateFields(e, t), H = async (e, t) => {
+    }, v = (e, t) => a.value?.validateFields(e, t), H = async (e, t) => {
       const o = await a.value?.validateFields(
         e,
         t
@@ -115,23 +115,23 @@ const Se = /* @__PURE__ */ re({
         u,
         c
       );
-    }, c = (e) => e === !0 ? U(n) : a.value?.getFieldsValue(e), J = (e) => {
+    }, c = (e) => e === !0 ? R(n) : a.value?.getFieldsValue(e), J = (e) => {
       const t = c(e);
       return F(t, u, c);
     }, Q = (e, t) => a.value?.validate(e, t), X = (e, t = {}) => {
       a.value?.scrollToField(e, t);
     }, Y = (e) => {
       Object.assign(n, e), m();
-    }, v = (e, t, o = !0, i) => {
+    }, I = (e, t, o = !0, i) => {
       y(e, t, o, i), m();
     };
-    function I(e) {
-      return e(U(n)), d.push(e), () => {
+    function C(e) {
+      return e(R(n)), d.push(e), () => {
         d = d.filter((t) => t !== e);
       };
     }
-    function C(e, t) {
-      if (R(e)) {
+    function U(e, t) {
+      if (P(e)) {
         let o = s;
         for (let i = 0; i < e.length - 1; i++)
           h(o[e[i]]) || (o[e[i]] = {}), o = o[e[i]];
@@ -142,11 +142,11 @@ const Se = /* @__PURE__ */ re({
     function Z(e, t) {
       if (!h(e) || !h(t))
         return;
-      const o = j(s, t);
+      const o = S(s, t);
       if (me(o, e))
         return;
-      const i = j(f(T), t);
-      h(i) && r.syncToUrlPriority || (y(t, e, !1), C(t, e));
+      const i = S(f(T), t);
+      h(i) && r.syncToUrlPriority || (y(t, e, !1), U(t, e));
     }
     function z(e, t) {
       t && (u = ve(
@@ -156,44 +156,45 @@ const Se = /* @__PURE__ */ re({
         !0
       ));
     }
-    function M({ initialValue: e, name: t, transform: o }) {
+    function w({ initialValue: e, name: t, transform: o }) {
       Z(e, t), z(t, o);
     }
-    function w() {
+    function _() {
       return s;
     }
     function ee(e) {
-      if (D(
-        e === W,
+      if ($(
+        e === j,
         "usage",
         "getInternalInstance should only used at internal"
-      ), e === W)
+      ), e === j)
         return {
-          registerField: M,
-          registerWatch: I,
-          setFieldValue: v,
-          getInitialValues: w,
-          updateInitialModel: C
+          registerField: w,
+          registerWatch: C,
+          setFieldValue: I,
+          getInitialValues: _,
+          updateInitialModel: U,
+          validateFields: v
         };
     }
     function m() {
       if (d.length) {
-        const e = U(n);
+        const e = R(n);
         d.forEach((t) => {
           t(e);
         });
       }
     }
-    const _ = {
-      resetFields: K,
-      clearValidate: L,
-      validateFields: G,
+    const A = {
+      resetFields: L,
+      clearValidate: G,
+      validateFields: v,
       getFieldsValue: c,
       validate: Q,
       scrollToField: X,
       setFieldsValue: Y,
-      setFieldValue: v,
-      registerWatch: I,
+      setFieldValue: I,
+      registerWatch: C,
       validateFieldsReturnTransformed: H,
       getFieldsValueTransformed: J,
       getInternalInstance: ee
@@ -201,7 +202,7 @@ const Se = /* @__PURE__ */ re({
     ae(
       () => r.name,
       (e) => {
-        e && (g.registerForm(e, _), se(() => {
+        e && (g.registerForm(e, A), se(() => {
           g.unregisterForm(r.name);
         }));
       },
@@ -216,13 +217,14 @@ const Se = /* @__PURE__ */ re({
       model: fe(() => n),
       updateModel: y,
       internalInstance: {
-        registerWatch: I,
-        registerField: M,
-        setFieldValue: v,
-        getInitialValues: w,
-        updateInitialModel: C
+        registerWatch: C,
+        registerField: w,
+        setFieldValue: I,
+        getInitialValues: _,
+        updateInitialModel: U,
+        validateFields: v
       }
-    }), x(_), (e, t) => (k(), b(f(pe), de(
+    }), D(A), (e, t) => (E(), k(f(pe), de(
       {
         ref_key: "formRef",
         ref: a
@@ -238,19 +240,19 @@ const Se = /* @__PURE__ */ re({
       {
         model: n,
         "data-form-name": e.name,
-        onFinish: $
+        onFinish: K
       }
     ), {
-      default: E(() => [
-        e.autoFocusFirstInput ? (k(), b(f(Ie), {
+      default: N(() => [
+        e.autoFocusFirstInput ? (E(), k(f(Ie), {
           key: 1,
           renderer: te
         }, {
-          default: E(() => [
-            N(e.$slots, "default")
+          default: N(() => [
+            O(e.$slots, "default")
           ]),
           _: 3
-        })) : N(e.$slots, "default", { key: 0 })
+        })) : O(e.$slots, "default", { key: 0 })
       ]),
       _: 3
     }, 16, ["model", "data-form-name"]));

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

@@ -149,6 +149,10 @@ export type ApFormInternalInstance = {
      * 更新表单的初始值（仅用于某些组件内部调用的情况）
      */
     updateInitialModel: (name: FormItemProps['name'], val: any) => void;
+    /**
+     * 表单校验
+     */
+    validateFields: ApFormExpose['validateFields'];
 };
 export type ApFormItemExpose = FormItemExpose & {
     /**

package/es/src/ap-table/components/setting/modal/index.vue.mjs

@@ -1,6 +1,6 @@
-import { defineComponent as fe, ref as v, computed as U, watch as k, toRef as de, useSlots as ge, createVNode as l, cloneVNode as ve, unref as e, createElementBlock as E, openBlock as T, Fragment as ye, createBlock as K, createCommentVNode as j, resolveDynamicComponent as B, withCtx as s, withDirectives as Se, createElementVNode as m, normalizeClass as u, toDisplayString as y, createTextVNode as _, isRef as he, vShow as Te } from "vue";
+import { defineComponent as fe, ref as g, computed as U, watch as z, toRef as de, useSlots as ve, createVNode as l, cloneVNode as ge, unref as e, createElementBlock as E, openBlock as T, Fragment as ye, createBlock as B, createCommentVNode as j, resolveDynamicComponent as N, withCtx as s, withDirectives as Se, createElementVNode as m, normalizeClass as u, toDisplayString as y, createTextVNode as x, isRef as he, vShow as Te } from "vue";
 import { SettingOutlined as Ce, SaveOutlined as be } from "@ant-design/icons-vue";
-import { Button as F, Modal as ke, Divider as N, RadioGroup as _e, RadioButton as M, Flex as ze, Space as q, Popover as xe } from "@aplus-frontend/antdv";
+import { Button as F, Modal as ke, Divider as $, RadioGroup as _e, RadioButton as M, Flex as ze, Space as q, Popover as xe } from "@aplus-frontend/antdv";
 import "../../../../ap-button/index.mjs";
 import { randomStr as Ae } from "../../../../utils/index.mjs";
 import "../../../../config-provider/index.mjs";
@@ -14,7 +14,7 @@ import "../sorter/index.vue.mjs";
 import "../template/edit-form.vue.mjs";
 import "../template/index.vue.mjs";
 import "../tree-select/index.vue.mjs";
-import Re, { customCloneColumnStates as $, isEqualColumnStateIgnoreLabel as Ve } from "../utils.mjs";
+import Re, { customCloneColumnStates as I, isEqualColumnStateIgnoreLabel as Ve } from "../utils.mjs";
 import { useLocale as De } from "../../../../config-provider/hooks/use-locale.mjs";
 import { useNamespace as G } from "../../../../config-provider/hooks/use-namespace.mjs";
 import Le from "../template/index.vue2.mjs";
@@ -41,26 +41,27 @@ const je = {
       columnsBackup: J,
       updateSize: Q,
       updateColumns: W
-    } = Ke(), f = v(), z = U(() => c.config.persistenceKey), C = v(!1), {
+    } = Ke(), f = g(), C = U(() => c.config.persistenceKey), b = g(!1), {
       basicTemplate: X,
       customizeTemplateList: S,
       addTemplate: Y,
-      deleteTemplate: I,
+      deleteTemplate: R,
       updateTemplate: Z
-    } = Ne(c.config, z, pe), {
+    } = Ne(c.config, C, pe), {
       columnState: p,
-      setColumnState: R,
+      setColumnState: V,
       isAllSelected: ee,
       toggleSelectAll: te
-    } = Be([]), V = U(() => `${z.value}__active_key`);
+    } = Be([]), k = U(() => C.value && `${C.value}__active_key`);
     function D(a) {
-      localStorage.setItem(V.value, a);
+      k.value && localStorage.setItem(k.value, a);
     }
-    function x() {
-      return localStorage.getItem(V.value);
+    function A() {
+      if (k.value)
+        return localStorage.getItem(k.value);
     }
-    const o = v(c.config.defaultActiveKey ?? x());
-    k(() => S.value, (a) => {
+    const o = g(c.config.defaultActiveKey ?? A());
+    z(() => S.value, (a) => {
       a.length && !o.value && (o.value = a[0]?.key);
     }, {
       immediate: !0
@@ -72,27 +73,27 @@ const je = {
     const {
       t: r
     } = De(), {
-      b: g,
-      be: b
+      b: v,
+      be: _
     } = G("ap-column-setting"), {
       b: ae
-    } = G("ap-table"), ne = $e("ap-column-setting"), h = v(!1), L = v(!1), le = ge(), O = we(le.trigger) || l(F, {
+    } = G("ap-table"), ne = $e("ap-column-setting"), h = g(!1), L = g(!1), le = ve(), O = we(le.trigger) || l(F, {
       icon: l(Ce, null, null),
       class: ae("setting-trigger-button")
-    }, null), P = O ? ve(O, {
+    }, null), P = O ? ge(O, {
       onClick: () => {
         h.value = !0;
       }
     }) : null;
     function oe() {
-      R($(e(X).columnState));
+      V(I(e(X).columnState));
     }
-    function A(a, t) {
+    function w(a, t) {
       W?.(Re(e(J), a)), Q?.(t);
     }
     function ie() {
-      A(e(p), e(f)), h.value = !1;
-      const a = $(p.value), t = Z(o.value, {
+      w(e(p), e(f)), h.value = !1;
+      const a = I(p.value), t = Z(o.value, {
         columnState: a,
         size: f.value
       });
@@ -105,34 +106,33 @@ const je = {
         columnState: p.value,
         size: f.value
       };
-      Y(n), C.value = !1, o.value = t, c.config.onChange?.(n.columnState, n);
+      Y(n), b.value = !1, o.value = t, c.config.onChange?.(n.columnState, n);
     }
     function re(a, t) {
-      console.log(a, t);
       const n = [...t].find((i) => i?.key === a);
-      n && (R($(n.columnState)), f.value = n.size);
+      n && (V(I(n.columnState)), f.value = n.size);
     }
     function ue(a) {
       if (a !== o.value) {
-        I(a);
+        R(a);
         return;
       }
       const t = S.value, n = t.findIndex((d) => d.key === a), i = t[n + 1]?.key ?? t[n - 1]?.key;
-      I(a), o.value = i, D(i);
+      R(a), o.value = i, D(i);
     }
     function ce(a) {
       if (L.value = a, !a) {
-        const t = x();
+        const t = A();
         t && t !== o.value && (o.value = t);
       }
     }
     function pe(a) {
-      const t = x() ?? a[0].key;
+      const t = A() ?? a[0].key;
       o.value = t;
       const n = [...a].find((i) => i?.key === t);
-      n && A(n.columnState, n.size);
+      n && w(n.columnState, n.size);
     }
-    k(
+    z(
       [o, S],
       // eslint-disable-next-line @typescript-eslint/no-unused-vars
       ([a, t], [n, i]) => {
@@ -140,7 +140,7 @@ const je = {
           const d = [...t].find((me) => me.key === a);
           if (!d)
             return;
-          A(d.columnState, d.size);
+          w(d.columnState, d.size);
         }
         re(a, t);
       },
@@ -148,19 +148,19 @@ const je = {
         immediate: !0
       }
     );
-    const w = v(!1);
-    return k([f, p, h], ([a, t, n]) => {
+    const K = g(!1);
+    return z([f, p, h], ([a, t, n]) => {
       if (!n)
         return;
       const i = S.value.find((d) => d.key === o.value);
-      i && (i.size !== a || !Ve(t, i.columnState)) ? w.value = !0 : w.value = !1;
+      i && (i.size !== a || !Ve(t, i.columnState)) ? K.value = !0 : K.value = !1;
     }, {
       deep: !0
-    }), k(() => o.value, (a) => {
+    }), z(() => o.value, (a) => {
       c.config.onActiveChange?.(a);
     }, {
       immediate: !0
-    }), (a, t) => (T(), E(ye, null, [e(P) ? (T(), K(B(e(P)), {
+    }), (a, t) => (T(), E(ye, null, [e(P) ? (T(), B(N(e(P)), {
       key: 0
     })) : j("", !0), l(e(ke), {
       open: h.value,
@@ -173,7 +173,7 @@ const je = {
         height: "516px"
       },
       "after-open-change": ce,
-      "wrap-class-name": `${e(g)()} ${e(ne)}`,
+      "wrap-class-name": `${e(v)()} ${e(ne)}`,
       "ok-text": e(r)("ap.apTable.setting.saveAndApply"),
       "mask-closable": !1,
       onOk: ie
@@ -187,8 +187,8 @@ const je = {
           size: 12
         }, {
           default: s(() => [l(e(xe), {
-            open: C.value,
-            "onUpdate:open": t[3] || (t[3] = (i) => C.value = i),
+            open: b.value,
+            "onUpdate:open": t[3] || (t[3] = (i) => b.value = i),
             trigger: "click",
             arrow: !1,
             placement: "topLeft",
@@ -196,57 +196,57 @@ const je = {
           }, {
             content: s(() => [l(Ee, {
               onConfirm: se,
-              onCancel: t[2] || (t[2] = () => C.value = !1)
+              onCancel: t[2] || (t[2] = () => b.value = !1)
             })]),
             default: s(() => [l(e(Ue), {
               type: "borderLink",
               disabled: !a.config.persistenceKey
             }, {
               icon: s(() => [l(e(be))]),
-              default: s(() => [_(y(e(r)("ap.apTable.setting.saveAsTemplate")) + " ", 1)]),
+              default: s(() => [x(y(e(r)("ap.apTable.setting.saveAsTemplate")) + " ", 1)]),
               _: 1
             }, 8, ["disabled"])]),
             _: 1
-          }, 8, ["open"]), w.value ? (T(), E("span", {
+          }, 8, ["open"]), K.value ? (T(), E("span", {
             key: 0,
-            class: u(e(g)("modify-tip"))
+            class: u(e(v)("modify-tip"))
           }, y(e(r)("ap.apTable.setting.modifyNotification")), 3)) : j("", !0)]),
           _: 1
         }), l(e(q), {
           size: 10
         }, {
-          default: s(() => [(T(), K(B(n.cancelBtn))), (T(), K(B(n.okBtn)))]),
+          default: s(() => [(T(), B(N(n.cancelBtn))), (T(), B(N(n.okBtn)))]),
           _: 2
         }, 1024)]),
         _: 2
       }, 1024)]),
       default: s(() => [Se(m("div", {
-        class: u(e(g)("wrapper"))
+        class: u(e(v)("wrapper"))
       }, [m("div", {
-        class: u(e(g)("left"))
+        class: u(e(v)("left"))
       }, [l(Le, {
         "customize-template-list": e(S),
-        "persistence-key": z.value
-      }, null, 8, ["customize-template-list", "persistence-key"])], 2), l(e(N), {
+        "persistence-key": C.value
+      }, null, 8, ["customize-template-list", "persistence-key"])], 2), l(e($), {
         type: "vertical",
         style: {
           height: "100%",
           margin: "0px"
         }
       }), m("div", {
-        class: u(e(g)("center"))
+        class: u(e(v)("center"))
       }, [m("div", {
-        class: u(e(b)("center", "header"))
+        class: u(e(_)("center", "header"))
       }, [m("div", {
-        class: u(e(b)("center", "tip-wrapper"))
+        class: u(e(_)("center", "tip-wrapper"))
       }, [m("span", {
-        class: u(e(b)("center", "header-tips"))
+        class: u(e(_)("center", "header-tips"))
       }, y(e(r)("ap.apTable.setting.selectAllTip")), 3), l(e(F), {
         type: "link",
         size: "small",
         onClick: e(te)
       }, {
-        default: s(() => [_(y(e(ee) ? e(r)("ap.apTable.setting.unSelectAll") : e(r)("ap.apTable.setting.selectAll")), 1)]),
+        default: s(() => [x(y(e(ee) ? e(r)("ap.apTable.setting.unSelectAll") : e(r)("ap.apTable.setting.selectAll")), 1)]),
         _: 1
       }, 8, ["onClick"])], 2), l(e(_e), {
         value: f.value,
@@ -255,31 +255,31 @@ const je = {
         default: s(() => [l(e(M), {
           value: "small"
         }, {
-          default: s(() => [_(y(e(r)("ap.apTable.setting.sizeSmall")), 1)]),
+          default: s(() => [x(y(e(r)("ap.apTable.setting.sizeSmall")), 1)]),
           _: 1
         }), l(e(M), {
           value: "middle"
         }, {
-          default: s(() => [_(y(e(r)("ap.apTable.setting.sizeNormal")), 1)]),
+          default: s(() => [x(y(e(r)("ap.apTable.setting.sizeNormal")), 1)]),
           _: 1
         })]),
         _: 1
-      }, 8, ["value"])], 2), m("div", je, [l(e(N), {
+      }, 8, ["value"])], 2), m("div", je, [l(e($), {
         dashed: "",
         style: {
           margin: "0px"
         }
       })]), l(Oe, {
-        class: u(e(b)("center", "content")),
+        class: u(e(_)("center", "content")),
         value: e(p)
-      }, null, 8, ["class", "value"])], 2), l(e(N), {
+      }, null, 8, ["class", "value"])], 2), l(e($), {
         type: "vertical",
         style: {
           height: "100%",
           margin: "0px"
         }
       }), m("div", {
-        class: u(e(g)("right"))
+        class: u(e(v)("right"))
       }, [l(Pe, {
         value: e(p),
         "onUpdate:value": t[1] || (t[1] = (n) => he(p) ? p.value = n : null),