@pisell/materials 1.0.1007 → 1.0.1009

package/es/components/pisellBatchActionBar/types.d.ts

@@ -0,0 +1,237 @@
+import type { CSSProperties, ReactNode } from 'react';
+/**
+ * 布局模式
+ */
+export declare type BatchActionBarPosition = 'sticky-top' | 'sticky-bottom' | 'float' | 'inline';
+/**
+ * 确认弹窗配置
+ */
+export interface BatchActionConfirmConfig {
+    /**
+     * 弹窗标题
+     */
+    title?: string;
+    /**
+     * 弹窗描述内容
+     */
+    description?: string;
+    /**
+     * 确认按钮文案
+     */
+    okText?: string;
+    /**
+     * 取消按钮文案
+     */
+    cancelText?: string;
+}
+/**
+ * 默认操作按钮配置
+ * @description 固定四个基础操作按钮：全选、反选、取消选择、删除
+ */
+export interface DefaultActionsConfig {
+    /**
+     * 是否显示默认操作按钮（全选、反选、取消选择、删除）
+     * @default true
+     */
+    showDefaultActions?: boolean;
+    /**
+     * 是否显示全选按钮
+     * @default true
+     */
+    showSelectAll?: boolean;
+    /**
+     * 是否显示反选按钮
+     * @default true
+     */
+    showInvert?: boolean;
+    /**
+     * 是否显示取消选择按钮
+     * @default true
+     */
+    showClear?: boolean;
+    /**
+     * 是否显示删除按钮
+     * @default true
+     */
+    showDelete?: boolean;
+}
+/**
+ * 自定义操作按钮配置
+ */
+export interface BatchActionItem {
+    /**
+     * 操作唯一标识
+     */
+    key: string;
+    /**
+     * 按钮文案
+     */
+    label: ReactNode;
+    /**
+     * 按钮图标
+     */
+    icon?: ReactNode;
+    /**
+     * 按钮尺寸
+     * @description 对应 GraphicTextCard 的 size 属性
+     * @default 'small'
+     */
+    size?: 'small' | 'default' | 'large';
+    /**
+     * 是否禁用
+     * @description 支持函数形式，基于 selection 动态判断
+     */
+    disabled?: boolean | ((selectedKeys: React.Key[], selectedRows?: any[]) => boolean);
+    /**
+     * 是否显示
+     * @description 支持函数形式，基于 selection 动态判断
+     * @default true
+     */
+    visible?: boolean | ((selectedKeys: React.Key[], selectedRows?: any[]) => boolean);
+    /**
+     * 是否显示 loading 状态
+     */
+    loading?: boolean;
+    /**
+     * 是否需要确认弹窗
+     * @default false
+     */
+    confirm?: boolean | BatchActionConfirmConfig;
+    /**
+     * 自定义样式
+     */
+    style?: CSSProperties;
+    /**
+     * 自定义类名
+     */
+    className?: string;
+    /**
+     * 按钮组标识
+     * @description 相同 group 的按钮会分组展示
+     */
+    group?: string;
+    /**
+     * 按钮点击回调
+     * @description 如果配置了此回调，会优先使用此回调，否则使用组件级别的 onActionClick
+     */
+    onClick?: (selectedKeys: React.Key[], selectedRows?: any[]) => void | Promise<void>;
+}
+/**
+ * PisellBatchActionBar 组件 Props
+ * @description 批量操作栏组件，用于承载基于选中对象的批量行为操作
+ */
+export interface PisellBatchActionBarProps {
+    /**
+     * 自定义类名
+     */
+    className?: string;
+    /**
+     * 自定义样式
+     */
+    style?: CSSProperties;
+    /**
+     * 选中的 key 数组
+     * @description 必填，用于感知选择状态
+     */
+    selectedKeys: React.Key[];
+    /**
+     * 选中的行数据数组
+     * @description 可选，用于传递给操作回调
+     */
+    selectedRows?: any[];
+    /**
+     * 总数据量
+     * @description 用于判断全选状态
+     */
+    total?: number;
+    /**
+     * 当前页数据量
+     * @description 用于判断全选当前页状态
+     */
+    currentPageTotal?: number;
+    /**
+     * 当前页数据 key 数组
+     * @description 用于判断全选当前页状态
+     */
+    currentPageKeys?: React.Key[];
+    /**
+     * 布局模式
+     * @default 'float'
+     */
+    position?: BatchActionBarPosition;
+    /**
+     * 吸顶/吸底时的偏移量
+     * @default 0
+     */
+    offset?: number;
+    /**
+     * 是否显示选中数量提示
+     * @default true
+     */
+    showSelectedCount?: boolean;
+    /**
+     * 选中数量提示文案
+     * @description 支持字符串模板（使用 {count} 占位符）或函数形式，默认使用国际化文本
+     * @default getText('batch-action-bar-selected-count', count)
+     */
+    selectedCountText?: string | ((count: number) => string);
+    /**
+     * 默认操作按钮配置
+     * @description 只包含前三个基础选择操作按钮，其他操作按钮通过 actions 传入
+     */
+    defaultActions?: DefaultActionsConfig;
+    /**
+     * 自定义操作按钮配置
+     */
+    actions?: BatchActionItem[];
+    /**
+     * 操作按钮排序
+     * @description 通过 key 数组控制按钮顺序
+     */
+    actionOrder?: string[];
+    /**
+     * 是否启用溢出折叠
+     * @default true
+     */
+    enableOverflow?: boolean;
+    /**
+     * 溢出折叠阈值（按钮数量）
+     * @default 5
+     */
+    overflowThreshold?: number;
+    /**
+     * "更多"按钮文案
+     * @description 默认使用国际化文本
+     * @default getText('batch-action-bar-more')
+     */
+    moreText?: string;
+    /**
+     * 全选回调
+     */
+    onSelectAll?: () => void;
+    /**
+     * 反选回调
+     * @description 反选操作，将当前选中的变为未选中，未选中的变为选中
+     */
+    onInvert?: () => void;
+    /**
+     * 清空选择回调
+     */
+    onClear?: () => void;
+    /**
+     * 删除回调
+     * @description 删除选中项，点击后会先弹出确认弹窗
+     */
+    onDelete?: (selectedKeys: React.Key[], selectedRows?: any[]) => void;
+    /**
+     * 删除确认弹窗配置
+     * @description 自定义删除确认弹窗的标题和内容
+     */
+    deleteConfirmConfig?: BatchActionConfirmConfig;
+    /**
+     * 自定义操作按钮点击回调
+     * @description 当 actions 中的按钮被点击时触发，通过 action.key 区分不同的操作
+     * @description 如果 action 中配置了 onClick，则优先使用 action.onClick
+     */
+    onActionClick?: (key: string, selectedKeys: React.Key[], selectedRows?: any[]) => void | Promise<void>;
+}

