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

package/es/src/ag-grid/editable/form-item.vue.mjs

@@ -1,21 +1,21 @@
-import { defineComponent as L, useSlots as P, ref as y, onMounted as G, watch as W, createElementBlock as U, openBlock as $, Fragment as q, createVNode as p, unref as l, mergeProps as g, withCtx as h, createSlots as J, renderList as Q, renderSlot as X, normalizeProps as Y, guardReactiveProps as Z } from "vue";
-import { cloneDeep as u, isEqual as ee, omit as oe } from "lodash-unified";
-import { ApForm as C } from "../../ap-form/index.mjs";
-import { useInjectForm as te } from "../../ap-form/context.mjs";
-import { useWatch as ae } from "../../ap-form/hooks/use-watch.mjs";
-import { getModelValue as ne } from "../../ap-form/utils/get.mjs";
-import { transformValues as le } from "../../ap-form/utils/transform.mjs";
+import { defineComponent as G, useSlots as W, ref as y, onMounted as U, watch as $, unref as r, createElementBlock as q, openBlock as J, Fragment as Q, createVNode as f, mergeProps as h, withCtx as C, createSlots as X, renderList as Y, renderSlot as Z, normalizeProps as ee, guardReactiveProps as oe } from "vue";
+import { cloneDeep as u, isEqual as te, omit as ae } from "lodash-unified";
+import { ApForm as b } from "../../ap-form/index.mjs";
+import { useInjectForm as ne } from "../../ap-form/context.mjs";
+import { useWatch as le } from "../../ap-form/hooks/use-watch.mjs";
+import { getModelValue as re } from "../../ap-form/utils/get.mjs";
+import { transformValues as ie } from "../../ap-form/utils/transform.mjs";
 import "../../config-provider/index.mjs";
-import { useGetEditableColumns as re } from "../hooks/use-editable-columns.mjs";
-import { useEditableFormItemApi as se } from "../hooks/use-editable-form-item-api.mjs";
+import { useGetEditableColumns as se } from "../hooks/use-editable-columns.mjs";
+import { useEditableFormItemApi as me } from "../hooks/use-editable-form-item-api.mjs";
 import "../index.vue2.mjs";
