xmirror-components 1.0.30-alpha.7 → 1.0.30

package/build/es/locale/zh-cn.d.ts

@@ -0,0 +1,25 @@
+declare const messages: {
+    'operation.add': string;
+    'operation.delete': string;
+    'operation.batchDelete': string;
+    'operation.edit': string;
+    'operation.download': string;
+    'operation.logout': string;
+    'operation.export': string;
+    'operation.close': string;
+    'operation.details': string;
+    'operation.confirm': string;
+    'operation.save': string;
+    'operation.cancel': string;
+    'component.table.selected': string;
+    'component.table.total': string;
+    'component.table.visibleError': string;
+    'component.searcharea.toggle': string;
+    'component.searcharea.submit': string;
+    'component.searcharea.reset': string;
+    'component.searcharea.close': string;
+    'message.delete': string;
+    'message.success': string;
+    'table.pagination.total': string;
+};
+export default messages;

package/build/es/locale/zh-cn.js

@@ -0,0 +1,28 @@
+var messages = {
+    // 操作类
+    'operation.add': '添加',
+    'operation.delete': '删除',
+    'operation.batchDelete': '批量删除',
+    'operation.edit': '编辑',
+    'operation.download': '下载',
+    'operation.logout': '退出登录',
+    'operation.export': '导出',
+    'operation.close': '关闭',
+    'operation.details': '详情',
+    'operation.confirm': '确认',
+    'operation.save': '保存',
+    'operation.cancel': '取消',
+    // 组件
+    'component.table.selected': '已选{length}条',
+    'component.table.total': '共{total}条',
+    'component.table.visibleError': '列表最少保留一个字段',
+    'component.searcharea.toggle': '高级搜索',
+    'component.searcharea.submit': '筛选',
+    'component.searcharea.reset': '重置',
+    'component.searcharea.close': '收起',
+    // 提示类
+    'message.delete': '删除操作无法恢复，确认删除？',
+    'message.success': '操作成功',
+    'table.pagination.total': '共{total}条',
+};
+export default messages;

package/build/lib/components/ConfigProvider/index.js

@@ -10,17 +10,6 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -28,6 +17,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConfigContext = void 0;
 exports.default = ConfigProvider;
 var react_1 = __importDefault(require("react"));
