@aplus-frontend/ui 6.24.2 → 6.26.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (46) hide show
  1. package/es/src/ag-grid/index.vue.mjs +36 -32
  2. package/es/src/ap-form/interface.d.ts +1 -2
  3. package/es/src/ap-form/search-form/hooks/use-count-per-row.mjs +27 -24
  4. package/es/src/ap-form/search-form/index.vue.d.ts +1 -1
  5. package/es/src/ap-form/search-form/index.vue.mjs +116 -109
  6. package/es/src/ap-grid/editable/form-item.vue.mjs +1 -0
  7. package/es/src/ap-grid/editable/index.vue.mjs +1 -0
  8. package/es/src/ap-grid/index.vue.mjs +229 -212
  9. package/es/src/ap-grid/interface.d.ts +13 -1
  10. package/es/src/ap-pro-card/components/card/index.vue.d.ts +1 -1
  11. package/es/src/ap-pro-card/components/statistic/index.vue.d.ts +2 -1
  12. package/es/src/ap-pro-card/components/statistic/index.vue2.mjs +43 -37
  13. package/es/src/ap-pro-card/interface.d.ts +3 -1
  14. package/es/src/ap-table/hooks/use-table-paging-ng.d.ts +1 -1
  15. package/es/src/ap-table/hooks/use-table-paging-ng.mjs +41 -41
  16. package/es/src/business/ap-value-select-card/index.vue.d.ts +6 -0
  17. package/es/src/business/ap-value-select-card/index.vue2.mjs +88 -80
  18. package/es/src/utils/copy.mjs +14 -4
  19. package/es/src/version.d.ts +1 -1
  20. package/es/src/version.mjs +1 -1
  21. package/lib/src/ag-grid/index.vue.js +1 -1
  22. package/lib/src/ap-form/interface.d.ts +1 -2
  23. package/lib/src/ap-form/search-form/hooks/use-count-per-row.js +1 -1
  24. package/lib/src/ap-form/search-form/index.vue.d.ts +1 -1
  25. package/lib/src/ap-form/search-form/index.vue.js +1 -1
  26. package/lib/src/ap-grid/editable/form-item.vue.js +1 -1
  27. package/lib/src/ap-grid/editable/index.vue.js +1 -1
  28. package/lib/src/ap-grid/index.vue.js +1 -1
  29. package/lib/src/ap-grid/interface.d.ts +13 -1
  30. package/lib/src/ap-pro-card/components/card/index.vue.d.ts +1 -1
  31. package/lib/src/ap-pro-card/components/statistic/index.vue.d.ts +2 -1
  32. package/lib/src/ap-pro-card/components/statistic/index.vue2.js +1 -1
  33. package/lib/src/ap-pro-card/interface.d.ts +3 -1
  34. package/lib/src/ap-table/hooks/use-table-paging-ng.d.ts +1 -1
  35. package/lib/src/ap-table/hooks/use-table-paging-ng.js +1 -1
  36. package/lib/src/business/ap-value-select-card/index.vue.d.ts +6 -0
  37. package/lib/src/business/ap-value-select-card/index.vue2.js +1 -1
  38. package/lib/src/utils/copy.js +1 -1
  39. package/lib/src/version.d.ts +1 -1
  40. package/lib/src/version.js +1 -1
  41. package/package.json +5 -5
  42. package/theme/ap-pro-card/index.css +29 -25
  43. package/theme/ap-pro-card/index.less +32 -16
  44. package/theme/ap-value-select-card/index.css +1 -0
  45. package/theme/ap-value-select-card/index.less +1 -0
  46. package/theme/index.css +30 -25