-import ie from "../style/editable.mjs";
-import { getShadowName as me } from "../utils.mjs";
-import { getColumnTransformOptions as ue, arrayToObject as b } from "./utils.mjs";
-import { useNamespace as de } from "../../config-provider/hooks/use-namespace.mjs";
-import { useGlobalConfig as pe } from "../../config-provider/hooks/use-global-config.mjs";
-import fe from "../index.vue.mjs";
-const Ne = /* @__PURE__ */ L({
+import ue from "../style/editable.mjs";
+import { getShadowName as de } from "../utils.mjs";
+import { getColumnTransformOptions as pe, arrayToObject as R, getRowKey as fe } from "./utils.mjs";
+import { useNamespace as ce } from "../../config-provider/hooks/use-namespace.mjs";
+import { useGlobalConfig as we } from "../../config-provider/hooks/use-global-config.mjs";
+import ge from "../index.vue.mjs";
+const Ke = /* @__PURE__ */ G({
   name: "EditableGrid",
   __name: "form-item",
   props: {
@@ -138,112 +138,122 @@ const Ne = /* @__PURE__ */ L({
     name: {},
     formItem: {}
   },
-  setup(R, {
+  setup(v, {
     expose: B
   }) {
-    const v = P(), o = R, {
-      b: x
-    } = de("editable-aggrid"), I = ie("editable-aggrid"), r = y(), {
-      internalInstance: s
-    } = te();
-    function S(e) {
-      const t = ue(o.columns || []);
-      if (!Object.keys(t).length || !e?.length)
+    const x = W(), a = v, {
+      b: S
+    } = ce("editable-aggrid"), I = ue("editable-aggrid"), m = y(), {
+      internalInstance: n
+    } = ne();
+    function F(e) {
+      const o = pe(a.columns || []);
+      if (!Object.keys(o).length || !e?.length)
         return e;
-      let a = [];
-      for (const m of e)
-        a.push(le(m, t));
-      return a;
+      let t = [];
+      for (const s of e)
+        t.push(ie(s, o));
+      return t;
     }
-    const i = me(o.name);
-    let f = [];
-    G(() => {
-      const e = o.formItem?.initialValue ?? ne(s?.getInitialValues() ?? {}, o.name);
-      e && (s?.updateInitialModel(i, b(u(e), o.rowKey)), f = u(e), n.value || _(u(e), "suffix", !0));
+    const i = de(a.name);
+    let c = [];
+    U(() => {
+      const e = a.formItem?.initialValue ?? re(n?.getInitialValues() ?? {}, a.name);
+      e && (n?.updateInitialModel(i, R(u(e), a.rowKey)), c = u(e), l.value || j(u(e), "suffix", !0));
     });
-    const n = y([]), T = ae(o.name);
-    W(() => T.value, (e) => {
-      ee(e, n.value) || c(e ?? u(f));
+    const l = y([]), T = le(a.name);
+    $(() => T.value, (e) => {
+      te(e, l.value) || w(e ?? u(c));
     }, {
       deep: !0,
       flush: "post",
       immediate: !0
     });
-    const E = pe("valueTypeMap"), F = re(o, E, i), {
-      add: V,
-      addMultiple: N,
-      __addMultiple: _,
-      remove: j,
+    const E = we("valueTypeMap"), V = se(a, E, i), {
+      add: N,
+      addMultiple: _,
+      __addMultiple: j,
+      remove: K,
       removeByKey: k,
       getRowData: D,
       getRowsData: O,
       setRowData: z,
       clear: H,
       refreshRowIds: d
-    } = se(o, s, n, i);
-    function K() {
-      const e = r.value?._internalGridApi;
+    } = me(a, n, l, i);
+    function L() {
+      const e = m.value?._internalGridApi;
       if (!d.value?.length || !e)
         return;
-      const t = d.value.map((a) => e.getRowNode(a)).filter((a) => !!a);
+      const o = d.value.map((t) => e.getRowNode(t)).filter((t) => !!t);
       e.refreshCells({
-        rowNodes: t,
+        rowNodes: o,
         force: !0
       }), d.value = [];
     }
-    function c(e) {
-      n.value = [...e];
-      const t = b(e, o.rowKey);
-      s?.setFieldValue(o.name, [...e]), s?.setFieldValue(i, t);
+    function w(e) {
+      l.value = [...e];
+      const o = R(e, a.rowKey);
+      n?.setFieldValue(a.name, [...e]), n?.setFieldValue(i, o);
     }
-    function w(e, t) {
-      const a = e === "end" ? n.value.length - 1 : e;
-      r.value?.scrollToRow(a, t);
+    function g(e, o) {
+      const t = e === "end" ? l.value.length - 1 : e;
+      m.value?.scrollToRow(t, o);
     }
-    function M(e, t) {
-      r.value?.scrollToColumn(e, t);
+    function M(e, o) {
+      m.value?.scrollToColumn(e, o);
+    }
+    function P(e, o) {
+      const t = [i, String(e), o].flat();
+      return n?.validateFields([t]);
+    }
+    function A(e) {
+      const t = r(l).map((s, p) => [i, String(fe(s, p, a.rowKey)), e].flat());
+      return n?.validateFields(t);
     }
     return B({
-      add: V,
-      addMultiple: N,
-      remove: j,
+      add: N,
+      addMultiple: _,
+      remove: K,
       removeByKey: k,
       getRowData: D,
       getRowsData: O,
       setRowData: z,
       clear: H,
-      setTableData: c,
-      scrollTo: w,
-      scrollToRow: w,
+      setTableData: w,
+      scrollTo: g,
+      scrollToRow: g,
       scrollToColumn: M,
-      table: r
-    }), (e, t) => ($(), U(q, null, [p(l(C).FormItem, {
+      validateCell: P,
+      validateColumn: A,
+      table: m
+    }), (e, o) => (J(), q(Q, null, [f(r(b).FormItem, {
       hidden: "",
       name: e.name,
       "initial-value": e.formItem?.initialValue,
-      transform: S
-    }, null, 8, ["name", "initial-value"]), p(l(C).FormItem, g({
+      transform: F
+    }, null, 8, ["name", "initial-value"]), f(r(b).FormItem, h({
       label: e.label
     }, e.formItem), {
-      default: h(() => [p(fe, g(l(oe)(o, ["name", "maxLength", "onChange", "defaultValue", "formItem"]), {
+      default: C(() => [f(ge, h(r(ae)(a, ["name", "maxLength", "onChange", "defaultValue", "formItem"]), {
         ref_key: "tableRef",
-        ref: r,
-        class: [l(x)(), l(I)],
+        ref: m,
+        class: [r(S)(), r(I)],
         size: "mini",
-        columns: l(F),
-        "data-source": n.value,
+        columns: r(V),
+        "data-source": l.value,
         "search-form": !1,
-        onUpdate: K
-      }), J({
+        onUpdate: L
+      }), X({
         _: 2
-      }, [Q(v, (a, m) => ({
-        name: m,
-        fn: h((A) => [X(e.$slots, m, Y(Z(A || {})))])
+      }, [Y(x, (t, s) => ({
+        name: s,
+        fn: C((p) => [Z(e.$slots, s, ee(oe(p || {})))])
       }))]), 1040, ["class", "columns", "data-source"])]),
       _: 3
     }, 16, ["label"])], 64));
   }
 });
 export {
-  Ne as default
+  Ke as default
 };

package/es/src/ag-grid/editable/interface.d.ts

@@ -87,7 +87,21 @@ export type EditableAgGridExpose<RecordType = any, ModelType = RecordType[]> = O
     validateFieldsReturnTransformed: EditableTableExpose<ModelType, RecordType>['validateFields'];
     table: AgGridExpose;
 };
-export type EditableAgGridFormItemExpose<RecordType = any, ModelType = RecordType[]> = Omit<EditableAgGridExpose<RecordType, ModelType>, 'resetFields' | 'validateFields' | 'validateFieldsReturnTransformed'>;
+export type EditableAgGridFormItemExpose<RecordType = any, ModelType = RecordType[]> = Omit<EditableAgGridExpose<RecordType, ModelType>, 'resetFields' | 'validateFields' | 'validateFieldsReturnTransformed'> & {
+    /**
+     * 校验单元格
+     * @param rowId 行唯一标识
+     * @param field 字段
+     * @returns
+     */
+    validateCell: (rowId: any, field: NamePath) => any;
+    /**
+     * 校验列
+     * @param colKey 列唯一标识
+     * @returns
+     */
+    validateColumn: (colKey: string | number) => any;
+};
 export type EditableAgGridFormItemProps<RecordType = any> = Omit<EditableAgGridProps<RecordType>, 'name' | 'value' | 'onUpdate:value'> & {
     label?: string;
     /**

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 & {
     /**