+var IntlProvider_1 = __importDefault(require("../IntlProvider"));
+var locale_1 = require("../../locale");
 // 递归合并函数
 function deepMerge(target, source) {
     var result = __assign({}, target);
@@ -47,14 +38,20 @@ var baseConfig = {
     iconButton: {
         size: 'small',
         render: function (_a) {
-            var children = _a.children, params = __rest(_a, ["children"]);
+            var children = _a.children;
             return children;
         }
     },
-    iconFont: {}
+    iconFont: {},
+    locale: 'zh'
 };
 exports.ConfigContext = react_1.default.createContext(baseConfig);
 function ConfigProvider(_a) {
     var children = _a.children, config = _a.config;
-    return (react_1.default.createElement(exports.ConfigContext.Provider, { value: deepMerge(baseConfig, config) }, children));
+    var mergeConfig = deepMerge(baseConfig, config);
+    return (react_1.default.createElement(exports.ConfigContext.Provider, { value: mergeConfig },
+        react_1.default.createElement(IntlProvider_1.default, { config: {
+                locale: config.locale,
+                messages: locale_1.messages
+            } }, children)));
 }

package/build/lib/components/IntlProvider/FormattedMessage/index.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = FormattedMessage;
+var react_1 = require("react");
+var index_1 = require("../index");
+var useIntl_1 = require("../useIntl");
+function FormattedMessage(_a) {
+    var id = _a.id, defaultMessage = _a.defaultMessage, values = _a.values;
+    var _b = (0, react_1.useContext)(index_1.IntlContext), messages = _b.messages, locale = _b.locale;
+    return (0, useIntl_1.formatMessageFn)({ messages: messages, locale: locale })({ id: id, defaultMessage: defaultMessage, values: values });
+}

package/build/lib/components/IntlProvider/index.js

@@ -0,0 +1,25 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useIntl = exports.FormattedMessage = exports.IntlContext = void 0;
+exports.default = IntlProvider;
+var react_1 = __importDefault(require("react"));
+var locale_1 = require("../../locale");
+var FormattedMessage_1 = __importDefault(require("./FormattedMessage"));
+exports.FormattedMessage = FormattedMessage_1.default;
+var useIntl_1 = __importDefault(require("./useIntl"));
+exports.useIntl = useIntl_1.default;
+var baseConfig = {
+    locale: 'zh',
+    messages: locale_1.messages
+};
+exports.IntlContext = react_1.default.createContext(baseConfig);
+function IntlProvider(_a) {
+    var children = _a.children, config = _a.config;
+    return (react_1.default.createElement(exports.IntlContext.Provider, { value: {
+            locale: config.locale,
+            messages: locale_1.messages
+        } }, children));
+}

package/build/lib/components/IntlProvider/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/build/lib/components/IntlProvider/useIntl/index.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.formatMessageFn = void 0;
+exports.default = useIntl;
+var react_1 = require("react");
+var index_1 = require("../index");
+var formatMessageFn = function (_a) {
+    var messages = _a.messages, locale = _a.locale;
+    return function (_a) {
+        var _b;
+        var id = _a.id, defaultMessage = _a.defaultMessage, values = _a.values;
+        var message = ((_b = messages === null || messages === void 0 ? void 0 : messages[locale]) === null || _b === void 0 ? void 0 : _b[id]) || defaultMessage;
+        if (typeof values === 'object') {
+            Object.keys(values).forEach(function (key) {
+                message = message.replace("{".concat(key, "}"), values[key]);
+            });
+        }
+        return message;
+    };
+};
+exports.formatMessageFn = formatMessageFn;
+function useIntl() {
+    var _a = (0, react_1.useContext)(index_1.IntlContext), messages = _a.messages, locale = _a.locale;
+    return {
+        $t: function (_a, values) {
+            var id = _a.id, defaultMessage = _a.defaultMessage;
+            return (0, exports.formatMessageFn)({ messages: messages, locale: locale })({ id: id, defaultMessage: defaultMessage, values: values });
+        },
+        formatMessage: (0, exports.formatMessageFn)({ messages: messages, locale: locale })
+    };
+}

package/build/lib/components/SearchArea/ToggleButton/index.js

@@ -44,6 +44,7 @@ var react_1 = __importStar(require("react"));
 var antd_1 = require("antd");
 var icons_1 = require("@ant-design/icons");
 var styled_1 = __importDefault(require("@emotion/styled"));
+var IntlProvider_1 = require("../../IntlProvider");
 var AnimatedIcon = (0, styled_1.default)(icons_1.CaretUpOutlined, {
     shouldForwardProp: function (prop) { return prop !== 'show'; },
 })(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n  transition: transform 0.3s ease-in-out;\n  transform: rotate(", ");\n"], ["\n  transition: transform 0.3s ease-in-out;\n  transform: rotate(", ");\n"])), function (props) { return props.show ? '0deg' : '180deg'; });
@@ -62,7 +63,7 @@ function ToggleButton(_a) {
         onChange === null || onChange === void 0 ? void 0 : onChange(!(panel === null || panel === void 0 ? void 0 : panel.show));
     }, [panel]);
     return (react_1.default.createElement(antd_1.Button, { type: "link", style: { paddingLeft: 0, paddingRight: 0 }, onClick: toggle },
-        "\u9AD8\u7EA7\u641C\u7D22",
+        react_1.default.createElement(IntlProvider_1.FormattedMessage, { id: "comgponent.searcharea.togle", defaultMessage: '高级搜索' }),
         react_1.default.createElement(AnimatedIcon, { show: show })));
 }
 exports.default = ToggleButton;

package/build/lib/components/SearchArea/index.js

@@ -68,6 +68,7 @@ var icons_1 = require("@ant-design/icons");
 var styled_1 = __importDefault(require("@emotion/styled"));
 var Item_1 = __importDefault(require("./Item"));
 var ToggleButton_1 = __importDefault(require("./ToggleButton"));
