@aplus-frontend/ui 0.0.37 → 0.0.39

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 (43) hide show
  1. package/es/src/ap-download/ap-download.vue.mjs +26 -35
  2. package/es/src/ap-download/hooks/index.d.ts +1 -6
  3. package/es/src/ap-download/hooks/index.mjs +12 -12
  4. package/es/src/ap-download/interface.d.ts +3 -13
  5. package/es/src/ap-download/style/ap-download.css +12 -12
  6. package/es/src/ap-form/ap-form-item-group/index.vue.mjs +28 -27
  7. package/es/src/ap-form/search-form/index.vue.mjs +107 -102
  8. package/es/src/ap-table/ap-table.vue.d.ts +10 -4
  9. package/es/src/ap-table/ap-table.vue.mjs +58 -57
  10. package/es/src/ap-table/constants.d.ts +8 -8
  11. package/es/src/ap-table/hooks/use-table-row-selection.d.ts +1 -1
  12. package/es/src/ap-table/interface.d.ts +6 -2
  13. package/es/src/business/ap-label/ApLabel.vue.d.ts +13 -2
  14. package/es/src/business/ap-label/ApLabel.vue2.mjs +43 -25
  15. package/es/src/business/ap-label/interface.d.ts +6 -3
  16. package/es/src/business/ap-label/style.css +2 -1
  17. package/es/src/business/expandAlert/ApExpandAlert.vue2.mjs +1 -1
  18. package/es/src/business/expandAlert/interface.d.ts +1 -1
  19. package/es/src/business/index.d.ts +53 -9
  20. package/es/src/theme/ap-download/ap-download.css +12 -12
  21. package/es/src/theme/ap-label/ap-label.css +2 -1
  22. package/lib/src/ap-download/ap-download.vue.js +1 -1
  23. package/lib/src/ap-download/hooks/index.d.ts +1 -6
  24. package/lib/src/ap-download/hooks/index.js +1 -1
  25. package/lib/src/ap-download/interface.d.ts +3 -13
  26. package/lib/src/ap-download/style/ap-download.css +12 -12
  27. package/lib/src/ap-form/ap-form-item-group/index.vue.js +1 -1
  28. package/lib/src/ap-form/search-form/index.vue.js +1 -1
  29. package/lib/src/ap-table/ap-table.vue.d.ts +10 -4
  30. package/lib/src/ap-table/ap-table.vue.js +1 -1
  31. package/lib/src/ap-table/constants.d.ts +8 -8
  32. package/lib/src/ap-table/hooks/use-table-row-selection.d.ts +1 -1
  33. package/lib/src/ap-table/interface.d.ts +6 -2
  34. package/lib/src/business/ap-label/ApLabel.vue.d.ts +13 -2
  35. package/lib/src/business/ap-label/ApLabel.vue2.js +1 -1
  36. package/lib/src/business/ap-label/interface.d.ts +6 -3
  37. package/lib/src/business/ap-label/style.css +2 -1
  38. package/lib/src/business/expandAlert/ApExpandAlert.vue2.js +1 -1
  39. package/lib/src/business/expandAlert/interface.d.ts +1 -1
  40. package/lib/src/business/index.d.ts +53 -9
  41. package/lib/src/theme/ap-download/ap-download.css +12 -12
  42. package/lib/src/theme/ap-label/ap-label.css +2 -1
  43. package/package.json +4 -4
@@ -1,10 +1,11 @@
1
- import { defineComponent as y, computed as a, watch as _, openBlock as z, createElementBlock as I, normalizeStyle as O, normalizeClass as i, createElementVNode as n, renderSlot as v, toDisplayString as B } from "vue";
1
+ import { defineComponent as y, computed as n, unref as z, openBlock as v, createElementBlock as I, normalizeStyle as N, normalizeClass as i, createElementVNode as s, renderSlot as B, toDisplayString as O } from "vue";
2
2
  import "../config-provider/index.mjs";
3
- import { useOssInit as N, useOss as k } from "./hooks/index.mjs";
3
+ import { useOssInit as k } from "./hooks/index.mjs";
4
4
  import "./style/ap-download.css";
