@aplus-frontend/ui 7.20.2 → 7.20.3

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

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

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

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

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

@@ -111,6 +111,13 @@ export type EditableAgGridExpose<RecordType = any, ModelType = RecordType[]> = O
      * @returns
      */
     refreshColumns: (columnKey: string | string[], force?: boolean) => void;
+    /**
+     * 添加一条数据（通过行key）
+     * @param defaultValue
+     * @param key
+     * @returns
+     */
+    addByKey: (defaultValue?: Partial<RecordType> | undefined, key?: number) => void;
 };
 export type EditableAgGridFormItemExpose<RecordType = any, ModelType = RecordType[]> = Omit<EditableAgGridExpose<RecordType, ModelType>, 'resetFields' | 'validateFields' | 'validateFieldsReturnTransformed'> & {
     /**

package/es/src/ag-grid/hooks/use-columns.mjs

@@ -1,11 +1,11 @@
-import { ref as s, computed as c, watch as y } from "vue";
+import { ref as c, computed as s, watch as y } from "vue";
 import { getStringKey as a, runPipelineHooks as C } from "../utils.mjs";
-const w = (o) => {
-  const r = s([]), u = s([]);
-  function l(n = []) {
+const w = (r) => {
+  const o = c([]), l = c([]);
+  function u(n = []) {
     return n.filter((e) => !e.hideInTable).map((e) => {
       if (e.children?.length) {
-        const t = l(e.children);
+        const t = u(e.children);
         return t?.length ? {
           ...e,
           children: t
@@ -14,25 +14,25 @@ const w = (o) => {
       return e;
     }).filter(Boolean);
   }
-  function f(n) {
-    return r.value.find((e) => a(e.key) === n);
+  function m(n) {
+    return o.value.find((e) => a(e.key) === n);
   }
-  const m = c(
-    () => r.value.map((n) => a(n.key)).filter(Boolean)
+  const f = s(
+    () => o.value.map((n) => a(n.key)).filter(Boolean)
   );
   async function d(n, e) {
     return await C(
-      o.plugins,
+      r.plugins,
       n,
       (t) => t.beforeColumnsChange?.bind(t),
       e
     );
   }
   y(
-    () => o.columns,
+    () => r.columns,
     async () => {
-      const n = l(o.columns), e = await d(n, r.value);
-      r.value = e, u.value = e, o.onShownColumnsChange?.(e);
+      const n = u(r.columns), e = await d(n, o.value);
+      o.value = e, l.value = e, r.onShownColumnsChange?.(e);
     },
     {
       deep: !0,
@@ -54,12 +54,12 @@ const w = (o) => {
         };
       }
   }
-  const h = c(() => i(r.value));
+  const h = s(() => i(u(r.columns)));
   return {
-    columns: r,
-    shownColumns: u,
-    columnKeys: m,
-    getTargetColumnByKey: f,
+    columns: o,
+    shownColumns: l,
+    columnKeys: f,
+    getTargetColumnByKey: m,
     defaultSortOrder: h
   };
 };

package/es/src/ag-grid/hooks/use-editable-api.d.ts

@@ -4,6 +4,7 @@ import { ApFormInternalInstance, ApFormExpose } from '../../ap-form';
 import { EditableAgGridProps } from '../editable/interface';
 export declare const useEditableApi: <RecordType>(props: EditableAgGridProps<RecordType>, formApi: Ref<ApFormExpose | undefined> | ApFormInternalInstance | undefined, tableData: Ref<RecordType[]>, updateTableData?: (newData: RecordType[]) => void) => {
     add: (defaultValue?: Partial<RecordType>, insertIndex?: number) => void;
+    addByKey: (defaultValue?: Partial<RecordType>, key?: number) => void;
     addMultiple: (list: number | Partial<RecordType>[], insetIn?: "prefix" | "suffix") => void;
     remove: (data: RecordType | RecordType[]) => void;
     removeByKey: (key: Key | Key[]) => void;