@aplus-frontend/ui 0.5.35 → 0.5.37

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

@@ -1,5 +1,5 @@
-import { defineComponent as P, useSlots as A, toRef as H, ref as h, unref as f, watch as W, nextTick as G, createBlock as K, openBlock as U, mergeProps as C, withCtx as g, createVNode as $, createSlots as q, renderList as J, renderSlot as Q, normalizeProps as X, guardReactiveProps as Y } from "vue";
-import { ApForm as y } from "../../ap-form/index.mjs";
+import { defineComponent as P, useSlots as A, toRef as H, ref as h, unref as u, watch as K, nextTick as W, createBlock as G, openBlock 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 w } from "../../utils/index.mjs";
@@ -9,7 +9,7 @@ import { useInjectForm as te } from "../../ap-form/context.mjs";
 import { useNamespace as ae } 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 ge = /* @__PURE__ */ P({
+const ye = /* @__PURE__ */ P({
   name: "EditableGrid",
   __name: "form-item",
   props: {
@@ -154,10 +154,10 @@ const ge = /* @__PURE__ */ P({
       default: () => ({})
     }
   },
-  setup(x, {
-    expose: b
+  setup(b, {
+    expose: x
   }) {
-    const R = A(), l = x, {
+    const R = A(), l = b, {
       b: B
     } = ae("editable-grid");
     function S(e, o) {
@@ -166,108 +166,114 @@ const ge = /* @__PURE__ */ P({
     const {
       internalInstance: t,
       model: F
-    } = te(), p = H(l.name), d = h(S(f(F), p.value) || []), N = y.useWatch(p);
-    W(() => N.value, async (e) => {
+    } = te(), p = H(l.name), d = h(S(u(F), p.value) || []), N = C.useWatch(p);
+    K(() => N.value, async (e) => {
       var o;
-      await G(), d.value = e, (o = l.onChange) == null || o.call(l, e);
+      await W(), d.value = e, (o = l.onChange) == null || o.call(l, e);
     }, {
       deep: !0
     });
-    const c = h(), v = le("valueTypeMap"), D = oe(l, v);
-    function L(e, o) {
-      var r;
-      const n = ((r = f(d)) == null ? void 0 : r.length) || 0;
+    const c = h(), v = le("valueTypeMap"), k = oe(l, v);
+    function D(e, o) {
+      var s;
+      const n = ((s = u(d)) == null ? void 0 : s.length) || 0;
       if (w(l.maxLength) && n >= l.maxLength)
         return;
       const a = {
         ...e || {}
       };
-      t == null || t.setFieldValue(l.name, a, !0, (u, s) => {
-        if (!u[s]) {
-          u[s] = [a];
+      t == null || t.setFieldValue(l.name, a, !0, (r, f) => {
+        if (!r[f]) {
+          r[f] = [a];
           return;
         }
-        I(o) ? u[s].push(a) : u[s].splice(o, 0, a);
+        I(o) ? r[f].push(a) : r[f].splice(o, 0, a);
       });
     }
-    function V(e, o = "suffix") {
-      var u;
-      const n = ((u = f(d)) == null ? void 0 : u.length) || 0, a = m(e) ? e : e.length;
+    function L(e, o = "suffix") {
+      var r;
+      const n = ((r = u(d)) == null ? void 0 : r.length) || 0, a = m(e) ? e : e.length;
       if (w(l.maxLength) && n + a > l.maxLength)
         return;
-      const r = m(e) ? new Array(e).fill(0).map(() => ({})) : M(e);
-      t == null || t.setFieldValue(l.name, r, !0, (s, i) => {
-        if (!s[i]) {
-          s[i] = [...r];
+      const s = m(e) ? new Array(e).fill(0).map(() => ({})) : M(e);
+      t == null || t.setFieldValue(l.name, s, !0, (f, i) => {
+        if (!f[i]) {
+          f[i] = [...s];
           return;
         }
-        o === "suffix" ? s[i].push(...r) : s[i].unshift(...r);
+        o === "suffix" ? f[i].push(...s) : f[i].unshift(...s);
       });
     }
-    function T(e) {
+    function V(e) {
       const o = new Set(m(e) ? [e] : e);
       t == null || t.setFieldValue(l.name, void 0, !0, (n, a) => {
-        n[a] = n[a].filter((r, u) => !o.has(u));
+        n[a] = n[a].filter((s, r) => !o.has(r));
       });
     }
-    function _() {
-      return f(d);
+    function T() {
+      return u(d);
     }
-    function E(e) {
+    function _(e) {
       var o;
-      return (o = f(d)) == null ? void 0 : o[e];
+      return (o = u(d)) == null ? void 0 : o[e];
     }
-    function k(e, o, n = !0) {
-      t == null || t.setFieldValue(l.name, void 0, !0, (a, r) => {
-        !a[r] || !a[r][e] || (a[r][e] = {
-          ...n ? a[r][e] : {},
-          ...o
-        });
+    function j(e, o, n = !0) {
+      t == null || t.setFieldValue(l.name, void 0, !0, (a, s) => {
+        if (!(!a[s] || !a[s][e])) {
+          if (!n) {
+            const r = Object.keys(a[s][e]);
+            for (const f of r)
+              f !== l.rowKey && delete a[s][e][f];
+          }
+          Object.assign(a[s][e], {
+            ...o
+          });
+        }
       });
     }
-    function j(e) {
+    function E(e) {
       t == null || t.setFieldValue(l.name, e);
     }
-    function z(e) {
+    function O(e) {
       var n;
       const o = e === "end" ? d.value.length - 1 : e;
       (n = c.value) == null || n.scrollToRow(o);
     }
-    function O() {
+    function z() {
       var e;
       (e = t == null ? void 0 : t.setFieldValue) == null || e.call(t, l.name, []);
     }
-    return b({
-      add: L,
-      remove: T,
-      getRowData: E,
-      getRowsData: _,
-      setRowData: k,
-      addMultiple: V,
-      scrollTo: z,
-      setTableData: j,
-      clear: O
-    }), (e, o) => (U(), K(f(y).FormItem, C(e.formItem, {
+    return x({
+      add: D,
+      remove: V,
+      getRowData: _,
+      getRowsData: T,
+      setRowData: j,
+      addMultiple: L,
+      scrollTo: O,
+      setTableData: E,
+      clear: z
+    }), (e, o) => (U(), G(u(C).FormItem, g(e.formItem, {
       name: e.name,
       label: e.label
     }), {
-      default: g(() => [$(ne, C(f(ee)(l, ["name", "value", "onUpdate:value", "maxLength", "onChange", "defaultValue", "formItem"]), {
+      default: y(() => [$(ne, g(u(ee)(l, ["name", "value", "onUpdate:value", "maxLength", "onChange", "defaultValue", "formItem"]), {
         ref_key: "tableRef",
         ref: c,
-        class: f(B)(),
-        columns: f(D),
+        class: u(B)(),
+        columns: u(k),
         "data-source": d.value,
         "search-form": !1
       }), q({
         _: 2
       }, [J(R, (n, a) => ({
         name: a,
-        fn: g((r) => [Q(e.$slots, a, X(Y(r || {})))])
+        fn: y((s) => [Q(e.$slots, a, X(Y(s || {})))])
       }))]), 1040, ["class", "columns", "data-source"])]),
       _: 3
     }, 16, ["name", "label"]));
   }
 });
 export {
-  ge as default
+  ye as default
 };

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

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

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

@@ -43,6 +43,10 @@ export type EditableGridColumnType<RecordType = any, ExtraValueType = 'text', Va
         editable?: boolean;
         originalNode?: VNode;
     }) => any;
+    /**
+     * 是否渲染必填标记（只渲染标记不生成校验规则）
+     */
+    markRequired?: boolean;
 } : never;
 export type EditableGridProps<RecordType = any> = Omit<ApGridProps<RecordType>, 'columns' | 'dataSource' | 'onChange' | 'card' | 'request' | 'params' | 'defaultData' | 'searchForm' | 'beforeSearchSubmit' | 'manual'> & {
     /**