@aplus-frontend/ui 0.6.0-beta.0 → 0.6.0-beta.10

package/es/src/ap-form/search-form/index.vue.mjs

@@ -1,25 +1,25 @@
-import { isVNode as ee, defineComponent as te, useSlots as oe, ref as ae, shallowRef as j, computed as _, unref as n, watch as L, createVNode as t, Fragment as w, createBlock as x, openBlock as d, mergeProps as ne, withCtx as F, resolveDynamicComponent as A, createElementBlock as le, renderList as re } from "vue";
-import { Col as R, Flex as B, Button as U, Row as se } from "@aplus-frontend/antdv";
+import { isVNode as oe, defineComponent as ae, useSlots as ne, ref as L, shallowRef as U, computed as _, unref as n, watch as V, createVNode as t, Fragment as w, createBlock as x, openBlock as d, mergeProps as le, withCtx as A, resolveDynamicComponent as B, createElementBlock as re, renderList as se } from "vue";
+import { Col as R, Flex as N, Button as M, Row as ie } from "@aplus-frontend/antdv";
 import "../ap-form.vue.mjs";
 import "../item/index.vue2.mjs";
-import { genRealChildren as V } from "../item-group/helper.mjs";
+import { genRealChildren as W } from "../item-group/helper.mjs";
 import "../../config-provider/index.mjs";
-import { isArray as ie, isBoolean as ce, omit as ue } from "lodash-unified";
-import { isDef as M } from "../../utils/index.mjs";
-import { execFunc as W, diffFormItem as pe } from "./utils.mjs";
+import { isArray as ue, isBoolean as ce, omit as pe } from "lodash-unified";
+import { isDef as D } from "../../utils/index.mjs";
+import { execFunc as q, diffFormItem as de } from "./utils.mjs";
 import "./components/popover-filter.vue.mjs";
-import { useCountPerRow as de } from "./hooks/use-count-per-row.mjs";
+import { useCountPerRow as fe } from "./hooks/use-count-per-row.mjs";
 import "./components/popover-sorter/index.vue.mjs";