package/es/components/pisellCardList/index.d.ts

@@ -0,0 +1,107 @@
+import React from 'react';
+import { PisellCheckboxGroupProps } from '../pisellCheckboxGroup';
+import { PisellContextType } from '../pisell-config-provider/context';
+import { PisellWalletPassCardProps, FormatOption } from '../pisellWalletPassCard';
+import './index.less';
+export interface PisellCardListProps extends Omit<PisellCheckboxGroupProps, 'options'> {
+    platform?: PisellContextType['platform'];
+    /** 当用户查看完所有记录时，底部会显示此消息 */
+    endMessage?: React.ReactNode;
+    /** 加载下次数据时的加载站位 */
+    loader?: React.ReactNode;
+    /** 是否有更多数据 */
+    hasMore: boolean;
+    /** 加载更多数据回调 */
+    loadMoreData?: () => Promise<void>;
+    /** 当前list数据 */
+    data: PisellWalletPassCardProps[];
+    /** list空数据时展示内容 */
+    empty?: React.ReactNode;
+    /** 是否展示空状态 */
+    showEmpty?: boolean;
+    /** 是否展示卡片名称 */
+    showName?: boolean;
+    /** 是否展示店铺名称 */
+    showStoreName?: boolean;
+    /** 是否展示核销金额 */
+    showRedeem?: boolean;
+    /** 是否展示余额 */
+    showBalance?: boolean;
+    /** 是否展示编码 */
+    showCode?: boolean;
+    /** 是否展示到期时间 */
+    showValidDate?: boolean;
+    /** 使用日程信息计算有效期 */
+    validDateBySchedule?: boolean;
+    /** 日程列表 */
+    scheduleList?: any[];
+    /** 是否展示详情按钮 */
+    showDetail?: boolean;
+    /** 是否展示二维码 */
+    showQrCode?: boolean;
+    /** 是否展示封面图 */
+    showCover?: boolean;
+    /** 是否余额货币单位 */
+    showBalanceSymbol?: boolean;
+    /** 卡片大小 */
+    type?: 'default' | 'mini';
+    /** 展示操作按钮 */
+    showActions?: boolean;
+    /** 操作按钮配置 */
+    actions?: {
+        /** 按钮展示方式 */
+        layout: 'expanded' | 'collapsed';
+        /** detail 按钮配置 */
+        detail?: {
+            visible: boolean;
+            iconColor: string;
+        };
+        /** edit按钮配置 */
+        edit?: {
+            visible: boolean;
+            iconColor: string;
+            dialogTitle: string;
+            enableDialog: boolean;
+            fields: {
+                name: string;
+                label: string;
+            };
+        };
+    };
+    /** 编辑编辑按钮后，弹窗展示之前 */
+    beforeEdit?: (value: any, index: number) => Promise<any> | boolean | void;
+    /** 编辑弹窗点击提交 */
+    onConfirmEdit?: (value: any, index: number, data: any) => void;
+    /** 是否展示状态标识 */
+    showStatus?: boolean;
+    /** 名称标题字号字重颜色配置 */
+    nameTitleStyle?: {
+        fontSize: number;
+        fontWeight: number;
+        color: string;
+    };
+    /** 开启编辑金额 */
+    enableEditAmount?: boolean;
+    /** 编辑金额事件 */
+    onConfirmEditAmount?: (value: number, index: number, data: any) => void;
+    /** 是否使用外部详情处理 */
+    useExternalDetail?: boolean;
+    /** 详情事件 */
+    onDetail?: (value: any, index: number) => void;
+    /** 自定义余额格式化函数，如果提供则优先使用 */
+    formatBalance?: (balance?: number, option?: FormatOption) => React.ReactNode;
+    /** 自定义余额标题格式化函数，如果提供则优先使用 */
+    formatBalanceTitle?: (balanceTitle?: string, option?: FormatOption) => React.ReactNode;
+    /** 自定义使用金额格式化函数，如果提供则优先使用 */
+    formatRedeem?: (redeem?: number, option?: FormatOption) => React.ReactNode;
+    /** 自定义使用金额标题格式化函数，如果提供则优先使用 */
+    formatRedeemTitle?: (redeemTitle?: string, option?: FormatOption) => React.ReactNode;
+    /** 编辑金额前事件 */
+    onBeforeEditAmount?: (value: any, index: number, data: any) => Promise<any> | boolean | void;
+    /** 选项点击事件 */
+    onItemClick?: (e: React.MouseEvent<HTMLDivElement>, option: any) => void;
+    /** 是否展示选中状态的背景色 */
+    showActiveBackground?: boolean;
+}
+declare const _default: React.NamedExoticComponent<PisellCardListProps>;
+export default _default;

