@aplus-frontend/ui 6.25.0 → 6.26.0

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

@@ -87,8 +87,8 @@ const Do = /* @__PURE__ */ ze({
   },
   setup(X, { expose: Y }) {
     Le.registerModules([Oe]);
-    const o = X, h = Ae(), { e: y, b: i, be: Z } = lo("ag-grid"), p = v(o.size), _ = eo(p, j(o, "rowHeight")), f = v(), [, ee] = _e();
-    let w = !!o.dataSource;
+    const o = X, h = Ae(), { e: y, b: i, be: Z } = lo("ag-grid"), f = v(o.size), _ = eo(f, j(o, "rowHeight")), w = v(), [, ee] = _e();
+    let u = !!o.dataSource;
     const A = no(o), { shownColumns: d, shownColumnsBackup: oe } = oo(o), { defaultColDef: te, columnDefs: ae } = to(
       d,
       o
@@ -105,7 +105,7 @@ const Do = /* @__PURE__ */ ze({
     };
     function ne() {
       var s;
-      const e = (s = f.value.getColumns()) == null ? void 0 : s.filter((T) => T.getSort() !== void 0);
+      const e = (s = w.value.getColumns()) == null ? void 0 : s.filter((T) => T.getSort() !== void 0);
       if (!(e != null && e.length))
         return;
       const t = e[0], r = t.getColDef(), n = t.getSort();
@@ -125,10 +125,10 @@ const Do = /* @__PURE__ */ ze({
         return ((n = r.type) == null ? void 0 : n.name) === "ApView";
       });
     }), {
-      formRef: u,
+      formRef: m,
       submit: C,
       reset: F,
-      data: m,
+      data: p,
       tableProps: N,
       handleTableChangeOptional: V,
       submitWith: I,
@@ -139,7 +139,7 @@ const Do = /* @__PURE__ */ ze({
     } = $e({
       async request(e) {
         var r;
-        if (w = !1, !R(o.dataSource)) {
+        if (u = !1, !R(o.dataSource)) {
           const n = e.pageSize * (e.current - 1);
           return {
             data: (o.pagination === !1 ? o.dataSource : o.dataSource.slice(n, n + e.pageSize)) || [],
@@ -161,7 +161,7 @@ const Do = /* @__PURE__ */ ze({
       pagination: o.pagination,
       sortFields: le
     }), ue = l(
-      () => R(o.dataSource) ? m.records : o.dataSource
+      () => R(o.dataSource) ? p.records : o.dataSource
     ), {
       select: me,
       unSelect: pe,
@@ -202,28 +202,32 @@ const Do = /* @__PURE__ */ ze({
       return je(o.rowKey) ? o.rowKey(e) : e[o.rowKey];
     }
     const P = ({
-      api: e = f.value
+      api: e = w.value
     }) => {
       if (!o.rowSelection)
         return;
       const t = B.value;
-      if (!t.length)
+      if (!t.length) {
+        setTimeout(() => {
+          u = !0;
+        }, 0);
         return;
-      w = !1;
+      }
+      u = !1;
       const r = [];
       e.forEachNode((n) => {
         const s = n.data, T = x(s);
         t.find((De) => x(De) === T) && r.push(n);
       }), e.setNodesSelected({ nodes: r, newValue: !0 }), setTimeout(() => {
-        w = !0;
+        u = !0;
       }, 0);
     }, ve = (e) => {
-      w && (e.node.isSelected() ? me(e.data) : pe(e.data));
+      u && (e.node.isSelected() ? me(e.data) : pe(e.data));
     }, be = () => {
-      w = !0;
+      u = !0;
     }, M = () => {
       var e;
-      we(), (e = f.value) == null || e.deselectAll();
+      we(), (e = w.value) == null || e.deselectAll();
     };
     function Re(e) {
       ge(e), Ke(() => {
@@ -233,40 +237,40 @@ const Do = /* @__PURE__ */ ze({
     function W(e = !1) {
       var r, n, s;
       const t = e ? "getFieldsValueTransformed" : "getFieldsValue";
-      return (s = (n = (r = u.value) == null ? void 0 : r.apForm) == null ? void 0 : n[t]) == null ? void 0 : s.call(n, !0);
+      return (s = (n = (r = m.value) == null ? void 0 : r.apForm) == null ? void 0 : n[t]) == null ? void 0 : s.call(n, !0);
     }
     function L(e) {
       var t, r, n;
-      (n = (r = (t = u.value) == null ? void 0 : t.apForm) == null ? void 0 : r.setFieldsValue) == null || n.call(r, e);
+      (n = (r = (t = m.value) == null ? void 0 : t.apForm) == null ? void 0 : r.setFieldsValue) == null || n.call(r, e);
     }
     function O() {
       var e;
-      return ((e = u.value) == null ? void 0 : e.getSorterItems()) || [];
+      return ((e = m.value) == null ? void 0 : e.getSorterItems()) || [];
     }
     function G(e) {
       var t;
-      (t = u.value) == null || t.setSorterItems(e);
+      (t = m.value) == null || t.setSorterItems(e);
     }
     function H() {
       var e;
-      (e = u.value) == null || e.resetSorterItems();
+      (e = m.value) == null || e.resetSorterItems();
     }
     Xe({
       columns: l(() => d.value),
       columnsBackup: l(() => oe.value),
-      size: l(() => Ze[p.value]),
+      size: l(() => Ze[f.value]),
       updateColumns(e) {
         var t;
-        console.log(e), d.value = e, (t = o.onShownColumnsChange) == null || t.call(o, e);
+        d.value = e, (t = o.onShownColumnsChange) == null || t.call(o, e);
       },
       updateSize(e) {
-        p.value = Ye[e];
+        f.value = Ye[e];
       },
       renderConfig: l(() => ({
         className: Z("table-header", "title"),
         color: ee.value.colorTextTertiary
       })),
-      dataSource: l(() => a(m).records),
+      dataSource: l(() => a(p).records),
       getSearchFormValues: W,
       setSearchFormValues: L,
       submit: C,
@@ -278,12 +282,12 @@ const Do = /* @__PURE__ */ ze({
       resetSearchFormSorterItems: H
     });
     const Ce = l(
-      () => R(o.loading) ? m.loading : o.loading
+      () => R(o.loading) ? p.loading : o.loading
     ), Fe = l(() => [
       i(),
       o.card ? null : i("wrapper"),
       i("adaptive"),
-      i(`size-${p.value}`)
+      i(`size-${f.value}`)
     ].filter(Boolean)), Be = l(() => ({
       height: "100%",
       ...o.tableStyle || {}
@@ -296,7 +300,7 @@ const Do = /* @__PURE__ */ ze({
     }
     function ke(e, t) {
       var r;
-      (r = f.value) == null || r.ensureIndexVisible(e, t);
+      (r = w.value) == null || r.ensureIndexVisible(e, t);
     }
     return k(
       () => o.dataSource,
@@ -307,10 +311,10 @@ const Do = /* @__PURE__ */ ze({
     ), k(
       () => o.size,
       (e) => {
-        p.value = e;
+        f.value = e;
       }
     ), k(
-      () => a(m).loading,
+      () => a(p).loading,
       (e) => {
         var t;
         (t = o.onLoadingChange) == null || t.call(o, e);
@@ -329,7 +333,7 @@ const Do = /* @__PURE__ */ ze({
         clearAll: M
       },
       scrollToRow: ke,
-      getDataSource: () => a(m.records),
+      getDataSource: () => a(p.records),
       getPaging: ie,
       setPaging: de,
       getSearchFormSorterItems: O,
@@ -348,7 +352,7 @@ const Do = /* @__PURE__ */ ze({
         }, [
           z(a(qe).SearchForm, U(e.searchForm || {}, {
             ref_key: "formRef",
-            ref: u,
+            ref: m,
             "custom-reset": "",
             "submit-loading": a(N).loading,
             onSubmit: a(C),
@@ -389,7 +393,7 @@ const Do = /* @__PURE__ */ ze({
           }, [
             z(a(We), {
               style: b(Be.value),
-              "row-data": a(m).records,
+              "row-data": a(p).records,
               "column-defs": a(ae),
               "default-col-def": a(te),
               "locale-text": {
@@ -406,7 +410,7 @@ const Do = /* @__PURE__ */ ze({
               "enable-browser-tooltips": e.browserTooltips,
               "tooltip-interaction": "",
               onSortChanged: ne,
-              onGridReady: t[0] || (t[0] = (s) => f.value = s.api),
+              onGridReady: t[0] || (t[0] = (s) => w.value = s.api),
               onRowDataUpdated: P,
               onRowSelected: ve,
               onFirstDataRendered: be

package/es/src/ap-form/search-form/index.vue.d.ts

@@ -414,10 +414,7 @@ declare function __VLS_template(): {
                             default: string | number | ColSize;
                         };
                         xl: {
-                            type: PropType<string | number | **
-                             *最后一行剩余的空间
-                             tips: 如果有小数，则其包含误差， 会比实际值更大
-                             */).ColSize>;
+                            type: PropType<string | number | ColSize>;
                             default: string | number | ColSize;
                         };
                         xxl: {
@@ -1256,10 +1253,7 @@ declare const __VLS_component: DefineComponent<ApFormSearchFormProps, {
                         default: string | number | ColSize;
                     };
                     xl: {
-                        type: PropType<string | number | **
-                         *最后一行剩余的空间
-                         tips: 如果有小数，则其包含误差， 会比实际值更大
-                         */).ColSize>;
+                        type: PropType<string | number | ColSize>;
                         default: string | number | ColSize;
                     };
                     xxl: {

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

@@ -1,12 +1,12 @@
-import { isVNode as se, defineComponent as ie, useSlots as ce, ref as D, shallowRef as U, computed as _, unref as n, watch as z, createVNode as o, Fragment as w, createBlock as y, openBlock as d, mergeProps as ue, withCtx as B, resolveDynamicComponent as I, createElementBlock as pe, renderList as de, normalizeStyle as fe } from "vue";
+import { isVNode as se, defineComponent as ie, useSlots as ue, ref as D, shallowRef as U, computed as _, unref as n, watch as z, createVNode as o, Fragment as w, createBlock as g, openBlock as d, mergeProps as ce, withCtx as B, resolveDynamicComponent as I, createElementBlock as pe, renderList as de, normalizeStyle as fe } from "vue";
 import { Col as R, Flex as k, Button as M, Row as me } from "@aplus-frontend/antdv";
 import "../ap-form.vue.mjs";
 import "../item/index.vue2.mjs";
 import { genRealChildren as q } from "../item-group/helper.mjs";
 import "../../config-provider/index.mjs";
-import { isArray as he, isBoolean as xe, omit as ge } from "lodash-unified";
+import { isArray as he, isBoolean as xe, omit as ye } from "lodash-unified";
 import { isDef as H } from "../../utils/index.mjs";
-import { execFunc as G, diffFormItem as ye } from "./utils.mjs";
+import { execFunc as G, diffFormItem as ge } from "./utils.mjs";
 import "./components/popover-filter.vue.mjs";
 import { useCountPerRow as ve } from "./hooks/use-count-per-row.mjs";
 import "./components/popover-sorter/index.vue.mjs";
@@ -121,7 +121,7 @@ const s = 100, Xe = /* @__PURE__ */ ie({
     expose: Q
   }) {
     var W;
-    const i = ce(), t = f, {
+    const i = ue(), t = f, {
       b: m
     } = _e("ap-form-search-form"), {
       t: T
@@ -143,7 +143,7 @@ const s = 100, Xe = /* @__PURE__ */ ie({
       handleClickConfirm: F
     } = Ce(h);
     z(() => i.default(), (e) => {
-      E = h.value, h.value = ye(E, q(e)), L.value = !1;
+      E = h.value, h.value = ge(E, q(e)), L.value = !1;
     }), z(() => {
       var e;
       return (e = i.extra) == null ? void 0 : e.call(i);
@@ -154,28 +154,27 @@ const s = 100, Xe = /* @__PURE__ */ ie({
       return J(e * (s / 24), 4);
     }
     const l = _(() => {
-      const e = h.value, a = [], r = [], g = [], c = n(O);
-      console.log("_spanPerCol", c);
+      const e = h.value, a = [], r = [], y = [], u = n(O);
       let C = 0, N = 0;
-      const ne = s * t.maxRows - c * (n(p) && !t.extraInAction ? 2 : 1);
+      const ne = s * t.maxRows - u * (n(p) && !t.extraInAction ? 2 : 1);
       e.forEach((A) => {
-        const u = Se(A).props;
-        if (xe(u.hidden) ? !!u.hidden : H(u.hidden))
+        const c = Se(A).props;
+        if (xe(c.hidden) ? !!c.hidden : H(c.hidden))
           a.push(A);
         else {
-          let S = u.span ? te(u.span) : c;
+          let S = c.span ? te(c.span) : u;
           const j = {
             node: A,
             span: S,
-            key: `ApFormSearchFormItem-${ee(u.name)}-${u._signal}`
+            key: `ApFormSearchFormItem-${ee(c.name)}-${c._signal}`
           }, V = s - C % s;
-          V < S && (S += V), C += S, C > ne ? r.push(j) : (N = C, g.push(j));
+          V < S && (S += V), C += S, C > ne ? r.push(j) : (N = C, y.push(j));
         }
       });
-      const $ = s - (N + c) % s, le = Math.ceil(N) % s < c, re = $ < c ? s : $;
+      const $ = s - (N + u) % s, le = Math.ceil(N) % s < u, re = $ < u ? s : $;
       return {
         hideNode: o(w, null, [a]),
-        nodes: g,
+        nodes: y,
         collapseNodes: r,
         extraSpan: re,
         lastRowOnlyIncludeActionAndExtra: le
@@ -226,7 +225,7 @@ const s = 100, Xe = /* @__PURE__ */ ie({
             }), t.extraInAction ? n(p) : null]
           })]
         })]
-      }), g = !t.extraInAction && n(p) ? o(R, {
+      }), y = !t.extraInAction && n(p) ? o(R, {
         flex: x(l.value.extraSpan),
         key: "extraNode"
       }, {
@@ -237,10 +236,10 @@ const s = 100, Xe = /* @__PURE__ */ ie({
             default: () => [e]
           })]
         })]
-      }) : null, c = o(R, {
+      }) : null, u = o(R, {
         flex: x(l.value.extraSpan)
       }, null);
-      return l.value.lastRowOnlyIncludeActionAndExtra ? o(w, null, [g || c, r]) : o(w, null, [r, g]);
+      return l.value.lastRowOnlyIncludeActionAndExtra ? o(w, null, [y || u, r]) : o(w, null, [r, y]);
     });
     function ae() {
       var a;
@@ -252,24 +251,24 @@ const s = 100, Xe = /* @__PURE__ */ ie({
       getSorterItems: () => b.value,
       setSorterItems: F,
       resetSorterItems: ae
-    }), (e, a) => (d(), y(Fe, ue({
+    }), (e, a) => (d(), g(Fe, ce({
       ref_key: "apForm",
       ref: v,
       class: n(m)()
-    }, n(ge)(t, ["collapse", "defaultCollapse", "onUpdate:collapse", "searchText", "resetText", "onSubmit", "onReset", "extraInAction", "forceExpand", "countPerRow"])), {
-      default: B(() => [(d(), y(I(l.value.hideNode))), o(n(me), {
+    }, n(ye)(t, ["collapse", "defaultCollapse", "onUpdate:collapse", "searchText", "resetText", "onSubmit", "onReset", "extraInAction", "forceExpand", "countPerRow"])), {
+      default: B(() => [(d(), g(I(l.value.hideNode))), o(n(me), {
         gutter: 8
       }, {
-        default: B(() => [(d(!0), pe(w, null, de(l.value.nodes, (r) => (d(), y(n(R), {
+        default: B(() => [(d(!0), pe(w, null, de(l.value.nodes, (r) => (d(), g(n(R), {
           key: r.key,
           flex: x(r.span),
           style: fe({
             maxWidth: x(r.span)
           })
         }, {
-          default: B(() => [(d(), y(I(r.node)))]),
+          default: B(() => [(d(), g(I(r.node)))]),
           _: 2
-        }, 1032, ["flex", "style"]))), 128)), (d(), y(I(oe.value)))]),
+        }, 1032, ["flex", "style"]))), 128)), (d(), g(I(oe.value)))]),
         _: 1
       })]),
       _: 1

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

@@ -150,6 +150,7 @@ const we = /* @__PURE__ */ K({
       type: [Boolean, Function]
     },
     treeConfig: {},
+    onReady: {},
     columns: {},
     defaultValue: {},
     "onUpdate:value": {},

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

@@ -150,6 +150,7 @@ const Re = /* @__PURE__ */ $({
       type: [Boolean, Function]
     },
     treeConfig: {},
+    onReady: {},
     columns: {},
     defaultValue: {},
     "onUpdate:value": {},