+var IntlProvider_1 = require("../IntlProvider");
 var AnimatedContainer = (0, styled_1.default)('div', {
     shouldForwardProp: function (prop) { return prop !== 'show'; },
 })(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n  overflow: hidden;\n  transition: max-height 0.4s ease-in-out;\n  max-height: ", ";\n"], ["\n  overflow: hidden;\n  transition: max-height 0.4s ease-in-out;\n  max-height: ", ";\n"])), function (props) { return props.show ? '450px' : '0'; });
@@ -144,13 +145,15 @@ function InternalSearchArea(_a) {
                     : children,
                 react_1.default.createElement(antd_1.Col, { flex: 1 },
                     react_1.default.createElement(SearchAreaHandle, null,
-                        react_1.default.createElement(antd_1.Button, { loading: loading, type: "primary", onClick: submit }, "\u7B5B\u9009"),
-                        react_1.default.createElement(antd_1.Button, { loading: loading, onClick: reset }, "\u91CD\u7F6E"),
+                        react_1.default.createElement(antd_1.Button, { loading: loading, type: "primary", onClick: submit },
+                            react_1.default.createElement(IntlProvider_1.FormattedMessage, { id: "component.searcharea.submit", defaultMessage: '筛选' })),
+                        react_1.default.createElement(antd_1.Button, { loading: loading, onClick: reset },
+                            react_1.default.createElement(IntlProvider_1.FormattedMessage, { id: "component.searcharea.reset", defaultMessage: '重置' })),
                         react_1.default.createElement(antd_1.Button, { type: "link", style: {
                                 paddingLeft: 0,
                                 paddingRight: 0
                             }, onClick: close },
-                            "\u6536\u8D77",
+                            react_1.default.createElement(IntlProvider_1.FormattedMessage, { id: "component.searcharea.close", defaultMessage: '收起' }),
                             react_1.default.createElement(icons_1.UpOutlined, null))))))));
 }
 var SearchArea = InternalSearchArea;

package/build/lib/components/Table/Footer/index.js

@@ -34,7 +34,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 var react_1 = __importStar(require("react"));
-var react_intl_1 = require("react-intl");
+var IntlProvider_1 = require("../../IntlProvider");
 var antd_1 = require("antd");
 var react_transition_group_1 = require("react-transition-group");
 var icons_1 = require("@ant-design/icons");