package/es/components/pisellCheckboxGroup/index.d.ts

@@ -0,0 +1,40 @@
+import React from 'react';
+import { PisellContextType } from '../pisell-config-provider/context';
+import './index.less';
+export interface PisellCheckboxGroupOption {
+    label: string;
+    value: string;
+    disabled?: boolean;
+    error?: boolean;
+    [key: string]: any;
+}
+declare type PisellCheckboxGroupValue = string | string[] | any;
+export interface PisellCheckboxGroupProps extends React.HTMLAttributes<HTMLDivElement> {
+    platform?: PisellContextType['platform'];
+    direction?: 'horizontal' | 'vertical';
+    fullWidth?: boolean;
+    gap?: number;
+    padding?: number;
+    options: PisellCheckboxGroupOption[];
+    onChange?: (value: PisellCheckboxGroupValue, item: PisellCheckboxGroupOption) => void;
+    value?: PisellCheckboxGroupValue;
+    renderOption?: (option: PisellCheckboxGroupOption, active: boolean, index: number) => React.ReactNode;
+    rowKey?: string;
+    mode?: 'multiple' | 'single';
+    iconPosition?: 'left' | 'right' | 'hide';
+    optionClassName?: string;
+    optionActiveClassName?: string;
+    onChangeDebounce?: boolean;
+    onItemClick?: (e: React.MouseEvent<HTMLDivElement>, option: PisellCheckboxGroupOption) => void;
+    showActiveBackground?: boolean;
+}
+/**
+ * @title: PisellCheckboxGroup
+ * @description: 选中组件
+ * @param {PisellCheckboxGroupProps} props
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-08-16 10:34
+ */
+declare const PisellCheckboxGroup: (props: PisellCheckboxGroupProps) => JSX.Element;
+export default PisellCheckboxGroup;

