@zat-design/sisyphus-react 3.0.16-beta.2 → 3.1.4

package/lib/ProTable/index.js

@@ -1,7 +1,6 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -12,14 +11,15 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectSpread4 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _jsxRuntime = require("react/jsx-runtime");
+var _react = require("react");
 var _antd = require("antd");
 var _lodash = require("lodash");
 var _ahooks = require("ahooks");
-var _react = _interopRequireWildcard(require("react"));
 var _reactSvg = require("react-svg");
 var _classnames2 = _interopRequireDefault(require("classnames"));
-var _zatDesignProComponent = require("zat-design-pro-component");
-var _utils = require("@zat-design-pro-component/utils");
+var _utils = require("@zat-design/utils");
+var _index = require("../index");
 var _utils2 = require("../ProUtils/utils");
 var _components = require("./components");
 var _useAntdTable = _interopRequireDefault(require("./useAntdTable"));
@@ -27,22 +27,20 @@ var _empty = _interopRequireDefault(require("../assets/empty.png"));
 var _reset = _interopRequireDefault(require("../assets/reset.svg"));
 var _customColumn = _interopRequireDefault(require("../assets/customColumn.svg"));
 var _utils3 = require("./utils");
-var _excluded = ["tableId", "headerRender", "footerRender", "quickConfig", "stripe", "columns", "className", "summary"],
+var _excluded = ["tableId", "headerRender", "footerRender", "quickConfig", "stripe", "columns", "className", "summary", "emptyText"],
   _excluded2 = ["resizeColumn", "columnConfig", "cacheTime", "storage"];
 var defaultCacheTime = 1; // columns 配置保存时间为一天
 // 全局上下文