@@ -87,8 +87,8 @@ const Do = /* @__PURE__ */ ze({
87
87
  },
88
88
  setup(X, { expose: Y }) {
89
89
  Le.registerModules([Oe]);
90
- 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();
91
- let w = !!o.dataSource;
90
+ 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();
91
+ let u = !!o.dataSource;
92
92
  const A = no(o), { shownColumns: d, shownColumnsBackup: oe } = oo(o), { defaultColDef: te, columnDefs: ae } = to(
93
93
  d,
94
94
  o
@@ -105,7 +105,7 @@ const Do = /* @__PURE__ */ ze({
105
105
  };
106
106
  function ne() {
107
107
  var s;
108
- const e = (s = f.value.getColumns()) == null ? void 0 : s.filter((T) => T.getSort() !== void 0);
108
+ const e = (s = w.value.getColumns()) == null ? void 0 : s.filter((T) => T.getSort() !== void 0);
109
109
  if (!(e != null && e.length))
110
110
  return;
111
111
  const t = e[0], r = t.getColDef(), n = t.getSort();
@@ -125,10 +125,10 @@ const Do = /* @__PURE__ */ ze({
125
125
  return ((n = r.type) == null ? void 0 : n.name) === "ApView";
126
126
  });
127
127
  }), {
128
- formRef: u,
128
+ formRef: m,
129
129
  submit: C,
130
130
  reset: F,
131
- data: m,
131
+ data: p,
132
132
  tableProps: N,
133
133
  handleTableChangeOptional: V,
134
134
  submitWith: I,
@@ -139,7 +139,7 @@ const Do = /* @__PURE__ */ ze({
139
139
  } = $e({
140
140
  async request(e) {
141
141
  var r;
142
- if (w = !1, !R(o.dataSource)) {
142
+ if (u = !1, !R(o.dataSource)) {
143
143
  const n = e.pageSize * (e.current - 1);
144
144
  return {
145
145
  data: (o.pagination === !1 ? o.dataSource : o.dataSource.slice(n, n + e.pageSize)) || [],
@@ -161,7 +161,7 @@ const Do = /* @__PURE__ */ ze({
161
161
  pagination: o.pagination,
162
162
  sortFields: le
163
163
  }), ue = l(
164
- () => R(o.dataSource) ? m.records : o.dataSource
164
+ () => R(o.dataSource) ? p.records : o.dataSource
165
165
  ), {
166
166
  select: me,
167
167
  unSelect: pe,
@@ -202,28 +202,32 @@ const Do = /* @__PURE__ */ ze({
202
202
  return je(o.rowKey) ? o.rowKey(e) : e[o.rowKey];
203
203
  }
204
204
  const P = ({
205
- api: e = f.value
205
+ api: e = w.value
206
206
  }) => {
207
207
  if (!o.rowSelection)
208
208
  return;
209
209
  const t = B.value;
210
- if (!t.length)
210
+ if (!t.length) {
211
+ setTimeout(() => {
212
+ u = !0;
213
+ }, 0);
211
214
  return;
212
- w = !1;
215
+ }
216
+ u = !1;
213
217
  const r = [];
214
218
  e.forEachNode((n) => {
215
219
  const s = n.data, T = x(s);
216
220
  t.find((De) => x(De) === T) && r.push(n);
217
221
  }), e.setNodesSelected({ nodes: r, newValue: !0 }), setTimeout(() => {
218
- w = !0;
222
+ u = !0;
219
223
  }, 0);
220
224
  }, ve = (e) => {
221
- w && (e.node.isSelected() ? me(e.data) : pe(e.data));
225
+ u && (e.node.isSelected() ? me(e.data) : pe(e.data));
222
226
  }, be = () => {
223
- w = !0;
227
+ u = !0;
224
228
  }, M = () => {
225
229
  var e;
226
- we(), (e = f.value) == null || e.deselectAll();
230
+ we(), (e = w.value) == null || e.deselectAll();
227
231
  };
228
232
  function Re(e) {
229
233
  ge(e), Ke(() => {
@@ -233,40 +237,40 @@ const Do = /* @__PURE__ */ ze({
233
237
  function W(e = !1) {
234
238
  var r, n, s;
235
239
  const t = e ? "getFieldsValueTransformed" : "getFieldsValue";
236
- return (s = (n = (r = u.value) == null ? void 0 : r.apForm) == null ? void 0 : n[t]) == null ? void 0 : s.call(n, !0);
240
+ return (s = (n = (r = m.value) == null ? void 0 : r.apForm) == null ? void 0 : n[t]) == null ? void 0 : s.call(n, !0);
237
241
  }
238
242
  function L(e) {
239
243
  var t, r, n;
240
- (n = (r = (t = u.value) == null ? void 0 : t.apForm) == null ? void 0 : r.setFieldsValue) == null || n.call(r, e);
244
+ (n = (r = (t = m.value) == null ? void 0 : t.apForm) == null ? void 0 : r.setFieldsValue) == null || n.call(r, e);
241
245
  }
242
246
  function O() {
243
247
  var e;
244
- return ((e = u.value) == null ? void 0 : e.getSorterItems()) || [];
248
+ return ((e = m.value) == null ? void 0 : e.getSorterItems()) || [];
245
249
  }
246
250
  function G(e) {
247
251
  var t;
248
- (t = u.value) == null || t.setSorterItems(e);
252
+ (t = m.value) == null || t.setSorterItems(e);
249
253
  }
250
254
  function H() {
251
255
  var e;
252
- (e = u.value) == null || e.resetSorterItems();
256
+ (e = m.value) == null || e.resetSorterItems();
253
257
  }
254
258
  Xe({
255
259
  columns: l(() => d.value),
256
260
  columnsBackup: l(() => oe.value),
257
- size: l(() => Ze[p.value]),
261
+ size: l(() => Ze[f.value]),
258
262
  updateColumns(e) {
259
263
  var t;
260
- console.log(e), d.value = e, (t = o.onShownColumnsChange) == null || t.call(o, e);
264
+ d.value = e, (t = o.onShownColumnsChange) == null || t.call(o, e);
261
265
  },
262
266
  updateSize(e) {
263
- p.value = Ye[e];
267
+ f.value = Ye[e];
264
268
  },
265
269
  renderConfig: l(() => ({
266
270
  className: Z("table-header", "title"),
267
271
  color: ee.value.colorTextTertiary
268
272
  })),
269
- dataSource: l(() => a(m).records),
273
+ dataSource: l(() => a(p).records),
270
274
  getSearchFormValues: W,
271
275
  setSearchFormValues: L,
272
276
  submit: C,
@@ -278,12 +282,12 @@ const Do = /* @__PURE__ */ ze({
278
282
  resetSearchFormSorterItems: H
279
283
  });
280
284
  const Ce = l(
281
- () => R(o.loading) ? m.loading : o.loading
285
+ () => R(o.loading) ? p.loading : o.loading
282
286
  ), Fe = l(() => [
283
287
  i(),
284
288
  o.card ? null : i("wrapper"),
285
289
  i("adaptive"),
286
- i(`size-${p.value}`)
290
+ i(`size-${f.value}`)
287
291
  ].filter(Boolean)), Be = l(() => ({
288
292
  height: "100%",
289
293
  ...o.tableStyle || {}
@@ -296,7 +300,7 @@ const Do = /* @__PURE__ */ ze({
296
300
  }
297
301
  function ke(e, t) {
298
302
  var r;
299
- (r = f.value) == null || r.ensureIndexVisible(e, t);
303
+ (r = w.value) == null || r.ensureIndexVisible(e, t);
300
304
  }
301
305
  return k(
302
306
  () => o.dataSource,
@@ -307,10 +311,10 @@ const Do = /* @__PURE__ */ ze({
307
311
  ), k(
308
312
  () => o.size,
309
313
  (e) => {
310
- p.value = e;
314
+ f.value = e;
311
315
  }
312
316
  ), k(
313
- () => a(m).loading,
317
+ () => a(p).loading,
314
318
  (e) => {
315
319
  var t;
316
320
  (t = o.onLoadingChange) == null || t.call(o, e);
@@ -329,7 +333,7 @@ const Do = /* @__PURE__ */ ze({
329
333
  clearAll: M
330
334
  },
331
335
  scrollToRow: ke,
332
- getDataSource: () => a(m.records),
336
+ getDataSource: () => a(p.records),
333
337
  getPaging: ie,
334
338
  setPaging: de,
335
339
  getSearchFormSorterItems: O,
@@ -348,7 +352,7 @@ const Do = /* @__PURE__ */ ze({
348
352
  }, [
349
353
  z(a(qe).SearchForm, U(e.searchForm || {}, {
350
354
  ref_key: "formRef",
351
- ref: u,
355
+ ref: m,
352
356
  "custom-reset": "",
353
357
  "submit-loading": a(N).loading,
354
358
  onSubmit: a(C),
@@ -389,7 +393,7 @@ const Do = /* @__PURE__ */ ze({
389
393
  }, [
390
394
  z(a(We), {
391
395
  style: b(Be.value),
392
- "row-data": a(m).records,
396
+ "row-data": a(p).records,
393
397
  "column-defs": a(ae),
394
398
  "default-col-def": a(te),
395
399
  "locale-text": {
@@ -406,7 +410,7 @@ const Do = /* @__PURE__ */ ze({
406
410
  "enable-browser-tooltips": e.browserTooltips,
407
411
  "tooltip-interaction": "",
408
412
  onSortChanged: ne,
409
- onGridReady: t[0] || (t[0] = (s) => f.value = s.api),
413
+ onGridReady: t[0] || (t[0] = (s) => w.value = s.api),
410
414
  onRowDataUpdated: P,
411
415
  onRowSelected: ve,
412
416
  onFirstDataRendered: be
@@ -151,7 +151,6 @@ export type ApFormListProps = {
151
151
  initialValue?: any[];
152
152
  transform?: ApFormItemTransformType;
153
153
  };
154
- type AllowCountPerRowType = 1 | 2 | 3 | 4 | 6 | 8 | 12 | 24;
155
154
  export type ApFormSearchFormProps = ApFormProps & {
156
155
  collapse?: boolean;
157
156
  defaultCollapse?: boolean;
@@ -163,7 +162,7 @@ export type ApFormSearchFormProps = ApFormProps & {
163
162
  customReset?: boolean;
164
163
  extraInAction?: boolean;
165
164
  forceExpand?: boolean;
166
- countPerRow?: AllowCountPerRowType;
165
+ countPerRow?: number;
167
166
  submitLoading?: boolean;
168
167
  /**
169
168
  * 最大显示的行(超出后将会收起进入更多筛选)
@@ -1,35 +1,38 @@
1
- import { ref as w, watchEffect as a, computed as s, unref as i } from "vue";
2
- import { useResizeObserver as P } from "@vueuse/core";
3
- import { isUndefined as R } from "lodash-unified";
4
- const c = [1, 2, 3, 4, 6, 8, 12, 24], g = { xs: 0, sm: 768, md: 1280, lg: 1728 }, h = Object.entries(g).sort(
5
- (t, r) => r[1] - t[1]
6
- ), v = (t) => {
7
- const r = w(0);
8
- a(
9
- (e) => {
10
- const n = R(t.resizeTarget) ? document.documentElement : t.resizeTarget, { stop: o } = P(n, (f) => {
11
- const m = f[0], { width: d } = m.contentRect;
12
- r.value = d;
1
+ import { ref as a, watchEffect as d, computed as r, unref as f } from "vue";
2
+ import { useResizeObserver as w } from "@vueuse/core";
3
+ import { isUndefined as h } from "lodash-unified";
4
+ const l = { xs: 0, sm: 768, md: 1280, lg: 1728 }, z = Object.entries(l).sort(
5
+ (e, n) => n[1] - e[1]
6
+ ), p = (e) => {
7
+ const n = a(0);
8
+ d(
9
+ (t) => {
10
+ const o = h(e.resizeTarget) ? document.documentElement : e.resizeTarget, { stop: c } = w(o, (i) => {
11
+ const m = i[0], { width: u } = m.contentRect;
12
+ n.value = u;
13
13
  });
14
- e(() => {
15
- o();
14
+ t(() => {
15
+ c();
16
16
  });
17
17
  },
18
18
  { flush: "post" }
19
19
  );
20
- const u = s(() => {
21
- for (const [e, n] of h)
22
- if (i(r) > n)
23
- return e;
20
+ const s = r(() => {
21
+ for (const [t, o] of z)
22
+ if (f(n) > o)
23
+ return t;
24
24
  return "md";
25
25
  });
26
- return s(() => {
27
- const e = c.findIndex(
28
- (o) => o === t.countPerRow
29
- ), n = i(u);
30
- return n === "lg" ? c[e + 1] || t.countPerRow : n === "xs" && c[e - 1] || t.countPerRow;
26
+ return r(() => {
27
+ const t = e.countPerRow, o = {
28
+ xs: t - 2,
29
+ sm: t - 1,
30
+ md: t,
31
+ lg: t + 1
32
+ };
33
+ return Math.max(1, o[s.value]);
31
34
  });
32
35
  };
33
36
  export {
34
- v as useCountPerRow
37
+ p as useCountPerRow
35
38
  };
@@ -851,7 +851,7 @@ declare const __VLS_component: DefineComponent<ApFormSearchFormProps, {
851
851
  validateTrigger: string | string[];
852
852
  hideRequiredMark: boolean;
853
853
  validateOnRuleChange: boolean;
854
- countPerRow: 1 | 2 | 3 | 4 | 6 | 8 | 12 | 24;
854
+ countPerRow: number;
855
855
  defaultCollapse: boolean;
856
856
  customReset: boolean;
857
857
  extraInAction: boolean;
@@ -1,27 +1,28 @@
1
- import { isVNode as ne, defineComponent as le, useSlots as re, ref as D, shallowRef as U, computed as S, unref as n, watch as W, createVNode as o, Fragment as _, createBlock as x, openBlock as d, mergeProps as se, withCtx as A, resolveDynamicComponent as B, createElementBlock as ie, renderList as ue } from "vue";
2
- import { Col as w, Flex as I, Button as M, Row as ce } from "@aplus-frontend/antdv";
1
+ 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";
2
+ import { Col as R, Flex as k, Button as M, Row as me } from "@aplus-frontend/antdv";
3
3
  import "../ap-form.vue.mjs";
4
4
  import "../item/index.vue2.mjs";
5
- import { genRealChildren as z } from "../item-group/helper.mjs";
5
+ import { genRealChildren as q } from "../item-group/helper.mjs";
6
6
  import "../../config-provider/index.mjs";
7
- import { isArray as pe, isBoolean as de, omit as me } from "lodash-unified";
8
- import { isDef as q } from "../../utils/index.mjs";
9
- import { execFunc as H, diffFormItem as fe } from "./utils.mjs";
7
+ import { isArray as he, isBoolean as xe, omit as ye } from "lodash-unified";
8
+ import { isDef as H } from "../../utils/index.mjs";
9
+ import { execFunc as G, diffFormItem as ge } from "./utils.mjs";
10
10
  import "./components/popover-filter.vue.mjs";
11
- import { useCountPerRow as he } from "./hooks/use-count-per-row.mjs";
11
+ import { useCountPerRow as ve } from "./hooks/use-count-per-row.mjs";
12
12
  import "./components/popover-sorter/index.vue.mjs";
13
- import { useSorter as ge } from "./hooks/use-sorter.mjs";
14
- import { getTargetNode as xe } from "./hooks/use-collapse-input-count.mjs";
15
- import { useNamespace as ye } from "../../config-provider/hooks/use-namespace.mjs";
16
- import { useLocale as ve } from "../../config-provider/hooks/use-locale.mjs";
17
- import G from "../item/index.vue.mjs";
18
- import Ce from "./components/popover-filter.vue2.mjs";
19
- import Se from "./components/popover-sorter/index.vue2.mjs";
20
- import _e from "../ap-form.vue2.mjs";
21
- function we(m) {
22
- return typeof m == "function" || Object.prototype.toString.call(m) === "[object Object]" && !ne(m);
13
+ import { useSorter as Ce } from "./hooks/use-sorter.mjs";
14
+ import { getTargetNode as Se } from "./hooks/use-collapse-input-count.mjs";
15
+ import { floorWith as J } from "@fruits-chain/utils";
16
+ import { useNamespace as _e } from "../../config-provider/hooks/use-namespace.mjs";
17
+ import { useLocale as we } from "../../config-provider/hooks/use-locale.mjs";
18
+ import K from "../item/index.vue.mjs";
19
+ import Re from "./components/popover-filter.vue2.mjs";
20
+ import be from "./components/popover-sorter/index.vue2.mjs";
21
+ import Fe from "../ap-form.vue2.mjs";
22
+ function Ne(f) {
23
+ return typeof f == "function" || Object.prototype.toString.call(f) === "[object Object]" && !se(f);
23
24
  }
24
- const s = 24, He = /* @__PURE__ */ le({
25
+ const s = 100, Xe = /* @__PURE__ */ ie({
25
26
  name: "ApFormSearchForm",
26
27
  __name: "index",
27
28
  props: {
@@ -99,7 +100,7 @@ const s = 24, He = /* @__PURE__ */ le({
99
100
  default: !1
100
101
  },
101
102
  countPerRow: {
102
- default: 4
103
+ default: 5
103
104
  },
104
105
  submitLoading: {
105
106
  type: Boolean
@@ -116,152 +117,158 @@ const s = 24, He = /* @__PURE__ */ le({
116
117
  default: 300
117
118
  }
118
119
  },
119
- setup(m, {
120
- expose: J
120
+ setup(f, {
121
+ expose: Q
121
122
  }) {
122
- var L;
123
- const i = re(), t = m, {
124
- b: f
125
- } = ye("ap-form-search-form"), {
126
- t: k
127
- } = ve(), K = he(t), y = D(), Q = D();
128
- function T() {
123
+ var W;
124
+ const i = ue(), t = f, {
125
+ b: m
126
+ } = _e("ap-form-search-form"), {
127
+ t: T
128
+ } = we(), X = ve(t), v = D(), Y = D();
129
+ function P() {
129
130
  var a;
130
- const e = (a = y.value) == null ? void 0 : a.getFieldsValueTransformed(!0);
131
- H(t.onSubmit, e);
131
+ const e = (a = v.value) == null ? void 0 : a.getFieldsValueTransformed(!0);
132
+ G(t.onSubmit, e);
132
133
  }
133
- function X() {
134
+ function Z() {
134
135
  var e, a;
135
- t.customReset || (a = (e = y.value) == null ? void 0 : e.resetFields) == null || a.call(e), H(t.onReset);
136
+ t.customReset || (a = (e = v.value) == null ? void 0 : e.resetFields) == null || a.call(e), G(t.onReset);
136
137
  }
137
- const Y = (e) => q(e) ? (pe(e) ? e : [e]).join("") : Date.now();
138
+ const ee = (e) => H(e) ? (he(e) ? e : [e]).join("") : Date.now();
138
139
  let E = [];
139
- const h = U(z(i.default())), c = U((L = i.extra) == null ? void 0 : L.call(i)), P = S(() => Math.floor(s / n(K))), {
140
- items: R,
141
- sorted: O,
142
- handleClickConfirm: b
143
- } = ge(h);
144
- W(() => i.default(), (e) => {
145
- E = h.value, h.value = fe(E, z(e)), O.value = !1;
146
- }), W(() => {
140
+ const h = U(q(i.default())), p = U((W = i.extra) == null ? void 0 : W.call(i)), O = _(() => J(s / n(X), 4)), {
141
+ items: b,
142
+ sorted: L,
143
+ handleClickConfirm: F
144
+ } = Ce(h);
145
+ z(() => i.default(), (e) => {
146
+ E = h.value, h.value = ge(E, q(e)), L.value = !1;
147
+ }), z(() => {
147
148
  var e;
148
149
  return (e = i.extra) == null ? void 0 : e.call(i);
149
150
  }, (e) => {
150
- c.value = e;
151
+ p.value = e;
151
152
  });
152
- const l = S(() => {
153
- const e = h.value, a = [], r = [], g = [], u = n(P);
154
- let v = 0, F = 0;
155
- const te = s * t.maxRows - u * (n(c) && !t.extraInAction ? 2 : 1);
156
- e.forEach((N) => {
157
- const p = xe(N).props;
158
- if (de(p.hidden) ? !!p.hidden : q(p.hidden))
159
- a.push(N);
153
+ function te(e) {
154
+ return J(e * (s / 24), 4);
155
+ }
156
+ const l = _(() => {
157
+ const e = h.value, a = [], r = [], y = [], u = n(O);
158
+ let C = 0, N = 0;
159
+ const ne = s * t.maxRows - u * (n(p) && !t.extraInAction ? 2 : 1);
160
+ e.forEach((A) => {
161
+ const c = Se(A).props;
162
+ if (xe(c.hidden) ? !!c.hidden : H(c.hidden))
163
+ a.push(A);
160
164
  else {
161
- let C = p.span || u;
162
- const V = {
163
- node: N,
164
- span: C,
165
- key: `ApFormSearchFormItem-${Y(p.name)}-${p._signal}`
166
- }, $ = s - v % s;
167
- $ < C && (C += $), v += C, v > te ? r.push(V) : (F = v, g.push(V));
165
+ let S = c.span ? te(c.span) : u;
166
+ const j = {
167
+ node: A,
168
+ span: S,
169
+ key: `ApFormSearchFormItem-${ee(c.name)}-${c._signal}`
170
+ }, V = s - C % s;
171
+ V < S && (S += V), C += S, C > ne ? r.push(j) : (N = C, y.push(j));
168
172
  }
169
173
  });
170
- const j = s - (F + u) % s, oe = F % s < u, ae = j < u ? s : j;
174
+ const $ = s - (N + u) % s, le = Math.ceil(N) % s < u, re = $ < u ? s : $;
171
175
  return {
172
- hideNode: o(_, null, [a]),
173
- nodes: g,
176
+ hideNode: o(w, null, [a]),
177
+ nodes: y,
174
178
  collapseNodes: r,
175
- extraSpan: ae,
176
- lastRowOnlyIncludeActionAndExtra: oe
179
+ extraSpan: re,
180
+ lastRowOnlyIncludeActionAndExtra: le
177
181
  };
178
- }), Z = S(() => {
182
+ }), x = (e) => `${e}%`, oe = _(() => {
179
183
  let e;
180
- const a = l.value.collapseNodes.length || t.sortable && h.value.length, r = o(w, {
181
- span: n(P),
184
+ const a = l.value.collapseNodes.length || t.sortable && h.value.length, r = o(R, {
185
+ flex: x(n(O)),
182
186
  key: "actionWrapper"
183
187
  }, {
184
- default: () => [o(G, null, {
185
- default: () => [o(I, {
188
+ default: () => [o(K, null, {
189
+ default: () => [o(k, {
186
190
  wrap: "wrap",
187
- justify: l.value.lastRowOnlyIncludeActionAndExtra && !(n(c) && t.extraInAction) ? "flex-end" : "space-between"
191
+ justify: l.value.lastRowOnlyIncludeActionAndExtra && !(n(p) && t.extraInAction) ? "flex-end" : "space-between"
188
192
  }, {
189
- default: () => [o(I, {
193
+ default: () => [o(k, {
190
194
  gap: 8,
191
195
  wrap: "wrap"
192
196
  }, {
193
197
  default: () => [a ? o("div", {
194
- class: f("column-setting-trigger-wrapper")
195
- }, [l.value.collapseNodes.length ? o(Ce, {
196
- onSubmit: T,
198
+ class: m("column-setting-trigger-wrapper")
199
+ }, [l.value.collapseNodes.length ? o(Re, {
200
+ onSubmit: P,
197
201
  config: l.value.collapseNodes,
198
202
  submitLoading: t.submitLoading
199
- }, null) : null, t.sortable && R.value.length ? o(Se, {
203
+ }, null) : null, t.sortable && b.value.length ? o(be, {
200
204
  ref: "sorterIns",
201
- items: R.value,
202
- onClickConfirm: b,
203
- sorted: O.value
205
+ items: b.value,
206
+ onClickConfirm: F,
207
+ sorted: L.value
204
208
  }, null) : null]) : null, o(M, {
205
209
  type: "primary",
206
- onClick: T,
210
+ onClick: P,
207
211
  loading: t.submitLoading ? {
208
212
  delay: t.loadingDelay
209
213
  } : !1,
210
214
  htmlType: "submit",
211
- class: f("action-btn")
215
+ class: m("action-btn")
212
216
  }, {
213
- default: () => [t.searchText || k("ap.apForm.search.search")]
217
+ default: () => [t.searchText || T("ap.apForm.search.search")]
214
218
  }), o(M, {
215
- onClick: X,
219
+ onClick: Z,
216
220
  type: "text",
217
- class: [f("action-btn"), f("action-btn-reset")]
221
+ class: [m("action-btn"), m("action-btn-reset")]
218
222
  }, {
219
- default: () => [t.resetText || k("ap.apForm.search.reset")]
223
+ default: () => [t.resetText || T("ap.apForm.search.reset")]
220
224
  })]
221
- }), t.extraInAction ? n(c) : null]
225
+ }), t.extraInAction ? n(p) : null]
222
226
  })]
223
227
  })]
224
- }), g = !t.extraInAction && n(c) ? o(w, {
225
- span: l.value.extraSpan,
228
+ }), y = !t.extraInAction && n(p) ? o(R, {
229
+ flex: x(l.value.extraSpan),
226
230
  key: "extraNode"
227
231
  }, {
228
- default: () => [o(G, null, {
229
- default: () => [o(I, {
232
+ default: () => [o(K, null, {
233
+ default: () => [o(k, {
230
234
  justify: l.value.extraSpan === s || l.value.lastRowOnlyIncludeActionAndExtra ? "start" : "flex-end"
231
- }, we(e = n(c)) ? e : {
235
+ }, Ne(e = n(p)) ? e : {
232
236
  default: () => [e]
233
237
  })]
234
238
  })]
235
- }) : null, u = o(w, {
236
- span: l.value.extraSpan
239
+ }) : null, u = o(R, {
240
+ flex: x(l.value.extraSpan)
237
241
  }, null);
238
- return l.value.lastRowOnlyIncludeActionAndExtra ? o(_, null, [g || u, r]) : o(_, null, [r, g]);
242
+ return l.value.lastRowOnlyIncludeActionAndExtra ? o(w, null, [y || u, r]) : o(w, null, [r, y]);
239
243
  });
240
- function ee() {
244
+ function ae() {
241
245
  var a;
242
- const e = (a = Q.value) == null ? void 0 : a.getCachedList();
243
- b(e);
246
+ const e = (a = Y.value) == null ? void 0 : a.getCachedList();
247
+ F(e);
244
248
  }
245
- return J({
246
- apForm: S(() => n(y)),
247
- getSorterItems: () => R.value,
248
- setSorterItems: b,
249
- resetSorterItems: ee
250
- }), (e, a) => (d(), x(_e, se({
249
+ return Q({
250
+ apForm: _(() => n(v)),
251
+ getSorterItems: () => b.value,
252
+ setSorterItems: F,
253
+ resetSorterItems: ae
254
+ }), (e, a) => (d(), g(Fe, ce({
251
255
  ref_key: "apForm",
252
- ref: y,
253
- class: n(f)()
254
- }, n(me)(t, ["collapse", "defaultCollapse", "onUpdate:collapse", "searchText", "resetText", "onSubmit", "onReset", "extraInAction", "forceExpand", "countPerRow"])), {
255
- default: A(() => [(d(), x(B(l.value.hideNode))), o(n(ce), {
256
+ ref: v,
257
+ class: n(m)()
258
+ }, n(ye)(t, ["collapse", "defaultCollapse", "onUpdate:collapse", "searchText", "resetText", "onSubmit", "onReset", "extraInAction", "forceExpand", "countPerRow"])), {
259
+ default: B(() => [(d(), g(I(l.value.hideNode))), o(n(me), {
256
260
  gutter: 8
257
261
  }, {
258
- default: A(() => [(d(!0), ie(_, null, ue(l.value.nodes, (r) => (d(), x(n(w), {
262
+ default: B(() => [(d(!0), pe(w, null, de(l.value.nodes, (r) => (d(), g(n(R), {
259
263
  key: r.key,
260
- span: r.span
264
+ flex: x(r.span),
265
+ style: fe({
266
+ maxWidth: x(r.span)
267
+ })
261
268
  }, {
262
- default: A(() => [(d(), x(B(r.node)))]),
269
+ default: B(() => [(d(), g(I(r.node)))]),
263
270
  _: 2
264
- }, 1032, ["span"]))), 128)), (d(), x(B(Z.value)))]),
271
+ }, 1032, ["flex", "style"]))), 128)), (d(), g(I(oe.value)))]),
265
272
  _: 1
266
273
  })]),
267
274
  _: 1
@@ -269,5 +276,5 @@ const s = 24, He = /* @__PURE__ */ le({
269
276
  }
270
277
  });
271
278
  export {
272
- He as default
279
+ Xe as default
273
280
  };
@@ -150,6 +150,7 @@ const we = /* @__PURE__ */ K({
150
150
  type: [Boolean, Function]
151
151
  },
152
152
  treeConfig: {},
153
+ onReady: {},
153
154
  columns: {},
154
155
  defaultValue: {},
155
156
  "onUpdate:value": {},
@@ -150,6 +150,7 @@ const Re = /* @__PURE__ */ $({
150
150
  type: [Boolean, Function]
151
151
  },
152
152
  treeConfig: {},
153
+ onReady: {},
153
154
  columns: {},
154
155
  defaultValue: {},
155
156
  "onUpdate:value": {},