package/es/components/pisellDataSourceContainer/PisellDataSourceContainer.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { DataSourceContainerProps } from './type';
 declare const PisellDataSourceContainer: (props: DataSourceContainerProps) => JSX.Element;
 export default PisellDataSourceContainer;

package/es/components/pisellDataSourceContainer/components/ColumnsSetting/index.d.ts

@@ -6,6 +6,7 @@ export declare const COLUMNS_SHARED_STATE_KEYS: {
 };
 export interface ColumnsSettingProps {
     scopeId?: string;
+    __id?: string;
 }
 export interface ColumnSettingItem {
     key: string;
@@ -16,7 +17,12 @@ export interface ColumnSettingItem {
     sortIndex?: number;
     fixed?: 'left' | 'right' | boolean;
 }
-declare const _default: React.ForwardRefExoticComponent<Omit<ColumnsSettingProps & DataSourceContainerContextType & React.RefAttributes<unknown> & {
+/**
+ * 暴露给父组件的 ref 方法
+ */
+export interface ColumnsSettingRef {
+}
+declare const _default: React.ForwardRefExoticComponent<Omit<ColumnsSettingProps & DataSourceContainerContextType & React.RefAttributes<ColumnsSettingRef> & {
     refId?: string | undefined;
 }, "ref"> & React.RefAttributes<any>>;
 export default _default;

package/es/components/pisellDataSourceContainer/components/ColumnsSetting/index.js

@@ -4,9 +4,10 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { forwardRef, useState, useEffect } from 'react';
+import React, { forwardRef, useState, useEffect, useImperativeHandle } from 'react';
 import withContainer from "../../utils/withContainer";
 import ColumnsSetting from "../../../table/Actions/component/ColumnsSetting";
+import { saveColumnSettingToLocal } from "./utils";
 export var COLUMNS_SHARED_STATE_KEYS = {
   columnsValue: function columnsValue(instanceId) {
     return "".concat(instanceId, ":columns:value");
@@ -15,14 +16,23 @@ export var COLUMNS_SHARED_STATE_KEYS = {
     return "".concat(instanceId, ":columns:change");
   }
 };
-var WithColumnsSetting = /*#__PURE__*/forwardRef(function (props) {
+
+/**
+ * 暴露给父组件的 ref 方法
+ */
+
+var WithColumnsSetting = /*#__PURE__*/forwardRef(function (props, ref) {
   var refManager = props.refManager,
     _props$scopeId = props.scopeId,
-    scopeId = _props$scopeId === void 0 ? 'table' : _props$scopeId;
+    scopeId = _props$scopeId === void 0 ? 'table' : _props$scopeId,
+    __id = props.__id;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     value = _useState2[0],
     setValue = _useState2[1];
+  useImperativeHandle(ref, function () {
+    return {};
+  }, []);
   useEffect(function () {
     var unsubscribe = refManager.subscribeSharedState(COLUMNS_SHARED_STATE_KEYS.columnsValue(scopeId), setValue);
     return unsubscribe;
@@ -31,6 +41,23 @@ var WithColumnsSetting = /*#__PURE__*/forwardRef(function (props) {
     var typedValue = newValue;
     setValue(typedValue);
     refManager.setSharedState(COLUMNS_SHARED_STATE_KEYS.columnsChange(scopeId), typedValue);
+    if (__id) {
+      saveColumnSettingToLocal({
+        componentId: __id,
+        columnSetting: typedValue.map(function (col, index) {
+          var _col$sortIndex;
+          return {
+            key: col.key,
+            dataIndex: col.dataIndex,
+            title: col.title,
+            titleString: col.titleString,
+            isShow: col.isShow,
+            sortIndex: (_col$sortIndex = col.sortIndex) !== null && _col$sortIndex !== void 0 ? _col$sortIndex : index,
+            fixed: col.fixed
+          };
+        })
+      });
+    }
   };
   return /*#__PURE__*/React.createElement(ColumnsSetting, {
     value: value,

package/es/components/pisellDataSourceContainer/components/ColumnsSetting/utils.d.ts

@@ -0,0 +1,22 @@
+import React from 'react';
+export declare const saveColumnSettingToLocal: ({ componentId, columnSetting, }: {
+    componentId: string;
+    columnSetting: Array<{
+        key: string;
+        dataIndex: string;
+        title?: React.ReactNode;
+        titleString?: string;
+        isShow: boolean;
+        sortIndex?: number;
+        fixed?: 'left' | 'right' | boolean;
+    }>;
+}) => void;
+export declare const getColumnSettingFromLocal: (componentId?: string) => any;
+export declare const mergeColumnSettingSimple: ({ columns, componentId, }: {
+    columns: Record<string, any>[];
+    componentId?: string | undefined;
+}) => {
+    isShow: any;
+    sortIndex: any;
+}[];
+export declare const clearColumnSettingFromLocal: (componentId?: string) => void;

package/es/components/pisellDataSourceContainer/components/ColumnsSetting/utils.js

@@ -0,0 +1,117 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import { isJson } from '@pisell/utils';
+
+/**
+ * 复制过来的功能
+ */
+var getTableKey = function getTableKey(componentId) {
+  // 兼容非浏览器环境（如SSR/测试）
+  if (typeof window === 'undefined' || typeof window.location === 'undefined') {
+    return "table-setting-".concat(componentId);
+  }
+  var _window$location = window.location,
+    pathname = _window$location.pathname,
+    search = _window$location.search;
+  var appendPath = pathname || '/';
+
+  // 仅用于读取 memory_key，其余查询参数忽略
+  var memoryKey = '';
+  try {
+    var params = new URLSearchParams(search || '');
+    var mk = params.get('memory_key');
+    if (mk && mk.trim() !== '') {
+      memoryKey = mk.trim();
+    }
+  } catch (e) {
+    // 忽略解析异常，降级为仅使用 pathname
+  }
+  var urlPart = memoryKey ? "".concat(appendPath, "#").concat(memoryKey) : appendPath;
+  return "table-setting-".concat(componentId, "-").concat(urlPart);
+};
+export var saveColumnSettingToLocal = function saveColumnSettingToLocal(_ref) {
+  var componentId = _ref.componentId,
+    columnSetting = _ref.columnSetting;
+  if (!componentId) return;
+  var storageKey = getTableKey(componentId);
+  var data = {
+    column_setting: columnSetting,
+    updatedAt: Date.now()
+  };
+  localStorage.setItem(storageKey, JSON.stringify(data));
+};
+export var getColumnSettingFromLocal = function getColumnSettingFromLocal(componentId) {
+  if (!componentId) return null;
+  var storageKey = getTableKey(componentId);
+  var originData = localStorage.getItem(storageKey);
+  if (originData && isJson(originData)) {
+    var data = JSON.parse(originData);
+    return data.column_setting;
+  }
+  return null;
+};
+export var mergeColumnSettingSimple = function mergeColumnSettingSimple(_ref2) {
+  var columns = _ref2.columns,
+    componentId = _ref2.componentId;
+  // 没有 componentId，直接返回默认配置
+  if (!componentId) {
+    return columns.map(function (item, index) {
+      var _item$isShow;
+      return _objectSpread(_objectSpread({}, item), {}, {
+        isShow: (_item$isShow = item.isShow) !== null && _item$isShow !== void 0 ? _item$isShow : true,
+        sortIndex: index
+      });
+    });
+  }
+
+  // 从本地存储读取
+  var cachedColumns = getColumnSettingFromLocal(componentId);
+  if (!cachedColumns || !Array.isArray(cachedColumns)) {
+    return columns.map(function (item, index) {
+      var _item$isShow2;
+      return _objectSpread(_objectSpread({}, item), {}, {
+        isShow: (_item$isShow2 = item.isShow) !== null && _item$isShow2 !== void 0 ? _item$isShow2 : true,
+        sortIndex: index
+      });
+    });
+  }
+
+  // 构建本地缓存的 Map（使用 dataIndex 作为 key）
+  var cachedMap = new Map(cachedColumns.map(function (item) {
+    return [item.dataIndex, item];
+  }));
+
+  // 合并配置：本地缓存优先
+  var mergedColumns = columns.map(function (item, index) {
+    var _item$isShow3;
+    var cached = cachedMap.get(item.dataIndex);
+    if (cached) {
+      var _cached$isShow, _cached$sortIndex;
+      return _objectSpread(_objectSpread({}, item), {}, {
+        isShow: (_cached$isShow = cached.isShow) !== null && _cached$isShow !== void 0 ? _cached$isShow : true,
+        sortIndex: (_cached$sortIndex = cached.sortIndex) !== null && _cached$sortIndex !== void 0 ? _cached$sortIndex : index
+        // 注意：fixed 等特殊字段不从缓存中覆盖，保持 props 传入的值
+      });
+    }
+    return _objectSpread(_objectSpread({}, item), {}, {
+      isShow: (_item$isShow3 = item.isShow) !== null && _item$isShow3 !== void 0 ? _item$isShow3 : true,
+      sortIndex: index
+    });
+  });
+
+  // 按 sortIndex 排序
+  mergedColumns.sort(function (a, b) {
+    var _a$sortIndex, _b$sortIndex;
+    return ((_a$sortIndex = a.sortIndex) !== null && _a$sortIndex !== void 0 ? _a$sortIndex : 0) - ((_b$sortIndex = b.sortIndex) !== null && _b$sortIndex !== void 0 ? _b$sortIndex : 0);
+  });
+  return mergedColumns;
+};
+export var clearColumnSettingFromLocal = function clearColumnSettingFromLocal(componentId) {
+  if (!componentId) return;
+  var storageKey = getTableKey(componentId);
+  localStorage.removeItem(storageKey);
+};

package/es/components/pisellDataSourceContainer/components/Pagination/index.js

@@ -2,24 +2,33 @@ var _excluded = ["serverActions", "refManager"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-import React, { forwardRef } from 'react';
+import React, { forwardRef, useMemo } from 'react';
 import Pagination from "../../../Pagination";
 import withContainer from "../../utils/withContainer";
+import { getText } from "../../../../locales";
 var WithPagination = /*#__PURE__*/forwardRef(function (props) {
   var listAction = props.serverActions.list,
     refManager = props.refManager,
     otherProps = _objectWithoutProperties(props, _excluded);
   var pagination = listAction.pagination,
     data = listAction.data;
+
+  /** 分页配置属性 */
+  var paginationProps = useMemo(function () {
+    return {
+      showTotal: function showTotal(total) {
+        return getText('table-pagination-total')((pagination === null || pagination === void 0 ? void 0 : pagination.pageNumber) || 1, Math.ceil(total / ((pagination === null || pagination === void 0 ? void 0 : pagination.pageSize) || 10)));
+      },
+      total: (data === null || data === void 0 ? void 0 : data.count) || 0,
+      current: (pagination === null || pagination === void 0 ? void 0 : pagination.pageNumber) || 1,
+      pageSize: (pagination === null || pagination === void 0 ? void 0 : pagination.pageSize) || 10,
+      onChange: listAction.onPageChange
+    };
+  }, [pagination === null || pagination === void 0 ? void 0 : pagination.pageNumber, pagination === null || pagination === void 0 ? void 0 : pagination.pageSize, data === null || data === void 0 ? void 0 : data.count, listAction.onPageChange]);
   if (!pagination) {
     console.error('分页功能未启用');
     return null;
   }
-  return /*#__PURE__*/React.createElement(Pagination, _extends({}, otherProps, {
-    total: (data === null || data === void 0 ? void 0 : data.count) || 0,
-    current: (pagination === null || pagination === void 0 ? void 0 : pagination.pageNumber) || 1,
-    pageSize: (pagination === null || pagination === void 0 ? void 0 : pagination.pageSize) || 10,
-    onChange: listAction.onPageChange
-  }));
+  return /*#__PURE__*/React.createElement(Pagination, _extends({}, otherProps, paginationProps));
 });
 export default withContainer(WithPagination, 'pagination');

package/es/components/pisellDataSourceContainer/components/Table/index.d.ts

@@ -2,6 +2,7 @@ import React from 'react';
 import { DataSourceContainerContextType } from '../../type';
 declare const _default: React.ForwardRefExoticComponent<Omit<Partial<import("antd").TableProps<any>> & DataSourceContainerContextType & {
     scopeId?: string | undefined;
+    __id?: string | undefined;
 } & React.RefAttributes<unknown> & {
     refId?: string | undefined;
 }, "ref"> & React.RefAttributes<any>>;