@@ -111,7 +111,7 @@ function Index(props) {
                 return (react_1.default.createElement(styles_1.StyledRow, { ref: transitionNodeRef, justify: "space-between" },
                     react_1.default.createElement(antd_1.Col, { style: { display: 'flex', alignItems: 'center' } },
                         react_1.default.createElement(antd_1.Checkbox, { checked: checked, indeterminate: indeterminate, onChange: changeCheckAll },
-                            react_1.default.createElement(react_intl_1.FormattedMessage, { id: "component.table.selected", defaultMessage: '已选{length}条', values: {
+                            react_1.default.createElement(IntlProvider_1.FormattedMessage, { id: "component.table.selected", defaultMessage: '已选{length}条', values: {
                                     length: (_b = (_a = rowSelection.selectedRowKeys) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0
                                 } }))),
                     react_1.default.createElement(antd_1.Col, { style: { display: 'flex', alignItems: 'center' } },

package/build/lib/components/Table/PopoverSetColumns/index.js

@@ -47,7 +47,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var react_1 = __importStar(require("react"));
 var antd_1 = require("antd");
-var react_intl_1 = require("react-intl");
+var IntlProvider_1 = require("../../IntlProvider");
 var icons_1 = require("@ant-design/icons");
 // import { message, IconFont } from 'xmirror-components'
 var AntdApp_1 = require("../../AntdApp");
@@ -122,7 +122,7 @@ function PopoverSetColumns(_a) {
         var checked = _a.target.checked;
         var dataIndex = _b.dataIndex;
         if (visibleItems.length === 1 && !checked) {
-            AntdApp_1.message.error(react_1.default.createElement(react_intl_1.FormattedMessage, { id: "component.table.visibleError", defaultMessage: '列表最少保留一个字段' }));
+            AntdApp_1.message.error(react_1.default.createElement(IntlProvider_1.FormattedMessage, { id: "component.table.visibleError", defaultMessage: '列表最少保留一个字段' }));
             return;
         }
         var id = Array.isArray(dataIndex) ? dataIndex.join(',') : dataIndex;

package/build/lib/components/Table/ResizableColumns/index.js

@@ -0,0 +1,114 @@
+"use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resizableColumns = exports.ResizableTitle = void 0;
+var react_1 = __importStar(require("react"));
+var ahooks_1 = require("ahooks");
+var icons_1 = require("@ant-design/icons");
+var react_resizable_1 = require("react-resizable");
+var utils_1 = require("../utils");
+var styles_1 = require("./styles");
+var ResizableTitle = function (props) {
+    var onResize = props.onResize, width = props.width, restProps = __rest(props, ["onResize", "width"]);
+    var _a = (0, react_1.useState)(false), resizing = _a[0], setResizing = _a[1];
+    if (!width) {
+        return react_1.default.createElement("th", __assign({}, restProps));
+    }
+    var onResizeStart = function (_e) {
+        setResizing(true);
+    };
+    var onResizeStop = function (_e) {
+        setResizing(false);
+    };
+    return (react_1.default.createElement(react_resizable_1.Resizable, { width: width, height: 0, handle: react_1.default.createElement(styles_1.ResizableHandle, { className: resizing ? 'resizing' : '', onClick: function (e) { return e.stopPropagation(); } },
+            react_1.default.createElement(icons_1.MenuOutlined, { className: "react-resizable-handle-icon" })), onResize: onResize, onResizeStart: onResizeStart, onResizeStop: onResizeStop, draggableOpts: { enableUserSelectHack: false } },
+        react_1.default.createElement("th", __assign({}, restProps))));
+};
+exports.ResizableTitle = ResizableTitle;
+var resizableColumns = function (columns, tableId) {
+    // const [columnsWidth, setColumnsWidth] = useSetState({})
+    var _a = (0, ahooks_1.useLocalStorageState)('table-resizable_' + tableId, {}), columnsWidth = _a[0], setColumnsWidth = _a[1];
+    var handleResize = function (column) {
+        return function (_, _a) {
+            var size = _a.size;
+            var dataIndex = (0, utils_1.dataIndexToString)(column === null || column === void 0 ? void 0 : column.dataIndex);
+            setColumnsWidth(function (value) {
+                var _a;
+                return __assign(__assign({}, value), (_a = {}, _a[dataIndex] = size.width, _a));
+            });
+        };
+    };
+    return (0, react_1.useMemo)(function () {
+        return columns.map(function (col) {
+            var dataIndex = col.dataIndex;
+            if (Array.isArray(col.dataIndex)) {
+                dataIndex = col.dataIndex.join('.');
+            }
+            else {
+                dataIndex = col.dataIndex;
+            }
+            var width = (columnsWidth === null || columnsWidth === void 0 ? void 0 : columnsWidth[dataIndex]) || col.width;
+            return __assign(__assign({}, col), { width: width, onHeaderCell: function (column) {
+                    return {
+                        width: column.width,
+                        onResize: handleResize(column)
+                    };
+                } });
+        });
+    }, [columns, columnsWidth]);
+};
+exports.resizableColumns = resizableColumns;

package/build/lib/components/Table/ResizableColumns/styles.js

@@ -0,0 +1,17 @@
+"use strict";
+var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cooked, raw) {
+    if (Object.defineProperty) { Object.defineProperty(cooked, "raw", { value: raw }); } else { cooked.raw = raw; }
+    return cooked;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ResizableHandle = void 0;
+var styled_1 = __importDefault(require("@emotion/styled"));
+/**
+ * 可调整大小的列拖拽手柄样式组件
+ * 用于表格列宽调整功能
+ */
+exports.ResizableHandle = styled_1.default.span(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n  position: absolute;\n  top: 0;\n  right: 0;\n  bottom: 0;\n  display: inline-flex;\n  align-items: center;\n  justify-content: center;\n  width: 6px;\n  height: 30px;\n  margin: auto 0;\n  text-align: center;\n  cursor: col-resize;\n  user-select: none;\n  background: #f0f0f0;\n  border: 1px solid #d3d3d3;\n  border-radius: 3px;\n  opacity: 0;\n  transition: all 0.1s;\n\n  &.resizing,\n  &:hover {\n    opacity: 1;\n  }\n\n  .react-resizable-handle-icon {\n    display: inline-block;\n    transform: rotateZ(90deg) scale(0.3);\n  }\n"], ["\n  position: absolute;\n  top: 0;\n  right: 0;\n  bottom: 0;\n  display: inline-flex;\n  align-items: center;\n  justify-content: center;\n  width: 6px;\n  height: 30px;\n  margin: auto 0;\n  text-align: center;\n  cursor: col-resize;\n  user-select: none;\n  background: #f0f0f0;\n  border: 1px solid #d3d3d3;\n  border-radius: 3px;\n  opacity: 0;\n  transition: all 0.1s;\n\n  &.resizing,\n  &:hover {\n    opacity: 1;\n  }\n\n  .react-resizable-handle-icon {\n    display: inline-block;\n    transform: rotateZ(90deg) scale(0.3);\n  }\n"])));
+var templateObject_1;

package/build/lib/components/Table/index.js

@@ -53,9 +53,10 @@ var ahooks_1 = require("ahooks");
 var icons_1 = require("@ant-design/icons");
 var PopoverSetColumns_1 = __importDefault(require("./PopoverSetColumns"));
 var Footer_1 = __importDefault(require("./Footer"));
+var ResizableColumns_1 = require("./ResizableColumns");
 var styles_1 = require("./styles");
 function Index(props, ref) {
-    var _a = props.columns, columns = _a === void 0 ? [] : _a, columnsSort = props.columnsSort, columnsVisible = props.columnsVisible, _b = props.tableId, tableId = _b === void 0 ? '' : _b, pagination = props.pagination, dataSource = props.dataSource;
+    var _a = props.columns, columns = _a === void 0 ? [] : _a, columnsSort = props.columnsSort, columnsVisible = props.columnsVisible, _b = props.tableId, tableId = _b === void 0 ? '' : _b, pagination = props.pagination, dataSource = props.dataSource, columnsResizable = props.columnsResizable;
     var pathname = location.pathname;
     var _tableId = pathname + tableId;
     var _c = (0, ahooks_1.useLocalStorageState)('TABLE_' + _tableId, {
@@ -222,6 +223,6 @@ function Index(props, ref) {
     return (react_1.default.createElement(styles_1.TableWrapper, { ref: ref },
         react_1.default.createElement(antd_1.Table, __assign({ ref: tableRef, scroll: {
                 x: 900
-            } }, props, { pagination: paginationProps, columns: renderColumns }))));
+            }, components: { header: { cell: columnsResizable ? ResizableColumns_1.ResizableTitle : undefined } } }, props, { pagination: paginationProps, columns: columnsResizable ? (0, ResizableColumns_1.resizableColumns)(renderColumns, tableId) : renderColumns }))));
 }
 exports.default = (0, react_1.forwardRef)(Index);

package/build/lib/components/Table/utils.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.dataIndexToString = void 0;
+/**
+ * 将 dataIndex 转换为字符串
+ * @param dataIndex - 数据索引，可能是字符串或数组
+ * @returns 转换后的字符串
+ */
+var dataIndexToString = function (dataIndex) {
+    if (!dataIndex)
+        return '';
+    if (Array.isArray(dataIndex)) {
+        return dataIndex.join('.');
+    }
+    return dataIndex;
+};
+exports.dataIndexToString = dataIndexToString;

package/build/lib/hooks/useTable/index.js

@@ -57,7 +57,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var react_1 = require("react");
-var react_intl_1 = require("react-intl");
+var IntlProvider_1 = require("../../components/IntlProvider");
 var ahooks_1 = require("ahooks");
 var AntdApp_1 = require("../../components/AntdApp");
 var ORDER_MAP = {
@@ -74,17 +74,17 @@ var defaultOptions = {
     },
     showRowSelection: false,
     multiPageSelection: false,
-    onBeforeRequest: function (params) { return __awaiter(void 0, void 0, void 0, function () { return __generator(this, function (_a) {
+    onBeforeRequest: function (_) { return __awaiter(void 0, void 0, void 0, function () { return __generator(this, function (_a) {
         return [2 /*return*/, undefined];
     }); }); },
-    onAfterRequest: function (response) { return __awaiter(void 0, void 0, void 0, function () { return __generator(this, function (_a) {
+    onAfterRequest: function (_) { return __awaiter(void 0, void 0, void 0, function () { return __generator(this, function (_a) {
         return [2 /*return*/, undefined];
     }); }); }
 };
 function useTable(request, options) {
     var _this = this;
     if (options === void 0) { options = {}; }
-    var intl = (0, react_intl_1.useIntl)();
+    var intl = (0, IntlProvider_1.useIntl)();
     var _a = __assign(__assign({}, defaultOptions), options), rowKey = _a.rowKey, interval = _a.interval, immediate = _a.immediate, defaultPagination = _a.defaultPagination, showRowSelection = _a.showRowSelection, multiPageSelection = _a.multiPageSelection, onBeforeRequest = _a.onBeforeRequest, onAfterRequest = _a.onAfterRequest;
     var tableTimerRef = (0, react_1.useRef)(null);
     var _b = (0, react_1.useState)(false), loading = _b[0], setLoading = _b[1];
@@ -152,7 +152,6 @@ function useTable(request, options) {
                                 total: total
                             });
                         }
-                        console.log(list);
                         if (list.length === 0 && current && current > 1 && total && total > 0) {
                             maxPage = Math.ceil(total / size);
                             initList(maxPage, pageSize, auto);
@@ -201,10 +200,11 @@ function useTable(request, options) {
     }, []);
     /**
      * 列表多选执行
-     * @param _ 选中的key数组
+     * @param selectedRowKeys 选中的key数组
      * @param selectedRows 被选中的项
+     * @param info 选择信息
      */
-    var onSelectChange = (0, react_1.useCallback)(function (_, selectedRows) {
+    var onSelectChange = (0, react_1.useCallback)(function (_, selectedRows, __) {
         setSelectedRows(selectedRows);
     }, []);
     /**
@@ -245,7 +245,7 @@ function useTable(request, options) {
      * @param order 排序的值
      */
     var onChangeTable = (0, react_1.useCallback)(function (pagination, filter, order) {
-        var _a;
+        var _a, _b, _c;
         // 处理筛选参数
         Object.entries(filter).forEach(function (_a) {
             var key = _a[0], value = _a[1];
@@ -257,20 +257,26 @@ function useTable(request, options) {
             }
         });
         // 处理排序参数
-        if (order === null || order === void 0 ? void 0 : order.order) {
-            if ((_a = order === null || order === void 0 ? void 0 : order.column) === null || _a === void 0 ? void 0 : _a.sort) {
-                searchParams.column = order.column.sort;
+        // 如果 order 是数组，取第一个元素
+        var sortInfo = Array.isArray(order) ? order[0] : order;
+        if (sortInfo === null || sortInfo === void 0 ? void 0 : sortInfo.order) {
+            if ((_a = sortInfo === null || sortInfo === void 0 ? void 0 : sortInfo.column) === null || _a === void 0 ? void 0 : _a.sort) {
+                searchParams.column = sortInfo.column.sort;
             }
-            else {
-                searchParams.column = order.field;
+            else if (sortInfo.field) {
+                // 处理 field 可能是数组的情况
+                searchParams.column = Array.isArray(sortInfo.field) ? sortInfo.field[0] : sortInfo.field;
             }
-            searchParams.order = ORDER_MAP[order.order];
+            searchParams.order = ORDER_MAP[sortInfo.order];
         }
         else {
             searchParams.column = null;
             searchParams.order = null;
         }
-        initList(pagination.current, pagination.pageSize);
+        // 使用当前分页值作为默认值，处理可能为 undefined 的情况
+        var currentPage = (_b = pagination.current) !== null && _b !== void 0 ? _b : paginationRef.current.current;
+        var currentPageSize = (_c = pagination.pageSize) !== null && _c !== void 0 ? _c : paginationRef.current.pageSize;
+        initList(currentPage, currentPageSize);
     }, [initList, searchParams]);
     // 初始化
     (0, react_1.useEffect)(function () {

package/build/lib/index.d.ts

@@ -14,7 +14,6 @@ import { Options as Options_2 } from 'ahooks/lib/useRequest/src/types';
 import { Plugin as Plugin_2 } from 'ahooks/lib/useRequest/src/types';
 import { Result } from 'ahooks/lib/useRequest/src/types';
 import { RowProps } from 'antd';
-import { RowSelectMethod } from 'antd/es/table/interface';
 import { Service } from 'ahooks/lib/useRequest/src/types';
 import { SwitchProps } from 'antd/es/switch';
 import { TableColumnType } from 'antd';
@@ -127,6 +126,7 @@ export declare const ConfigContext: default_2.Context<ConfigContextProps>;
 declare interface ConfigContextProps {
     iconButton: IconButtonConfig;
     iconFont: IconFontConfig;
+    locale: MessagesKeys;
 }
 
 export declare function ConfigProvider({ children, config }: ConfigProviderProps): default_2.JSX.Element;
@@ -138,8 +138,6 @@ declare interface ConfigProviderProps {
     config: ConfigProviderConfigProps;
 }
 
-declare type FilterParams = Record<string, string[] | string | null>;
-
 export declare function GlobalLoading(): default_2.JSX.Element;
 
 export declare const IconButton: default_2.ForwardRefExoticComponent<IconButtonProps & default_2.RefAttributes<HTMLButtonElement | HTMLAnchorElement>>;
@@ -232,6 +230,8 @@ declare interface InternalSearchAreaProps extends FormProps<any> {
 
 export declare let message: MessageInstance;
 
+declare type MessagesKeys = 'zh' | 'en';
+
 export declare let modal: Omit<ModalStaticFunctions, 'warn'>;
 
 export declare let notification: NotificationInstance;
@@ -320,26 +320,7 @@ declare interface ReturnData<T = BaseRecord> {
     /**
      * 列表 props，拓展到 table 上
      */
-    tableProps: {
-        rowKey: string;
-        loading: boolean;
-        dataSource: T[];
-        rowSelection?: {
-            selectedRowKeys: Array<string | number>;
-            onChange?: (selectedRowKeys: Array<string | number>, selectedRows: T[], info: {
-                type: RowSelectMethod;
-            }) => void;
-        };
-        onChange: (pagination: TableChangeParams, filter: FilterParams, order: SortParams) => void;
-        pagination: {
-            showQuickJumper: boolean;
-            showSizeChanger: boolean;
-            showTotal: (total: number) => string;
-            total: number;
-            current: number;
-            pageSize: number;
-        };
-    };
+    tableProps: TableComponentProps;
     /**
      * 列表搜索
      */
@@ -394,14 +375,6 @@ declare interface SearchAreaHooks {
 
 export declare let setGlobalLoading: (_value: boolean) => void;
 
-declare interface SortParams {
-    field: string;
-    order: 'ascend' | 'descend' | null;
-    column?: {
-        sort?: string;
-    };
-}
-
 /**
  * Switch 可自定义 value
  */
@@ -433,11 +406,6 @@ declare interface SwitchValueProps<T = boolean | string | number, F = boolean |
 
 export declare const Table: default_2.ForwardRefExoticComponent<TableComponentProps<AnyObject> & default_2.RefAttributes<HTMLDivElement>>;
 
-declare interface TableChangeParams {
-    current: number;
-    pageSize: number;
-}
-
 declare interface TableComponentProps<RecordType = AnyObject> extends Omit<TableProps<RecordType>, 'columns'> {
     /**
      * 列表项
@@ -459,6 +427,10 @@ declare interface TableComponentProps<RecordType = AnyObject> extends Omit<Table
      * 中间的批量操作弹出层
      */
     selectionPopover?: default_2.ReactNode;
+    /**
+     * 是否开启列宽调整功能
+     */
+    columnsResizable?: boolean;
 }
 
 /**