@aplus-frontend/ui 0.5.23 → 0.5.25

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

@@ -1,15 +1,15 @@
-import { defineComponent as O, useSlots as P, toRef as H, ref as g, unref as r, watch as W, nextTick as G, createBlock as K, openBlock as M, mergeProps as y, withCtx as C, createVNode as U, createSlots as $, renderList as q, renderSlot as J, normalizeProps as Q, guardReactiveProps as X } from "vue";
-import { ApForm as w } from "../../ap-form/index.mjs";
-import { isArray as Y, isNumber as d, cloneDeep as f, omit as Z } from "lodash-unified";
+import { defineComponent as P, useSlots as A, toRef as H, ref as h, unref as f, watch as W, nextTick as G, openBlock as K, createBlock as U, mergeProps as g, withCtx as y, createVNode as $, createSlots as q, renderList as J, renderSlot as Q, normalizeProps as X, guardReactiveProps as Y } from "vue";
+import { ApForm as C } from "../../ap-form/index.mjs";
+import { isArray as Z, isUndefined as I, isNumber as m, cloneDeep as M, omit as ee } from "lodash-unified";
 import "../../config-provider/index.mjs";
-import { isDef as m } from "../../utils/index.mjs";
-import { useGetEditableColumns as I } from "../hooks/use-editable-columns.mjs";
+import { isDef as w } from "../../utils/index.mjs";
+import { useGetEditableColumns as oe } from "../hooks/use-editable-columns.mjs";
 import "../index.vue2.mjs";
