@hw-component/table 0.0.3-beta-v6 → 0.0.3-beta-v8

package/es/HTableBody/index.d.ts

@@ -8,6 +8,7 @@ interface HTableBodyProps extends Omit<ProTableProps<any, any>, "dataSource"> {
     emptyRender?: (tableInstance: HTableInstance) => React.ReactNode;
     errorRender?: (tableInstance: HTableInstance, error: Error) => React.ReactNode;
     tableStyle?: React.CSSProperties;
+    paginationStyle?: React.CSSProperties;
 }
-declare const _default: ({ configData, pagination, onPageChange, rowSelection, rowKey, emptyRender, errorRender, tableStyle, ...props }: HTableBodyProps) => JSX.Element;
+declare const _default: ({ configData, pagination, onPageChange, rowSelection, rowKey, emptyRender, errorRender, tableStyle, paginationStyle, ...props }: HTableBodyProps) => JSX.Element;
 export default _default;

package/es/HTableBody/index.js

@@ -19,7 +19,7 @@ import { useHTableConfigContext } from '../TableConfig.js';
 import HTablePagination from '../HTablePagination/index.js';
 import { useClassName } from '../hooks/index.js';
 
-var _excluded = ["configData", "pagination", "onPageChange", "rowSelection", "rowKey", "emptyRender", "errorRender", "tableStyle"];
+var _excluded = ["configData", "pagination", "onPageChange", "rowSelection", "rowKey", "emptyRender", "errorRender", "tableStyle", "paginationStyle"];
 function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, 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 _context, _context2; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(t), !0)).call(_context, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context2 = ownKeys(Object(t))).call(_context2, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 var defaultRender = function defaultRender() {
@@ -39,6 +39,7 @@ var Body = (function (_ref) {
     emptyRender = _ref.emptyRender,
     errorRender = _ref.errorRender,
     tableStyle = _ref.tableStyle,
+    paginationStyle = _ref.paginationStyle,
     props = _objectWithoutProperties(_ref, _excluded);
   var selectedRowKeys = rowSelection.selectedRowKeys,
     onChange = rowSelection.onChange;
@@ -103,7 +104,8 @@ var Body = (function (_ref) {
         dataSource: records,
         pagination: false
       })), pagination !== false && jsx(HTablePagination, _objectSpread({
-        onPageChange: onPageChange
+        onPageChange: onPageChange,
+        paginationStyle: paginationStyle
       }, pagination))]
     })
   });

package/es/HTablePagination/index.d.ts

@@ -1,7 +1,9 @@
 import type { PaginationProps } from "antd";
 import type { ParamsModal } from "@/components/modal";
+import React from "react";
 interface IPaginationProps extends PaginationProps {
     onPageChange?: (params: ParamsModal) => void;
+    paginationStyle?: React.CSSProperties;
 }
-declare const _default: ({ onPageChange, ...props }: IPaginationProps) => JSX.Element;
+declare const _default: ({ onPageChange, paginationStyle, ...props }: IPaginationProps) => JSX.Element;
 export default _default;

package/es/HTablePagination/index.js

@@ -15,17 +15,18 @@ import _concatInstanceProperty from '@babel/runtime-corejs3/core-js/instance/con
 import { jsx, Fragment } from 'react/jsx-runtime';
 import { Row, Pagination } from 'antd';
 import { useHTableContext } from '../context.js';
+import { useClassName } from '../hooks/index.js';
 