-import { useNamespace as fe } from "../../config-provider/hooks/use-namespace.mjs";
-import { useLocale as me } from "../../config-provider/hooks/use-locale.mjs";
-import D from "../item/index.vue.mjs";
-import he from "./components/popover-filter.vue2.mjs";
-import xe from "./components/popover-sorter/index.vue2.mjs";
-import ye from "../ap-form.vue2.mjs";
-function ge(f) {
-  return typeof f == "function" || Object.prototype.toString.call(f) === "[object Object]" && !ee(f);
+import { useNamespace as me } from "../../config-provider/hooks/use-namespace.mjs";
+import { useLocale as he } from "../../config-provider/hooks/use-locale.mjs";
+import z from "../item/index.vue.mjs";
+import xe from "./components/popover-filter.vue2.mjs";
+import ye from "./components/popover-sorter/index.vue2.mjs";
+import ge from "../ap-form.vue2.mjs";
+function ve(f) {
+  return typeof f == "function" || Object.prototype.toString.call(f) === "[object Object]" && !oe(f);
 }
-const s = 24, Le = /* @__PURE__ */ te({
+const s = 24, Ue = /* @__PURE__ */ ae({
   name: "ApFormSearchForm",
   __name: "index",
   props: {
@@ -111,138 +111,140 @@ const s = 24, Le = /* @__PURE__ */ te({
     }
   },
   setup(f, {
-    expose: q
+    expose: H
   }) {
     var P;
-    const i = oe(), o = f, {
+    const i = ne(), o = f, {
       b: m
-    } = fe("ap-form-search-form"), {
-      t: N
-    } = me(), z = de(o), y = ae();
-    function k() {
-      var e, a;
-      (a = (e = y.value) == null ? void 0 : e.validateFields()) == null || a.then((l) => W(o.onSubmit, l));
+    } = me("ap-form-search-form"), {
+      t: k
+    } = he(), G = fe(o), y = L();
+    function I() {
+      var a;
+      const e = (a = y.value) == null ? void 0 : a.getFieldsValueTransformed(!0);
+      q(o.onSubmit, e);
     }
-    function H() {
+    function J() {
       var e, a;
-      o.customReset || (a = (e = y.value) == null ? void 0 : e.resetFields) == null || a.call(e), W(o.onReset);
+      o.customReset || (a = (e = y.value) == null ? void 0 : e.resetFields) == null || a.call(e), q(o.onReset);
     }
-    const G = (e) => M(e) ? (ie(e) ? e : [e]).join("") : Date.now();
-    let I = [];
-    const c = j(V(i.default())), u = j((P = i.extra) == null ? void 0 : P.call(i)), E = _(() => Math.floor(s / n(z)));
-    L(() => i.default(), (e) => {
-      I = c.value, c.value = pe(I, V(e));
-    }), L(() => {
+    const K = (e) => D(e) ? (ue(e) ? e : [e]).join("") : Date.now();
+    let T = [];
+    const u = U(W(i.default())), b = L(!1), c = U((P = i.extra) == null ? void 0 : P.call(i)), E = _(() => Math.floor(s / n(G)));
+    V(() => i.default(), (e) => {
+      T = u.value, u.value = de(T, W(e)), b.value = !1;
+    }), V(() => {
       var e;
       return (e = i.extra) == null ? void 0 : e.call(i);
     }, (e) => {
-      u.value = e;
+      c.value = e;
     });
-    const r = _(() => {
-      const e = c.value, a = [], l = [], g = [], h = n(E);
-      let v = 0, b = 0;
-      const Q = s * o.maxRows - h * (n(u) && !o.extraInAction ? 2 : 1);
-      e.forEach((S, Z) => {
-        const p = S.props;
-        if (ce(p.hidden) ? !!p.hidden : M(p.hidden))
-          a.push(S);
+    const l = _(() => {
+      const e = u.value, a = [], r = [], g = [], h = n(E);
+      let v = 0, S = 0;
+      const Y = s * o.maxRows - h * (n(c) && !o.extraInAction ? 2 : 1);
+      e.forEach((F, te) => {
+        const p = F.props;
+        if (ce(p.hidden) ? !!p.hidden : D(p.hidden))
+          a.push(F);
         else {
           let C = p.span || h;
-          const O = {
-            node: S,
+          const $ = {
+            node: F,
             span: C,
-            key: `ApFormSearchFormItem-${Z}-${G(p.name)}-${p._signal}`
-          }, $ = s - v % s;
-          $ < C && (C += $), v += C, v > Q ? l.push(O) : (b = v, g.push(O));
+            key: `ApFormSearchFormItem-${te}-${K(p.name)}-${p._signal}`
+          }, j = s - v % s;
+          j < C && (C += j), v += C, v > Y ? r.push($) : (S = v, g.push($));
         }
       });
-      const T = s - (b + h) % s, X = b % s < h, Y = T < h ? s : T;
+      const O = s - (S + h) % s, Z = S % s < h, ee = O < h ? s : O;
       return {
         hideNode: t(w, null, [a]),
         nodes: g,
-        collapseNodes: l,
-        extraSpan: Y,
-        lastRowOnlyIncludeActionAndExtra: X
+        collapseNodes: r,
+        extraSpan: ee,
+        lastRowOnlyIncludeActionAndExtra: Z
       };
     });
-    function J(e) {
-      c.value = [...e];
+    function Q(e) {
+      u.value = [...e], b.value = !0;
     }
-    const K = _(() => {
+    const X = _(() => {
       let e;
       const a = t(R, {
         span: n(E),
         key: "actionWrapper"
       }, {
-        default: () => [t(D, null, {
-          default: () => [t(B, {
+        default: () => [t(z, null, {
+          default: () => [t(N, {
             wrap: "wrap",
-            justify: r.value.lastRowOnlyIncludeActionAndExtra && !(n(u) && o.extraInAction) ? "flex-end" : "space-between"
+            justify: l.value.lastRowOnlyIncludeActionAndExtra && !(n(c) && o.extraInAction) ? "flex-end" : "space-between"
           }, {
-            default: () => [t(B, {
+            default: () => [t(N, {
               gap: 8,
               wrap: "wrap"
             }, {
               default: () => [t("div", {
                 class: m("column-setting-trigger-wrapper")
-              }, [r.value.collapseNodes.length ? t(he, {
-                onSubmit: k,
-                config: r.value.collapseNodes,
+              }, [l.value.collapseNodes.length ? t(xe, {
+                onSubmit: I,
+                config: l.value.collapseNodes,
                 submitLoading: o.submitLoading
-              }, null) : null, o.sortable && c.value.length ? t(xe, {
-                children: c.value,
-                onClickConfirm: J
-              }, null) : null]), t(U, {
+              }, null) : null, o.sortable && u.value.length ? t(ye, {
+                children: u.value,
+                onClickConfirm: Q,
+                sorted: b.value
+              }, null) : null]), t(M, {
                 type: "primary",
-                onClick: k,
+                onClick: I,
                 loading: o.submitLoading,
                 htmlType: "submit",
                 class: m("action-btn")
               }, {
-                default: () => [o.searchText || N("ap.apForm.search.search")]
-              }), t(U, {
-                onClick: H,
+                default: () => [o.searchText || k("ap.apForm.search.search")]
+              }), t(M, {
+                onClick: J,
                 type: "text",
                 class: [m("action-btn"), m("action-btn-reset")]
               }, {
-                default: () => [o.resetText || N("ap.apForm.search.reset")]
+                default: () => [o.resetText || k("ap.apForm.search.reset")]
               })]
-            }), o.extraInAction ? n(u) : null]
+            }), o.extraInAction ? n(c) : null]
           })]
         })]
-      }), l = !o.extraInAction && n(u) ? t(R, {
-        span: r.value.extraSpan,
+      }), r = !o.extraInAction && n(c) ? t(R, {
+        span: l.value.extraSpan,
         key: "extraNode"
       }, {
-        default: () => [t(D, null, {
-          default: () => [t(B, {
-            justify: r.value.extraSpan === s || r.value.lastRowOnlyIncludeActionAndExtra ? "start" : "flex-end"
-          }, ge(e = n(u)) ? e : {
+        default: () => [t(z, null, {
+          default: () => [t(N, {
+            justify: l.value.extraSpan === s || l.value.lastRowOnlyIncludeActionAndExtra ? "start" : "flex-end"
+          }, ve(e = n(c)) ? e : {
             default: () => [e]
           })]
         })]
       }) : null, g = t(R, {
-        span: r.value.extraSpan
+        span: l.value.extraSpan
       }, null);
-      return r.value.lastRowOnlyIncludeActionAndExtra ? t(w, null, [l || g, a]) : t(w, null, [a, l]);
+      return l.value.lastRowOnlyIncludeActionAndExtra ? t(w, null, [r || g, a]) : t(w, null, [a, r]);
     });
-    return q({
+    return H({
       apForm: _(() => n(y))
-    }), (e, a) => (d(), x(ye, ne({
+    }), (e, a) => (d(), x(ge, le({
       ref_key: "apForm",
       ref: y,
       class: n(m)()
-    }, n(ue)(o, ["collapse", "defaultCollapse", "onUpdate:collapse", "searchText", "resetText", "onSubmit", "onReset", "extraInAction", "forceExpand", "countPerRow"])), {
-      default: F(() => [(d(), x(A(r.value.hideNode))), t(n(se), {
-        gutter: 16
+    }, n(pe)(o, ["collapse", "defaultCollapse", "onUpdate:collapse", "searchText", "resetText", "onSubmit", "onReset", "extraInAction", "forceExpand", "countPerRow"])), {
+      default: A(() => [(d(), x(B(l.value.hideNode))), t(n(ie), {
+        gutter: 8
       }, {
-        default: F(() => [(d(!0), le(w, null, re(r.value.nodes, (l) => (d(), x(n(R), {
-          key: l.key,
-          span: l.span
+        default: A(() => [(d(!0), re(w, null, se(l.value.nodes, (r) => (d(), x(n(R), {
+          key: r.key,
+          span: r.span
         }, {
-          default: F(() => [(d(), x(A(l.node)))]),
+          default: A(() => [(d(), x(B(r.node)))]),
           _: 2
-        }, 1032, ["span"]))), 128)), (d(), x(A(K.value)))]),
+        }, 1032, ["span"]))), 128)), (d(), x(B(X.value)))]),
         _: 1
       })]),
       _: 1
@@ -250,5 +252,5 @@ const s = 24, Le = /* @__PURE__ */ te({
   }
 });
 export {
-  Le as default
+  Ue as default
 };

package/es/src/ap-grid/constants.d.ts

@@ -1,10 +1,10 @@
 export declare const sizeMap: {
     readonly mini: "small";
     readonly small: "small";
-    readonly medium: "small";
+    readonly medium: "middle";
 };
 export declare const sizeReverseMap: {
-    readonly small: "medium";
-    readonly middle: undefined;
+    readonly small: "mini";
+    readonly middle: "medium";
 };
 export declare const ROW_SELECTION_FIELD = "_ap-grid-row-selection-field";

package/es/src/ap-grid/constants.mjs

@@ -1,13 +1,13 @@
-const l = {
+const e = {
   mini: "small",
   small: "small",
-  medium: "small"
-}, e = {
-  small: "medium",
-  middle: void 0
-}, s = "_ap-grid-row-selection-field";
+  medium: "middle"
+}, i = {
+  small: "mini",
+  middle: "medium"
+}, l = "_ap-grid-row-selection-field";
 export {
-  s as ROW_SELECTION_FIELD,
-  l as sizeMap,
-  e as sizeReverseMap
+  l as ROW_SELECTION_FIELD,
+  e as sizeMap,
+  i as sizeReverseMap
 };

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

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