-import { useInjectForm as ee } from "../../ap-form/context.mjs";
-import { useNamespace as oe } from "../../config-provider/hooks/use-namespace.mjs";
-import { useGlobalConfig as ae } from "../../config-provider/hooks/use-global-config.mjs";
-import te from "../index.vue.mjs";
-const he = /* @__PURE__ */ O({
+import { useInjectForm as ae } from "../../ap-form/context.mjs";
+import { useNamespace as te } from "../../config-provider/hooks/use-namespace.mjs";
+import { useGlobalConfig as le } from "../../config-provider/hooks/use-global-config.mjs";
+import ne from "../index.vue.mjs";
+const ye = /* @__PURE__ */ P({
   name: "EditableGrid",
   __name: "form-item",
   props: {
@@ -154,105 +154,109 @@ const he = /* @__PURE__ */ O({
   setup(x, {
     expose: b
   }) {
-    const R = P(), t = x, {
+    const R = A(), l = x, {
       b: B
-    } = oe("editable-grid");
+    } = te("editable-grid");
     function S(e, o) {
-      return Y(o) ? o.reduce((n, l) => n == null ? void 0 : n[l], e) : e == null ? void 0 : e[o];
+      return Z(o) ? o.reduce((n, t) => n == null ? void 0 : n[t], e) : e == null ? void 0 : e[o];
     }
     const {
       internalInstance: a,
       model: F
-    } = ee(), i = H(t.name), u = g(S(r(F), i.value) || []), N = w.useWatch(i);
+    } = ae(), p = H(l.name), d = h(S(f(F), p.value) || []), N = C.useWatch(p);
     W(() => N.value, async (e) => {
       var o;
-      await G(), u.value = e, (o = t.onChange) == null || o.call(t, e);
+      await G(), d.value = e, (o = l.onChange) == null || o.call(l, e);
     }, {
       deep: !0
     });
-    const p = g(), v = ae("valueTypeMap"), D = I(t, v);
+    const c = h(), v = le("valueTypeMap"), D = oe(l, v);
     function L(e, o) {
       var s;
-      const n = ((s = r(u)) == null ? void 0 : s.length) || 0;
-      if (m(t.maxLength) && n >= t.maxLength)
+      const n = ((s = f(d)) == null ? void 0 : s.length) || 0;
+      if (w(l.maxLength) && n >= l.maxLength)
         return;
-      const l = [...r(u) || []];
-      m(o) ? l.splice(o, 0, {
+      const t = {
         ...e || {}
-      }) : l.push({
-        ...e || {}
-      }), a == null || a.setFieldValue(t.name, l);
+      };
+      a == null || a.setFieldValue(l.name, t, !0, (u, r) => {
+        console.log("run add", u[r]), u[r] || (u[r] = [t]), I(o) ? u[r].push(t) : u[r].splice(o, 0, t);
+      });
     }
     function V(e, o = "suffix") {
-      var h;
-      const n = ((h = r(u)) == null ? void 0 : h.length) || 0, l = d(e) ? e : e.length;
-      if (m(t.maxLength) && n + l > t.maxLength)
+      var u;
+      const n = ((u = f(d)) == null ? void 0 : u.length) || 0, t = m(e) ? e : e.length;
+      if (w(l.maxLength) && n + t > l.maxLength)
         return;
-      const s = [...r(u) || []], c = d(e) ? new Array(e).fill(0).map(() => ({})) : f(e);
-      o === "suffix" ? s.push(...c) : s.unshift(...c), a == null || a.setFieldValue(t.name, s);
+      const s = m(e) ? new Array(e).fill(0).map(() => ({})) : M(e);
+      a == null || a.setFieldValue(l.name, s, !0, (r, i) => {
+        r[i] || (r[i] = [...s]), o === "suffix" ? r[i].push(...s) : r[i].unshift(...s);
+      });
     }
-    function _(e) {
-      let o = f(r(u) || []);
-      const n = d(e) ? [e] : e;
-      o = o.filter((l, s) => !n.includes(s)), a == null || a.setFieldValue(t.name, o);
+    function T(e) {
+      const o = new Set(m(e) ? [e] : e);
+      a == null || a.setFieldValue(l.name, void 0, !0, (n, t) => {
+        n[t] = n[t].filter((s, u) => !o.has(u));
+      });
     }
-    function E() {
-      return r(u);
+    function _() {
+      return f(d);
     }
-    function T(e) {
+    function E(e) {
       var o;
-      return (o = r(u)) == null ? void 0 : o[e];
+      return (o = f(d)) == null ? void 0 : o[e];
     }
     function k(e, o, n = !0) {
-      const l = f(r(u));
-      l[e] && (l[e] = {
-        ...n ? l[e] : {},
-        ...o
-      }, a == null || a.setFieldValue(t.name, [...l]));
+      a == null || a.setFieldValue(l.name, null, !0, (t, s) => {
+        !t[s] || !t[s][e] || (t[s][e] = {
+          ...n ? t[s][e] : {},
+          ...o
+        });
+      });
     }
     function j(e) {
-      a == null || a.setFieldValue(t.name, e);
+      a == null || a.setFieldValue(l.name, e);
     }
     function z(e) {
       var n;
-      const o = e === "end" ? u.value.length - 1 : e;
-      (n = p.value) == null || n.scrollToRow(o);
+      const o = e === "end" ? d.value.length - 1 : e;
+      (n = c.value) == null || n.scrollToRow(o);
     }
-    function A() {
+    function O() {
       var e;
-      (e = a == null ? void 0 : a.setFieldValue) == null || e.call(a, t.name, []);
+      (e = a == null ? void 0 : a.setFieldValue) == null || e.call(a, l.name, []);
     }
     return b({
       add: L,
-      remove: _,
-      getRowData: T,
-      getRowsData: E,
+      remove: T,
+      getRowData: E,
+      getRowsData: _,
       setRowData: k,
       addMultiple: V,
       scrollTo: z,
       setTableData: j,
-      clear: A
-    }), (e, o) => (M(), K(r(w).FormItem, y(e.formItem, {
+      clear: O
+    }), (e, o) => (K(), U(f(C).FormItem, g(e.formItem, {
       name: e.name,
       label: e.label
     }), {
-      default: C(() => [U(te, y(r(Z)(t, ["name", "value", "onUpdate:value", "maxLength", "onChange", "defaultValue", "formItem"]), {
+      default: y(() => [$(ne, g(f(ee)(l, ["name", "value", "onUpdate:value", "maxLength", "onChange", "defaultValue", "formItem"]), {
         ref_key: "tableRef",
-        ref: p,
-        class: r(B)(),
-        columns: r(D),
-        "data-source": u.value,
+        ref: c,
+        class: f(B)(),
+        columns: f(D),
+        "data-source": d.value,
         "search-form": !1
-      }), $({
+      }), q({
         _: 2
-      }, [q(R, (n, l) => ({
-        name: l,
-        fn: C((s) => [J(e.$slots, l, Q(X(s || {})))])
+      }, [J(R, (n, t) => ({
+        name: t,
+        fn: y((s) => [Q(e.$slots, t, X(Y(s || {})))])
       }))]), 1040, ["class", "columns", "data-source"])]),
       _: 3
     }, 16, ["name", "label"]));
   }
 });
 export {
-  he as default
+  ye as default
 };

package/es/src/ap-grid/editable/index.vue.d.ts

@@ -1,6 +1,6 @@
 import { EditableGridExpose, EditableGridProps } from './interface';
 import { Recordable } from '../../type';
-import { VNodeProps, AllowedComponentProps, ComponentCustomProps, PublicProps, ShallowUnwrapRef, VNode } from 'vue';
+import { VNodeProps, AllowedComponentProps, ComponentCustomProps, PublicProps, ShallowUnwrapRef, VNode, RendererNode, RendererElement } from 'vue';
 declare const _default: <RecordType extends Recordable = any>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_expose?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
     props: __VLS_PrettifyLocal<Pick<Partial<{}> & Omit<{
         readonly "onUpdate:value"?: ((...args: any[]) => any) | undefined;
@@ -9,7 +9,9 @@ declare const _default: <RecordType extends Recordable = any>(__VLS_props: NonNu
     attrs: any;
     slots: Readonly<Record<string, any>> & Record<string, any>;
     emit: (event: "update:value", ...args: any[]) => void;
-}>) => VNode & {
+}>) => VNode<RendererNode, RendererElement, {
+    [key: string]: any;
+}> & {
     __ctx?: Awaited<typeof __VLS_setup>;
 };
 export default _default;

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

@@ -1,16 +1,16 @@
-import { defineComponent as M, useSlots as U, ref as w, watch as v, unref as n, createBlock as $, openBlock as q, withCtx as c, createVNode as R, mergeProps as J, createSlots as Q, renderList as X, renderSlot as Y, normalizeProps as Z, guardReactiveProps as ee } from "vue";
-import { ApForm as p } from "../../ap-form/index.mjs";
-import { isEqual as ae, isArray as b, isNumber as h, cloneDeep as y, omit as te } from "lodash-unified";
+import { defineComponent as U, useSlots as $, ref as w, watch as x, unref as u, openBlock as q, createBlock as J, withCtx as h, createVNode as v, mergeProps as Q, createSlots as X, renderList as Y, renderSlot as Z, normalizeProps as M, guardReactiveProps as ee } from "vue";
+import { ApForm as g } from "../../ap-form/index.mjs";
+import { isEqual as ae, isArray as R, isUndefined as te, isNumber as y, cloneDeep as le, omit as oe } from "lodash-unified";
 import "../../config-provider/index.mjs";
 import "../../hooks/index.mjs";
-import { isDef as g } from "../../utils/index.mjs";
-import { useGetEditableColumns as le } from "../hooks/use-editable-columns.mjs";
+import { isDef as b } from "../../utils/index.mjs";
+import { useGetEditableColumns as ne } from "../hooks/use-editable-columns.mjs";
 import "../index.vue2.mjs";
-import { useNamespace as oe } from "../../config-provider/hooks/use-namespace.mjs";
-import { useControllableValue as ne } from "../../hooks/useControllableValue.mjs";
-import { useGlobalConfig as re } from "../../config-provider/hooks/use-global-config.mjs";
-import se from "../index.vue.mjs";
-const we = /* @__PURE__ */ M({
+import { useNamespace as se } from "../../config-provider/hooks/use-namespace.mjs";
+import { useControllableValue as re } from "../../hooks/useControllableValue.mjs";
+import { useGlobalConfig as ue } from "../../config-provider/hooks/use-global-config.mjs";
+import ie from "../index.vue.mjs";
+const Re = /* @__PURE__ */ U({
   name: "EditableGrid",
   __name: "index",
   props: {
@@ -155,128 +155,133 @@ const we = /* @__PURE__ */ M({
     expose: F,
     emit: S
   }) {
-    const N = U(), t = B, {
+    const N = $(), t = B, {
       b: V
-    } = oe("editable-grid"), _ = S, C = w(), {
-      value: s,
+    } = se("editable-grid"), _ = S, C = w(), {
+      value: m,
       updateValue: L
-    } = ne(t, _), u = w(), D = re("valueTypeMap"), m = p.useWatch(t.name, u);
-    v(() => m.value, (e) => {
+    } = re(t, _), i = w(), E = ue("valueTypeMap"), c = g.useWatch(t.name, i);
+    x(() => c.value, (e) => {
       var a;
       L(e), (a = t.onChange) == null || a.call(t, e);
     }, {
-      deep: !0
-    }), v(s, (e) => {
+      deep: !0,
+      flush: "post"
+    }), x(m, (e) => {
       var a;
-      e !== n(m) && (ae(e, n(m)) || (a = u.value) == null || a.setFieldValue(t.name, e));
+      e !== u(c) && (ae(e, u(c)) || (a = i.value) == null || a.setFieldValue(t.name, e));
     }, {
       deep: !0
     });
-    const E = le(t, D);
-    function k() {
+    const D = ne(t, E);
+    function T() {
       var e;
-      (e = u.value) == null || e.resetFields();
+      (e = i.value) == null || e.resetFields();
     }
-    function A(e) {
-      return e ? (b(e) ? e : [e]).map((o) => b(o) ? [t.name, ...o] : [t.name, o]) : void 0;
+    function k(e) {
+      return e ? (R(e) ? e : [e]).map((l) => R(l) ? [t.name, ...l] : [t.name, l]) : void 0;
     }
-    async function T(e, a) {
-      var l;
-      const o = await ((l = u.value) == null ? void 0 : l.validateFields(A(e), a));
-      return o == null ? void 0 : o[t.name];
+    async function A(e, a) {
+      var o;
+      const l = await ((o = i.value) == null ? void 0 : o.validateFields(k(e), a));
+      return l == null ? void 0 : l[t.name];
     }
     function j(e, a) {
-      var r, d, i;
-      const o = ((r = n(s)) == null ? void 0 : r.length) || 0;
-      if (g(t.maxLength) && o >= t.maxLength)
+      var n, s, r;
+      const l = ((n = u(m)) == null ? void 0 : n.length) || 0;
+      if (b(t.maxLength) && l >= t.maxLength)
         return;
-      const l = [...n(s) || []];
-      g(a) ? l.splice(a, 0, {
+      const o = {
         ...e || {}
-      }) : l.push({
-        ...e || {}
-      }), (i = (d = u.value) == null ? void 0 : d.setFieldValue) == null || i.call(d, t.name, l);
+      };
+      (r = (s = i.value) == null ? void 0 : s.setFieldValue) == null || r.call(s, t.name, o, !0, (d, f) => {
+        console.log("run add", d[f]), d[f] || (d[f] = [o]), te(a) ? d[f].push(o) : d[f].splice(a, 0, o);
+      });
     }
     function z(e, a = "suffix") {
-      var i, f, x;
-      const o = ((i = n(s)) == null ? void 0 : i.length) || 0, l = h(e) ? e : e.length;
-      if (g(t.maxLength) && o + l > t.maxLength)
+      var s, r, d;
+      const l = ((s = u(m)) == null ? void 0 : s.length) || 0, o = y(e) ? e : e.length;
+      if (b(t.maxLength) && l + o > t.maxLength)
         return;
-      const r = [...n(s) || []], d = h(e) ? new Array(e).fill(0).map(() => ({})) : y(e);
-      a === "suffix" ? r.push(...d) : r.unshift(...d), (x = (f = u.value) == null ? void 0 : f.setFieldValue) == null || x.call(f, t.name, r);
+      const n = y(e) ? new Array(e).fill(0).map(() => ({})) : le(e);
+      (d = (r = i.value) == null ? void 0 : r.setFieldValue) == null || d.call(r, t.name, n, !0, (f, p) => {
+        f[p] || (f[p] = [...n]), a === "suffix" ? f[p].push(...n) : f[p].unshift(...n);
+      });
     }
-    function O(e) {
-      var l, r;
-      let a = y(n(s) || []);
-      const o = h(e) ? [e] : e;
-      a = a.filter((d, i) => !o.includes(i)), (r = (l = u.value) == null ? void 0 : l.setFieldValue) == null || r.call(l, t.name, a);
+    function I(e) {
+      var l, o;
+      const a = new Set(y(e) ? [e] : e);
+      (o = (l = i.value) == null ? void 0 : l.setFieldValue) == null || o.call(l, t.name, void 0, !0, (n, s) => {
+        n[s] = n[s].filter((r, d) => !a.has(d));
+      });
     }
-    function P() {
-      return n(s);
+    function O() {
+      return u(m);
     }
-    function H(e) {
+    function P(e) {
       var a;
-      (a = u.value) == null || a.setFieldValue(t.name, e);
+      (a = i.value) == null || a.setFieldValue(t.name, e);
     }
-    function I(e) {
+    function H(e) {
       var a;
-      return (a = n(s)) == null ? void 0 : a[e];
+      return (a = u(m)) == null ? void 0 : a[e];
     }
-    function W(e, a, o = !0) {
-      var r, d;
-      const l = y(n(s));
-      l[e] && (l[e] = {
-        ...o ? l[e] : {},
-        ...a
-      }, (d = (r = u.value) == null ? void 0 : r.setFieldValue) == null || d.call(r, t.name, [...l]));
+    function W(e, a, l = !0) {
+      var o, n;
+      (n = (o = i.value) == null ? void 0 : o.setFieldValue) == null || n.call(o, t.name, null, !0, (s, r) => {
+        !s[r] || !s[r][e] || (s[r][e] = {
+          ...l ? s[r][e] : {},
+          ...a
+        });
+      });
     }
     function G(e) {
-      var o;
-      const a = e === "end" ? s.value.length - 1 : e;
-      (o = C.value) == null || o.scrollToRow(a);
+      var l;
+      const a = e === "end" ? m.value.length - 1 : e;
+      (l = C.value) == null || l.scrollToRow(a);
     }
     function K() {
       var e, a;
-      (a = (e = u.value) == null ? void 0 : e.setFieldValue) == null || a.call(e, t.name, []);
+      (a = (e = i.value) == null ? void 0 : e.setFieldValue) == null || a.call(e, t.name, []);
     }
     return F({
-      resetFields: k,
-      validateFields: T,
+      resetFields: T,
+      validateFields: A,
       add: j,
-      remove: O,
-      getRowData: I,
-      getRowsData: P,
+      remove: I,
+      getRowData: H,
+      getRowsData: O,
       setRowData: W,
       addMultiple: z,
       scrollTo: G,
       clear: K,
-      setTableData: H
-    }), (e, a) => (q(), $(n(p), {
+      setTableData: P
+    }), (e, a) => (q(), J(u(g), {
       ref_key: "formRef",
-      ref: u,
+      ref: i,
       "initial-values": {
-        [t.name]: n(s)
+        [t.name]: u(m)
       },
       style: {
         height: "100%"
       }
     }, {
-      default: c(() => [R(n(p).FormItem, {
+      default: h(() => [v(u(g).FormItem, {
         name: e.name,
         "no-style": ""
       }, {
-        default: c(() => [R(se, J(n(te)(t, ["name", "value", "onUpdate:value", "maxLength", "onChange", "defaultValue"]), {
+        default: h(() => [v(ie, Q(u(oe)(t, ["name", "value", "onUpdate:value", "maxLength", "onChange", "defaultValue"]), {
           ref_key: "tableRef",
           ref: C,
-          class: n(V)(),
-          columns: n(E),
-          "data-source": n(s),
+          class: u(V)(),
+          columns: u(D),
+          "data-source": u(m),
           "search-form": !1
-        }), Q({
+        }), X({
           _: 2
-        }, [X(N, (o, l) => ({
-          name: l,
-          fn: c((r) => [Y(e.$slots, l, Z(ee(r || {})))])
+        }, [Y(N, (l, o) => ({
+          name: o,
+          fn: h((n) => [Z(e.$slots, o, M(ee(n || {})))])
         }))]), 1040, ["class", "columns", "data-source"])]),
         _: 3
       }, 8, ["name"])]),
@@ -285,5 +290,5 @@ const we = /* @__PURE__ */ M({
   }
 });
 export {
-  we as default
+  Re as default
 };

package/es/src/ap-grid/hooks/use-inner-params.mjs

@@ -1,4 +1,4 @@
-import { DEFAULT_PAGE_SIZE as g, DEFAULT_CURRENT as E } from "../../ap-table/hooks/use-table-paging-ng.mjs";
+import { DEFAULT_CURRENT as g, DEFAULT_PAGE_SIZE as E } from "../../ap-table/hooks/use-table-paging-ng.mjs";
 const a = {
   asc: "ascend",
   desc: "descend"
@@ -6,8 +6,8 @@ const a = {
   const t = {};
   let c = {};
   const s = {
-    current: E,
-    pageSize: g
+    current: g,
+    pageSize: E
   };
   function i(n) {
     o == null || o(s, c, t, {

package/es/src/ap-grid/index.vue.d.ts

@@ -1,6 +1,6 @@
 import { VxeTableSlots } from 'vxe-table';
 import { ApGridColumnType, ApGridExpose, ApGridProps } from './interface';
-import { VNodeProps, AllowedComponentProps, ComponentCustomProps, PublicProps, ShallowUnwrapRef, VNode } from 'vue';
+import { VNodeProps, AllowedComponentProps, ComponentCustomProps, PublicProps, ShallowUnwrapRef, VNode, RendererNode, RendererElement } from 'vue';
 declare const _default: <RecordType>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_expose?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
     props: __VLS_PrettifyLocal<Pick<Partial<{}> & Omit<{} & VNodeProps & AllowedComponentProps & ComponentCustomProps, never>, never> & ApGridProps<RecordType> & Partial<{}>> & PublicProps;
     expose(exposed: ShallowUnwrapRef<ApGridExpose>): void;
@@ -35,7 +35,9 @@ declare const _default: <RecordType>(__VLS_props: NonNullable<Awaited<typeof __V
         }) => any;
     };
     emit: {};
-}>) => VNode & {
+}>) => VNode<RendererNode, RendererElement, {
+    [key: string]: any;
+}> & {
     __ctx?: Awaited<typeof __VLS_setup>;
 };
 export default _default;