@hw-component/table 0.0.3-beta-v5 → 0.0.3-beta-v7

package/es/HTableBody/index.js

@@ -17,6 +17,7 @@ import { useHTableContext } from '../context.js';
 import { ConfigProvider, Empty } from 'antd';
 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"];
 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; }
@@ -75,12 +76,10 @@ var Body = (function (_ref) {
     records: records,
     rowKey: rowKey
   });
+  var className = useClassName("hw-table-body");
   return jsx("div", {
-    style: _objectSpread({
-      borderRadius: 4,
-      overflow: "hidden"
-    }, tableStyle),
-    className: "hw_table_body",
+    style: tableStyle,
+    className: "hw_table_body  ".concat(className),
     children: jsxs(ConfigProvider, {
       renderEmpty: function renderEmpty() {
         if (error) {

package/es/HTablePagination/index.js

@@ -40,7 +40,8 @@ var HTablePagination = (function (_ref) {
       style: {
         paddingBottom: 24,
         paddingRight: 24,
-        paddingLeft: 24
+        paddingLeft: 24,
+        backgroundColor: "#fff"
       },
       children: jsx(Pagination, _objectSpread({
         size: "small",

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/index.d.ts

@@ -0,0 +1 @@
+export declare const useClassName: (className: string | string[]) => string;

package/es/hooks/index.js

@@ -0,0 +1,25 @@
+// welcome to hoo hoo hoo
+import 'core-js/modules/es.array.join.js';
+import _Array$isArray from '@babel/runtime-corejs3/core-js/array/is-array';
+import _mapInstanceProperty from '@babel/runtime-corejs3/core-js/instance/map';
+import _concatInstanceProperty from '@babel/runtime-corejs3/core-js/instance/concat';
+import { useContext, useMemo } from 'react';
+import { ConfigContext } from 'antd/es/config-provider';
+
+var useClassName = function useClassName(className) {
+  var config = useContext(ConfigContext);
+  return useMemo(function () {
+    var _context2;
+    if (_Array$isArray(className)) {
+      var classNames = _mapInstanceProperty(className).call(className, function (item) {
+        var _context;
+        return _concatInstanceProperty(_context = "".concat(config.getPrefixCls(), "-")).call(_context, item);
+      });
+      return classNames.join(" ");
+    }
+    return _concatInstanceProperty(_context2 = "".concat(config.getPrefixCls(), "-")).call(_context2, className);
+  }, [className]);
+};
+
+export { useClassName };
+// powered by hdj

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

@@ -0,0 +1,5 @@
+.ant-hw-table-body {
+  border-radius: 4px;
+  background-color: #fff;
+  overflow: hidden;
+}

package/es/index.d.ts

@@ -1,3 +1,4 @@
+import "./index.less";
 export { default as HTable } from "./Table";
 export { default as useHTable } from "./hooks/useHTable";
 export { default as HTableConfig } from "./TableConfig";

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,10 @@ 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;
 }
 export interface TableInstance {
     reload: (params?: ParamsModal) => Promise<any>;

package/lib/HTableBody/index.js

@@ -19,7 +19,8 @@ var hooks = require('./hooks.js');
 var context = require('../context.js');
 var antd = require('antd');
 var TableConfig = require('../TableConfig.js');
-var index = require('../HTablePagination/index.js');
+var index$1 = require('../HTablePagination/index.js');
+var index = require('../hooks/index.js');
 
 var _excluded = ["configData", "pagination", "onPageChange", "rowSelection", "rowKey", "emptyRender", "errorRender", "tableStyle"];
 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; }
@@ -78,12 +79,10 @@ var Body = (function (_ref) {
     records: records,
     rowKey: rowKey
   });
+  var className = index.useClassName("hw-table-body");
   return jsxRuntime.jsx("div", {
-    style: _objectSpread({
-      borderRadius: 4,
-      overflow: "hidden"
-    }, tableStyle),
-    className: "hw_table_body",
+    style: tableStyle,
+    className: "hw_table_body  ".concat(className),
     children: jsxRuntime.jsxs(antd.ConfigProvider, {
       renderEmpty: function renderEmpty() {
         if (error) {
@@ -106,7 +105,7 @@ var Body = (function (_ref) {
         rowKey: rowKey,
         dataSource: records,
         pagination: false
-      })), pagination !== false && jsxRuntime.jsx(index.default, _objectSpread({
+      })), pagination !== false && jsxRuntime.jsx(index$1.default, _objectSpread({
         onPageChange: onPageChange
       }, pagination))]
     })

package/lib/HTablePagination/index.js

@@ -43,7 +43,8 @@ var HTablePagination = (function (_ref) {
       style: {
         paddingBottom: 24,
         paddingRight: 24,
-        paddingLeft: 24
+        paddingLeft: 24,
+        backgroundColor: "#fff"
       },
       children: jsxRuntime.jsx(antd.Pagination, _objectSpread({
         size: "small",

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/index.d.ts

@@ -0,0 +1 @@
+export declare const useClassName: (className: string | string[]) => string;

package/lib/hooks/index.js

@@ -0,0 +1,26 @@
+'use strict';
+
+require('core-js/modules/es.array.join.js');
+var _Array$isArray = require('@babel/runtime-corejs3/core-js/array/is-array');
+var _mapInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/map');
+var _concatInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/concat');
+var React = require('react');
+var configProvider = require('antd/es/config-provider');
+
+var useClassName = function useClassName(className) {
+  var config = React.useContext(configProvider.ConfigContext);
+  return React.useMemo(function () {
+    var _context2;
+    if (_Array$isArray(className)) {
+      var classNames = _mapInstanceProperty(className).call(className, function (item) {
+        var _context;
+        return _concatInstanceProperty(_context = "".concat(config.getPrefixCls(), "-")).call(_context, item);
+      });
+      return classNames.join(" ");
+    }
+    return _concatInstanceProperty(_context2 = "".concat(config.getPrefixCls(), "-")).call(_context2, className);
+  }, [className]);
+};
+
+exports.useClassName = useClassName;
+// powered by h

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

@@ -0,0 +1,5 @@
+.ant-hw-table-body {
+  border-radius: 4px;
+  background-color: #fff;
+  overflow: hidden;
+}

package/lib/index.d.ts

@@ -1,3 +1,4 @@
+import "./index.less";
 export { default as HTable } from "./Table";
 export { default as useHTable } from "./hooks/useHTable";
 export { default as HTableConfig } from "./TableConfig";

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,10 @@ 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;
 }
 export interface TableInstance {
     reload: (params?: ParamsModal) => Promise<any>;

package/package.json

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

package/src/components/HTableBody/index.tsx

@@ -8,6 +8,7 @@ import { ConfigProvider, Empty } from "antd";
 import type { HTableInstance } from "../modal";
 import { useHTableConfigContext } from "../TableConfig";
 import HTablePagination from "../HTablePagination";
+import { useClassName } from "../hooks";
 interface HTableBodyProps extends Omit<ProTableProps<any, any>, "dataSource"> {
   configData?: ConfigDataModal;
   onPageChange?: (params: ParamsModal) => void;
@@ -57,11 +58,9 @@ export default ({
     rowOnChange(key, rowData);
   };
   useSynchronousKeys({ selectedRowKeys, records, rowKey });
+  const className = useClassName("hw-table-body");
   return (
-    <div
-      style={{ borderRadius: 4, overflow: "hidden", ...tableStyle }}
-      className="hw_table_body"
-    >
+    <div style={tableStyle} className={`hw_table_body  ${className}`}>
       <ConfigProvider
         renderEmpty={() => {
           if (error) {

package/src/components/HTablePagination/index.tsx

@@ -20,7 +20,7 @@ export default ({ onPageChange, ...props }: IPaginationProps) => {
     return (
       <Row
         justify={"end"}
-        style={{ paddingBottom: 24, paddingRight: 24, paddingLeft: 24 }}
+        style={{ paddingBottom: 24, paddingRight: 24, paddingLeft: 24 ,backgroundColor:"#fff"}}
       >
         <Pagination
           size={"small"}

package/src/components/TableCustomize.tsx

@@ -2,7 +2,7 @@ import useCurrentTable from "./hooks/useCurrentTable";
 import useRowObj from "./hooks/useRowObj";
 import { HTableContext } from "./context";
 import type { HTableProps } from "./modal";
-import useReq from "./hooks/useReq";
+import useReq, {IParamsModal} from "./hooks/useReq";
 import useDispatch from "./hooks/useDispatch";
 import React from "react";
 const Index: React.FC<HTableProps> = ({
@@ -11,8 +11,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/index.ts

@@ -0,0 +1,14 @@
+import { useContext, useMemo } from "react";
+import { ConfigContext } from "antd/es/config-provider";
+export const useClassName = (className: string | string[]) => {
+  const config = useContext(ConfigContext);
+  return useMemo(() => {
+    if (Array.isArray(className)) {
+      const classNames = className.map((item) => {
+        return `${config.getPrefixCls()}-${item}`;
+      });
+      return classNames.join(" ");
+    }
+    return `${config.getPrefixCls()}-${className}`;
+  }, [className]);
+};

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

@@ -0,0 +1,6 @@
+@import "./styles/local.less";
+.@{ant-prefix}-hw-table-body{
+  border-radius: 4px;
+  background-color: #fff;
+  overflow: hidden;
+}

package/src/components/index.tsx

@@ -1,3 +1,4 @@
+import "./index.less";
 export { default as HTable } from "./Table";
 export { default as useHTable } from "./hooks/useHTable";
 export { default as HTableConfig } from "./TableConfig";

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,10 @@ 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
 }
 export interface TableInstance {
   reload: (params?: ParamsModal) => Promise<any>;

package/src/components/styles/local.less

@@ -0,0 +1 @@
+@ant-prefix: ant;

package/src/pages/Table/index.tsx

@@ -22,10 +22,6 @@ export default () => {
       <HTable
         configData={configData}
         rowKey={"id"}
-        headerStyle={{ borderRadius: 0 }}
-        tableStyle={{ borderRadius: 0, background: "#fff" }}
-        spaceSize={0}
-        footerStyle={{ marginTop: 20 }}
         table={hTable}
         actionRender={(allCheck, selectedRowKeys, xjTable) => {
           console.log(allCheck, selectedRowKeys, xjTable);

package/src/pages/TableCustomize/index.tsx

@@ -5,6 +5,7 @@ import {
   HTableFooter,
   HTablePagination,
 } from "../../components";
+import {useRequest} from "ahooks";
 
 const configData = [
   {
@@ -21,28 +22,32 @@ 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} />