-var TableContext = /*#__PURE__*/(0, _react.createContext)({});
-exports.TableContext = TableContext;
-var defaultPage = {
+var TableContext = exports.TableContext = /*#__PURE__*/(0, _react.createContext)({});
+var defaultPage = exports.defaultPage = {
   pageNum: 1,
   pageSize: 10
 };
-exports.defaultPage = defaultPage;
 function ProTable(props) {
   var _curTableConfig$pathK;
-  var _ref = (0, _zatDesignProComponent.useProConfig)('globalConfig') || {},
+  var _ref = (0, _index.useProConfig)('globalConfig') || {},
     configStorage = _ref.storage; // 获取全局缓存位置配置
-  var _ref2 = (0, _zatDesignProComponent.useProConfig)('ProTable') || {},
+  var _ref2 = (0, _index.useProConfig)('ProTable') || {},
     configResizeColumn = _ref2.resizeColumn,
     configTColumnConfig = _ref2.columnConfig,
     configCacheTime = _ref2.cacheTime;
@@ -55,6 +53,8 @@ function ProTable(props) {
     propsColumns = _props$columns === void 0 ? [] : _props$columns,
     className = props.className,
     summary = props.summary,
+    _props$emptyText = props.emptyText,
+    emptyText = _props$emptyText === void 0 ? '暂无数据' : _props$emptyText,
     restProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var quickTableConfig = quickConfig ? (0, _objectSpread4.default)({
     // resizeColumn: true,
@@ -72,6 +72,9 @@ function ProTable(props) {
     _quickTableConfig$sto = quickTableConfig.storage,
     storage = _quickTableConfig$sto === void 0 ? configStorage : _quickTableConfig$sto,
     tableProps = (0, _objectWithoutProperties2.default)(quickTableConfig, _excluded2);
+  var _ref3 = tableProps || {},
+    pagination = _ref3.pagination,
+    dataSource = _ref3.dataSource;
   var propsColumnObj = (0, _react.useMemo)(function () {
     return propsColumns.reduce(function (acc, cur) {
       // @ts-ignore
@@ -131,8 +134,8 @@ function ProTable(props) {
   };
   // 列宽resize函数
   var handleResize = function handleResize(index) {
-    return function (e, _ref3) {
-      var size = _ref3.size;
+    return function (e, _ref4) {
+      var size = _ref4.size;
       var nextColumns = (0, _toConsumableArray2.default)(curColumns);
       nextColumns[index] = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, nextColumns[index]), {}, {
         width: size.width
@@ -167,9 +170,14 @@ function ProTable(props) {
     return newColumns;
   }, [curColumns, handleResize]);
   var handleColumnConfig = function handleColumnConfig(checkList) {
-    var newColumns = checkList === null || checkList === void 0 ? void 0 : checkList.map(function (item) {
-      return (0, _objectSpread4.default)({}, propsColumnObj[item.dataIndex]);
-    });
+    var newColumns = [];
+    if (checkList === 'all') {
+      newColumns = propsColumns;
+    } else {
+      newColumns = checkList === null || checkList === void 0 ? void 0 : checkList.map(function (item) {
+        return (0, _objectSpread4.default)({}, propsColumnObj === null || propsColumnObj === void 0 ? void 0 : propsColumnObj[item]);
+      });
+    }
     setCurColumns(newColumns);
   };
   (0, _ahooks.useDebounceEffect)(function () {
@@ -190,135 +198,148 @@ function ProTable(props) {
   });
   var customColumns = (0, _react.useMemo)(function () {
     return propsColumns.map(function (item) {
-      return (0, _objectSpread4.default)((0, _objectSpread4.default)({}, item), {}, {
-        disabled: item.fixed
-      });
+      return {
+        label: item === null || item === void 0 ? void 0 : item.title,
+        value: item === null || item === void 0 ? void 0 : item.dataIndex,
+        disabled: item.fixed,
+        fixed: item.fixed
+      };
     });
   }, [propsColumns]);
   var checkColumns = (0, _react.useMemo)(function () {
     return curColumns.map(function (item) {
-      return (0, _objectSpread4.default)((0, _objectSpread4.default)({}, item), {}, {
-        disabled: item.fixed
-      });
+      return item === null || item === void 0 ? void 0 : item.dataIndex;
     });
   }, [curColumns]);
-  var Empty = /*#__PURE__*/_react.default.createElement("div", {
-    className: "ant-empty ant-empty-normal"
-  }, /*#__PURE__*/_react.default.createElement("div", {
-    className: "ant-empty-image"
-  }, /*#__PURE__*/_react.default.createElement("img", {
-    src: _empty.default,
-    alt: "\u6682\u65E0\u6570\u636E"
-  })), /*#__PURE__*/_react.default.createElement("div", {
-    className: "ant-empty-description"
-  }, "\u6682\u65E0\u6570\u636E"));
   var renderSummary = function renderSummary() {
-    var _ref4 = summary || {},
-      columns = _ref4.columns,
-      _ref4$total = _ref4.total,
-      total = _ref4$total === void 0 ? true : _ref4$total,
-      _ref4$fixed = _ref4.fixed,
-      fixed = _ref4$fixed === void 0 ? true : _ref4$fixed;
-    var _ref5 = tableProps || {},
-      dataSource = _ref5.dataSource;
+    var _ref5 = summary || {},
+      columns = _ref5.columns,
+      _ref5$total = _ref5.total,
+      total = _ref5$total === void 0 ? true : _ref5$total,
+      _ref5$fixed = _ref5.fixed,
+      fixed = _ref5$fixed === void 0 ? true : _ref5$fixed;
+    var _ref6 = tableProps || {},
+      dataSource = _ref6.dataSource;
     // 没有数据时，不展示合计栏
     if (!(dataSource === null || dataSource === void 0 ? void 0 : dataSource.length)) {
       return null;
     }
-    return /*#__PURE__*/_react.default.createElement(_antd.Table.Summary, {
-      fixed: fixed
-    }, /*#__PURE__*/_react.default.createElement(_antd.Table.Summary.Row, null, columns === null || columns === void 0 ? void 0 : columns.map(function (_ref6) {
-      var key = _ref6.key,
-        index = _ref6.index,
-        colSpan = _ref6.colSpan,
-        prefix = _ref6.prefix,
-        title = _ref6.title,
-        precision = _ref6.precision,
-        valueType = _ref6.valueType;
-      var text = null;
-      if (title) {
-        text = title;
-      } else if (total && key) {
-        var _dataSource$reduce;
-        var format = _utils2.valueTypeRender === null || _utils2.valueTypeRender === void 0 ? void 0 : _utils2.valueTypeRender[valueType];
-        var sum = dataSource === null || dataSource === void 0 ? void 0 : (_dataSource$reduce = dataSource.reduce) === null || _dataSource$reduce === void 0 ? void 0 : _dataSource$reduce.call(dataSource, function (pre, cur) {
-          var _cur$key;
-          return _utils.tools.calc(pre, '+', (_cur$key = cur[key]) !== null && _cur$key !== void 0 ? _cur$key : 0);
-        }, 0);
-        text = format ? format(sum, precision !== null && precision !== void 0 ? precision : 2) : sum;
-      }
-      return /*#__PURE__*/_react.default.createElement(_antd.Table.Summary.Cell, {
-        key: key,
-        index: index,
-        colSpan: colSpan
-      }, prefix, text);
-    })));
+    return (0, _jsxRuntime.jsx)(_antd.Table.Summary, {
+      fixed: fixed,
+      children: (0, _jsxRuntime.jsx)(_antd.Table.Summary.Row, {
+        children: columns === null || columns === void 0 ? void 0 : columns.map(function (_ref7) {
+          var key = _ref7.key,
+            index = _ref7.index,
+            colSpan = _ref7.colSpan,
+            prefix = _ref7.prefix,
+            suffix = _ref7.suffix,
+            title = _ref7.title,
+            precision = _ref7.precision,
+            valueType = _ref7.valueType;
+          var text = null;
+          if (title) {
+            text = title;
+          } else if (total && key) {
+            var _dataSource$reduce;
+            var format = _utils2.valueTypeRender === null || _utils2.valueTypeRender === void 0 ? void 0 : _utils2.valueTypeRender[valueType];
+            var sum = dataSource === null || dataSource === void 0 ? void 0 : (_dataSource$reduce = dataSource.reduce) === null || _dataSource$reduce === void 0 ? void 0 : _dataSource$reduce.call(dataSource, function (pre, cur) {
+              var _get;
+              return _utils.tools.calc(pre, '+', (_get = (0, _lodash.get)(cur, key)) !== null && _get !== void 0 ? _get : 0);
+            }, 0);
+            text = format ? format(sum, precision !== null && precision !== void 0 ? precision : 2) : sum;
+          }
+          var _key = key;
+          return (0, _jsxRuntime.jsxs)(_antd.Table.Summary.Cell, {
+            index: index,
+            colSpan: colSpan,
+            children: [prefix, text, suffix]
+          }, _key);
+        })
+      })
+    });
   };
   var cls = (0, _classnames2.default)((0, _defineProperty2.default)({
     'pro-table': true,
     'pro-table-no-stripe': !stripe
   }, className, className));
-  return /*#__PURE__*/_react.default.createElement(TableContext.Provider, {
+  return (0, _jsxRuntime.jsx)(TableContext.Provider, {
     value: {
       pathKey: pathKey,
       tableConfig: tableConfig,
       Storage: Storage
-    }
-  }, /*#__PURE__*/_react.default.createElement("div", {
-    className: cls
-  }, (headerRender || columnConfig || resizeColumn) && /*#__PURE__*/_react.default.createElement("div", {
-    className: "column-config"
-  }, /*#__PURE__*/_react.default.createElement("div", {
-    className: "left-contain"
-  }, headerRender ? headerRender() : null), /*#__PURE__*/_react.default.createElement("div", {
-    className: "right-actions"
-  }, resizeColumn && /*#__PURE__*/_react.default.createElement(_antd.Button, {
-    icon: /*#__PURE__*/_react.default.createElement(_reactSvg.ReactSVG, {
-      className: "anticon",
-      wrapper: "span",
-      src: _reset.default
-    }),
-    onClick: resetColumnWidth
-  }, "\u91CD\u7F6E\u5217\u5BBD"), columnConfig && /*#__PURE__*/_react.default.createElement(_zatDesignProComponent.ProTransferModal, {
-    label: "\u5217",
-    title: "\u81EA\u5B9A\u4E49\u5217",
-    draggable: true,
-    span: 8,
-    defaultValue: checkColumns,
-    clearCheckedOnClose: false,
-    fieldNames: {
-      value: 'dataIndex',
-      label: 'title'
     },
-    dataSource: customColumns,
-    onOk: handleColumnConfig
-  }, /*#__PURE__*/_react.default.createElement(_antd.Button, {
-    className: "custom-column-btn",
-    icon: /*#__PURE__*/_react.default.createElement(_reactSvg.ReactSVG, {
-      className: "anticon",
-      wrapper: "span",
-      src: _customColumn.default
+    children: (0, _jsxRuntime.jsxs)("div", {
+      className: cls,
+      children: [(headerRender || columnConfig || resizeColumn) && (0, _jsxRuntime.jsxs)("div", {
+        className: "column-config",
+        children: [(0, _jsxRuntime.jsx)("div", {
+          className: "left-contain",
+          children: headerRender ? typeof headerRender === 'function' ? headerRender() : headerRender : null
+        }), (0, _jsxRuntime.jsxs)("div", {
+          className: "right-actions",
+          children: [resizeColumn && (0, _jsxRuntime.jsx)(_antd.Button, {
+            icon: (0, _jsxRuntime.jsx)(_reactSvg.ReactSVG, {
+              className: "anticon",
+              wrapper: "span",
+              src: _reset.default
+            }),
+            onClick: resetColumnWidth,
+            children: "\u91CD\u7F6E\u5217\u5BBD"
+          }), columnConfig && (0, _jsxRuntime.jsx)(_index.ProTreeModal, {
+            title: "\u81EA\u5B9A\u4E49\u5217",
+            span: 8,
+            mode: "list",
+            draggable: true,
+            dataSource: customColumns,
+            value: checkColumns,
+            allValue: "all",
+            onChange: handleColumnConfig,
+            trigger: (0, _jsxRuntime.jsx)(_antd.Button, {
+              className: "custom-column-btn",
+              icon: (0, _jsxRuntime.jsx)(_reactSvg.ReactSVG, {
+                className: "anticon",
+                wrapper: "span",
+                src: _customColumn.default
+              }),
+              children: "\u81EA\u5B9A\u4E49\u5217"
+            })
+          })]
+        })]
+      }), (0, _jsxRuntime.jsxs)("div", {
+        className: "pro-table-container",
+        children: [(0, _jsxRuntime.jsx)(_antd.Table, (0, _objectSpread4.default)({
+          components: resizeColumn ? _components.TableResizable.components : undefined,
+          // @ts-ignore
+          columns: columns,
+          locale: {
+            emptyText: (0, _jsxRuntime.jsxs)("div", {
+              className: "ant-empty ant-empty-normal",
+              children: [(0, _jsxRuntime.jsx)("div", {
+                className: "ant-empty-image",
+                children: (0, _jsxRuntime.jsx)("img", {
+                  src: _empty.default,
+                  alt: "\u6682\u65E0\u6570\u636E"
+                })
+              }), (0, _jsxRuntime.jsx)("div", {
+                className: "ant-empty-description",
+                children: typeof emptyText === 'function' ? emptyText() : emptyText
+              })]
+            })
+          },
+          summary: (0, _typeof2.default)(summary) === 'object' ? function () {
+            return renderSummary();
+          } : summary
+        }, tableProps)), (0, _jsxRuntime.jsx)(_components.ResizableLine, {})]
+      }), footerRender ? (0, _jsxRuntime.jsx)("div", {
+        className: "pro-table-footer ".concat(pagination && !!(dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) ? 'has-page' : 'no-page'),
+        children: typeof footerRender === 'function' ? footerRender() : footerRender
+      }) : null]
     })
-  }, "\u81EA\u5B9A\u4E49\u5217")))), /*#__PURE__*/_react.default.createElement("div", {
-    className: "pro-table-container"
-  }, /*#__PURE__*/_react.default.createElement(_antd.Table, (0, _objectSpread4.default)({
-    components: resizeColumn ? _components.TableResizable.components : undefined,
-    // @ts-ignore
-    columns: columns,
-    locale: {
-      emptyText: Empty
-    },
-    summary: (0, _typeof2.default)(summary) === 'object' ? function () {
-      return renderSummary();
-    } : summary
-  }, tableProps)), /*#__PURE__*/_react.default.createElement(_components.ResizableLine, null)), footerRender ? /*#__PURE__*/_react.default.createElement("div", {
-    className: "pro-table-footer ".concat((tableProps === null || tableProps === void 0 ? void 0 : tableProps.pagination) ? 'has-page' : 'no-page')
-  }, footerRender()) : null));
+  });
 }
 ProTable.defaultProps = {
   quickConfig: false,
   stripe: true
 };
 ProTable.useAntdTable = _useAntdTable.default;
-var _default = ProTable;
-exports.default = _default;
+var _default = exports.default = ProTable;

package/lib/ProTable/propsType.d.ts

@@ -1,25 +1,43 @@
-import { ReactNode } from 'react';
-import { TableProps } from 'antd/lib/table/Table';
-import { ColumnType, GetRowKey, RowSelectionType } from 'antd/lib/table/interface';
+import { Key, ReactNode } from 'react';
+import { TableProps } from 'antd/es/table/Table';
+import { ColumnType, GetRowKey, RowSelectionType } from 'antd/es/table/interface';
 import { FormInstance } from 'antd';
 interface SummaryColumnProps {
-    key: string;
+    key: string | string[];
     index: number;
     title?: string;
     colSpan?: number;
     valueType?: string;
     precision?: number;
     prefix?: ReactNode | string;
+    suffix?: ReactNode | string;
 }
 export interface ProTableSummaryProps {
     columns: SummaryColumnProps[];
     total?: boolean;
     fixed?: boolean;
 }
-export type ProTableProps = TableProps<any> & {
+export interface ProTableColumn extends Omit<ColumnType<any>, 'dataIndex'> {
+    dataIndex: string | string[];
+    width?: number | string;
+    minWidth?: number;
+    valueType?: ProTableValueType;
+    format?: string;
+    precision?: number;
+    code?: string | string[] | (() => string);
+    copyable?: boolean;
+    prefix?: string | ReactNode | ((value: any, record?: any, index?: number) => any);
+    suffix?: string | ReactNode | ((value: any, record?: any, index?: number) => any);
+    tooltip?: ReactNode | {
+        title?: ReactNode;
+        icon?: ReactNode;
+    };
+    transform?: (value: any, record?: any) => string[];
+}
+export interface ProTableProps extends Omit<TableProps<any>, 'summary' | 'columns'> {
     tableId?: string;
     rowKey?: string | GetRowKey<any>;
-    headerRender?: () => ReactNode;
+    headerRender?: ReactNode | (() => ReactNode);
     quickConfig?: boolean;
     resizeColumn?: boolean;
     sortRow?: boolean | 'drag' | 'move';
@@ -27,29 +45,16 @@ export type ProTableProps = TableProps<any> & {
     cacheTime?: number | boolean;
     sortColumnText?: string;
     storage?: 'localStorage' | 'sessionStorage';
-    footerRender?: () => ReactNode;
+    footerRender?: ReactNode | (() => ReactNode);
+    emptyText?: string | ReactNode | (() => ReactNode);
     summary?: ProTableSummaryProps | TableProps<any>['summary'];
     /**
      * 斑马纹设置
      */
     stripe?: boolean;
-};
-export type ProTableValueType = 'percentage' | 'permillage' | 'thousandth' | 'datePicker' | 'enumName' | 'enumCodeName' | 'address' | 'thousandthCNY' | 'date' | 'dateTime' | 'dateStartTime' | 'dateEndTime' | 'dateStartEndTime';
-export interface ProTableColumn extends ColumnType<any> {
-    dataIndex: string | string[];
-    width?: number | string;
-    minWidth?: number;
-    valueType?: ProTableValueType;
-    format?: string;
-    precision?: number;
-    code?: string | (() => string);
-    copyable?: boolean;
-    tooltip?: ReactNode | {
-        title?: ReactNode;
-        icon?: ReactNode;
-    };
-    transform?: (value: any, record?: any) => string[];
+    columns: ProTableColumn[];
 }
+export type ProTableValueType = 'percentage' | 'permillage' | 'thousandth' | 'datePicker' | 'enumName' | 'enumCodeName' | 'address' | 'thousandthCNY' | 'date' | 'dateTime' | 'dateStartTime' | 'dateEndTime' | 'dateStartEndTime';
 export interface Response<T = any> {
     data: T;
     status: number;
@@ -70,19 +75,28 @@ export interface RequestOptions<T, R> {
     page?: PaginationProps;
     crossPageSelect?: boolean;
     onPageChange?: (page: PaginationProps) => void;
-    transformParams?: (params: any) => any;
-    transformResponse?: (data: any) => R[];
+    transformParams?: (params: any, requestParams: any) => any;
+    transformResponse?: (res: any) => ListResponse<R>;
 }
 export interface Params<T = any> extends PaginationProps {
     queryBean?: Partial<T>;
     [key: string]: any;
 }
 export interface List<T> {
-    pageNum: number;
-    pageSize: number;
+    pageNum?: number;
+    pageSize?: number;
     total: number;
     list: T[];
 }
 export type ListResponse<T> = Response<List<T>>;
 export type Service<Req, Res> = (params?: Params<Req>) => Promise<ListResponse<Res>>;
+export interface UseAntdTableState<I, R> {
+    data: R[];
+    total: number;
+    selectedRecords: R[];
+    selectedRowKeys: Key[];
+    searchValues: I;
+    extraFilter: any;
+    allSelected: boolean;
+}
 export {};

package/lib/ProTable/style/index.less

@@ -1,4 +1,42 @@
 .pro-table {
+  &.pro-table-bordered {
+    .ant-table .ant-table-thead>tr>th {
+      border-bottom: 1px solid #f0f0f0
+    }
+
+    .ant-table>.ant-table-container>.ant-table-content>table,
+    .ant-table>.ant-table-container>.ant-table-header>table {
+      border-top: 1px solid rgba(0, 0, 0, 0.06);
+    }
+
+    .ant-table>.ant-table-container>.ant-table-content>table>thead>tr>th,
+    .ant-table>.ant-table-container>.ant-table-header>table>thead>tr>th,
+    .ant-table>.ant-table-container>.ant-table-body>table>thead>tr>th,
+    .ant-table>.ant-table-container>.ant-table-summary>table>thead>tr>th,
+    .ant-table>.ant-table-container>.ant-table-content>table>tbody>tr>td,
+    .ant-table>.ant-table-container>.ant-table-header>table>tbody>tr>td,
+    .ant-table>.ant-table-container>.ant-table-body>table>tbody>tr>td,
+    .ant-table>.ant-table-container>.ant-table-summary>table>tbody>tr>td,
+    .ant-table>.ant-table-container>.ant-table-content>table>tfoot>tr>th,
+    .ant-table>.ant-table-container>.ant-table-header>table>tfoot>tr>th,
+    .ant-table>.ant-table-container>.ant-table-body>table>tfoot>tr>th,
+    .ant-table>.ant-table-container>.ant-table-summary>table>tfoot>tr>th,
+    .ant-table>.ant-table-container>.ant-table-content>table>tfoot>tr>td,
+    .ant-table>.ant-table-container>.ant-table-header>table>tfoot>tr>td,
+    .ant-table>.ant-table-container>.ant-table-body>table>tfoot>tr>td,
+    .ant-table>.ant-table-container>.ant-table-summary>table>tfoot>tr>td {
+      border-right: 1px solid rgba(0, 0, 0, 0.06);
+    }
+
+    .ant-table .ant-table-tbody>tr:not(.ant-table-measure-row)>td {
+      border-bottom: 1px solid #f0f0f0;
+    }
+
+    .ant-table>.ant-table-container {
+      border-left: 1px solid rgba(0, 0, 0, 0.06);
+    }
+  }
+
   .custom-column-btn {
     display    : inline-flex;
     align-items: center;
@@ -48,7 +86,7 @@
 
   &.pro-table-no-stripe {
     .ant-table.ant-table-scroll-horizontal .ant-table-tbody .ant-table-row:nth-child(n)>td {
-      background: #fff;
+      background: var(--zaui-base-bg, #ffffff);
     }
   }
 
@@ -156,17 +194,36 @@
       align-items: center;
 
       .icon-tip {
-        svg {
-          margin-left   : 8px;
-          width         : 14px;
-          height        : 14px;
-          vertical-align: text-bottom;
-          fill          : #909090;
+
+        div {
+          width : 14px;
+          height: 14px;
+
+          svg {
+            margin-left: 8px;
+            width      : 14px;
+            height     : 14px;
+            fill       : #909090;
+          }
         }
       }
     }
   }
 
+  .ant-table.ant-table-bordered {
+    .ant-table-thead>tr>th {
+      border-bottom: 1px solid #f0f0f0;
+    }
+
+    .ant-table-tbody>tr:not(.ant-table-placeholder)>td {
+      border-bottom: 1px solid #f0f0f0;
+    }
+
+    .ant-table-tbody>tr:not(.ant-table-measure-row)>td {
+      border-bottom: 1px solid #f0f0f0;
+    }
+  }
+
   .ant-table-tbody .ant-table-placeholder {
     background: var(--zaui-base-bg, #ffffff) !important;
   }
@@ -233,7 +290,7 @@
   }
 
   .ant-pagination .ant-pagination-item-active a {
-    color        : #fff;
+    color        : #ffffff;
     background   : var(--zaui-brand, #006aff) !important;
     border-radius: var(--zaui-border-radius, 4px);
   }
@@ -259,29 +316,6 @@
   }
 }
 
-.setting-overlay {
-  .column-setting-title {
-    display        : flex;
-    align-items    : center;
-    justify-content: space-between;
-  }
-
-  .ant-popover-inner-content {
-    max-height: 280px;
-    overflow-y: auto;
-  }
-
-  .column-checkbox-item {
-    display        : flex;
-    align-items    : center;
-    justify-content: space-between;
-
-    .ant-checkbox-wrapper {
-      font-weight: 500;
-    }
-  }
-}
-
 .ant-dropdown-placement-bottomLeft {
   .ant-dropdown-menu-vertical.ant-dropdown-menu-light {
 
@@ -291,4 +325,4 @@
       }
     }
   }
-}
+}

package/lib/ProTable/useAntdTable.d.ts

@@ -2,10 +2,12 @@ import { Key } from 'react';
 import { useRequest } from 'ahooks';
 import { RequestOptions, Service } from './propsType';
 declare function useAntdTable<I, R extends Record<string, any>, S extends Service<I, R>>(service: S, options?: RequestOptions<I, R>, useRequestOptions?: Parameters<typeof useRequest>[1]): {
-    data: any;
+    data: R[];
     params: any;
     rowSelection: {
-        type: import("antd/lib/table/interface").RowSelectionType;
+        fixed: boolean;
+        type: import("antd/es/table/interface").RowSelectionType;
+        columnWidth: number;
         selectedRowKeys: Key[];
         onChange(rowKeys: Key[], rows: any[]): void;
         onSelectAll: (selected: boolean) => void;
@@ -32,20 +34,22 @@ declare function useAntdTable<I, R extends Record<string, any>, S extends Servic
         showSizeChanger: boolean;
         showQuickJumper: boolean;
         onPaginationChange: boolean;
-        total: any;
+        total: number;
         showTotal: (total: any) => string;
         onShowSizeChange: (current: number, pageSize: number) => void;
         onChange: (current: number, pageSize: number) => void;
     };
     onReset: () => void;
     onSearch: (values: any) => void;
-    refresh: () => void;
+    refresh: () => Promise<void>;
     tableProps: {
         rowKey: string | import("rc-table/lib/interface").GetRowKey<R>;
         loading: boolean;
-        dataSource: any;
+        dataSource: R[];
         rowSelection: {
-            type: import("antd/lib/table/interface").RowSelectionType;
+            fixed: boolean;
+            type: import("antd/es/table/interface").RowSelectionType;
+            columnWidth: number;
             selectedRowKeys: Key[];
             onChange(rowKeys: Key[], rows: any[]): void;
             onSelectAll: (selected: boolean) => void;
@@ -64,7 +68,7 @@ declare function useAntdTable<I, R extends Record<string, any>, S extends Servic
             showSizeChanger: boolean;
             showQuickJumper: boolean;
             onPaginationChange: boolean;
-            total: any;
+            total: number;
             showTotal: (total: any) => string;
             onShowSizeChange: (current: number, pageSize: number) => void;
             onChange: (current: number, pageSize: number) => void;