@aplus-frontend/ui 7.10.5 → 7.11.0

package/es/src/ag-grid/editable/index.vue.mjs

@@ -1,18 +1,18 @@
-import { defineComponent as $, useSlots as q, ref as b, watch as J, unref as n, createBlock as Q, openBlock as X, withCtx as c, createVNode as R, mergeProps as Y, createSlots as Z, renderList as ee, renderSlot as oe, normalizeProps as ae, guardReactiveProps as te } from "vue";
-import { isEqual as ne, isArray as v, omit as le } from "lodash-unified";
-import { ApForm as f } from "../../ap-form/index.mjs";
+import { defineComponent as M, useSlots as $, ref as v, watch as q, unref as l, createBlock as J, openBlock as Q, withCtx as m, createVNode as R, mergeProps as X, createSlots as Y, renderList as Z, renderSlot as ee, normalizeProps as oe, guardReactiveProps as ae } from "vue";
+import { isEqual as te, isArray as b, omit as ne } from "lodash-unified";
+import { ApForm as c } from "../../ap-form/index.mjs";
 import "../../config-provider/index.mjs";
 import "../../hooks/index.mjs";
-import { useEditableApi as re } from "../hooks/use-editable-api.mjs";
-import { useGetEditableColumns as se } from "../hooks/use-editable-columns.mjs";
+import { useEditableApi as le } from "../hooks/use-editable-api.mjs";
+import { useGetEditableColumns as re } from "../hooks/use-editable-columns.mjs";
 import "../index.vue2.mjs";
