@hw-component/table 0.0.1-beta-v3 → 0.0.1-beta-v5

package/es/Body/index.d.ts

@@ -5,8 +5,8 @@ import type { HTableInstance } from "../modal";
 interface HTableBodyProps extends Omit<ProTableProps<any, any>, "dataSource"> {
     configData: ConfigDataModal;
     onPageChange: (params: ParamsModal) => void;
-    emptyRender?: (table: HTableInstance) => React.ReactNode;
-    errorRender?: (table: HTableInstance, error: Error) => React.ReactNode;
+    emptyRender?: (tableInstance: HTableInstance) => React.ReactNode;
+    errorRender?: (tableInstance: HTableInstance, error: Error) => React.ReactNode;
 }
 declare const _default: ({ loading, configData, pagination, onPageChange, rowSelection, rowKey, emptyRender, errorRender, ...props }: HTableBodyProps) => JSX.Element;
 export default _default;

package/es/Body/index.js

@@ -42,7 +42,7 @@ var Body = (function (_ref) {
   var selectedRowKeys = rowSelection.selectedRowKeys,
     onChange = rowSelection.onChange;
   var _useHTableContext = useHTableContext(),
-    table = _useHTableContext.table,
+    tableInstance = _useHTableContext.tableInstance,
     data = _useHTableContext.data,
     selectedRowData = _useHTableContext.selectedRowData,
     rowOnChange = _useHTableContext.rowOnChange,
@@ -60,7 +60,7 @@ var Body = (function (_ref) {
     size = _ref2.size,
     current = _ref2.current,
     total = _ref2.total;
-  var cols = useCols(configData, table);
+  var cols = useCols(configData, tableInstance);
   var change = function change(key, rowData) {
     if (onChange) {
       return onChange(key, rowData);
@@ -80,9 +80,9 @@ var Body = (function (_ref) {
     children: jsx(ConfigProvider, {
       renderEmpty: function renderEmpty() {
         if (error) {
-          return tableErrorRender === null || tableErrorRender === void 0 ? void 0 : tableErrorRender(table, error);
+          return tableErrorRender === null || tableErrorRender === void 0 ? void 0 : tableErrorRender(tableInstance, error);
         }
-        return tableEmptyRender === null || tableEmptyRender === void 0 ? void 0 : tableEmptyRender(table);
+        return tableEmptyRender === null || tableEmptyRender === void 0 ? void 0 : tableEmptyRender(tableInstance);
       },
       children: jsx(ProTable, _objectSpread(_objectSpread({}, props), {}, {
         columns: cols,

package/es/Footer/index.d.ts

@@ -3,7 +3,7 @@ import React from "react";
 import type { HTableInstance, ResultModal, RowObj } from "../modal";
 interface IFooterProps {
     actionRender?: ActionRenderFn;
-    footerRender?: (table: HTableInstance, selectedRowData: RowObj, data?: ResultModal) => React.ReactNode;
+    footerRender?: (tableInstance: HTableInstance, selectedRowData: RowObj, data?: ResultModal) => React.ReactNode;
 }
 declare const _default: ({ actionRender, footerRender }: IFooterProps) => JSX.Element;
 export default _default;

package/es/Footer/index.js

@@ -13,7 +13,7 @@ var Footer = (function (_ref) {
   var _useHTableContext = useHTableContext(),
     data = _useHTableContext.data,
     selectedRowData = _useHTableContext.selectedRowData,
-    table = _useHTableContext.table;
+    tableInstance = _useHTableContext.tableInstance;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     allCheck = _useState2[0],
@@ -23,7 +23,7 @@ var Footer = (function (_ref) {
   var num = allCheck ? total : 0;
   if (footerRender) {
     return jsx(Fragment, {
-      children: footerRender(table, selectedRowData, data)
+      children: footerRender(tableInstance, selectedRowData, data)
     });
   }
   var dom = jsx(Card, {
@@ -55,7 +55,7 @@ var Footer = (function (_ref) {
             children: num
           }), "\u6761"]
         })]
-      }), actionRender === null || actionRender === void 0 ? void 0 : actionRender(allCheck, selectedRowData, table)]
+      }), actionRender === null || actionRender === void 0 ? void 0 : actionRender(allCheck, selectedRowData, tableInstance)]
     })
   });
   if (!data) {

package/es/Header/index.d.ts

@@ -4,6 +4,7 @@ interface IHeaderProps {
     configData: ConfigDataModal;
     onFinish: (value: Record<string, any>) => Promise<any>;
     searchSpan?: ColProps;
+    loading?: boolean;
 }
-declare const _default: ({ configData, onFinish, searchSpan, }: IHeaderProps) => JSX.Element;
+declare const _default: ({ configData, onFinish, searchSpan, loading, }: IHeaderProps) => JSX.Element;
 export default _default;

package/es/Header/index.js

@@ -12,10 +12,11 @@ var Header = (function (_ref) {
     _ref$searchSpan = _ref.searchSpan,
     searchSpan = _ref$searchSpan === void 0 ? {
       span: 6
-    } : _ref$searchSpan;
+    } : _ref$searchSpan,
+    loading = _ref.loading;
   var _useHTableContext = useHTableContext(),
-    table = _useHTableContext.table;
-  var form = table.form;
+    tableInstance = _useHTableContext.tableInstance;
+  var form = tableInstance.form;
   var nConfigData = useMemo(function () {
     return formConfigDataProvider(configData);
   }, [configData]);
@@ -29,7 +30,8 @@ var Header = (function (_ref) {
     },
     children: jsx(HForm, {
       itemSpan: searchSpan,
-      request: onFinish,
+      onFinish: onFinish,
+      submitLoading: loading,
       gutter: [20, 0],
       hideLabel: true,
       configData: nConfigData,

package/es/Table.d.ts

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

package/es/Table.js

@@ -20,7 +20,7 @@ import useRowObj from './hooks/useRowObj.js';
 import { HTableContext } from './context.js';
 import { Space } from 'antd';
 
-var _excluded = ["request", "configData", "searchSpan", "table", "actionRender", "footerRender"],
+var _excluded = ["request", "configData", "searchSpan", "table", "actionRender", "footerRender", "hideHeader"],
   _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; }
@@ -31,6 +31,7 @@ var Table = (function (_ref) {
     table = _ref.table,
     actionRender = _ref.actionRender,
     footerRender = _ref.footerRender,
+    hideHeader = _ref.hideHeader,
     props = _objectWithoutProperties(_ref, _excluded);
   var saveParams = useMemo(function () {
     return {
@@ -58,16 +59,17 @@ var Table = (function (_ref) {
   var _useRowObj = useRowObj(),
     selectedRowData = _useRowObj.selectedRowData,
     rowOnChange = _useRowObj.rowOnChange;
-  var cuTable = useCurrentTable({
+  var tableInstance = useCurrentTable({
     table: table,
-    reload: function reload() {
-      run(_objectSpread({}, saveParams.params));
+    reload: function reload(params) {
+      var reqParams = params || saveParams.params;
+      run(_objectSpread({}, reqParams));
     },
     changeRowData: rowOnChange
   });
   return jsx(HTableContext.Provider, {
     value: {
-      table: cuTable,
+      tableInstance: tableInstance,
       selectedRowData: selectedRowData,
       rowOnChange: rowOnChange,
       data: data,
@@ -79,9 +81,10 @@ var Table = (function (_ref) {
       style: {
         width: "100%"
       },
-      children: [jsx(Header, {
+      children: [!hideHeader && jsx(Header, {
         configData: configData,
         onFinish: run,
+        loading: loading,
         searchSpan: searchSpan
       }), jsx(Body, _objectSpread({
         loading: loading,
@@ -89,7 +92,7 @@ var Table = (function (_ref) {
         onPageChange: function onPageChange(page) {
           run(_objectSpread(_objectSpread({}, saveParams.params), page));
         }
-      }, props)), jsx(Footer, {
+      }, props)), footerRender !== false && jsx(Footer, {
         actionRender: actionRender,
         footerRender: footerRender
       })]

package/es/context.d.ts

@@ -1,7 +1,7 @@
 import React from "react";
 import type { ResultModal, RowObj, HTableInstance } from "./modal";
 interface HContextModal {
-    table: HTableInstance;
+    tableInstance: HTableInstance;
     data?: ResultModal;
     selectedRowData: RowObj;
     rowOnChange: (keys: React.Key[], rowData: any[]) => void;

package/es/hooks/useCurrentTable.d.ts

@@ -2,7 +2,7 @@ import type React from "react";
 import type { ParamsModal, HTableInstance } from "../modal";
 interface currentTableParams {
     table?: HTableInstance;
-    reload: (params: ParamsModal) => void;
+    reload: (params?: ParamsModal) => void;
     changeRowData: (keys: React.Key[], data: any) => void;
 }
 declare const _default: ({ table, reload, changeRowData }: currentTableParams) => HTableInstance;

package/es/hooks/useHTable.d.ts

@@ -2,7 +2,7 @@ import type { ParamsModal } from "../modal";
 declare const _default: () => {
     form: import("@hw-component/form/lib/Form/modal").HFormInstance;
     table: {
-        reload: (params: ParamsModal) => ParamsModal;
+        reload: (params?: ParamsModal) => ParamsModal | undefined;
         setSelectedRowData: () => void;
     };
 };

package/es/modal.d.ts

@@ -18,23 +18,25 @@ export interface ParamsModal extends Record<string, any> {
     current?: number;
 }
 interface HColumns extends Omit<ProColumns, "render"> {
-    render?: (dom: React.ReactNode, data: any, index: number, table: HTableInstance) => React.ReactNode;
+    render?: (dom: React.ReactNode, data: any, index: number, tableInstance: HTableInstance) => React.ReactNode;
     showSearch?: boolean;
     searchType?: HItemProps["type"];
     searchRender?: HItemProps["render"];
 }
 export type ConfigItemModal = Omit<HItemProps, "render" | "type"> & HColumns;
 export type ConfigDataModal = ConfigItemModal[];
-export type ActionRenderFn = (allCheck: boolean, selectedRowKeys: RowObj, xjTable: HTableInstance) => React.ReactNode;
+export type ActionRenderFn = (allCheck: boolean, selectedRowKeys: RowObj, tableInstance: HTableInstance) => React.ReactNode;
+type FooterRenderFn = (tableInstance: HTableInstance, selectedRowData: RowObj, data?: ResultModal) => React.ReactNode;
 export interface HTableProps extends Omit<ProTableProps<any, any>, "request"> {
     request: (params: ParamsModal) => Promise<ResultModal>;
     configData: ConfigDataModal;
     searchSpan?: ColProps;
     table?: HTableInstance;
     actionRender?: ActionRenderFn;
-    emptyRender?: (table: HTableInstance) => React.ReactNode;
-    errorRender?: (table: HTableInstance, error: Error) => React.ReactNode;
-    footerRender?: (table: HTableInstance, selectedRowData: RowObj, data?: ResultModal) => React.ReactNode;
+    emptyRender?: (tableInstance: HTableInstance) => React.ReactNode;
+    errorRender?: (tableInstance: HTableInstance, error: Error) => React.ReactNode;
+    footerRender?: FooterRenderFn | false;
+    hideHeader?: boolean;
 }
 export interface TableInstance {
     reload: (params: ParamsModal) => void;

package/lib/Body/index.d.ts

@@ -5,8 +5,8 @@ import type { HTableInstance } from "../modal";
 interface HTableBodyProps extends Omit<ProTableProps<any, any>, "dataSource"> {
     configData: ConfigDataModal;
     onPageChange: (params: ParamsModal) => void;
-    emptyRender?: (table: HTableInstance) => React.ReactNode;
-    errorRender?: (table: HTableInstance, error: Error) => React.ReactNode;
+    emptyRender?: (tableInstance: HTableInstance) => React.ReactNode;
+    errorRender?: (tableInstance: HTableInstance, error: Error) => React.ReactNode;
 }
 declare const _default: ({ loading, configData, pagination, onPageChange, rowSelection, rowKey, emptyRender, errorRender, ...props }: HTableBodyProps) => JSX.Element;
 export default _default;

package/lib/Body/index.js

@@ -45,7 +45,7 @@ var Body = (function (_ref) {
   var selectedRowKeys = rowSelection.selectedRowKeys,
     onChange = rowSelection.onChange;
   var _useHTableContext = context.useHTableContext(),
-    table = _useHTableContext.table,
+    tableInstance = _useHTableContext.tableInstance,
     data = _useHTableContext.data,
     selectedRowData = _useHTableContext.selectedRowData,
     rowOnChange = _useHTableContext.rowOnChange,
@@ -63,7 +63,7 @@ var Body = (function (_ref) {
     size = _ref2.size,
     current = _ref2.current,
     total = _ref2.total;
-  var cols = hooks.useCols(configData, table);
+  var cols = hooks.useCols(configData, tableInstance);
   var change = function change(key, rowData) {
     if (onChange) {
       return onChange(key, rowData);
@@ -83,9 +83,9 @@ var Body = (function (_ref) {
     children: jsxRuntime.jsx(antd.ConfigProvider, {
       renderEmpty: function renderEmpty() {
         if (error) {
-          return tableErrorRender === null || tableErrorRender === void 0 ? void 0 : tableErrorRender(table, error);
+          return tableErrorRender === null || tableErrorRender === void 0 ? void 0 : tableErrorRender(tableInstance, error);
         }
-        return tableEmptyRender === null || tableEmptyRender === void 0 ? void 0 : tableEmptyRender(table);
+        return tableEmptyRender === null || tableEmptyRender === void 0 ? void 0 : tableEmptyRender(tableInstance);
       },
       children: jsxRuntime.jsx(ProTable, _objectSpread(_objectSpread({}, props), {}, {
         columns: cols,

package/lib/Footer/index.d.ts

@@ -3,7 +3,7 @@ import React from "react";
 import type { HTableInstance, ResultModal, RowObj } from "../modal";
 interface IFooterProps {
     actionRender?: ActionRenderFn;
-    footerRender?: (table: HTableInstance, selectedRowData: RowObj, data?: ResultModal) => React.ReactNode;
+    footerRender?: (tableInstance: HTableInstance, selectedRowData: RowObj, data?: ResultModal) => React.ReactNode;
 }
 declare const _default: ({ actionRender, footerRender }: IFooterProps) => JSX.Element;
 export default _default;

package/lib/Footer/index.js

@@ -16,7 +16,7 @@ var Footer = (function (_ref) {
   var _useHTableContext = context.useHTableContext(),
     data = _useHTableContext.data,
     selectedRowData = _useHTableContext.selectedRowData,
-    table = _useHTableContext.table;
+    tableInstance = _useHTableContext.tableInstance;
   var _useState = React.useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     allCheck = _useState2[0],
@@ -26,7 +26,7 @@ var Footer = (function (_ref) {
   var num = allCheck ? total : 0;
   if (footerRender) {
     return jsxRuntime.jsx(jsxRuntime.Fragment, {
-      children: footerRender(table, selectedRowData, data)
+      children: footerRender(tableInstance, selectedRowData, data)
     });
   }
   var dom = jsxRuntime.jsx(antd.Card, {
@@ -58,7 +58,7 @@ var Footer = (function (_ref) {
             children: num
           }), "\u6761"]
         })]
-      }), actionRender === null || actionRender === void 0 ? void 0 : actionRender(allCheck, selectedRowData, table)]
+      }), actionRender === null || actionRender === void 0 ? void 0 : actionRender(allCheck, selectedRowData, tableInstance)]
     })
   });
   if (!data) {

package/lib/Header/index.d.ts

@@ -4,6 +4,7 @@ interface IHeaderProps {
     configData: ConfigDataModal;
     onFinish: (value: Record<string, any>) => Promise<any>;
     searchSpan?: ColProps;
+    loading?: boolean;
 }
-declare const _default: ({ configData, onFinish, searchSpan, }: IHeaderProps) => JSX.Element;
+declare const _default: ({ configData, onFinish, searchSpan, loading, }: IHeaderProps) => JSX.Element;
 export default _default;

package/lib/Header/index.js

@@ -15,10 +15,11 @@ var Header = (function (_ref) {
     _ref$searchSpan = _ref.searchSpan,
     searchSpan = _ref$searchSpan === void 0 ? {
       span: 6
-    } : _ref$searchSpan;
+    } : _ref$searchSpan,
+    loading = _ref.loading;
   var _useHTableContext = context.useHTableContext(),
-    table = _useHTableContext.table;
-  var form$1 = table.form;
+    tableInstance = _useHTableContext.tableInstance;
+  var form$1 = tableInstance.form;
   var nConfigData = React.useMemo(function () {
     return utils.formConfigDataProvider(configData);
   }, [configData]);
@@ -32,7 +33,8 @@ var Header = (function (_ref) {
     },
     children: jsxRuntime.jsx(form.HForm, {
       itemSpan: searchSpan,
-      request: onFinish,
+      onFinish: onFinish,
+      submitLoading: loading,
       gutter: [20, 0],
       hideLabel: true,
       configData: nConfigData,

package/lib/Table.d.ts

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

package/lib/Table.js

@@ -23,7 +23,7 @@ var useRowObj = require('./hooks/useRowObj.js');
 var context = require('./context.js');
 var antd = require('antd');
 
-var _excluded = ["request", "configData", "searchSpan", "table", "actionRender", "footerRender"],
+var _excluded = ["request", "configData", "searchSpan", "table", "actionRender", "footerRender", "hideHeader"],
   _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; }
@@ -34,6 +34,7 @@ var Table = (function (_ref) {
     table = _ref.table,
     actionRender = _ref.actionRender,
     footerRender = _ref.footerRender,
+    hideHeader = _ref.hideHeader,
     props = _objectWithoutProperties(_ref, _excluded);
   var saveParams = React.useMemo(function () {
     return {
@@ -61,16 +62,17 @@ var Table = (function (_ref) {
   var _useRowObj = useRowObj.default(),
     selectedRowData = _useRowObj.selectedRowData,
     rowOnChange = _useRowObj.rowOnChange;
-  var cuTable = useCurrentTable.default({
+  var tableInstance = useCurrentTable.default({
     table: table,
-    reload: function reload() {
-      run(_objectSpread({}, saveParams.params));
+    reload: function reload(params) {
+      var reqParams = params || saveParams.params;
+      run(_objectSpread({}, reqParams));
     },
     changeRowData: rowOnChange
   });
   return jsxRuntime.jsx(context.HTableContext.Provider, {
     value: {
-      table: cuTable,
+      tableInstance: tableInstance,
       selectedRowData: selectedRowData,
       rowOnChange: rowOnChange,
       data: data,
@@ -82,9 +84,10 @@ var Table = (function (_ref) {
       style: {
         width: "100%"
       },
-      children: [jsxRuntime.jsx(index.default, {
+      children: [!hideHeader && jsxRuntime.jsx(index.default, {
         configData: configData,
         onFinish: run,
+        loading: loading,
         searchSpan: searchSpan
       }), jsxRuntime.jsx(index$1.default, _objectSpread({
         loading: loading,
@@ -92,7 +95,7 @@ var Table = (function (_ref) {
         onPageChange: function onPageChange(page) {
           run(_objectSpread(_objectSpread({}, saveParams.params), page));
         }
-      }, props)), jsxRuntime.jsx(index$2.default, {
+      }, props)), footerRender !== false && jsxRuntime.jsx(index$2.default, {
         actionRender: actionRender,
         footerRender: footerRender
       })]

package/lib/context.d.ts

@@ -1,7 +1,7 @@
 import React from "react";
 import type { ResultModal, RowObj, HTableInstance } from "./modal";
 interface HContextModal {
-    table: HTableInstance;
+    tableInstance: HTableInstance;
     data?: ResultModal;
     selectedRowData: RowObj;
     rowOnChange: (keys: React.Key[], rowData: any[]) => void;

package/lib/hooks/useCurrentTable.d.ts

@@ -2,7 +2,7 @@ import type React from "react";
 import type { ParamsModal, HTableInstance } from "../modal";
 interface currentTableParams {
     table?: HTableInstance;
-    reload: (params: ParamsModal) => void;
+    reload: (params?: ParamsModal) => void;
     changeRowData: (keys: React.Key[], data: any) => void;
 }
 declare const _default: ({ table, reload, changeRowData }: currentTableParams) => HTableInstance;

package/lib/hooks/useHTable.d.ts

@@ -2,7 +2,7 @@ import type { ParamsModal } from "../modal";
 declare const _default: () => {
     form: import("@hw-component/form/lib/Form/modal").HFormInstance;
     table: {
-        reload: (params: ParamsModal) => ParamsModal;
+        reload: (params?: ParamsModal) => ParamsModal | undefined;
         setSelectedRowData: () => void;
     };
 };

package/lib/modal.d.ts

@@ -18,23 +18,25 @@ export interface ParamsModal extends Record<string, any> {
     current?: number;
 }
 interface HColumns extends Omit<ProColumns, "render"> {
-    render?: (dom: React.ReactNode, data: any, index: number, table: HTableInstance) => React.ReactNode;
+    render?: (dom: React.ReactNode, data: any, index: number, tableInstance: HTableInstance) => React.ReactNode;
     showSearch?: boolean;
     searchType?: HItemProps["type"];
     searchRender?: HItemProps["render"];
 }
 export type ConfigItemModal = Omit<HItemProps, "render" | "type"> & HColumns;
 export type ConfigDataModal = ConfigItemModal[];
-export type ActionRenderFn = (allCheck: boolean, selectedRowKeys: RowObj, xjTable: HTableInstance) => React.ReactNode;
+export type ActionRenderFn = (allCheck: boolean, selectedRowKeys: RowObj, tableInstance: HTableInstance) => React.ReactNode;
+type FooterRenderFn = (tableInstance: HTableInstance, selectedRowData: RowObj, data?: ResultModal) => React.ReactNode;
 export interface HTableProps extends Omit<ProTableProps<any, any>, "request"> {
     request: (params: ParamsModal) => Promise<ResultModal>;
     configData: ConfigDataModal;
     searchSpan?: ColProps;
     table?: HTableInstance;
     actionRender?: ActionRenderFn;
-    emptyRender?: (table: HTableInstance) => React.ReactNode;
-    errorRender?: (table: HTableInstance, error: Error) => React.ReactNode;
-    footerRender?: (table: HTableInstance, selectedRowData: RowObj, data?: ResultModal) => React.ReactNode;
+    emptyRender?: (tableInstance: HTableInstance) => React.ReactNode;
+    errorRender?: (tableInstance: HTableInstance, error: Error) => React.ReactNode;
+    footerRender?: FooterRenderFn | false;
+    hideHeader?: boolean;
 }
 export interface TableInstance {
     reload: (params: ParamsModal) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hw-component/table",
-  "version": "0.0.1-beta-v3",
+  "version": "0.0.1-beta-v5",
   "description": "基于antd二次开发table组件",
   "keywords": [
     "table"
@@ -31,7 +31,7 @@
   },
   "dependencies": {
     "@ant-design/pro-table": "2.70.0",
-    "@hw-component/form": "0.0.9-beta-v7",
+    "@hw-component/form": "0.0.9-beta-v8",
     "ahooks": "2.10.9",
     "antd": "4.20.7",
     "core-js": "3",

package/src/components/Body/index.tsx

@@ -11,8 +11,11 @@ import { useHTableConfigContext } from "../TableConfig";
 interface HTableBodyProps extends Omit<ProTableProps<any, any>, "dataSource"> {
   configData: ConfigDataModal;
   onPageChange: (params: ParamsModal) => void;
-  emptyRender?: (table: HTableInstance) => React.ReactNode;
-  errorRender?: (table: HTableInstance, error: Error) => React.ReactNode;
+  emptyRender?: (tableInstance: HTableInstance) => React.ReactNode;
+  errorRender?: (
+    tableInstance: HTableInstance,
+    error: Error
+  ) => React.ReactNode;
 }
 const defaultRender = () => {
   return <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />;
@@ -30,14 +33,14 @@ export default ({
 }: HTableBodyProps) => {
   // @ts-ignore
   const { selectedRowKeys, onChange } = rowSelection;
-  const { table, data, selectedRowData, rowOnChange, error } =
+  const { tableInstance, data, selectedRowData, rowOnChange, error } =
     useHTableContext();
   const {
     emptyRender: tableEmptyRender = defaultRender,
     errorRender: tableErrorRender = defaultRender,
   } = useHTableConfigContext({ emptyRender, errorRender });
   const { records, size, current, total } = data || {};
-  const cols = useCols(configData, table);
+  const cols = useCols(configData, tableInstance);
   const change = (key: React.Key[], rowData: any[]) => {
     if (onChange) {
       return onChange(key, rowData);
@@ -50,9 +53,9 @@ export default ({
       <ConfigProvider
         renderEmpty={() => {
           if (error) {
-            return tableErrorRender?.(table, error);
+            return tableErrorRender?.(tableInstance, error);
           }
-          return tableEmptyRender?.(table);
+          return tableEmptyRender?.(tableInstance);
         }}
       >
         <ProTable

package/src/components/Footer/index.tsx

@@ -9,18 +9,18 @@ const { Text, Link } = Typography;
 interface IFooterProps {
   actionRender?: ActionRenderFn;
   footerRender?: (
-    table: HTableInstance,
+    tableInstance: HTableInstance,
     selectedRowData: RowObj,
     data?: ResultModal
   ) => React.ReactNode;
 }
 export default ({ actionRender, footerRender }: IFooterProps) => {
-  const { data, selectedRowData, table } = useHTableContext();
+  const { data, selectedRowData, tableInstance } = useHTableContext();
   const [allCheck, setAllCheck] = useState<boolean>(false);
   const { total } = data || {};
   const num = allCheck ? total : 0;
   if (footerRender) {
-    return <>{footerRender(table, selectedRowData, data)}</>;
+    return <>{footerRender(tableInstance, selectedRowData, data)}</>;
   }
   const dom = (
     <Card style={{ borderRadius: 4 }} bordered={false}>
@@ -41,7 +41,7 @@ export default ({ actionRender, footerRender }: IFooterProps) => {
             已选择<Link>{num}</Link>条
           </Text>
         </Space>
-        {actionRender?.(allCheck, selectedRowData, table)}
+        {actionRender?.(allCheck, selectedRowData, tableInstance)}
       </Row>
     </Card>
   );

package/src/components/Header/index.tsx

@@ -11,15 +11,17 @@ interface IHeaderProps {
   configData: ConfigDataModal;
   onFinish: (value: Record<string, any>) => Promise<any>;
   searchSpan?: ColProps;
+  loading?: boolean;
 }
 
 export default ({
   configData,
   onFinish,
   searchSpan = { span: 6 },
+  loading,
 }: IHeaderProps) => {
-  const { table } = useHTableContext();
-  const { form } = table;
+  const { tableInstance } = useHTableContext();
+  const { form } = tableInstance;
 
   const nConfigData: HItemProps[] = useMemo(
     () => formConfigDataProvider(configData),
@@ -34,7 +36,8 @@ export default ({
     >
       <HForm
         itemSpan={searchSpan}
-        request={onFinish}
+        onFinish={onFinish}
+        submitLoading={loading}
         gutter={[20, 0]}
         hideLabel={true}
         configData={nConfigData}

package/src/components/Table.tsx

@@ -15,6 +15,7 @@ export default ({
   table,
   actionRender,
   footerRender,
+  hideHeader,
   ...props
 }: HTableProps) => {
   const saveParams = useMemo(() => {
@@ -29,17 +30,18 @@ export default ({
     return request(reqParams);
   });
   const { selectedRowData, rowOnChange } = useRowObj();
-  const cuTable = useCurrentTable({
+  const tableInstance = useCurrentTable({
     table,
-    reload: () => {
-      run({ ...saveParams.params });
+    reload: (params) => {
+      const reqParams = params || saveParams.params;
+      run({ ...reqParams });
     },
     changeRowData: rowOnChange,
   });
   return (
     <HTableContext.Provider
       value={{
-        table: cuTable,
+        tableInstance,
         selectedRowData,
         rowOnChange,
         data,
@@ -47,11 +49,14 @@ export default ({
       }}
     >
       <Space size={20} direction={"vertical"} style={{ width: "100%" }}>
-        <Header
-          configData={configData}
-          onFinish={run}
-          searchSpan={searchSpan}
-        />
+        {!hideHeader && (
+          <Header
+            configData={configData}
+            onFinish={run}
+            loading={loading}
+            searchSpan={searchSpan}
+          />
+        )}
         <Body
           loading={loading}
           configData={configData}
@@ -60,7 +65,9 @@ export default ({
           }}
           {...props}
         />
-        <Footer actionRender={actionRender} footerRender={footerRender} />
+        {footerRender !== false && (
+          <Footer actionRender={actionRender} footerRender={footerRender} />
+        )}
       </Space>
     </HTableContext.Provider>
   );

package/src/components/context.ts

@@ -2,7 +2,7 @@ import React, { useContext } from "react";
 import type { ResultModal, RowObj, HTableInstance } from "./modal";
 
 interface HContextModal {
-  table: HTableInstance;
+  tableInstance: HTableInstance;
   data?: ResultModal;
   selectedRowData: RowObj;
   rowOnChange: (keys: React.Key[], rowData: any[]) => void;

package/src/components/hooks/useCurrentTable.ts

@@ -5,7 +5,7 @@ import useHTable from "../hooks/useHTable";
 
 interface currentTableParams {
   table?: HTableInstance;
-  reload: (params: ParamsModal) => void;
+  reload: (params?: ParamsModal) => void;
   changeRowData: (keys: React.Key[], data: any) => void;
 }
 export default ({ table, reload, changeRowData }: currentTableParams) => {

package/src/components/hooks/useHTable.tsx

@@ -6,7 +6,7 @@ export default () => {
   const form = useHForm();
   const table = useMemo(() => {
     return {
-      reload: (params: ParamsModal) => {
+      reload: (params?: ParamsModal) => {
         return params;
       },
       setSelectedRowData: () => {},

package/src/components/modal.ts

@@ -26,7 +26,7 @@ interface HColumns extends Omit<ProColumns, "render"> {
     dom: React.ReactNode,
     data: any,
     index: number,
-    table: HTableInstance
+    tableInstance: HTableInstance
   ) => React.ReactNode;
   showSearch?: boolean;
   searchType?: HItemProps["type"];
@@ -37,22 +37,26 @@ export type ConfigDataModal = ConfigItemModal[];
 export type ActionRenderFn = (
   allCheck: boolean,
   selectedRowKeys: RowObj,
-  xjTable: HTableInstance
+  tableInstance: HTableInstance
+) => React.ReactNode;
+type FooterRenderFn = (
+  tableInstance: HTableInstance,
+  selectedRowData: RowObj,
+  data?: ResultModal
 ) => React.ReactNode;
-
 export interface HTableProps extends Omit<ProTableProps<any, any>, "request"> {
   request: (params: ParamsModal) => Promise<ResultModal>;
   configData: ConfigDataModal;
   searchSpan?: ColProps;
   table?: HTableInstance;
   actionRender?: ActionRenderFn;
-  emptyRender?: (table: HTableInstance) => React.ReactNode;
-  errorRender?: (table: HTableInstance, error: Error) => React.ReactNode;
-  footerRender?: (
-    table: HTableInstance,
-    selectedRowData: RowObj,
-    data?: ResultModal
+  emptyRender?: (tableInstance: HTableInstance) => React.ReactNode;
+  errorRender?: (
+    tableInstance: HTableInstance,
+    error: Error
   ) => React.ReactNode;
+  footerRender?: FooterRenderFn | false;
+  hideHeader?: boolean;
 }
 export interface TableInstance {
   reload: (params: ParamsModal) => void;

package/src/pages/Test/index.tsx

@@ -1,4 +1,4 @@
-import { HTable, HTableConfig } from "../../components";
+import { HTable, HTableConfig, useHTable } from "../../components";
 import { Button } from "antd";
 const configData = [
   {
@@ -15,57 +15,46 @@ const configData = [
   },
 ];
 export default () => {
+  const hTable = useHTable();
   return (
-    <HTableConfig
-      emptyRender={() => {
-        return <div>红</div>;
-      }}
-    >
+    <>
+      <div
+        onClick={() => {
+          hTable.table.reload();
+        }}
+      >
+        {" "}
+        点我
+      </div>
       <HTable
         configData={configData}
         rowKey={"id"}
-        emptyRender={() => {
-          return <div>无数据</div>;
-        }}
-        errorRender={(table, error) => {
-          return <div>{error.message}</div>;
-        }}
+        table={hTable}
         actionRender={(allCheck, selectedRowKeys, xjTable) => {
           console.log(allCheck, selectedRowKeys, xjTable);
           return <Button>点我</Button>;
         }}
-        footerRender={(table, selectedRowData, data) => {
-          return (
-            <div>
-              {selectedRowData.keys?.length}条
-              <div
-                onClick={() => {
-                  table.table.setSelectedRowData([], []);
-                }}
-              >
-                点我
-              </div>
-            </div>
-          );
-        }}
+        footerRender={false}
         request={(a) => {
+          console.log(a);
           return new Promise((resolve, reject) => {
             setTimeout(() => {
-              resolve({
-                size: "10",
-                current: "1",
-                total: "100",
-                records: [
-                  {
-                    id: 1,
-                    name: "111",
-                  },
-                ],
-              });
+              reject(new Error("错误"));
+              // resolve({
+              //   size: "10",
+              //   current: "1",
+              //   total: "100",
+              //   records: [
+              //     {
+              //       id: 1,
+              //       name: "111",
+              //     },
+              //   ],
+              // });
             }, 2000);
           });
         }}
       />
-    </HTableConfig>
+    </>
   );
 };