@aplus-frontend/ui 0.0.38 → 0.0.40

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

@@ -1,25 +1,25 @@
-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";
-import { Col as b, Flex as D, Space as pe, Button as v, Row as ce } from "ant-design-vue";
+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";
+import { Col as R, Flex as M, Space as de, Button as E, Row as fe } from "ant-design-vue";
 import "../ap-form.vue.mjs";
 import "../ap-form-item.vue2.mjs";
 import "../../hooks/index.mjs";
-import { genRealChildren as O } from "../ap-form-item-group/helper.mjs";
-import { DoubleRightOutlined as de } from "@ant-design/icons-vue";
+import { genRealChildren as D } from "../ap-form-item-group/helper.mjs";
+import { DoubleRightOutlined as me } from "@ant-design/icons-vue";
 import "../../config-provider/index.mjs";
 import "../style/search-form.css";
-import { isArray as fe, omit as me } from "lodash-unified";
-import { isDef as he } from "../../utils/index.mjs";
-import { diffFormItem as xe } from "./utils.mjs";
-import { useControllableValue as Ce } from "../../hooks/useControllableValue.mjs";
-import { useNamespace as ge } from "../../config-provider/hooks/use-namespace.mjs";
-import { useGlobalConfig as ye } from "../../config-provider/hooks/use-global-config.mjs";
-import { useLocale as _e } from "../../config-provider/hooks/use-locale.mjs";
-import $ from "../ap-form-item.vue.mjs";
+import { isArray as he, isBoolean as xe, omit as ye } from "lodash-unified";
+import { isDef as $ } from "../../utils/index.mjs";
+import { diffFormItem as Ce } from "./utils.mjs";
+import { useControllableValue as ge } from "../../hooks/useControllableValue.mjs";
+import { useNamespace as _e } from "../../config-provider/hooks/use-namespace.mjs";
+import { useGlobalConfig as Re } from "../../config-provider/hooks/use-global-config.mjs";
+import { useLocale as Se } from "../../config-provider/hooks/use-locale.mjs";
+import L from "../ap-form-item.vue.mjs";
 import Fe from "../ap-form.vue2.mjs";