-import ie from "../style/editable.mjs";
-import { arrayToObject as y, getRowKey as de } from "./utils.mjs";
-import { useNamespace as ue } from "../../config-provider/hooks/use-namespace.mjs";
-import { useControllableValue as pe } from "../../hooks/useControllableValue.mjs";
-import { useGlobalConfig as me } from "../../config-provider/hooks/use-global-config.mjs";
-import ce from "../index.vue.mjs";
-const Fe = /* @__PURE__ */ $({
+import se from "../style/editable.mjs";
+import { arrayToObject as f, getRowKey as ie } from "./utils.mjs";
+import { useNamespace as de } from "../../config-provider/hooks/use-namespace.mjs";
+import { useControllableValue as ue } from "../../hooks/useControllableValue.mjs";
+import { useGlobalConfig as pe } from "../../config-provider/hooks/use-global-config.mjs";
+import me from "../index.vue.mjs";
+const Fe = /* @__PURE__ */ M({
   name: "EditableGrid",
   __name: "index",
   props: {
@@ -135,109 +135,117 @@ const Fe = /* @__PURE__ */ $({
     expose: x,
     emit: B
   }) {
-    const S = q(), o = C, {
+    const S = $(), a = C, {
       b: T
-    } = ue("editable-aggrid"), _ = ie("editable-aggrid"), F = B, d = b(), {
-      value: r,
-      updateValue: w
-    } = pe(o, F), l = b(), E = f.useWatch(o.name, l);
-    J(r, (e) => {
-      const a = y(e, o.rowKey);
-      ne(a, n(E)) || l.value?.setFieldValue(o.name, a);
+    } = de("editable-aggrid"), F = se("editable-aggrid"), _ = B, i = v(), {
+      value: s,
+      updateValue: y
+    } = ue(a, _), r = v(), E = c.useWatch(a.name, r);
+    q(s, (e) => {
+      const o = f(e, a.rowKey);
+      te(o, l(E)) || r.value?.setFieldValue(a.name, o);
     }, {
       deep: !0
     });
-    const K = me("valueTypeMap"), k = se(o, K), {
-      add: N,
-      addMultiple: j,
-      remove: A,
-      removeByKey: D,
-      getRowData: I,
-      getRowsData: V,
+    const K = pe("valueTypeMap"), k = re(a, K), {
+      add: A,
+      addMultiple: N,
+      remove: j,
+      removeByKey: I,
+      getRowData: V,
+      getRowsData: D,
       setRowData: H,
       clear: O,
-      refreshRowIds: p
-    } = re(o, l, r, w);
+      refreshRowIds: d
+    } = le(a, r, s, y);
     function z() {
-      const e = d.value?._internalGridApi;
-      if (!p.value?.length || !e)
+      const e = i.value?._internalGridApi;
+      if (!d.value?.length || !e)
         return;
-      const a = p.value.map((t) => e.getRowNode(t)).filter((t) => !!t);
+      const o = d.value.map((t) => e.getRowNode(t)).filter((t) => !!t);
       e.refreshCells({
-        rowNodes: a,
+        rowNodes: o,
         force: !0
-      }), p.value = [];
+      }), d.value = [];
     }
     function L() {
-      l.value?.resetFields();
+      r.value?.resetFields();
     }
-    function P(e) {
-      return e ? (v(e) ? e : [e]).map((t) => v(t) ? [o.name, ...t] : [o.name, t]) : void 0;
+    function w(e) {
+      return e ? (b(e) ? e : [e]).map((t) => b(t) ? [a.name, ...t] : [a.name, t]) : void 0;
     }
-    async function G(e, a) {
-      const s = (await l.value?.validateFields(P(e), a))?.[o.name];
+    function g(e) {
       try {
-        const u = Object.keys(s), h = r.value.map((i) => de(i, void 0, o.rowKey));
-        return u.sort((i, M) => h.findIndex((m) => String(m) === i) - h.findIndex((m) => String(m) === M)), u.map((i) => s[i]);
+        const o = Object.keys(e), t = s.value.map((n) => ie(n, void 0, a.rowKey));
+        return o.sort((n, u) => t.findIndex((p) => String(p) === n) - t.findIndex((p) => String(p) === u)), o.map((n) => e[n]);
       } catch {
-        return s;
+        return e;
       }
     }
+    async function P(e, o) {
+      const n = (await r.value?.validateFields(w(e), o))?.[a.name];
+      return g(n);
+    }
+    async function G(e, o) {
+      const n = (await r.value?.validateFieldsReturnTransformed(w(e), o))?.[a.name];
+      return g(n);
+    }
     function U(e) {
-      w(e);
-      const a = y(e, o.rowKey);
-      l.value?.setFieldValue(o.name, a);
+      y(e);
+      const o = f(e, a.rowKey);
+      r.value?.setFieldValue(a.name, o);
     }
-    function g(e, a) {
-      const t = e === "end" ? r.value.length - 1 : e;
-      d.value?.scrollToRow(t, a);
+    function h(e, o) {
+      const t = e === "end" ? s.value.length - 1 : e;
+      i.value?.scrollToRow(t, o);
     }
-    function W(e, a) {
-      d.value?.scrollToColumn(e, a);
+    function W(e, o) {
+      i.value?.scrollToColumn(e, o);
     }
     return x({
       resetFields: L,
-      validateFields: G,
-      add: N,
-      addMultiple: j,
-      remove: A,
-      removeByKey: D,
-      getRowData: I,
-      getRowsData: V,
+      validateFields: P,
+      validateFieldsReturnTransformed: G,
+      add: A,
+      addMultiple: N,
+      remove: j,
+      removeByKey: I,
+      getRowData: V,
+      getRowsData: D,
       setRowData: H,
       clear: O,
       setTableData: U,
-      scrollTo: g,
-      scrollToRow: g,
+      scrollTo: h,
+      scrollToRow: h,
       scrollToColumn: W
-    }), (e, a) => (X(), Q(n(f), {
+    }), (e, o) => (Q(), J(l(c), {
       ref_key: "formRef",
-      ref: l,
+      ref: r,
       "initial-values": {
-        [o.name]: n(y)(n(r), o.rowKey)
+        [a.name]: l(f)(l(s), a.rowKey)
       },
       style: {
         height: "100%"
       }
     }, {
-      default: c(() => [R(n(f).FormItem, {
+      default: m(() => [R(l(c).FormItem, {
         name: e.name,
         "no-style": ""
       }, {
-        default: c(() => [R(ce, Y(n(le)(o, ["name", "value", "onUpdate:value", "maxLength", "onChange", "defaultValue"]), {
+        default: m(() => [R(me, X(l(ne)(a, ["name", "value", "onUpdate:value", "maxLength", "onChange", "defaultValue"]), {
           ref_key: "tableRef",
-          ref: d,
-          class: [n(T)(), n(_)],
+          ref: i,
+          class: [l(T)(), l(F)],
           size: "mini",
-          columns: n(k),
-          "data-source": n(r),
+          columns: l(k),
+          "data-source": l(s),
           "search-form": !1,
           onUpdate: z
-        }), Z({
+        }), Y({
           _: 2
-        }, [ee(S, (t, s) => ({
-          name: s,
-          fn: c((u) => [oe(e.$slots, s, ae(te(u || {})))])
+        }, [Z(S, (t, n) => ({
+          name: n,
+          fn: m((u) => [ee(e.$slots, n, oe(ae(u || {})))])
         }))]), 1040, ["class", "columns", "data-source"])]),
         _: 3
       }, 8, ["name"])]),

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

@@ -84,8 +84,9 @@ export type EditableAgGridExpose<RecordType = any, ModelType = RecordType[]> = O
     scrollToRow: (index: number | 'end', position?: 'top' | 'bottom' | 'middle') => void;
     scrollToColumn: (key: string, position?: 'auto' | 'start' | 'middle' | 'end') => void;
     remove: (data: RecordType | RecordType[]) => void;
+    validateFieldsReturnTransformed: EditableTableExpose<ModelType, RecordType>['validateFields'];
 };
-export type EditableAgGridFormItemExpose<RecordType = any, ModelType = RecordType[]> = Omit<EditableAgGridExpose<RecordType, ModelType>, 'resetFields' | 'validateFields'>;
+export type EditableAgGridFormItemExpose<RecordType = any, ModelType = RecordType[]> = Omit<EditableAgGridExpose<RecordType, ModelType>, 'resetFields' | 'validateFields' | 'validateFieldsReturnTransformed'>;
 export type EditableAgGridFormItemProps<RecordType = any> = Omit<EditableAgGridProps<RecordType>, 'name' | 'value' | 'onUpdate:value'> & {
     label?: string;
     /**

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

@@ -1,5 +1,12 @@
+import { ApFormItemTransformType } from '../../ap-form';
 import { Recordable } from '../../type';
 import { AgGridProps } from '../interface';
+import { EditableAgGridColumnType } from './interface';
 export declare function getRowKey(record: any, index: number | undefined, rowKey: AgGridProps['rowKey']): any;
 export declare function arrayToObject(array: any[], rowKey: AgGridProps['rowKey']): Recordable;
 export declare function updateArrItem(arr: any[], rowKey: AgGridProps['rowKey'], obj: Recordable): any[];
+interface TransformFnMapType {
+    [key: string]: ApFormItemTransformType | TransformFnMapType;
+}
+export declare function getColumnTransformOptions(columns: EditableAgGridColumnType[]): TransformFnMapType;
+export {};

package/es/src/ag-grid/editable/utils.mjs

@@ -1,23 +1,38 @@
-import { isString as a } from "lodash-unified";
-function c(r, n, t) {
-  if (t)
-    return a(t) ? r[t] : t(r, n);
+import { isString as u } from "lodash-unified";
+import s from "../../ap-form/utils/set.mjs";
+function i(o, t, r) {
+  if (r)
+    return u(r) ? o[r] : r(o, t);
 }
-function s(r, n) {
-  const t = {};
-  return r.forEach((e, u) => {
-    const o = c(e, u, n);
-    t[o] = e;
-  }), t;
+function m(o, t) {
+  const r = {};
+  return o.forEach((e, n) => {
+    const f = i(e, n, t);
+    r[f] = e;
+  }), r;
 }
-function g(r, n, t) {
-  return r.map((e, u) => {
-    const o = c(e, u, n);
-    return t[o] ?? e;
+function p(o, t, r) {
+  return o.map((e, n) => {
+    const f = i(e, n, t);
+    return r[f] ?? e;
   });
 }
+function d(o) {
+  let t = {};
+  function r(e) {
+    for (const n of e)
+      n.children?.length ? r(n.children) : n.fieldProps?.transform && (t = s(
+        t,
+        [n.dataIndex].flat(1),
+        n.fieldProps.transform,
+        !0
+      ));
+  }
+  return r(o), t;
+}
 export {
-  s as arrayToObject,
-  c as getRowKey,
-  g as updateArrItem
+  m as arrayToObject,
+  d as getColumnTransformOptions,
+  i as getRowKey,
+  p as updateArrItem
 };