@aplus-frontend/ui 6.13.4 → 6.15.0

package/es/src/ap-grid/hooks/use-row-selection.d.ts

@@ -1,7 +1,8 @@
 import { TableRowSelection } from '@aplus-frontend/antdv/lib/table/interface';
 import { ComputedRef, Ref } from 'vue';
-import { ApTableProps, ApTableRowSelection } from '../../ap-table';
+import { ApTableProps } from '../../ap-table';
 import { Recordable } from '../../type';
+import { ApGridRowSelection } from '../interface';
 export interface RowSelectionReturnType<RecordType = any> {
     rowSelection: ComputedRef<TableRowSelection<RecordType>>;
     selectedRows: Ref<Partial<RecordType>[]>;
@@ -58,12 +59,12 @@ export interface RowSelectionReturnType<RecordType = any> {
     unSelectMulti: (items: RecordType[]) => void;
     /**
      * VxeTable 表格checkbox-change事件
-     * @param item
      * @param select
-     * @param partRowData
+     * @param selectedRows
+     * @param reserveSelectedRows
      * @returns
      */
-    selectChange: (item: RecordType, select: boolean, partRowData: RecordType[]) => void;
+    selectChange: (select: boolean, selectedRows: RecordType[], reserveSelectedRows: RecordType[]) => void;
     /**
      * VxeTable 表格checkbox-all事件
      * @param item
@@ -86,7 +87,7 @@ export interface RowSelectionReturnType<RecordType = any> {
      */
     selectMultiByKeys: (keys: (string | number)[]) => void;
 }
-type RowSelectionParams<T> = Omit<ApTableRowSelection<T>, 'mode'> & {
+type RowSelectionParams<T> = ApGridRowSelection<T> & {
     /**
      * 数据源（如果是后端分页，则表示当页数据，否则是全量数据）
      */

package/es/src/ap-grid/hooks/use-row-selection.mjs

@@ -1,117 +1,132 @@
-import { ref as I, computed as v, unref as o } from "vue";
-import { isFunction as i, cloneDeep as _ } from "lodash-unified";
-function b(a, c) {
-  return !(c != null && c.length) || i(a) ? [] : c.map((f) => ({ [a]: f }));
+import { ref as F, computed as M, unref as o } from "vue";
+import { isFunction as v, cloneDeep as h } from "lodash-unified";
+function T(a, c) {
+  return !(c != null && c.length) || v(a) ? [] : c.map((d) => ({ [a]: d }));
 }
-const F = (a) => {
-  a.defaultSelectedRowKeys;
-  const c = I(
-    b(a.rowKey, a.defaultSelectedRowKeys)
+const m = (a) => {
+  const c = F(
+    T(a.rowKey, a.defaultSelectedRowKeys)
   );
-  function f(e, t) {
+  function d(e, t) {
     c.value = t;
   }
-  const l = (e) => i(a.rowKey) ? a.rowKey(e) : e[a.rowKey], s = v(() => {
+  const u = (e) => v(a.rowKey) ? a.rowKey(e) : e[a.rowKey], s = M(() => {
     const e = /* @__PURE__ */ new Map();
     return o(c).forEach((t) => {
-      e.set(l(t), t);
+      e.set(u(t), t);
     }), e;
   });
-  function M(e) {
-    return o(s).has(l(e));
+  function w(e) {
+    return o(s).has(u(e));
   }
   function g(e) {
+    if (!f(e))
+      return;
     const t = o(s);
-    t.set(l(e), e), c.value = [...t.values()];
+    t.set(u(e), e), c.value = [...t.values()];
   }
-  function h(e) {
+  function x(e) {
     const t = o(s);
     for (const n of e)
-      t.set(l(n), n);
+      f(n) && t.set(u(n), n);
     c.value = [...t.values()];
   }
-  function w(e) {
-    if (i(a.rowKey))
+  function y(e) {
+    if (v(a.rowKey))
       return;
     const t = o(s);
     for (const n of e) {
-      const u = o(a.dataSource).find(
-        (r) => l(r) === n
-      ), S = { [a.rowKey]: n };
-      t.set(String(n), u || S);
+      const l = o(a.dataSource).find(
+        (i) => u(i) === n
+      ), r = { [a.rowKey]: n };
+      f(l || r) && t.set(n, l || r);
     }
     c.value = [...t.values()];
   }
-  function x(e) {
+  function E(e) {
+    if (!f(e))
+      return;
     const t = o(s);
-    t.delete(l(e)), c.value = [...t.values()];
+    t.delete(u(e)), c.value = [...t.values()];
   }
-  function y(e) {
+  function K(e) {
     const t = o(s);
     for (const n of e)
-      t.delete(l(n));
+      f(n) && t.delete(u(n));
     c.value = [...t.values()];
   }
-  function d(e, t) {
+  function S(e, t) {
     const n = e;
-    for (const u of t)
-      n.set(l(u), u);
+    for (const l of t)
+      n.set(u(l), l);
     return n;
   }
-  function K(e, t, n) {
-    const u = o(s);
-    t ? u.set(l(e), e) : u.delete(l(e)), d(u, n), c.value = [...u.values()];
+  function b(e, t, n) {
+    const l = o(s);
+    e ? S(l, [...n, ...t]) : o(a.dataSource).forEach((r) => {
+      const i = u(r);
+      t.some((B) => u(B) === i) ? l.set(i, r) : l.delete(i);
+    }), c.value = [...l.values()];
   }
   function A(e, t) {
-    c.value = [...t];
+    const n = h(o(s));
+    e ? S(n, t) : o(a.dataSource).forEach((l) => {
+      f(l) && n.delete(u(l));
+    }), c.value = [...n.values()];
+  }
+  function f(e) {
+    const t = a.shown, n = a.disabled, l = t ? t(e) : !0, r = n ? n(e) : !1;
+    return l && !r;
   }
   function C(e, t) {
-    const n = _(o(s));
-    o(a.dataSource).forEach((u) => {
-      e.find((r) => l(r) === l(u)) ? n.set(l(u), u) : n.delete(l(u));
-    }), d(n, t), c.value = [...n.values()];
+    const n = h(o(s));
+    o(a.dataSource).forEach((l) => {
+      e.find((i) => u(i) === u(l)) ? n.set(u(l), l) : n.delete(u(l));
+    }), S(n, t), c.value = [...n.values()];
   }
-  function E() {
+  function D() {
     const e = o(s);
     o(a.dataSource).forEach((t) => {
-      e.set(l(t), t);
+      f(t) && e.set(u(t), t);
     }), c.value = [...e.values()];
   }
   function R(e) {
-    const t = o(s), n = l(e);
+    if (!f(e))
+      return;
+    const t = o(s), n = u(e);
     t.has(n) ? t.delete(n) : t.set(n, e), c.value = [...t.values()];
   }
-  function D() {
+  function I() {
     const e = o(s);
     o(a.dataSource).forEach((t) => {
-      e.delete(l(t));
+      f(t) && e.delete(u(t));
     }), c.value = [...e.values()];
   }
-  function m() {
+  function k() {
     c.value = [];
   }
   return {
     select: g,
-    unSelect: x,
-    isSelected: M,
-    selectAll: E,
-    unSelectAll: D,
-    clearAll: m,
+    unSelect: E,
+    isSelected: w,
+    selectAll: D,
+    unSelectAll: I,
+    clearAll: k,
     toggleSelect: R,
     selectedRows: c,
-    selectMulti: h,
-    unSelectMulti: y,
-    rowSelection: v(() => ({
+    selectMulti: x,
+    unSelectMulti: K,
+    rowSelection: M(() => ({
       ...a,
-      onChange: f,
-      selectedRowKeys: o(c).map((e) => l(e))
+      onChange: d,
+      selectedRowKeys: o(c).map((e) => u(e))
     })),
-    selectChange: K,
+    selectChange: b,
     selectAllChange: A,
     selectRangeChange: C,
-    selectMultiByKeys: w
+    selectMultiByKeys: y
   };
 };
 export {
-  F as default
+  m as default
 };

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

@@ -252,17 +252,14 @@ const Gt = /* @__PURE__ */ $e({
       dataSource: Pe,
       rowKey: o.rowKey
     }), Te = ({
-      checked: e,
-      row: t
+      checked: e
     }) => {
-      const l = s.value;
-      if (l && l) {
-        const r = [
-          ...l.getCheckboxReserveRecords(),
-          ...l.getCheckboxRecords()
-        ];
-        y.selectChange(t, e, r);
-      }
+      const t = s.value;
+      t && t && y.selectChange(
+        e,
+        t.getCheckboxRecords(),
+        t.getCheckboxReserveRecords()
+      );
     }, Ne = ({
       checked: e
     }) => {

package/es/src/ap-grid/utils/table.mjs

@@ -1,10 +1,10 @@
-import { omit as d, isUndefined as s, isFunction as c, isNumber as C } from "lodash-unified";
+import { omit as u, isUndefined as s, isFunction as c, isNumber as C } from "lodash-unified";
 import { isDef as m } from "../../utils/index.mjs";
 const g = 20, w = 50, b = (e) => e.some((t) => !!t.html);
-function R(e) {
+function v(e) {
   var n;
   const t = {
-    ...d(e, [
+    ...u(e, [
       "columns",
       "request",
       "searchForm",
@@ -42,7 +42,7 @@ function R(e) {
       range: o.range || !1
     };
   }
-  return t.border = e.bordered === !1 ? "inner" : !0, e.expandable && (t.expandConfig = d(e.expandable, [
+  return t.border = e.bordered === !1 ? "inner" : !0, e.expandable && (t.expandConfig = u(e.expandable, [
     "renderContent",
     "width",
     "title"
@@ -50,10 +50,10 @@ function R(e) {
     enabled: !1
   }, t.virtualYConfig = {
     enabled: !1
-  }) : (f(t, "X", e.virtual), f(t, "Y", e.virtual)), t.round = m(e.round) ? e.round : !e.card, e.virtual !== !1 && (t.headerCellConfig = {
+  }) : (f(t, "X", e.virtual), f(t, "Y", e.virtual)), t.round = m(e.round) ? e.round : !e.card, t.headerCellConfig = {
     height: 36,
     ...t.headerCellConfig || {}
-  }), t.treeConfig && (t.treeConfig = {
+  }, t.treeConfig && (t.treeConfig = {
     ...t.treeConfig || {},
     /**
      * 使用非树层级列表，配合transform
@@ -62,7 +62,7 @@ function R(e) {
   }), t;
 }
 function f(e, t, i) {
-  const n = t === "X", o = n ? "x" : "y", r = n ? "virtualXConfig" : "virtualYConfig", l = i == null ? void 0 : i[o], a = l !== !1, u = n ? g : w, h = C(l) && l >= 0 ? l : u;
+  const n = t === "X", o = n ? "x" : "y", r = n ? "virtualXConfig" : "virtualYConfig", l = i == null ? void 0 : i[o], a = l !== !1, d = n ? g : w, h = C(l) && l >= 0 ? l : d;
   e[r] = {
     enabled: a,
     gt: h,
@@ -94,5 +94,5 @@ function k(e) {
 export {
   k as getRowExpandProps,
   K as getRowSelectionProps,
-  R as toVxeProps
+  v as toVxeProps
 };

package/es/src/ap-list/hooks/use-offline-list.d.ts

@@ -14,6 +14,9 @@ export declare const useOfflineList: <DataType = Recordable>(params: ApListProps
         total: number;
         showSizeChanger: boolean;
         showQuickJumper: boolean;
+        showLessItems: boolean | undefined;
+        size: "default" | "small";
+        pageSizeOptions: (string | number)[];
     }>;
     dataSource: ComputedRef<DataType[]>;
     onChange: (page: number, size: number) => void;

package/es/src/ap-list/hooks/use-offline-list.mjs

@@ -1,32 +1,38 @@
-import { ref as o, computed as r, unref as t } from "vue";
-const l = (e) => {
-  const n = o(
+import { ref as g, computed as f, unref as n } from "vue";
+import { isDef as s } from "../../utils/index.mjs";
+import { isUndefined as S } from "lodash-unified";
+const C = (e) => {
+  const i = g(
     e.pagination && e.pagination.defaultCurrent || 1
-  ), u = o(
+  ), o = g(
     e.pagination && e.pagination.defaultPageSize || 10
   );
-  function a(i, g) {
-    n.value = i, u.value = g;
+  function d(t, a) {
+    i.value = t, o.value = a;
   }
-  const c = r(() => e.dataSource ? e.pagination === !1 ? [...e.dataSource] : e.dataSource.slice(
-    (t(n) - 1) * t(u),
-    t(n) * t(u)
+  const p = f(() => e.dataSource ? e.pagination === !1 ? [...e.dataSource] : e.dataSource.slice(
+    (n(i) - 1) * n(o),
+    n(i) * n(o)
   ) : []);
   return {
-    pagination: r(() => {
-      var i;
+    pagination: f(() => {
+      var c;
+      const { showLessItems: t, showSizeChanger: a, showQuickJumper: r, pageSizeOptions: u } = e.pagination || {};
       return {
-        current: t(n),
-        pageSize: t(u),
-        total: ((i = e.dataSource) == null ? void 0 : i.length) || 0,
-        showSizeChanger: !0,
-        showQuickJumper: !0
+        current: n(i),
+        pageSize: n(o),
+        total: ((c = e.dataSource) == null ? void 0 : c.length) || 0,
+        showSizeChanger: s(a) ? a : !t,
+        showQuickJumper: s(r) ? r : !t,
+        showLessItems: t,
+        size: "default",
+        pageSizeOptions: S(u) ? ["10", "20", "50", "100"] : u
       };
     }),
-    dataSource: c,
-    onChange: a
+    dataSource: p,
+    onChange: d
   };
 };
 export {
-  l as useOfflineList
+  C as useOfflineList
 };

package/es/src/ap-list/interface.d.ts

@@ -1,5 +1,5 @@
 import { StyleValue } from 'vue';
-import { RequestData } from '../ap-table';
+import { ApTablePaginationConfig, RequestData } from '../ap-table';
 import { Recordable } from '../type';
 import { InternalPagingType } from '../ap-table/hooks/use-table-paging-ng';
 export type ApListProps<RecordType = any, ParamsType = Recordable> = {
@@ -49,14 +49,12 @@ export type ApListProps<RecordType = any, ParamsType = Recordable> = {
     /**
      * 是否显示分页器（特定的分页器）或者指定默认的当前页和pageSize
      */
-    pagination?: false | {
-        defaultCurrent?: number;
-        defaultPageSize?: number;
+    pagination?: false | (Omit<ApTablePaginationConfig, 'showTotal'> & {
         /**
          * 只有一页时隐藏分页
          */
         hideOnSinglePage?: boolean;
-    };
+    });
     /**
      * 是否手动发起第一次网络请求
      */

package/es/src/business/ap-export-group/ApExportGroup.vue.d.ts

@@ -1,7 +1,7 @@
 import { ApExportGroupProps } from './interface';
 import { DefineComponent, ComponentOptionsMixin, PublicProps, ComponentProvideOptions } from 'vue';
 declare const _default: DefineComponent<ApExportGroupProps, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly<ApExportGroupProps> & Readonly<{}>, {
-    type: "button" | "dropdown";
+    type: "button" | "dropdown" | "group";
     exportField: boolean | {
         key?: string;
         convertField?: {