5
- import { useGlobalConfig as A } from "../config-provider/hooks/use-global-config.mjs";
6
- import { useNamespace as F } from "../config-provider/hooks/use-namespace.mjs";
7
- const M = { class: "icon" }, W = { class: "text" }, j = /* @__PURE__ */ y({
5
+ import { useLocale as A } from "../config-provider/hooks/use-locale.mjs";
6
+ import { useGlobalConfig as F } from "../config-provider/hooks/use-global-config.mjs";
7
+ import { useNamespace as M } from "../config-provider/hooks/use-namespace.mjs";
8
+ const W = { class: "icon" }, D = { class: "text" }, j = /* @__PURE__ */ y({
8
9
  name: "ApDownload",
9
10
  __name: "ap-download",
10
11
  props: {
@@ -16,43 +17,33 @@ const M = { class: "icon" }, W = { class: "text" }, j = /* @__PURE__ */ y({
16
17
  getOssAccess: {}
17
18
  },
18
19
  setup(l) {
19
- const t = l, p = A("uiMode"), { b: r, bm: s } = F("download");
20
- function c(e, o) {
20
+ const { lang: p } = A(), c = n(() => p.value === "zh-cn" ? "zh_CN" : "en_US"), t = l, d = F("uiMode"), { b: r, bm: a } = M("ap-download");
21
+ function u(e, o) {
21
22
  e.length === 4 && (e = `#${e[1]}${e[1]}${e[2]}${e[2]}${e[3]}${e[3]}`);
22
- const w = parseInt(e.slice(1, 3), 16), S = parseInt(e.slice(3, 5), 16), b = parseInt(e.slice(5, 7), 16), $ = Math.round(o * 255).toString(16).padStart(2, "0");
23
- return `#${w.toString(16).padStart(2, "0")}${S.toString(16).padStart(2, "0")}${b.toString(16).padStart(2, "0")}${$}`;
23
+ const S = parseInt(e.slice(1, 3), 16), $ = parseInt(e.slice(3, 5), 16), _ = parseInt(e.slice(5, 7), 16), b = Math.round(o * 255).toString(16).padStart(2, "0");
24
+ return `#${S.toString(16).padStart(2, "0")}${$.toString(16).padStart(2, "0")}${_.toString(16).padStart(2, "0")}${b}`;
24
25
  }
25
- const d = a(() => ({
26
+ const m = n(() => ({
26
27
  "--download-main-color": t.color,
27
- "--download-main-color-opacity": c(t.color, 0.6)
28
- })), u = a(() => [r("wrapper"), s("wrapper", t.size)].filter(Boolean)), m = a(() => {
29
- const e = [r("inner-wrapper"), s("inner-wrapper", t.size)];
30
- return t.disabled && (p.value === "aplus" ? e.push(s("inner-wrapper", "disabled")) : e.push(s("inner-wrapper", "disabled-admin"))), e;
31
- });
32
- _(
33
- () => t.disabled,
34
- () => {
35
- t.disabled || N(t.getOssAccess);
36
- },
37
- {
38
- flush: "sync"
39
- }
40
- );
41
- const { client: f } = k(), g = () => {
42
- t.disabled || f.downloadFile(t.fileName);
28
+ "--download-main-color-opacity": u(t.color, 0.6)
29
+ })), f = n(() => [r("wrapper"), a("wrapper", t.size)].filter(Boolean)), g = n(() => {
30
+ const e = [r("inner-wrapper"), a("inner-wrapper", t.size)];
31
+ return t.disabled && (d.value === "aplus" ? e.push(a("inner-wrapper", "disabled")) : e.push(a("inner-wrapper", "disabled-admin"))), e;
32
+ }), w = async () => {
33
+ t.disabled || await (await k(t.getOssAccess, z(c))).downloadFile(t.fileName);
43
34
  };
44
- return (e, o) => (z(), I("span", {
45
- style: O(d.value),
46
- class: i(u.value),
47
- onClick: g
35
+ return (e, o) => (v(), I("span", {
36
+ style: N(m.value),
37
+ class: i(f.value),
38
+ onClick: w
48
39
  }, [
49
- n("span", {
50
- class: i(m.value)
40
+ s("span", {
41
+ class: i(g.value)
51
42
  }, [
52
- n("span", M, [
53
- v(e.$slots, "icon")
43
+ s("span", W, [
44
+ B(e.$slots, "icon")
54
45
  ]),
55
- n("span", W, B(e.text), 1)
46
+ s("span", D, O(e.text), 1)
56
47
  ], 2)
57
48
  ], 6));
58
49
  }
@@ -1,9 +1,4 @@
1
1
  import { Oss } from '@aplus-frontend/oss';
2
2
 
3
3
  export type { Oss } from '@aplus-frontend/oss';
4
- export declare function useOss(): {
5
- client: Oss;
6
- };
7
- export declare function useOssInit(getOssAccess: any): Promise<{
8
- client: Oss;
9
- }>;
4
+ export declare function useOssInit(getOssAccess: any, Locale: 'zh_CN' | 'en_US'): Promise<Oss | null>;
@@ -1,21 +1,21 @@
1
- import { client as t } from "@aplus-frontend/oss";
2
- function o() {
3
- return { client: t };
4
- }
5
- async function e(n) {
6
- if (!n)
1
+ import { client as i } from "@aplus-frontend/oss";
2
+ const n = /* @__PURE__ */ new Map(), t = Symbol("ossInstance");
3
+ async function r(o, a) {
4
+ if (!o)
7
5
  throw new Error("请传入getOssAccess");
8
- return await t.initOssClient({
9
- locale: "zh_CN",
10
- getOssAccess: n,
6
+ if (n.has(t))
7
+ return n.get(t);
8
+ const e = await i.initOssClient({
9
+ locale: a,
10
+ getOssAccess: o,
11
11
  onFailure: (s) => {
12
12
  throw new Error(
13
13
  typeof (s == null ? void 0 : s.message) == "string" ? s.message : "获取oss临时权限失败"
14
14
  );
15
15
  }
16
- }), o();
16
+ });
17
+ return n.set(t, e), e;
17
18
  }
18
19
  export {
19
- o as useOss,
20
- e as useOssInit
20
+ r as useOssInit
21
21
  };
@@ -1,14 +1,5 @@
1
- interface AccessCreate {
2
- bucket: string;
3
- regionId: string;
4
- endpoint: string;
5
- accessKeyId: string;
6
- accessKeySecret: string;
7
- expiration: number;
8
- extInformation: string;
9
- fileProvideType: string;
10
- callbackUrl: string;
11
- }
1
+ import { accessCreate } from '@aplus-frontend/oss';
2
+
12
3
  export interface ApDownLoadProps {
13
4
  /**
14
5
  * 标签内容
@@ -28,6 +19,5 @@ export interface ApDownLoadProps {
28
19
  */
29
20
  disabled?: boolean;
30
21
  fileName: string;
31
- getOssAccess: () => Promise<AccessCreate>;
22
+ getOssAccess: () => Promise<accessCreate>;
32
23
  }
33
- export {};
@@ -1,51 +1,51 @@
1
- .aplus-download-wrapper {
1
+ .aplus-ap-download-wrapper {
2
2
  text-wrap: nowrap;
3
3
  display: inline-block;
4
4
  display: flex;
5
5
  }
6
- .aplus-download-inner-wrapper {
6
+ .aplus-ap-download-inner-wrapper {
7
7
  display: inline-block;
8
8
  color: var(--download-main-color);
9
9
  cursor: pointer;
10
10
  display: flex;
11
11
  align-items: center;
12
12
  }
13
- .aplus-download-inner-wrapper .icon {
13
+ .aplus-ap-download-inner-wrapper .icon {
14
14
  position: relative;
15
15
  font-size: 18px;
16
16
  }
17
- .aplus-download-inner-wrapper .text {
17
+ .aplus-ap-download-inner-wrapper .text {
18
18
  margin-left: 5px;
19
19
  }
20
- .aplus-download-inner-wrapper:hover {
20
+ .aplus-ap-download-inner-wrapper:hover {
21
21
  color: var(--download-main-color-opacity);
22
22
  }
23
- .aplus-download-inner-wrapper--large {
23
+ .aplus-ap-download-inner-wrapper--large {
24
24
  line-height: 26px;
25
25
  height: 28px;
26
26
  font-size: 16px;
27
27
  }
28
- .aplus-download-inner-wrapper--middle {
28
+ .aplus-ap-download-inner-wrapper--middle {
29
29
  line-height: 22px;
30
30
  height: 24px;
31
31
  font-size: 14px;
32
32
  }
33
- .aplus-download-inner-wrapper--small {
33
+ .aplus-ap-download-inner-wrapper--small {
34
34
  line-height: 19px;
35
35
  height: 20px;
36
36
  font-size: 12px;
37
37
  }
38
- .aplus-download-inner-wrapper--disabled {
38
+ .aplus-ap-download-inner-wrapper--disabled {
39
39
  color: #8896b0;
40
40
  cursor: not-allowed;
41
41
  }
42
- .aplus-download-inner-wrapper--disabled:hover {
42
+ .aplus-ap-download-inner-wrapper--disabled:hover {
43
43
  color: #8896b0;
44
44
  }
45
- .aplus-download-inner-wrapper--disabled-admin {
45
+ .aplus-ap-download-inner-wrapper--disabled-admin {
46
46
  cursor: not-allowed;
47
47
  color: #999;
48
48
  }
49
- .aplus-download-inner-wrapper--disabled-admin:hover {
49
+ .aplus-ap-download-inner-wrapper--disabled-admin:hover {
50
50
  color: #999;
51
51
  }
@@ -1,15 +1,16 @@
1
- import { isVNode as k, defineComponent as w, useSlots as _, watch as S, shallowRef as b, computed as x, unref as n, createVNode as N, mergeProps as c, openBlock as a, createBlock as u, withCtx as R, createElementBlock as h, Fragment as j, renderList as B, resolveDynamicComponent as P } from "vue";
1
+ import { isVNode as h, defineComponent as k, useSlots as w, watch as _, shallowRef as P, computed as S, unref as n, createVNode as b, mergeProps as m, openBlock as s, createBlock as c, withCtx as x, createElementBlock as B, Fragment as N, renderList as R, resolveDynamicComponent as j } from "vue";
2
2
  import { Col as v, Row as F } from "ant-design-vue";
3
- import { pick as I } from "lodash-unified";
3
+ import { pick as D, isBoolean as I } from "lodash-unified";
4
4
  import { apFormItemColPropKeys as O } from "../constant.mjs";
5
- import { genRealChildren as i, buildColSpan as V, getStringName as $ } from "./helper.mjs";
5
+ import { genRealChildren as u, buildColSpan as V, getStringName as $ } from "./helper.mjs";
6
6
  import "../../config-provider/index.mjs";
7
7
  import "../style/ap-form-item-group.css";
8
- import { useNamespace as A } from "../../config-provider/hooks/use-namespace.mjs";
9
- function D(o) {
10
- return typeof o == "function" || Object.prototype.toString.call(o) === "[object Object]" && !k(o);
8
+ import { isDef as A } from "../../utils/index.mjs";
9
+ import { useNamespace as E } from "../../config-provider/hooks/use-namespace.mjs";
10
+ function G(t) {
11
+ return typeof t == "function" || Object.prototype.toString.call(t) === "[object Object]" && !h(t);
11
12
  }
12
- const M = /* @__PURE__ */ w({
13
+ const U = /* @__PURE__ */ k({
13
14
  name: "ApFormItemGroup",
14
15
  __name: "index",
15
16
  props: {
@@ -27,31 +28,31 @@ const M = /* @__PURE__ */ w({
27
28
  default: 3
28
29
  }
29
30
  },
30
- setup(o) {
31
+ setup(t) {
31
32
  const {
32
- b: s
33
- } = A("ap-form-item-group"), {
34
- countPerRow: f,
35
- ...d
36
- } = o, p = _();
37
- S(() => p.default(), (t) => {
38
- l.value = i(t);
33
+ b: a
34
+ } = E("ap-form-item-group"), {
35
+ countPerRow: d,
36
+ ...f
37
+ } = t, p = w();
38
+ _(() => p.default(), (o) => {
39
+ l.value = u(o);
39
40
  });
40
- const l = b(i(p.default())), g = x(() => n(l).map((t, m) => {
41
- const e = t.props, r = I(e, O), y = r != null && r.span ? {} : V(f), C = !!(e != null && e.hidden);
41
+ const l = P(u(p.default())), g = S(() => n(l).map((o, i) => {
42
+ const e = o.props, r = D(e, O), y = r != null && r.span ? {} : V(d), C = I(e.hidden) ? !!e.hidden : A(e.hidden);
42
43
  return {
43
- key: `${m}-${$(e.name)}`,
44
- node: N(v, c(y, r, {
45
- class: C ? s("col-hidden") : ""
46
- }), D(t) ? t : {
47
- default: () => [t]
44
+ key: `${i}-${$(e.name)}`,
45
+ node: b(v, m(y, r, {
46
+ class: C ? a("col-hidden") : ""
47
+ }), G(o) ? o : {
48
+ default: () => [o]
48
49
  })
49
50
  };
50
51
  }));
51
- return (t, m) => (a(), u(n(F), c({
52
- class: n(s)()
53
- }, d), {
54
- default: R(() => [(a(!0), h(j, null, B(g.value, (e) => (a(), u(P(e.node), {
52
+ return (o, i) => (s(), c(n(F), m({
53
+ class: n(a)()
54
+ }, f), {
55
+ default: x(() => [(s(!0), B(N, null, R(g.value, (e) => (s(), c(j(e.node), {
55
56
  key: e.key
56
57
  }))), 128))]),
57
58
  _: 1
@@ -59,5 +60,5 @@ const M = /* @__PURE__ */ w({
59
60
  }
60
61
  });
61
62
  export {
62
- M as default
63
+ U as default
63
64
  };
@@ -1,25 +1,25 @@
1
- import { isVNode as oe, defineComponent as ae, useSlots as le, ref as ne, unref as t, shallowRef as j, computed as g, watch as M, cloneVNode as re, createVNode as l, Fragment as S, openBlock as c, createBlock as h, mergeProps as se, withCtx as B, resolveDynamicComponent as R, createElementBlock as ue, renderList as ie } from "vue";
2
- import { Col as b, Flex as D, Space as pe, Button as v, Row as ce } from "ant-design-vue";
1
+ import { isVNode as ne, defineComponent as le, useSlots as re, ref as se, unref as o, shallowRef as V, computed as g, watch as j, cloneVNode as ie, createVNode as n, Fragment as _, openBlock as m, createBlock as y, mergeProps as ue, withCtx as B, resolveDynamicComponent as A, createElementBlock as ce, renderList as pe } from "vue";
2
+ import { Col as R, Flex as M, Space as de, Button as E, Row as fe } from "ant-design-vue";
3
3
  import "../ap-form.vue.mjs";
4
4
  import "../ap-form-item.vue2.mjs";
5
5
  import "../../hooks/index.mjs";
6
- import { genRealChildren as O } from "../ap-form-item-group/helper.mjs";
7
- import { DoubleRightOutlined as de } from "@ant-design/icons-vue";
6
+ import { genRealChildren as D } from "../ap-form-item-group/helper.mjs";
7
+ import { DoubleRightOutlined as me } from "@ant-design/icons-vue";
8
8
  import "../../config-provider/index.mjs";
9
9
  import "../style/search-form.css";
10
- import { isArray as fe, omit as me } from "lodash-unified";
11
- import { isDef as he } from "../../utils/index.mjs";
12
- import { diffFormItem as xe } from "./utils.mjs";
13
- import { useControllableValue as Ce } from "../../hooks/useControllableValue.mjs";
14
- import { useNamespace as ge } from "../../config-provider/hooks/use-namespace.mjs";
15
- import { useGlobalConfig as ye } from "../../config-provider/hooks/use-global-config.mjs";
16
- import { useLocale as _e } from "../../config-provider/hooks/use-locale.mjs";
17
- import $ from "../ap-form-item.vue.mjs";
10
+ import { isArray as he, isBoolean as xe, omit as ye } from "lodash-unified";
11
+ import { isDef as $ } from "../../utils/index.mjs";
12
+ import { diffFormItem as Ce } from "./utils.mjs";
13
+ import { useControllableValue as ge } from "../../hooks/useControllableValue.mjs";
14
+ import { useNamespace as _e } from "../../config-provider/hooks/use-namespace.mjs";
15
+ import { useGlobalConfig as Re } from "../../config-provider/hooks/use-global-config.mjs";
16
+ import { useLocale as Se } from "../../config-provider/hooks/use-locale.mjs";
17
+ import L from "../ap-form-item.vue.mjs";
18
18
  import Fe from "../ap-form.vue2.mjs";
19
- function Se(d) {
20
- return typeof d == "function" || Object.prototype.toString.call(d) === "[object Object]" && !oe(d);
19
+ function Be(h) {
20
+ return typeof h == "function" || Object.prototype.toString.call(h) === "[object Object]" && !ne(h);
21
21
  }
22
- const i = 24, qe = /* @__PURE__ */ ae({
22
+ const i = 24, ze = /* @__PURE__ */ le({
23
23
  name: "ApFormSearchForm",
24
24
  __name: "index",
25
25
  props: {
@@ -98,134 +98,139 @@ const i = 24, qe = /* @__PURE__ */ ae({
98
98
  }
99
99
  },
100
100
  emits: ["update:collapse"],
101
- setup(d, {
102
- expose: L,
101
+ setup(h, {
102
+ expose: W,
103
103
  emit: q
104
104
  }) {
105
- var k;
106
- const r = le(), o = d, z = q, {
107
- value: f,
108
- updateValue: U
109
- } = Ce(o, z, {
105
+ var N;
106
+ const s = re(), a = h, z = q, {
107
+ value: u,
108
+ updateValue: H
109
+ } = ge(a, z, {
110
110
  valuePropName: "collapse",
111
111
  defaultValuePropName: "defaultCollapse"
112
112
  }), {
113
- b: W
114
- } = ge("ap-form-search-form"), G = ye("uiMode"), {
115
- t: w
116
- } = _e(), x = ne();
117
- function H() {
118
- U(!t(f));
119
- }
113
+ b: U
114
+ } = _e("ap-form-search-form"), G = Re("uiMode"), {
115
+ t: b
116
+ } = Se(), C = se();
120
117
  function J() {
121
- var e, a;
122
- (a = (e = x.value) == null ? void 0 : e.validateFields()) == null || a.then(o.onSubmit);
118
+ H(!o(u));
123
119
  }
124
120
  function K() {
125
- var e, a, n;
126
- o.customReset || (a = (e = x.value) == null ? void 0 : e.resetFields) == null || a.call(e), (n = o.onReset) == null || n.call(o);
121
+ var e, t;
122
+ (t = (e = C.value) == null ? void 0 : e.validateFields()) == null || t.then(a.onSubmit);
123
+ }
124
+ function Q() {
125
+ var e, t, l;
126
+ a.customReset || (t = (e = C.value) == null ? void 0 : e.resetFields) == null || t.call(e), (l = a.onReset) == null || l.call(a);
127
127
  }
128
- let E = [];
129
- const y = j(O(r.default())), m = j((k = r.extra) == null ? void 0 : k.call(r)), N = g(() => Math.floor(i / o.countPerRow));
130
- M(() => r.default(), (e) => {
131
- E = y.value, y.value = O(e);
132
- }), M(() => {
128
+ let v = [];
129
+ const S = V(D(s.default())), p = V((N = s.extra) == null ? void 0 : N.call(s)), w = g(() => Math.floor(i / a.countPerRow));
130
+ j(() => s.default(), (e) => {
131
+ v = S.value, S.value = D(e);
132
+ }), j(() => {
133
133
  var e;
134
- return (e = r.extra) == null ? void 0 : e.call(r);
134
+ return (e = s.extra) == null ? void 0 : e.call(s);
135
135
  }, (e) => {
136
- m.value = e;
136
+ p.value = e;
137
137
  });
138
- const Q = (e) => he(e) ? (fe(e) ? e : [e]).join("") : Date.now(), _ = g(() => {
139
- const e = xe(E, y.value), a = [], n = [], s = t(N);
140
- let F = 0;
141
- e.forEach((u) => {
142
- const p = u.props;
143
- p != null && p.hidden ? a.push(u) : (F += p.span || s, n.push(u));
138
+ const X = (e) => $(e) ? (he(e) ? e : [e]).join("") : Date.now(), F = g(() => {
139
+ const e = Ce(v, S.value), t = [], l = [], r = o(w);
140
+ let d = 0;
141
+ e.forEach((c) => {
142
+ const f = c.props;
143
+ (xe(f.hidden) ? !!f.hidden : $(f.hidden)) ? t.push(c) : (d += f.span || r, l.push(c));
144
144
  });
145
- const A = i - (F + s) % i, Y = A < s ? i : A, P = i - s * (t(m) && !o.extraInAction ? 2 : 1), Z = !o.forceExpand && F > P;
146
- let T = 0, V = 0;
147
- const ee = n.map((u, p) => {
148
- const C = u.props, I = C.span || s;
149
- if (T += I, !o.forceExpand && t(f) && T > P) {
150
- a.push(re(u, {
145
+ const k = i - (d + r) % i, Z = d % i < r, ee = k < r ? i : k, I = i - r * (o(p) && !a.extraInAction ? 2 : 1), te = !a.forceExpand && d > I;
146
+ let P = 0, T = 0;
147
+ const oe = l.map((c, f) => {
148
+ const x = c.props, O = x.span || r;
149
+ if (P += O, !a.forceExpand && o(u) && P > I) {
150
+ t.push(ie(c, {
151
151
  hidden: !0
152
152
  }));
153
153
  return;
154
154
  }
155
- return V += I, {
156
- node: u,
157
- span: C.span || s,
158
- key: `ApFormSearchFormItem-${p}-${Q(C.name)}-${C._signal}`
155
+ return T += O, {
156
+ node: c,
157
+ span: x.span || r,
158
+ key: `ApFormSearchFormItem-${f}-${X(x.name)}-${x._signal}`
159
159
  };
160
- }).filter(Boolean), te = i - V - s;
160
+ }).filter(Boolean), ae = i - T - r;
161
161
  return {
162
- hideNode: l(S, null, [a]),
163
- nodes: ee,
164
- defaultExtraSpan: Y,
165
- actualExtraSpan: te,
166
- showCollapse: Z
162
+ hideNode: n(_, null, [t]),
163
+ nodes: oe,
164
+ defaultExtraSpan: ee,
165
+ actualExtraSpan: ae,
166
+ showCollapse: te,
167
+ lastRowOnlyIncludeActionAndExtra: Z
167
168
  };
168
- }), X = g(() => {
169
+ }), Y = g(() => {
169
170
  let e;
170
- const a = t(_);
171
- return l(S, null, [l(b, {
172
- span: t(t(N))
171
+ const t = o(F), l = n(R, {
172
+ span: o(w),
173
+ key: "actionWrapper"
173
174
  }, {
174
- default: () => [l($, null, {
175
- default: () => [l(D, {
176
- justify: "space-between"
175
+ default: () => [n(L, null, {
176
+ default: () => [n(M, {
177
+ justify: !o(u) && t.lastRowOnlyIncludeActionAndExtra && !(o(p) && a.extraInAction) ? "flex-end" : "space-between"
177
178
  }, {
178
- default: () => [l(pe, null, {
179
- default: () => [l(v, {
179
+ default: () => [n(de, null, {
180
+ default: () => [n(E, {
180
181
  type: "primary",
181
- onClick: J,
182
- loading: o.submitLoading,
182
+ onClick: K,
183
+ loading: a.submitLoading,
183
184
  htmlType: "submit"
184
185
  }, {
185
- default: () => [o.searchText || w("ap.apForm.search.search")]
186
- }), l(v, {
187
- onClick: K
186
+ default: () => [a.searchText || b("ap.apForm.search.search")]
187
+ }), n(E, {
188
+ onClick: Q
188
189
  }, {
189
- default: () => [o.resetText || w("ap.apForm.search.reset")]
190
- }), a.showCollapse ? l(v, {
191
- onClick: H,
192
- icon: l(de, {
190
+ default: () => [a.resetText || b("ap.apForm.search.reset")]
191
+ }), t.showCollapse ? n(E, {
192
+ onClick: J,
193
+ icon: n(me, {
193
194
  style: G.value === "aplus" ? "color:#B8C3D1" : "color:#BFBFBF",
194
- rotate: t(f) ? 90 : -90
195
+ rotate: o(u) ? 90 : -90
195
196
  }, null)
196
197
  }, null) : null]
197
- }), o.extraInAction ? t(m) : null]
198
+ }), a.extraInAction ? o(p) : null]
198
199
  })]
199
200
  })]
200
- }), !o.extraInAction && t(m) ? l(b, {
201
- span: t(f) ? a.actualExtraSpan : a.defaultExtraSpan
201
+ }), r = !a.extraInAction && o(p) ? n(R, {
202
+ span: o(u) ? t.actualExtraSpan : t.defaultExtraSpan,
203
+ key: "extraNode"
202
204
  }, {
203
- default: () => [l($, null, {
204
- default: () => [l(D, {
205
- justify: !t(f) && a.defaultExtraSpan === i ? "start" : "end"
206
- }, Se(e = t(m)) ? e : {
205
+ default: () => [n(L, null, {
206
+ default: () => [n(M, {
207
+ justify: !o(u) && (t.defaultExtraSpan === i || t.lastRowOnlyIncludeActionAndExtra) ? "start" : "flex-end"
208
+ }, Be(e = o(p)) ? e : {
207
209
  default: () => [e]
208
210
  })]
209
211
  })]
210
- }) : null]);
212
+ }) : null, d = n(R, {
213
+ span: t.defaultExtraSpan
214
+ }, null);
215
+ return !o(u) && t.lastRowOnlyIncludeActionAndExtra ? n(_, null, [r || d, l]) : n(_, null, [l, r]);
211
216
  });
212
- return L({
213
- apForm: g(() => t(x))
214
- }), (e, a) => (c(), h(Fe, se({
215
- class: t(W)(),
217
+ return W({
218
+ apForm: g(() => o(C))
219
+ }), (e, t) => (m(), y(Fe, ue({
220
+ class: o(U)(),
216
221
  ref_key: "apForm",
217
- ref: x
218
- }, t(me)(o, ["collapse", "defaultCollapse", "onUpdate:collapse", "searchText", "resetText", "onSubmit", "onReset", "extraInAction", "forceExpand", "countPerRow"])), {
219
- default: B(() => [(c(), h(R(_.value.hideNode))), l(t(ce), {
222
+ ref: C
223
+ }, o(ye)(a, ["collapse", "defaultCollapse", "onUpdate:collapse", "searchText", "resetText", "onSubmit", "onReset", "extraInAction", "forceExpand", "countPerRow"])), {
224
+ default: B(() => [(m(), y(A(F.value.hideNode))), n(o(fe), {
220
225
  gutter: 16
221
226
  }, {
222
- default: B(() => [(c(!0), ue(S, null, ie(_.value.nodes, (n) => (c(), h(t(b), {
223
- key: n.key,
224
- span: n.span
227
+ default: B(() => [(m(!0), ce(_, null, pe(F.value.nodes, (l) => (m(), y(o(R), {
228
+ key: l.key,
229
+ span: l.span
225
230
  }, {
226
- default: B(() => [(c(), h(R(n.node)))]),
231
+ default: B(() => [(m(), y(A(l.node)))]),
227
232
  _: 2
228
- }, 1032, ["span"]))), 128)), (c(), h(R(X.value)))]),
233
+ }, 1032, ["span"]))), 128)), (m(), y(A(Y.value)))]),
229
234
  _: 1
230
235
  })]),
231
236
  _: 1
@@ -233,5 +238,5 @@ const i = 24, qe = /* @__PURE__ */ ae({
233
238
  }
234
239
  });
235
240
  export {
236
- qe as default
241
+ ze as default
237
242
  };
@@ -4,7 +4,7 @@ import { ColumnType } from 'ant-design-vue/es/table';
4
4
  import { RowSelectionReturnType } from './hooks/use-table-row-selection';
5
5
  import { SpinSize } from 'ant-design-vue/es/spin/Spin';
6
6
  import { VueTypeValidableDef } from '../../node_modules/vue-types';
7
- import { GetPopupContainer, FilterValue, SorterResult, TableCurrentDataSource, TableLocale, CompareFn, ColumnFilterItem, SortOrder } from 'ant-design-vue/es/table/interface';
7
+ import { GetPopupContainer, FilterValue, SorterResult, TableCurrentDataSource, TableLocale, CompareFn, ColumnFilterItem, SortOrder, TableRowSelection } from 'ant-design-vue/es/table/interface';
8
8
  import { RenderExpandIcon, PanelRender, TableComponents, TransformCellText, TableLayout, GetRowKey, TableSticky, RowClassName, GetComponentProps, ColumnType, Key, ExpandedRowRender } from 'ant-design-vue/es/vc-table/interface';
9
9
  import { TablePaginationConfig } from 'ant-design-vue';
10
10
  import { EllipsisConfig } from 'ant-design-vue/es/typography/Base';
@@ -672,7 +672,9 @@ declare const _default: <RecordType>(__VLS_props: {
672
672
  onOpenChange: PropType<(vis: boolean) => void>;
673
673
  'onUpdate:open': PropType<(vis: boolean) => void>;
674
674
  }>> | undefined;
675
- rowSelection?: true | ApTableRowSelection<RecordType> | undefined;
675
+ rowSelection?: true | ApTableRowSelection<RecordType> | ( TableRowSelection<RecordType> & {
676
+ mode?: "base" | undefined;
677
+ }) | undefined;
676
678
  rowClassName?: string | RowClassName<RecordType> | undefined;
677
679
  showHeader?: boolean | undefined;
678
680
  customRow?: GetComponentProps<RecordType> | undefined;
@@ -1417,7 +1419,9 @@ declare const _default: <RecordType>(__VLS_props: {
1417
1419
  onOpenChange: PropType<(vis: boolean) => void>;
1418
1420
  'onUpdate:open': PropType<(vis: boolean) => void>;
1419
1421
  }>> | undefined;
1420
- rowSelection?: true | ApTableRowSelection<RecordType> | undefined;
1422
+ rowSelection?: true | ApTableRowSelection<RecordType> | ( TableRowSelection<RecordType> & {
1423
+ mode?: "base" | undefined;
1424
+ }) | undefined;
1421
1425
  rowClassName?: string | RowClassName<RecordType> | undefined;
1422
1426
  showHeader?: boolean | undefined;
1423
1427
  customRow?: GetComponentProps<RecordType> | undefined;
@@ -2166,7 +2170,9 @@ declare const _default: <RecordType>(__VLS_props: {
2166
2170
  onOpenChange: PropType<(vis: boolean) => void>;
2167
2171
  'onUpdate:open': PropType<(vis: boolean) => void>;
2168
2172
  }>> | undefined;
2169
- rowSelection?: true | ApTableRowSelection<RecordType> | undefined;
2173
+ rowSelection?: true | ApTableRowSelection<RecordType> | ( TableRowSelection<RecordType> & {
2174
+ mode?: "base" | undefined;
2175
+ }) | undefined;
2170
2176
  rowClassName?: string | RowClassName<RecordType> | undefined;
2171
2177
  showHeader?: boolean | undefined;
2172
2178
  customRow?: GetComponentProps<RecordType> | undefined;