-function Se(d) {
-  return typeof d == "function" || Object.prototype.toString.call(d) === "[object Object]" && !oe(d);
+function Be(h) {
+  return typeof h == "function" || Object.prototype.toString.call(h) === "[object Object]" && !ne(h);
 }
-const i = 24, qe = /* @__PURE__ */ ae({
+const i = 24, ze = /* @__PURE__ */ le({
   name: "ApFormSearchForm",
   __name: "index",
   props: {
@@ -98,134 +98,139 @@ const i = 24, qe = /* @__PURE__ */ ae({
     }
   },
   emits: ["update:collapse"],
-  setup(d, {
-    expose: L,
+  setup(h, {
+    expose: W,
     emit: q
   }) {
-    var k;
-    const r = le(), o = d, z = q, {
-      value: f,
-      updateValue: U
-    } = Ce(o, z, {
+    var N;
+    const s = re(), a = h, z = q, {
+      value: u,
+      updateValue: H
+    } = ge(a, z, {
       valuePropName: "collapse",
       defaultValuePropName: "defaultCollapse"
     }), {
-      b: W
-    } = ge("ap-form-search-form"), G = ye("uiMode"), {
-      t: w
-    } = _e(), x = ne();
-    function H() {
-      U(!t(f));
-    }
+      b: U
+    } = _e("ap-form-search-form"), G = Re("uiMode"), {
+      t: b
+    } = Se(), C = se();
     function J() {
-      var e, a;
-      (a = (e = x.value) == null ? void 0 : e.validateFields()) == null || a.then(o.onSubmit);
+      H(!o(u));
     }
     function K() {
-      var e, a, n;
-      o.customReset || (a = (e = x.value) == null ? void 0 : e.resetFields) == null || a.call(e), (n = o.onReset) == null || n.call(o);
+      var e, t;
+      (t = (e = C.value) == null ? void 0 : e.validateFields()) == null || t.then(a.onSubmit);
+    }
+    function Q() {
+      var e, t, l;
+      a.customReset || (t = (e = C.value) == null ? void 0 : e.resetFields) == null || t.call(e), (l = a.onReset) == null || l.call(a);
     }
-    let E = [];
-    const y = j(O(r.default())), m = j((k = r.extra) == null ? void 0 : k.call(r)), N = g(() => Math.floor(i / o.countPerRow));
-    M(() => r.default(), (e) => {
-      E = y.value, y.value = O(e);
-    }), M(() => {
+    let v = [];
+    const S = V(D(s.default())), p = V((N = s.extra) == null ? void 0 : N.call(s)), w = g(() => Math.floor(i / a.countPerRow));
+    j(() => s.default(), (e) => {
+      v = S.value, S.value = D(e);
+    }), j(() => {
       var e;
-      return (e = r.extra) == null ? void 0 : e.call(r);
+      return (e = s.extra) == null ? void 0 : e.call(s);
     }, (e) => {
-      m.value = e;
+      p.value = e;
     });
-    const Q = (e) => he(e) ? (fe(e) ? e : [e]).join("") : Date.now(), _ = g(() => {
-      const e = xe(E, y.value), a = [], n = [], s = t(N);
-      let F = 0;
-      e.forEach((u) => {
-        const p = u.props;
-        p != null && p.hidden ? a.push(u) : (F += p.span || s, n.push(u));
+    const X = (e) => $(e) ? (he(e) ? e : [e]).join("") : Date.now(), F = g(() => {
+      const e = Ce(v, S.value), t = [], l = [], r = o(w);
+      let d = 0;
+      e.forEach((c) => {
+        const f = c.props;
+        (xe(f.hidden) ? !!f.hidden : $(f.hidden)) ? t.push(c) : (d += f.span || r, l.push(c));
       });
-      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;
-      let T = 0, V = 0;
-      const ee = n.map((u, p) => {
-        const C = u.props, I = C.span || s;
-        if (T += I, !o.forceExpand && t(f) && T > P) {
-          a.push(re(u, {
+      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;
+      let P = 0, T = 0;
+      const oe = l.map((c, f) => {
+        const x = c.props, O = x.span || r;
+        if (P += O, !a.forceExpand && o(u) && P > I) {
+          t.push(ie(c, {
             hidden: !0
           }));
           return;
         }
-        return V += I, {
-          node: u,
-          span: C.span || s,
-          key: `ApFormSearchFormItem-${p}-${Q(C.name)}-${C._signal}`
+        return T += O, {
+          node: c,
+          span: x.span || r,
+          key: `ApFormSearchFormItem-${f}-${X(x.name)}-${x._signal}`
         };
-      }).filter(Boolean), te = i - V - s;
+      }).filter(Boolean), ae = i - T - r;
       return {
-        hideNode: l(S, null, [a]),
-        nodes: ee,
-        defaultExtraSpan: Y,
-        actualExtraSpan: te,
-        showCollapse: Z
+        hideNode: n(_, null, [t]),
+        nodes: oe,
+        defaultExtraSpan: ee,
+        actualExtraSpan: ae,
+        showCollapse: te,
+        lastRowOnlyIncludeActionAndExtra: Z
       };
-    }), X = g(() => {
+    }), Y = g(() => {
       let e;
-      const a = t(_);
-      return l(S, null, [l(b, {
-        span: t(t(N))
+      const t = o(F), l = n(R, {
+        span: o(w),
+        key: "actionWrapper"
       }, {
-        default: () => [l($, null, {
-          default: () => [l(D, {
-            justify: "space-between"
+        default: () => [n(L, null, {
+          default: () => [n(M, {
+            justify: !o(u) && t.lastRowOnlyIncludeActionAndExtra && !(o(p) && a.extraInAction) ? "flex-end" : "space-between"
           }, {
-            default: () => [l(pe, null, {
-              default: () => [l(v, {
+            default: () => [n(de, null, {
+              default: () => [n(E, {
                 type: "primary",
-                onClick: J,
-                loading: o.submitLoading,
+                onClick: K,
+                loading: a.submitLoading,
                 htmlType: "submit"
               }, {
-                default: () => [o.searchText || w("ap.apForm.search.search")]
-              }), l(v, {
-                onClick: K
+                default: () => [a.searchText || b("ap.apForm.search.search")]
+              }), n(E, {
+                onClick: Q
               }, {
-                default: () => [o.resetText || w("ap.apForm.search.reset")]
-              }), a.showCollapse ? l(v, {
-                onClick: H,
-                icon: l(de, {
+                default: () => [a.resetText || b("ap.apForm.search.reset")]
+              }), t.showCollapse ? n(E, {
+                onClick: J,
+                icon: n(me, {
                   style: G.value === "aplus" ? "color:#B8C3D1" : "color:#BFBFBF",
-                  rotate: t(f) ? 90 : -90
+                  rotate: o(u) ? 90 : -90
                 }, null)
               }, null) : null]
-            }), o.extraInAction ? t(m) : null]
+            }), a.extraInAction ? o(p) : null]
           })]
         })]
-      }), !o.extraInAction && t(m) ? l(b, {
-        span: t(f) ? a.actualExtraSpan : a.defaultExtraSpan
+      }), r = !a.extraInAction && o(p) ? n(R, {
+        span: o(u) ? t.actualExtraSpan : t.defaultExtraSpan,
+        key: "extraNode"
       }, {
-        default: () => [l($, null, {
-          default: () => [l(D, {
-            justify: !t(f) && a.defaultExtraSpan === i ? "start" : "end"
-          }, Se(e = t(m)) ? e : {
+        default: () => [n(L, null, {
+          default: () => [n(M, {
+            justify: !o(u) && (t.defaultExtraSpan === i || t.lastRowOnlyIncludeActionAndExtra) ? "start" : "flex-end"
+          }, Be(e = o(p)) ? e : {
             default: () => [e]
           })]
         })]
-      }) : null]);
+      }) : null, d = n(R, {
+        span: t.defaultExtraSpan
+      }, null);
+      return !o(u) && t.lastRowOnlyIncludeActionAndExtra ? n(_, null, [r || d, l]) : n(_, null, [l, r]);
     });
-    return L({
-      apForm: g(() => t(x))
-    }), (e, a) => (c(), h(Fe, se({
-      class: t(W)(),
+    return W({
+      apForm: g(() => o(C))
+    }), (e, t) => (m(), y(Fe, ue({
+      class: o(U)(),
       ref_key: "apForm",
-      ref: x
-    }, t(me)(o, ["collapse", "defaultCollapse", "onUpdate:collapse", "searchText", "resetText", "onSubmit", "onReset", "extraInAction", "forceExpand", "countPerRow"])), {
-      default: B(() => [(c(), h(R(_.value.hideNode))), l(t(ce), {
+      ref: C
+    }, o(ye)(a, ["collapse", "defaultCollapse", "onUpdate:collapse", "searchText", "resetText", "onSubmit", "onReset", "extraInAction", "forceExpand", "countPerRow"])), {
+      default: B(() => [(m(), y(A(F.value.hideNode))), n(o(fe), {
         gutter: 16
       }, {
-        default: B(() => [(c(!0), ue(S, null, ie(_.value.nodes, (n) => (c(), h(t(b), {
-          key: n.key,
-          span: n.span
+        default: B(() => [(m(!0), ce(_, null, pe(F.value.nodes, (l) => (m(), y(o(R), {
+          key: l.key,
+          span: l.span
         }, {
-          default: B(() => [(c(), h(R(n.node)))]),
+          default: B(() => [(m(), y(A(l.node)))]),
           _: 2
-        }, 1032, ["span"]))), 128)), (c(), h(R(X.value)))]),
+        }, 1032, ["span"]))), 128)), (m(), y(A(Y.value)))]),
         _: 1
       })]),
       _: 1
@@ -233,5 +238,5 @@ const i = 24, qe = /* @__PURE__ */ ae({
   }
 });
 export {
-  qe as default
+  ze as default
 };

package/es/src/ap-form/style/ap-form-item.css

@@ -1,6 +1,6 @@
 .aplus-ap-form-item--bordered {
   box-sizing: border-box;
-  border: 1px solid #dee4ed;
+  border: 1px solid var(--ap-form-bordered-border-color-base);
   border-radius: 4px;
   padding-inline: 12px;
 }
@@ -38,15 +38,15 @@
   min-height: 30px;
 }
 .aplus-ap-form-item--bordered:hover {
-  border-color: #66a9ff;
+  border-color: var(--ap-form-bordered-border-color-hover);
 }
 .aplus-ap-form-item--bordered:focus {
-  border-color: #66a9ff;
-  box-shadow: 0 0 0 2px rgba(5, 155, 255, 0.1);
+  border-color: var(--ap-form-bordered-border-color-active);
+  box-shadow: 0 0 0 2px var(--ap-form-bordered-shadow-color);
 }
 .aplus-ap-form-item--focused {
-  border-color: #66a9ff;
-  box-shadow: 0 0 0 2px rgba(5, 155, 255, 0.1);
+  border-color: var(--ap-form-bordered-border-color-active);
+  box-shadow: 0 0 0 2px var(--ap-form-bordered-shadow-color);
 }
 .aplus-ap-form-item .ant-form-show-help .ant-form-item-explain-error {
   font-size: 12px;

package/es/src/ap-table/ap-table.vue.d.ts

@@ -4,7 +4,7 @@ import { ColumnType } from 'ant-design-vue/es/table';
 import { RowSelectionReturnType } from './hooks/use-table-row-selection';
 import { SpinSize } from 'ant-design-vue/es/spin/Spin';
 import { VueTypeValidableDef } from '../../node_modules/vue-types';
-import { GetPopupContainer, FilterValue, SorterResult, TableCurrentDataSource, TableLocale, CompareFn, ColumnFilterItem, SortOrder } from 'ant-design-vue/es/table/interface';
+import { GetPopupContainer, FilterValue, SorterResult, TableCurrentDataSource, TableLocale, CompareFn, ColumnFilterItem, SortOrder, TableRowSelection } from 'ant-design-vue/es/table/interface';
 import { RenderExpandIcon, PanelRender, TableComponents, TransformCellText, TableLayout, GetRowKey, TableSticky, RowClassName, GetComponentProps, ColumnType, Key, ExpandedRowRender } from 'ant-design-vue/es/vc-table/interface';
 import { TablePaginationConfig } from 'ant-design-vue';
 import { EllipsisConfig } from 'ant-design-vue/es/typography/Base';
@@ -672,7 +672,9 @@ declare const _default: <RecordType>(__VLS_props: {
         onOpenChange: PropType<(vis: boolean) => void>;
         'onUpdate:open': PropType<(vis: boolean) => void>;
     }>> | undefined;
-    rowSelection?: true | ApTableRowSelection<RecordType> | undefined;
+    rowSelection?: true | ApTableRowSelection<RecordType> | ( TableRowSelection<RecordType> & {
+        mode?: "base" | undefined;
+    }) | undefined;
     rowClassName?: string | RowClassName<RecordType> | undefined;
     showHeader?: boolean | undefined;
     customRow?: GetComponentProps<RecordType> | undefined;
@@ -715,6 +717,7 @@ declare const _default: <RecordType>(__VLS_props: {
         expandIcon?: any;
         title?: ((params: Omit<RowSelectionReturnType<RecordType>, "rowSelection" | "selectedRows"> & {
             selectedRows: RecordType[];
+            selectedRowKeys: (string | number)[];
         }) => any) | undefined;
         footer?: any;
         summary?: any;
@@ -733,6 +736,7 @@ declare const _default: <RecordType>(__VLS_props: {
         expandIcon?: any;
         title?: ((params: Omit<RowSelectionReturnType<RecordType>, "rowSelection" | "selectedRows"> & {
             selectedRows: RecordType[];
+            selectedRowKeys: (string | number)[];
         }) => any) | undefined;
         footer?: any;
         summary?: any;
@@ -1417,7 +1421,9 @@ declare const _default: <RecordType>(__VLS_props: {
             onOpenChange: PropType<(vis: boolean) => void>;
             'onUpdate:open': PropType<(vis: boolean) => void>;
         }>> | undefined;
-        rowSelection?: true | ApTableRowSelection<RecordType> | undefined;
+        rowSelection?: true | ApTableRowSelection<RecordType> | ( TableRowSelection<RecordType> & {
+            mode?: "base" | undefined;
+        }) | undefined;
         rowClassName?: string | RowClassName<RecordType> | undefined;
         showHeader?: boolean | undefined;
         customRow?: GetComponentProps<RecordType> | undefined;
@@ -1477,6 +1483,7 @@ declare const _default: <RecordType>(__VLS_props: {
         expandIcon?: any;
         title?: ((params: Omit<RowSelectionReturnType<RecordType>, "rowSelection" | "selectedRows"> & {
             selectedRows: RecordType[];
+            selectedRowKeys: (string | number)[];
         }) => any) | undefined;
         footer?: any;
         summary?: any;
@@ -1495,6 +1502,7 @@ declare const _default: <RecordType>(__VLS_props: {
         expandIcon?: any;
         title?: ((params: Omit<RowSelectionReturnType<RecordType>, "rowSelection" | "selectedRows"> & {
             selectedRows: RecordType[];
+            selectedRowKeys: (string | number)[];
         }) => any) | undefined;
         footer?: any;
         summary?: any;
@@ -2166,7 +2174,9 @@ declare const _default: <RecordType>(__VLS_props: {
                 onOpenChange: PropType<(vis: boolean) => void>;
                 'onUpdate:open': PropType<(vis: boolean) => void>;
             }>> | undefined;
-            rowSelection?: true | ApTableRowSelection<RecordType> | undefined;
+            rowSelection?: true | ApTableRowSelection<RecordType> | ( TableRowSelection<RecordType> & {
+                mode?: "base" | undefined;
+            }) | undefined;
             rowClassName?: string | RowClassName<RecordType> | undefined;
             showHeader?: boolean | undefined;
             customRow?: GetComponentProps<RecordType> | undefined;
@@ -2226,6 +2236,7 @@ declare const _default: <RecordType>(__VLS_props: {
             expandIcon?: any;
             title?: ((params: Omit<RowSelectionReturnType<RecordType>, "rowSelection" | "selectedRows"> & {
                 selectedRows: RecordType[];
+                selectedRowKeys: (string | number)[];
             }) => any) | undefined;
             footer?: any;
             summary?: any;
@@ -2244,6 +2255,7 @@ declare const _default: <RecordType>(__VLS_props: {
             expandIcon?: any;
             title?: ((params: Omit<RowSelectionReturnType<RecordType>, "rowSelection" | "selectedRows"> & {
                 selectedRows: RecordType[];
+                selectedRowKeys: (string | number)[];
             }) => any) | undefined;
             footer?: any;
             summary?: any;