-var _excluded = ["onPageChange"];
+var _excluded = ["onPageChange", "paginationStyle"];
 function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, 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 _context3, _context4; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context3 = ownKeys(Object(t), !0)).call(_context3, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context4 = ownKeys(Object(t))).call(_context4, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 var HTablePagination = (function (_ref) {
   var onPageChange = _ref.onPageChange,
+    paginationStyle = _ref.paginationStyle,
     props = _objectWithoutProperties(_ref, _excluded);
   var _useHTableContext = useHTableContext(),
-    contextOnPageChange = _useHTableContext.onPageChange;
-    _useHTableContext.configData;
-    var data = _useHTableContext.data;
+    contextOnPageChange = _useHTableContext.onPageChange,
+    data = _useHTableContext.data;
   var tableOnPageChange = onPageChange || contextOnPageChange;
   var _ref2 = data || {},
     size = _ref2.size,
@@ -34,14 +35,12 @@ var HTablePagination = (function (_ref) {
   var pageCurrent = _Number$parseInt(current || "1", 10);
   var pageSize = _Number$parseInt(size || "10", 10);
   var pageTotal = _Number$parseInt(total || "0", 10);
+  var className = useClassName("hw-table-pagination");
   if (data) {
     return jsx(Row, {
       justify: "end",
-      style: {
-        paddingBottom: 24,
-        paddingRight: 24,
-        paddingLeft: 24
-      },
+      className: className,
+      style: paginationStyle,
       children: jsx(Pagination, _objectSpread({
         size: "small",
         showQuickJumper: true,

package/es/Table.d.ts

@@ -1,3 +1,3 @@
 import type { HTableProps } from "./modal";
-declare const _default: ({ request, configData, searchSpan, table, actionRender, footerRender, hideHeader, headerStyle, footerStyle, tableStyle, action, spaceSize, className, ...props }: HTableProps) => JSX.Element;
+declare const _default: ({ request, configData, searchSpan, table, actionRender, footerRender, hideHeader, headerStyle, footerStyle, tableStyle, action, spaceSize, className, paginationStyle, ...props }: HTableProps) => JSX.Element;
 export default _default;

package/es/Table.js

@@ -20,7 +20,7 @@ import { Space } from 'antd';
 import useReq from './hooks/useReq.js';
 import useDispatch from './hooks/useDispatch.js';
 
-var _excluded = ["request", "configData", "searchSpan", "table", "actionRender", "footerRender", "hideHeader", "headerStyle", "footerStyle", "tableStyle", "action", "spaceSize", "className"];
+var _excluded = ["request", "configData", "searchSpan", "table", "actionRender", "footerRender", "hideHeader", "headerStyle", "footerStyle", "tableStyle", "action", "spaceSize", "className", "paginationStyle"];
 function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, 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 _context, _context2; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(t), !0)).call(_context, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context2 = ownKeys(Object(t))).call(_context2, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Table = (function (_ref) {
@@ -42,6 +42,7 @@ var Table = (function (_ref) {
     _ref$spaceSize = _ref.spaceSize,
     spaceSize = _ref$spaceSize === void 0 ? 15 : _ref$spaceSize,
     className = _ref.className,
+    paginationStyle = _ref.paginationStyle,
     props = _objectWithoutProperties(_ref, _excluded);
   var _useReq = useReq({
       request: request
@@ -91,7 +92,8 @@ var Table = (function (_ref) {
         searchSpan: searchSpan,
         headerStyle: headerStyle
       }), jsx(Body, _objectSpread({
-        tableStyle: tableStyle
+        tableStyle: tableStyle,
+        paginationStyle: paginationStyle
       }, props)), footerRender !== false && jsx(Footer, {
         actionRender: actionRender,
         footerRender: footerRender,

package/es/TableCustomize.js

@@ -8,6 +8,7 @@ import _Object$getOwnPropertyDescriptors from '@babel/runtime-corejs3/core-js/ob
 import _Object$defineProperties from '@babel/runtime-corejs3/core-js/object/define-properties';
 import _Object$defineProperty from '@babel/runtime-corejs3/core-js/object/define-property';
 import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
+import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
 import { jsx } from 'react/jsx-runtime';
 import useCurrentTable from './hooks/useCurrentTable.js';
 import useRowObj from './hooks/useRowObj.js';
@@ -15,6 +16,7 @@ import { HTableContext } from './context.js';
 import useReq from './hooks/useReq.js';
 import useDispatch from './hooks/useDispatch.js';
 
+var _excluded = ["request", "configData", "table", "action", "children"];
 function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, 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 _context, _context2; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(t), !0)).call(_context, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context2 = ownKeys(Object(t))).call(_context2, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Index = function Index(_ref) {
@@ -23,10 +25,11 @@ var Index = function Index(_ref) {
     table = _ref.table,
     _ref$action = _ref.action,
     action = _ref$action === void 0 ? {} : _ref$action,
-    children = _ref.children;
-  var _useReq = useReq({
+    children = _ref.children,
+    props = _objectWithoutProperties(_ref, _excluded);
+  var _useReq = useReq(_objectSpread({
       request: request
-    }),
+    }, props)),
     run = _useReq.run,
     loading = _useReq.loading,
     data = _useReq.data,

package/es/hooks/useReq.d.ts

@@ -1,8 +1,13 @@
 import type { ParamsModal, ResultModal } from "@/components/modal";
-interface IParamsModal {
-    request: (params: ParamsModal) => Promise<ResultModal>;
+export interface IParamsModal {
+    request?: (params: ParamsModal) => Promise<ResultModal>;
+    loading?: boolean;
+    error?: Error;
+    reload?: (params: any) => Promise<any>;
+    dataSource?: any;
+    manual?: boolean;
 }
-declare const _default: ({ request }: IParamsModal) => {
+declare const _default: ({ request, loading, error, reload, dataSource, manual }: IParamsModal) => {
     saveParams: {
         old: {};
     };
@@ -19,5 +24,13 @@ declare const _default: ({ request }: IParamsModal) => {
     mutate: import("@ahooksjs/use-request/lib/types").Mutate<ResultModal>;
     run: (params?: any) => Promise<ResultModal>;
     unmount: () => void;
+} | {
+    loading: boolean | undefined;
+    error: Error | undefined;
+    data: any;
+    run: (params?: Record<string, any>) => Promise<any>;
+    saveParams: {
+        old: {};
+    };
 };
 export default _default;

package/es/hooks/useReq.js

@@ -9,36 +9,96 @@ import _Object$defineProperties from '@babel/runtime-corejs3/core-js/object/defi
 import _Object$defineProperty from '@babel/runtime-corejs3/core-js/object/define-property';
 import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
 import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
-import { useMemo } from 'react';
+import _asyncToGenerator from '@babel/runtime-corejs3/helpers/asyncToGenerator';
+import _regeneratorRuntime from '@babel/runtime-corejs3/regenerator';
+import { useMemo, useEffect } from 'react';
 import { useRequest } from 'ahooks';
 
-var _excluded = ["size", "current"];
+var _excluded = ["size", "current"],
+  _excluded2 = ["size", "current"];
 function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, 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 _context, _context2; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(t), !0)).call(_context, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context2 = ownKeys(Object(t))).call(_context2, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context2, _context3; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context2 = ownKeys(Object(t), !0)).call(_context2, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context3 = ownKeys(Object(t))).call(_context3, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 var useReq = (function (_ref) {
-  var request = _ref.request;
+  var request = _ref.request,
+    loading = _ref.loading,
+    error = _ref.error,
+    reload = _ref.reload,
+    dataSource = _ref.dataSource,
+    _ref$manual = _ref.manual,
+    manual = _ref$manual === void 0 ? false : _ref$manual;
   var saveParams = useMemo(function () {
     return {
       old: {}
     };
   }, []);
+  var reloadFn = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+      var params,
+        _params$size,
+        size,
+        _params$current,
+        current,
+        oParams,
+        reqParams,
+        _args = arguments;
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            params = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
+            _params$size = params.size, size = _params$size === void 0 ? "10" : _params$size, _params$current = params.current, current = _params$current === void 0 ? "1" : _params$current, oParams = _objectWithoutProperties(params, _excluded);
+            reqParams = _objectSpread({
+              size: size,
+              current: current
+            }, oParams);
+            return _context.abrupt("return", reload === null || reload === void 0 ? void 0 : reload(reqParams));
+          case 4:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function reloadFn() {
+      return _ref2.apply(this, arguments);
+    };
+  }();
   var resultAction = useRequest(function () {
     var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    var _params$size = params.size,
-      size = _params$size === void 0 ? "10" : _params$size,
-      _params$current = params.current,
-      current = _params$current === void 0 ? "1" : _params$current,
-      oParams = _objectWithoutProperties(params, _excluded);
+    var _params$size2 = params.size,
+      size = _params$size2 === void 0 ? "10" : _params$size2,
+      _params$current2 = params.current,
+      current = _params$current2 === void 0 ? "1" : _params$current2,
+      oParams = _objectWithoutProperties(params, _excluded2);
     var reqParams = _objectSpread({
       size: size,
       current: current
     }, oParams);
     saveParams.old = reqParams;
-    return request(reqParams);
+    return request === null || request === void 0 ? void 0 : request(reqParams);
+  }, {
+    manual: true
   });
-  return _objectSpread(_objectSpread({}, resultAction), {}, {
+  useEffect(function () {
+    if (manual) {
+      return;
+    }
+    if (request) {
+      resultAction.run();
+      return;
+    }
+    reloadFn();
+  }, []);
+  if (request) {
+    return _objectSpread(_objectSpread({}, resultAction), {}, {
+      saveParams: saveParams
+    });
+  }
+  return {
+    loading: loading,
+    error: error,
+    data: dataSource,
+    run: reloadFn,
     saveParams: saveParams
-  });
+  };
 });
 
 export { useReq as default };

package/es/index.css

@@ -3,3 +3,11 @@
   background-color: #fff;
   overflow: hidden;
 }
+.ant-hw-table-body .ant-hw-table-pagination {
+  padding: 0 24px 24px;
+}
+.ant-hw-table-pagination {
+  padding: 24px;
+  border-radius: 4px;
+  background-color: #ffffff;
+}

package/es/modal.d.ts

@@ -29,8 +29,8 @@ export type ConfigDataModal = ConfigItemModal[];
 export type ActionRenderFn = (selectedRowKeys: RowObj, tableInstance: HTableInstance) => React.ReactNode;
 export type actionFn = (...arg: any[]) => void;
 type FooterRenderFn = (tableInstance: HTableInstance, selectedRowData: RowObj, data?: ResultModal) => React.ReactNode;
-export interface HTableProps extends Omit<ProTableProps<any, any>, "request"> {
-    request: (params: ParamsModal) => Promise<ResultModal>;
+export interface HTableProps extends Omit<ProTableProps<any, any>, "request" | "dataSource"> {
+    request?: (params: ParamsModal) => Promise<ResultModal>;
     configData: ConfigDataModal;
     searchSpan?: ColProps;
     table?: HTableInstance;
@@ -45,6 +45,11 @@ export interface HTableProps extends Omit<ProTableProps<any, any>, "request"> {
     footerStyle?: React.CSSProperties;
     spaceSize?: number;
     className?: string;
+    error?: Error;
+    reload?: (params: any) => Promise<any>;
+    manual?: boolean;
+    dataSource?: ResultModal;
+    paginationStyle?: React.CSSProperties;
 }
 export interface TableInstance {
     reload: (params?: ParamsModal) => Promise<any>;

package/lib/HTableBody/index.d.ts

@@ -8,6 +8,7 @@ interface HTableBodyProps extends Omit<ProTableProps<any, any>, "dataSource"> {
     emptyRender?: (tableInstance: HTableInstance) => React.ReactNode;
     errorRender?: (tableInstance: HTableInstance, error: Error) => React.ReactNode;
     tableStyle?: React.CSSProperties;
+    paginationStyle?: React.CSSProperties;
 }
-declare const _default: ({ configData, pagination, onPageChange, rowSelection, rowKey, emptyRender, errorRender, tableStyle, ...props }: HTableBodyProps) => JSX.Element;
+declare const _default: ({ configData, pagination, onPageChange, rowSelection, rowKey, emptyRender, errorRender, tableStyle, paginationStyle, ...props }: HTableBodyProps) => JSX.Element;
 export default _default;

package/lib/HTableBody/index.js

@@ -22,7 +22,7 @@ var TableConfig = require('../TableConfig.js');
 var index$1 = require('../HTablePagination/index.js');
 var index = require('../hooks/index.js');
 
-var _excluded = ["configData", "pagination", "onPageChange", "rowSelection", "rowKey", "emptyRender", "errorRender", "tableStyle"];
+var _excluded = ["configData", "pagination", "onPageChange", "rowSelection", "rowKey", "emptyRender", "errorRender", "tableStyle", "paginationStyle"];
 function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, 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 _context, _context2; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(t), !0)).call(_context, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context2 = ownKeys(Object(t))).call(_context2, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 var defaultRender = function defaultRender() {
@@ -42,6 +42,7 @@ var Body = (function (_ref) {
     emptyRender = _ref.emptyRender,
     errorRender = _ref.errorRender,
     tableStyle = _ref.tableStyle,
+    paginationStyle = _ref.paginationStyle,
     props = _objectWithoutProperties(_ref, _excluded);
   var selectedRowKeys = rowSelection.selectedRowKeys,
     onChange = rowSelection.onChange;
@@ -106,7 +107,8 @@ var Body = (function (_ref) {
         dataSource: records,
         pagination: false
       })), pagination !== false && jsxRuntime.jsx(index$1.default, _objectSpread({
-        onPageChange: onPageChange
+        onPageChange: onPageChange,
+        paginationStyle: paginationStyle
       }, pagination))]
     })
   });

package/lib/HTablePagination/index.d.ts

@@ -1,7 +1,9 @@
 import type { PaginationProps } from "antd";
 import type { ParamsModal } from "@/components/modal";
+import React from "react";
 interface IPaginationProps extends PaginationProps {
     onPageChange?: (params: ParamsModal) => void;
+    paginationStyle?: React.CSSProperties;
 }
-declare const _default: ({ onPageChange, ...props }: IPaginationProps) => JSX.Element;
+declare const _default: ({ onPageChange, paginationStyle, ...props }: IPaginationProps) => JSX.Element;
 export default _default;

package/lib/HTablePagination/index.js

@@ -18,17 +18,18 @@ var _concatInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/c
 var jsxRuntime = require('react/jsx-runtime');
 var antd = require('antd');
 var context = require('../context.js');
+var index = require('../hooks/index.js');
 
-var _excluded = ["onPageChange"];
+var _excluded = ["onPageChange", "paginationStyle"];
 function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, 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 _context3, _context4; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context3 = ownKeys(Object(t), !0)).call(_context3, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context4 = ownKeys(Object(t))).call(_context4, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 var HTablePagination = (function (_ref) {
   var onPageChange = _ref.onPageChange,
+    paginationStyle = _ref.paginationStyle,
     props = _objectWithoutProperties(_ref, _excluded);
   var _useHTableContext = context.useHTableContext(),
-    contextOnPageChange = _useHTableContext.onPageChange;
-    _useHTableContext.configData;
-    var data = _useHTableContext.data;
+    contextOnPageChange = _useHTableContext.onPageChange,
+    data = _useHTableContext.data;
   var tableOnPageChange = onPageChange || contextOnPageChange;
   var _ref2 = data || {},
     size = _ref2.size,
@@ -37,14 +38,12 @@ var HTablePagination = (function (_ref) {
   var pageCurrent = _Number$parseInt(current || "1", 10);
   var pageSize = _Number$parseInt(size || "10", 10);
   var pageTotal = _Number$parseInt(total || "0", 10);
+  var className = index.useClassName("hw-table-pagination");
   if (data) {
     return jsxRuntime.jsx(antd.Row, {
       justify: "end",
-      style: {
-        paddingBottom: 24,
-        paddingRight: 24,
-        paddingLeft: 24
-      },
+      className: className,
+      style: paginationStyle,
       children: jsxRuntime.jsx(antd.Pagination, _objectSpread({
         size: "small",
         showQuickJumper: true,

package/lib/Table.d.ts

@@ -1,3 +1,3 @@
 import type { HTableProps } from "./modal";
-declare const _default: ({ request, configData, searchSpan, table, actionRender, footerRender, hideHeader, headerStyle, footerStyle, tableStyle, action, spaceSize, className, ...props }: HTableProps) => JSX.Element;
+declare const _default: ({ request, configData, searchSpan, table, actionRender, footerRender, hideHeader, headerStyle, footerStyle, tableStyle, action, spaceSize, className, paginationStyle, ...props }: HTableProps) => JSX.Element;
 export default _default;

package/lib/Table.js

@@ -23,7 +23,7 @@ var antd = require('antd');
 var useReq = require('./hooks/useReq.js');
 var useDispatch = require('./hooks/useDispatch.js');
 
-var _excluded = ["request", "configData", "searchSpan", "table", "actionRender", "footerRender", "hideHeader", "headerStyle", "footerStyle", "tableStyle", "action", "spaceSize", "className"];
+var _excluded = ["request", "configData", "searchSpan", "table", "actionRender", "footerRender", "hideHeader", "headerStyle", "footerStyle", "tableStyle", "action", "spaceSize", "className", "paginationStyle"];
 function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, 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 _context, _context2; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(t), !0)).call(_context, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context2 = ownKeys(Object(t))).call(_context2, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Table = (function (_ref) {
@@ -45,6 +45,7 @@ var Table = (function (_ref) {
     _ref$spaceSize = _ref.spaceSize,
     spaceSize = _ref$spaceSize === void 0 ? 15 : _ref$spaceSize,
     className = _ref.className,
+    paginationStyle = _ref.paginationStyle,
     props = _objectWithoutProperties(_ref, _excluded);
   var _useReq = useReq.default({
       request: request
@@ -94,7 +95,8 @@ var Table = (function (_ref) {
         searchSpan: searchSpan,
         headerStyle: headerStyle
       }), jsxRuntime.jsx(index$1.default, _objectSpread({
-        tableStyle: tableStyle
+        tableStyle: tableStyle,
+        paginationStyle: paginationStyle
       }, props)), footerRender !== false && jsxRuntime.jsx(index$2.default, {
         actionRender: actionRender,
         footerRender: footerRender,

package/lib/TableCustomize.js

@@ -11,6 +11,7 @@ var _Object$getOwnPropertyDescriptors = require('@babel/runtime-corejs3/core-js/
 var _Object$defineProperties = require('@babel/runtime-corejs3/core-js/object/define-properties');
 var _Object$defineProperty = require('@babel/runtime-corejs3/core-js/object/define-property');
 var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
+var _objectWithoutProperties = require('@babel/runtime-corejs3/helpers/objectWithoutProperties');
 var jsxRuntime = require('react/jsx-runtime');
 var useCurrentTable = require('./hooks/useCurrentTable.js');
 var useRowObj = require('./hooks/useRowObj.js');
@@ -18,6 +19,7 @@ var context = require('./context.js');
 var useReq = require('./hooks/useReq.js');
 var useDispatch = require('./hooks/useDispatch.js');
 
+var _excluded = ["request", "configData", "table", "action", "children"];
 function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, 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 _context, _context2; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(t), !0)).call(_context, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context2 = ownKeys(Object(t))).call(_context2, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Index = function Index(_ref) {
@@ -26,10 +28,11 @@ var Index = function Index(_ref) {
     table = _ref.table,
     _ref$action = _ref.action,
     action = _ref$action === void 0 ? {} : _ref$action,
-    children = _ref.children;
-  var _useReq = useReq.default({
+    children = _ref.children,
+    props = _objectWithoutProperties(_ref, _excluded);
+  var _useReq = useReq.default(_objectSpread({
       request: request
-    }),
+    }, props)),
     run = _useReq.run,
     loading = _useReq.loading,
     data = _useReq.data,

package/lib/hooks/useReq.d.ts

@@ -1,8 +1,13 @@
 import type { ParamsModal, ResultModal } from "@/components/modal";
-interface IParamsModal {
-    request: (params: ParamsModal) => Promise<ResultModal>;
+export interface IParamsModal {
+    request?: (params: ParamsModal) => Promise<ResultModal>;
+    loading?: boolean;
+    error?: Error;
+    reload?: (params: any) => Promise<any>;
+    dataSource?: any;
+    manual?: boolean;
 }
-declare const _default: ({ request }: IParamsModal) => {
+declare const _default: ({ request, loading, error, reload, dataSource, manual }: IParamsModal) => {
     saveParams: {
         old: {};
     };
@@ -19,5 +24,13 @@ declare const _default: ({ request }: IParamsModal) => {
     mutate: import("@ahooksjs/use-request/lib/types").Mutate<ResultModal>;
     run: (params?: any) => Promise<ResultModal>;
     unmount: () => void;
+} | {
+    loading: boolean | undefined;
+    error: Error | undefined;
+    data: any;
+    run: (params?: Record<string, any>) => Promise<any>;
+    saveParams: {
+        old: {};
+    };
 };
 export default _default;

package/lib/hooks/useReq.js

@@ -12,36 +12,96 @@ var _Object$defineProperties = require('@babel/runtime-corejs3/core-js/object/de
 var _Object$defineProperty = require('@babel/runtime-corejs3/core-js/object/define-property');
 var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
 var _objectWithoutProperties = require('@babel/runtime-corejs3/helpers/objectWithoutProperties');
+var _asyncToGenerator = require('@babel/runtime-corejs3/helpers/asyncToGenerator');
+var _regeneratorRuntime = require('@babel/runtime-corejs3/regenerator');
 var React = require('react');
 var ahooks = require('ahooks');
 
-var _excluded = ["size", "current"];
+var _excluded = ["size", "current"],
+  _excluded2 = ["size", "current"];
 function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, 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 _context, _context2; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(t), !0)).call(_context, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context2 = ownKeys(Object(t))).call(_context2, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context2, _context3; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context2 = ownKeys(Object(t), !0)).call(_context2, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context3 = ownKeys(Object(t))).call(_context3, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 var useReq = (function (_ref) {
-  var request = _ref.request;
+  var request = _ref.request,
+    loading = _ref.loading,
+    error = _ref.error,
+    reload = _ref.reload,
+    dataSource = _ref.dataSource,
+    _ref$manual = _ref.manual,
+    manual = _ref$manual === void 0 ? false : _ref$manual;
   var saveParams = React.useMemo(function () {
     return {
       old: {}
     };
   }, []);
+  var reloadFn = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+      var params,
+        _params$size,
+        size,
+        _params$current,
+        current,
+        oParams,
+        reqParams,
+        _args = arguments;
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            params = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
+            _params$size = params.size, size = _params$size === void 0 ? "10" : _params$size, _params$current = params.current, current = _params$current === void 0 ? "1" : _params$current, oParams = _objectWithoutProperties(params, _excluded);
+            reqParams = _objectSpread({
+              size: size,
+              current: current
+            }, oParams);
+            return _context.abrupt("return", reload === null || reload === void 0 ? void 0 : reload(reqParams));
+          case 4:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function reloadFn() {
+      return _ref2.apply(this, arguments);
+    };
+  }();
   var resultAction = ahooks.useRequest(function () {
     var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    var _params$size = params.size,
-      size = _params$size === void 0 ? "10" : _params$size,
-      _params$current = params.current,
-      current = _params$current === void 0 ? "1" : _params$current,
-      oParams = _objectWithoutProperties(params, _excluded);
+    var _params$size2 = params.size,
+      size = _params$size2 === void 0 ? "10" : _params$size2,
+      _params$current2 = params.current,
+      current = _params$current2 === void 0 ? "1" : _params$current2,
+      oParams = _objectWithoutProperties(params, _excluded2);
     var reqParams = _objectSpread({
       size: size,
       current: current
     }, oParams);
     saveParams.old = reqParams;
-    return request(reqParams);
+    return request === null || request === void 0 ? void 0 : request(reqParams);
+  }, {
+    manual: true
   });
-  return _objectSpread(_objectSpread({}, resultAction), {}, {
+  React.useEffect(function () {
+    if (manual) {
+      return;
+    }
+    if (request) {
+      resultAction.run();
+      return;
+    }
+    reloadFn();
+  }, []);
+  if (request) {
+    return _objectSpread(_objectSpread({}, resultAction), {}, {
+      saveParams: saveParams
+    });
+  }
+  return {
+    loading: loading,
+    error: error,
+    data: dataSource,
+    run: reloadFn,
     saveParams: saveParams
-  });
+  };
 });
 
 exports.default = useReq;

package/lib/index.css

@@ -3,3 +3,11 @@
   background-color: #fff;
   overflow: hidden;
 }
+.ant-hw-table-body .ant-hw-table-pagination {
+  padding: 0 24px 24px;
+}
+.ant-hw-table-pagination {
+  padding: 24px;
+  border-radius: 4px;
+  background-color: #ffffff;
+}

package/lib/modal.d.ts

@@ -29,8 +29,8 @@ export type ConfigDataModal = ConfigItemModal[];
 export type ActionRenderFn = (selectedRowKeys: RowObj, tableInstance: HTableInstance) => React.ReactNode;
 export type actionFn = (...arg: any[]) => void;
 type FooterRenderFn = (tableInstance: HTableInstance, selectedRowData: RowObj, data?: ResultModal) => React.ReactNode;
-export interface HTableProps extends Omit<ProTableProps<any, any>, "request"> {
-    request: (params: ParamsModal) => Promise<ResultModal>;
+export interface HTableProps extends Omit<ProTableProps<any, any>, "request" | "dataSource"> {
+    request?: (params: ParamsModal) => Promise<ResultModal>;
     configData: ConfigDataModal;
     searchSpan?: ColProps;
     table?: HTableInstance;
@@ -45,6 +45,11 @@ export interface HTableProps extends Omit<ProTableProps<any, any>, "request"> {
     footerStyle?: React.CSSProperties;
     spaceSize?: number;
     className?: string;
+    error?: Error;
+    reload?: (params: any) => Promise<any>;
+    manual?: boolean;
+    dataSource?: ResultModal;
+    paginationStyle?: React.CSSProperties;
 }
 export interface TableInstance {
     reload: (params?: ParamsModal) => Promise<any>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hw-component/table",
-  "version": "0.0.3-beta-v6",
+  "version": "0.0.3-beta-v8",
   "description": "基于antd二次开发table组件",
   "keywords": [
     "table"

package/src/components/HTableBody/index.tsx

@@ -18,6 +18,7 @@ interface HTableBodyProps extends Omit<ProTableProps<any, any>, "dataSource"> {
     error: Error
   ) => React.ReactNode;
   tableStyle?: React.CSSProperties;
+  paginationStyle?: React.CSSProperties;
 }
 const defaultRender = () => {
   return <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />;
@@ -31,6 +32,7 @@ export default ({
   emptyRender,
   errorRender,
   tableStyle,
+  paginationStyle,
   ...props
 }: HTableBodyProps) => {
   // @ts-ignore
@@ -88,7 +90,7 @@ export default ({
           pagination={false}
         />
         {pagination !== false && (
-          <HTablePagination onPageChange={onPageChange} {...pagination} />
+          <HTablePagination onPageChange={onPageChange} paginationStyle={paginationStyle} {...pagination} />
         )}
       </ConfigProvider>
     </div>

package/src/components/HTablePagination/index.tsx

@@ -2,13 +2,15 @@ import type { PaginationProps} from "antd";
 import { Pagination, Row } from "antd";
 import { useHTableContext } from "../context";
 import type { ParamsModal } from "@/components/modal";
+import {useClassName} from "../hooks";
+import React from "react";
 interface IPaginationProps extends PaginationProps {
   onPageChange?: (params: ParamsModal) => void;
+  paginationStyle?: React.CSSProperties;
 }
-export default ({ onPageChange, ...props }: IPaginationProps) => {
+export default ({ onPageChange,paginationStyle, ...props }: IPaginationProps) => {
   const {
     onPageChange: contextOnPageChange,
-    configData: contextConfigData,
     data,
   } = useHTableContext();
   const tableOnPageChange = onPageChange || contextOnPageChange;
@@ -16,11 +18,13 @@ export default ({ onPageChange, ...props }: IPaginationProps) => {
   const pageCurrent = Number.parseInt(current || "1", 10);
   const pageSize = Number.parseInt(size || "10", 10);
   const pageTotal = Number.parseInt(total || "0", 10);
+  const className = useClassName("hw-table-pagination");
   if (data) {
     return (
       <Row
         justify={"end"}
-        style={{ paddingBottom: 24, paddingRight: 24, paddingLeft: 24 }}
+        className={className}
+        style={paginationStyle}
       >
         <Pagination
           size={"small"}

package/src/components/Table.tsx

@@ -22,6 +22,7 @@ export default ({
   action = {},
   spaceSize = 15,
   className,
+                    paginationStyle,
   ...props
 }: HTableProps) => {
   const { run, loading, data, error, saveParams } = useReq({ request });
@@ -61,7 +62,7 @@ export default ({
         {!hideHeader && (
           <Header searchSpan={searchSpan} headerStyle={headerStyle} />
         )}
-        <Body tableStyle={tableStyle} {...props} />
+        <Body tableStyle={tableStyle} paginationStyle={paginationStyle} {...props} />
         {footerRender !== false && (
           <Footer
             actionRender={actionRender}

package/src/components/TableCustomize.tsx

@@ -2,6 +2,7 @@ import useCurrentTable from "./hooks/useCurrentTable";
 import useRowObj from "./hooks/useRowObj";
 import { HTableContext } from "./context";
 import type { HTableProps } from "./modal";
+import type {IParamsModal} from "./hooks/useReq";
 import useReq from "./hooks/useReq";
 import useDispatch from "./hooks/useDispatch";
 import React from "react";
@@ -11,8 +12,9 @@ const Index: React.FC<HTableProps> = ({
   table,
   action = {},
   children,
+  ...props
 }) => {
-  const { run, loading, data, error, saveParams } = useReq({ request });
+  const { run, loading, data, error, saveParams } = useReq(({ request,...props } as IParamsModal));
   const dispatch = useDispatch(action);
   const { selectedRowData, rowOnChange, allSelectChange } = useRowObj();
   const tableInstance = useCurrentTable({

package/src/components/hooks/useReq.ts

@@ -1,23 +1,55 @@
-import { useMemo } from "react";
+import {useEffect, useMemo} from "react";
 import { useRequest } from "ahooks";
 import type { ParamsModal, ResultModal } from "@/components/modal";
-interface IParamsModal {
-  request: (params: ParamsModal) => Promise<ResultModal>;
+export interface IParamsModal {
+  request?: (params: ParamsModal) => Promise<ResultModal>;
+  loading?: boolean;
+  error?: Error;
+  reload?: (params: any) => Promise<any>;
+  dataSource?: any;
+  manual?: boolean
 }
-export default ({ request }: IParamsModal) => {
+export default ({ request ,loading,error,reload,dataSource,manual=false}: IParamsModal) => {
   const saveParams = useMemo(() => {
     return {
       old: {},
     };
   }, []);
+  const reloadFn=async (params: Record<string, any>={})=>{
+    const { size = "10", current = "1", ...oParams } = params;
+    const reqParams = { size, current, ...oParams };
+    return reload?.(reqParams);
+  }
   const resultAction = useRequest((params = {}) => {
     const { size = "10", current = "1", ...oParams } = params;
     const reqParams = { size, current, ...oParams };
     saveParams.old = reqParams;
-    return request(reqParams);
-  });
-  return {
-    ...resultAction,
+    return request?.(reqParams);
+  },{manual:true});
+
+  useEffect(()=>{
+     if (manual){
+       return;
+     }
+     if (request){
+        resultAction.run();
+        return;
+     }
+     reloadFn();
+  },[]);
+
+  if (request){
+    return {
+      ...resultAction,
+      saveParams,
+    };
+  }
+  return  {
+    loading,
+    error,
+    data:dataSource,
+    run:reloadFn,
     saveParams,
-  };
+
+  }
 };

package/src/components/index.less

@@ -3,4 +3,12 @@
   border-radius: 4px;
   background-color: #fff;
   overflow: hidden;
+  .@{ant-prefix}-hw-table-pagination{
+    padding: 0 24px 24px;
+  }
+}
+.@{ant-prefix}-hw-table-pagination{
+   padding: 24px;
+   border-radius: 4px;
+   background-color: #ffffff;
 }

package/src/components/modal.ts

@@ -45,8 +45,8 @@ type FooterRenderFn = (
   selectedRowData: RowObj,
   data?: ResultModal
 ) => React.ReactNode;
-export interface HTableProps extends Omit<ProTableProps<any, any>, "request"> {
-  request: (params: ParamsModal) => Promise<ResultModal>;
+export interface HTableProps extends Omit<ProTableProps<any, any>, "request"|"dataSource"> {
+  request?: (params: ParamsModal) => Promise<ResultModal>;
   configData: ConfigDataModal;
   searchSpan?: ColProps;
   table?: HTableInstance;
@@ -64,6 +64,11 @@ export interface HTableProps extends Omit<ProTableProps<any, any>, "request"> {
   footerStyle?: React.CSSProperties;
   spaceSize?: number;
   className?: string;
+  error?: Error;
+  reload?: (params: any) => Promise<any>;
+  manual?: boolean;
+  dataSource?: ResultModal;
+  paginationStyle?: React.CSSProperties
 }
 export interface TableInstance {
   reload: (params?: ParamsModal) => Promise<any>;

package/src/pages/TableCustomize/index.tsx

@@ -5,6 +5,8 @@ import {
   HTableFooter,
   HTablePagination,
 } from "../../components";
+import {useRequest} from "ahooks";
+import {Space} from "antd";
 
 const configData = [
   {
@@ -21,33 +23,39 @@ const configData = [
   },
 ];
 export default () => {
+  const {run,loading,error,data}=useRequest((params)=>{
+    const { current = 1 } = params;
+    return new Promise((resolve, reject) => {
+      setTimeout(() => {
+        // reject(new Error("错误"));
+        resolve({
+          size: "10",
+          current: current.toString(10),
+          total: "100",
+          records: [
+            {
+              id: 1,
+              name: "111",
+            },
+          ],
+        });
+      }, 2000);
+    });
+  });
   return (
     <TableCustomize
       configData={configData}
-      request={(params) => {
-        const { current = 1 } = params;
-        return new Promise((resolve, reject) => {
-          setTimeout(() => {
-            // reject(new Error("错误"));
-            resolve({
-              size: "10",
-              current: current.toString(10),
-              total: "100",
-              records: [
-                {
-                  id: 1,
-                  name: "111",
-                },
-              ],
-            });
-          }, 2000);
-        });
-      }}
+      loading={loading}
+      error={error}
+      dataSource={data}
+      reload={run}
     >
-      <HTableHeader />
-      <HTableBody pagination={false} />
-      <HTablePagination />
-      <HTableFooter />
+      <Space direction={"vertical"} style={{width:"100%"}}>
+        <HTableHeader />
+        <HTableBody pagination={false} />
+        <HTablePagination />
+        <HTableFooter />
+      </Space>
     </TableCustomize>
   );
 };