@hw-component/table 1.9.16 → 1.9.20

package/es/HTableBody/index.d.ts

@@ -21,6 +21,7 @@ export interface HTableBodyProps extends Omit<ProTableProps<any, any>, "dataSour
     paginationActionRender?: (tableInstance: HTableInstance) => React.ReactNode;
     localSorter?: boolean;
     options?: OptionModal | false;
+    table?: HTableInstance;
 }
 declare const _default: (bodyProps: HTableBodyProps) => JSX.Element;
 export default _default;

package/es/HTableBody/index.js

@@ -22,7 +22,7 @@ import AlertMsg from './AlertMsg.js';
 import Options from './Options/index.js';
 import HeaderTitle from './HeaderTitle/index.js';
 
-var _excluded = ["configData", "pagination", "onPageChange", "rowSelection", "rowKey", "emptyRender", "errorRender", "tableStyle", "paginationStyle", "headerTitle", "options", "actionRender", "affixProps", "goTop", "size", "optionsRender", "paginationActionRender", "localSorter", "columnsState", "tableExtraRender"],
+var _excluded = ["configData", "pagination", "onPageChange", "rowSelection", "rowKey", "emptyRender", "errorRender", "tableStyle", "paginationStyle", "headerTitle", "options", "actionRender", "affixProps", "goTop", "size", "optionsRender", "paginationActionRender", "localSorter", "columnsState", "tableExtraRender", "table", "onChange"],
   _excluded2 = ["value", "onChange", "reset"];
 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; }
@@ -56,12 +56,14 @@ var Body = (function (bodyProps) {
     localSorter = bodyProps.localSorter,
     columnsState = bodyProps.columnsState,
     tableExtraRender = bodyProps.tableExtraRender,
+    table = bodyProps.table,
+    tableOnchange = bodyProps.onChange,
     props = _objectWithoutProperties(bodyProps, _excluded);
   var _ref = rowSelection || {},
     selectedRowKeys = _ref.selectedRowKeys,
     configAlwaysShowAlert = _ref.alwaysShowAlert;
   var _useHTableContext = useHTableContext(),
-    tableInstance = _useHTableContext.tableInstance,
+    contextTableInstance = _useHTableContext.tableInstance,
     contextConfigData = _useHTableContext.configData,
     data = _useHTableContext.data,
     selectedRowData = _useHTableContext.selectedRowData,
@@ -81,6 +83,7 @@ var Body = (function (bodyProps) {
   var bodyConfigData = configData || contextConfigData;
   var _ref2 = data || {},
     records = _ref2.records;
+  var tableInstance = table || contextTableInstance;
   var _useCols = useCols({
       configData: bodyConfigData,
       table: tableInstance,
@@ -153,7 +156,10 @@ var Body = (function (bodyProps) {
           columns: cols,
           size: cuSize,
           search: false,
-          onChange: function onChange(page, filters, sorter) {
+          onChange: function onChange(page, filters, sorter, extra) {
+            if (tableOnchange) {
+              return tableOnchange(page, filters, sorter, extra);
+            }
             var field = sorter.field,
               order = sorter.order,
               column = sorter.column;
@@ -161,7 +167,6 @@ var Body = (function (bodyProps) {
             if (localSorter || typeof colSorter === "function") {
               return;
             }
-            console.log(sorter);
             var orderByField = typeof order === "undefined" ? undefined : field;
             var asc = typeof order === "undefined" ? undefined : order === "ascend";
             tableInstance.table.reloadWithParams({
@@ -184,6 +189,7 @@ var Body = (function (bodyProps) {
           paginationStyle: paginationStyle,
           affixProps: affixProps,
           goTop: goTop,
+          table: tableInstance,
           actionRender: paginationActionRender
         }, pagination))]
       })]

package/es/HTableHeader/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import type { IHeaderProps } from "./modal";
-declare const _default: ({ configData, onFinish, searchSpan, headerStyle, initValues, hideLabel, labelWidth, onReset, }: IHeaderProps) => JSX.Element;
+declare const _default: ({ configData, onFinish, searchSpan, headerStyle, initValues, hideLabel, labelWidth, onReset, table, loading, }: IHeaderProps) => JSX.Element;
 export default _default;

package/es/HTableHeader/index.js

@@ -24,14 +24,17 @@ var Header = (function (_ref) {
     initValues = _ref.initValues,
     hideLabel = _ref.hideLabel,
     labelWidth = _ref.labelWidth,
-    onReset = _ref.onReset;
+    onReset = _ref.onReset,
+    table = _ref.table,
+    loading = _ref.loading;
   var _useHTableContext = useHTableContext(),
-    tableInstance = _useHTableContext.tableInstance,
-    loading = _useHTableContext.loading,
+    contextTableInstance = _useHTableContext.tableInstance,
+    contextLoading = _useHTableContext.loading,
     contextOnFinish = _useHTableContext.onFinish,
     contextConfigData = _useHTableContext.configData,
     contextHideLabel = _useHTableContext.hideLabel,
     contextLabelWidth = _useHTableContext.labelWidth;
+  var tableInstance = table || contextTableInstance;
   var headerConfigData = configData || contextConfigData;
   var form = tableInstance.form;
   var subOnFinish = onFinish || contextOnFinish;
@@ -61,7 +64,7 @@ var Header = (function (_ref) {
       children: jsx(HForm, {
         itemSpan: searchSpan,
         onFinish: subOnFinish,
-        submitLoading: loading,
+        submitLoading: contextLoading || loading,
         dismissOnPressEnter: false,
         gutter: [20, 0],
         initialValues: initValues,

package/es/HTablePagination/index.d.ts

@@ -8,6 +8,7 @@ export interface IPaginationProps extends PaginationProps {
     affixProps?: AffixProps | false;
     goTop?: boolean;
     actionRender?: (tableInstance: HTableInstance) => React.ReactNode;
+    table?: HTableInstance;
 }
-declare const _default: ({ onPageChange, paginationStyle, affixProps, goTop, actionRender, ...props }: IPaginationProps) => JSX.Element;
+declare const _default: ({ onPageChange, paginationStyle, affixProps, goTop, actionRender, table, ...props }: IPaginationProps) => JSX.Element;
 export default _default;

package/es/HTablePagination/index.js

@@ -20,7 +20,7 @@ import { useState } from 'react';
 import GoTop from '../GoTop/index.js';
 import { useHTableConfigContext } from '../TableConfig.js';
 
-var _excluded = ["onPageChange", "paginationStyle", "affixProps", "goTop", "actionRender"],
+var _excluded = ["onPageChange", "paginationStyle", "affixProps", "goTop", "actionRender", "table"],
   _excluded2 = ["offsetBottom"];
 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 _context5, _context6; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context5 = ownKeys(Object(t), !0)).call(_context5, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context6 = ownKeys(Object(t))).call(_context6, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -30,15 +30,17 @@ var HTablePagination = (function (_ref) {
     affixProps = _ref.affixProps,
     goTop = _ref.goTop,
     actionRender = _ref.actionRender,
+    table = _ref.table,
     props = _objectWithoutProperties(_ref, _excluded);
   var _useHTableContext = useHTableContext(),
     contextOnPageChange = _useHTableContext.onPageChange,
     data = _useHTableContext.data,
-    tableInstance = _useHTableContext.tableInstance;
+    contextTableInstance = _useHTableContext.tableInstance;
   var _useHTableConfigConte = useHTableConfigContext({
       paginationStyle: paginationStyle
     }),
     defaultPaginationStyle = _useHTableConfigConte.paginationStyle;
+  var tableInstance = table || contextTableInstance;
   var tableOnPageChange = onPageChange || contextOnPageChange;
   var _ref2 = data || {},
     size = _ref2.size,

package/es/TableCustomize.js

@@ -18,7 +18,7 @@ import useReq from './hooks/useReq.js';
 import useDispatch from './hooks/useDispatch.js';
 import { useState } from 'react';
 
-var _excluded = ["request", "configData", "table", "action", "children", "rowKey"];
+var _excluded = ["request", "configData", "table", "action", "children", "rowKey", "hideLabel", "labelWidth"];
 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) {
@@ -29,6 +29,8 @@ var Index = function Index(_ref) {
     action = _ref$action === void 0 ? {} : _ref$action,
     children = _ref.children,
     rowKey = _ref.rowKey,
+    hideLabel = _ref.hideLabel,
+    labelWidth = _ref.labelWidth,
     props = _objectWithoutProperties(_ref, _excluded);
   var _useReq = useReq(_objectSpread({
       request: request
@@ -89,7 +91,9 @@ var Index = function Index(_ref) {
       setSelectedRowData: setSelectedRowData,
       rowKey: rowKey,
       headerOpen: open,
-      setHeaderOpen: setOpen
+      setHeaderOpen: setOpen,
+      hideLabel: hideLabel,
+      labelWidth: labelWidth
     },
     children: children
   });

package/lib/HTableBody/index.d.ts

@@ -21,6 +21,7 @@ export interface HTableBodyProps extends Omit<ProTableProps<any, any>, "dataSour
     paginationActionRender?: (tableInstance: HTableInstance) => React.ReactNode;
     localSorter?: boolean;
     options?: OptionModal | false;
+    table?: HTableInstance;
 }
 declare const _default: (bodyProps: HTableBodyProps) => JSX.Element;
 export default _default;

package/lib/HTableBody/index.js

@@ -25,7 +25,7 @@ var AlertMsg = require('./AlertMsg.js');
 var index = require('./Options/index.js');
 var index$2 = require('./HeaderTitle/index.js');
 
-var _excluded = ["configData", "pagination", "onPageChange", "rowSelection", "rowKey", "emptyRender", "errorRender", "tableStyle", "paginationStyle", "headerTitle", "options", "actionRender", "affixProps", "goTop", "size", "optionsRender", "paginationActionRender", "localSorter", "columnsState", "tableExtraRender"],
+var _excluded = ["configData", "pagination", "onPageChange", "rowSelection", "rowKey", "emptyRender", "errorRender", "tableStyle", "paginationStyle", "headerTitle", "options", "actionRender", "affixProps", "goTop", "size", "optionsRender", "paginationActionRender", "localSorter", "columnsState", "tableExtraRender", "table", "onChange"],
   _excluded2 = ["value", "onChange", "reset"];
 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; }
@@ -59,12 +59,14 @@ var Body = (function (bodyProps) {
     localSorter = bodyProps.localSorter,
     columnsState = bodyProps.columnsState,
     tableExtraRender = bodyProps.tableExtraRender,
+    table = bodyProps.table,
+    tableOnchange = bodyProps.onChange,
     props = _objectWithoutProperties(bodyProps, _excluded);
   var _ref = rowSelection || {},
     selectedRowKeys = _ref.selectedRowKeys,
     configAlwaysShowAlert = _ref.alwaysShowAlert;
   var _useHTableContext = context.useHTableContext(),
-    tableInstance = _useHTableContext.tableInstance,
+    contextTableInstance = _useHTableContext.tableInstance,
     contextConfigData = _useHTableContext.configData,
     data = _useHTableContext.data,
     selectedRowData = _useHTableContext.selectedRowData,
@@ -84,6 +86,7 @@ var Body = (function (bodyProps) {
   var bodyConfigData = configData || contextConfigData;
   var _ref2 = data || {},
     records = _ref2.records;
+  var tableInstance = table || contextTableInstance;
   var _useCols = hooks.useCols({
       configData: bodyConfigData,
       table: tableInstance,
@@ -156,7 +159,10 @@ var Body = (function (bodyProps) {
           columns: cols,
           size: cuSize,
           search: false,
-          onChange: function onChange(page, filters, sorter) {
+          onChange: function onChange(page, filters, sorter, extra) {
+            if (tableOnchange) {
+              return tableOnchange(page, filters, sorter, extra);
+            }
             var field = sorter.field,
               order = sorter.order,
               column = sorter.column;
@@ -164,7 +170,6 @@ var Body = (function (bodyProps) {
             if (localSorter || typeof colSorter === "function") {
               return;
             }
-            console.log(sorter);
             var orderByField = typeof order === "undefined" ? undefined : field;
             var asc = typeof order === "undefined" ? undefined : order === "ascend";
             tableInstance.table.reloadWithParams({
@@ -187,6 +192,7 @@ var Body = (function (bodyProps) {
           paginationStyle: paginationStyle,
           affixProps: affixProps,
           goTop: goTop,
+          table: tableInstance,
           actionRender: paginationActionRender
         }, pagination))]
       })]

package/lib/HTableHeader/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import type { IHeaderProps } from "./modal";
-declare const _default: ({ configData, onFinish, searchSpan, headerStyle, initValues, hideLabel, labelWidth, onReset, }: IHeaderProps) => JSX.Element;
+declare const _default: ({ configData, onFinish, searchSpan, headerStyle, initValues, hideLabel, labelWidth, onReset, table, loading, }: IHeaderProps) => JSX.Element;
 export default _default;

package/lib/HTableHeader/index.js

@@ -27,14 +27,17 @@ var Header = (function (_ref) {
     initValues = _ref.initValues,
     hideLabel = _ref.hideLabel,
     labelWidth = _ref.labelWidth,
-    onReset = _ref.onReset;
+    onReset = _ref.onReset,
+    table = _ref.table,
+    loading = _ref.loading;
   var _useHTableContext = context.useHTableContext(),
-    tableInstance = _useHTableContext.tableInstance,
-    loading = _useHTableContext.loading,
+    contextTableInstance = _useHTableContext.tableInstance,
+    contextLoading = _useHTableContext.loading,
     contextOnFinish = _useHTableContext.onFinish,
     contextConfigData = _useHTableContext.configData,
     contextHideLabel = _useHTableContext.hideLabel,
     contextLabelWidth = _useHTableContext.labelWidth;
+  var tableInstance = table || contextTableInstance;
   var headerConfigData = configData || contextConfigData;
   var form$1 = tableInstance.form;
   var subOnFinish = onFinish || contextOnFinish;
@@ -64,7 +67,7 @@ var Header = (function (_ref) {
       children: jsxRuntime.jsx(form.HForm, {
         itemSpan: searchSpan,
         onFinish: subOnFinish,
-        submitLoading: loading,
+        submitLoading: contextLoading || loading,
         dismissOnPressEnter: false,
         gutter: [20, 0],
         initialValues: initValues,

package/lib/HTablePagination/index.d.ts

@@ -8,6 +8,7 @@ export interface IPaginationProps extends PaginationProps {
     affixProps?: AffixProps | false;
     goTop?: boolean;
     actionRender?: (tableInstance: HTableInstance) => React.ReactNode;
+    table?: HTableInstance;
 }
-declare const _default: ({ onPageChange, paginationStyle, affixProps, goTop, actionRender, ...props }: IPaginationProps) => JSX.Element;
+declare const _default: ({ onPageChange, paginationStyle, affixProps, goTop, actionRender, table, ...props }: IPaginationProps) => JSX.Element;
 export default _default;

package/lib/HTablePagination/index.js

@@ -23,7 +23,7 @@ var React = require('react');
 var index$1 = require('../GoTop/index.js');
 var TableConfig = require('../TableConfig.js');
 
-var _excluded = ["onPageChange", "paginationStyle", "affixProps", "goTop", "actionRender"],
+var _excluded = ["onPageChange", "paginationStyle", "affixProps", "goTop", "actionRender", "table"],
   _excluded2 = ["offsetBottom"];
 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 _context5, _context6; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context5 = ownKeys(Object(t), !0)).call(_context5, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context6 = ownKeys(Object(t))).call(_context6, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -33,15 +33,17 @@ var HTablePagination = (function (_ref) {
     affixProps = _ref.affixProps,
     goTop = _ref.goTop,
     actionRender = _ref.actionRender,
+    table = _ref.table,
     props = _objectWithoutProperties(_ref, _excluded);
   var _useHTableContext = context.useHTableContext(),
     contextOnPageChange = _useHTableContext.onPageChange,
     data = _useHTableContext.data,
-    tableInstance = _useHTableContext.tableInstance;
+    contextTableInstance = _useHTableContext.tableInstance;
   var _useHTableConfigConte = TableConfig.useHTableConfigContext({
       paginationStyle: paginationStyle
     }),
     defaultPaginationStyle = _useHTableConfigConte.paginationStyle;
+  var tableInstance = table || contextTableInstance;
   var tableOnPageChange = onPageChange || contextOnPageChange;
   var _ref2 = data || {},
     size = _ref2.size,

package/lib/TableCustomize.js

@@ -21,7 +21,7 @@ var useReq = require('./hooks/useReq.js');
 var useDispatch = require('./hooks/useDispatch.js');
 var React = require('react');
 
-var _excluded = ["request", "configData", "table", "action", "children", "rowKey"];
+var _excluded = ["request", "configData", "table", "action", "children", "rowKey", "hideLabel", "labelWidth"];
 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) {
@@ -32,6 +32,8 @@ var Index = function Index(_ref) {
     action = _ref$action === void 0 ? {} : _ref$action,
     children = _ref.children,
     rowKey = _ref.rowKey,
+    hideLabel = _ref.hideLabel,
+    labelWidth = _ref.labelWidth,
     props = _objectWithoutProperties(_ref, _excluded);
   var _useReq = useReq.default(_objectSpread({
       request: request
@@ -92,7 +94,9 @@ var Index = function Index(_ref) {
       setSelectedRowData: setSelectedRowData,
       rowKey: rowKey,
       headerOpen: open,
-      setHeaderOpen: setOpen
+      setHeaderOpen: setOpen,
+      hideLabel: hideLabel,
+      labelWidth: labelWidth
     },
     children: children
   });

package/package.json

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

package/src/components/HTableBody/index.tsx

@@ -50,6 +50,7 @@ export interface HTableBodyProps
   paginationActionRender?: (tableInstance: HTableInstance) => React.ReactNode;
   localSorter?: boolean;
   options?: OptionModal | false;
+  table?:HTableInstance
 }
 const defaultRender = () => {
   return <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />;
@@ -76,12 +77,14 @@ export default (bodyProps: HTableBodyProps) => {
     localSorter,
     columnsState,
     tableExtraRender,
+      table,
+      onChange:tableOnchange,
     ...props
   } = bodyProps;
   const { selectedRowKeys, alwaysShowAlert: configAlwaysShowAlert } =
     rowSelection || {};
   const {
-    tableInstance,
+    tableInstance:contextTableInstance,
     configData: contextConfigData,
     data,
     selectedRowData,
@@ -95,7 +98,7 @@ export default (bodyProps: HTableBodyProps) => {
   const { cuSize, setCuSize } = useSize(size);
   const bodyConfigData = configData || contextConfigData;
   const { records } = data || {};
-
+  const tableInstance=table||contextTableInstance;
   const { cols } = useCols({
     configData: bodyConfigData,
     table: tableInstance,
@@ -158,14 +161,15 @@ export default (bodyProps: HTableBodyProps) => {
             columns={cols as any}
             size={cuSize}
             search={false}
-            onChange={(page, filters, sorter) => {
+            onChange={(page, filters, sorter,extra) => {
+              if (tableOnchange){
+                return tableOnchange(page,filters,sorter,extra);
+              }
               const { field, order ,column} = sorter as any;
               const {sorter:colSorter}=column;
               if (localSorter||typeof colSorter==="function") {
                 return;
               }
-
-              console.log(sorter)
               const orderByField =
                 typeof order === "undefined" ? undefined : field;
               const asc =
@@ -192,6 +196,7 @@ export default (bodyProps: HTableBodyProps) => {
               paginationStyle={paginationStyle}
               affixProps={affixProps}
               goTop={goTop}
+              table={tableInstance}
               actionRender={paginationActionRender}
               {...pagination}
             />

package/src/components/HTableHeader/index.tsx

@@ -24,15 +24,18 @@ export default ({
   hideLabel,
   labelWidth,
   onReset,
+  table,
+  loading,
 }: IHeaderProps) => {
   const {
-    tableInstance,
-    loading,
+    tableInstance:contextTableInstance,
+    loading:contextLoading,
     onFinish: contextOnFinish,
     configData: contextConfigData,
     hideLabel: contextHideLabel,
     labelWidth: contextLabelWidth,
   } = useHTableContext();
+  const tableInstance=table||contextTableInstance;
   const headerConfigData = configData || contextConfigData;
   const { form } = tableInstance;
   const subOnFinish = onFinish || contextOnFinish;
@@ -59,7 +62,7 @@ export default ({
         <HForm
           itemSpan={searchSpan}
           onFinish={subOnFinish}
-          submitLoading={loading}
+          submitLoading={contextLoading||loading}
           dismissOnPressEnter={false}
           gutter={[20, 0]}
           initialValues={initValues}

package/src/components/HTablePagination/index.tsx

@@ -13,6 +13,7 @@ export interface IPaginationProps extends PaginationProps {
   affixProps?: AffixProps | false;
   goTop?: boolean;
   actionRender?: (tableInstance: HTableInstance) => React.ReactNode;
+  table?:HTableInstance
 }
 export default ({
   onPageChange,
@@ -20,17 +21,18 @@ export default ({
   affixProps,
   goTop,
   actionRender,
+  table,
   ...props
 }: IPaginationProps) => {
   const {
     onPageChange: contextOnPageChange,
     data,
-    tableInstance,
+    tableInstance:contextTableInstance,
   } = useHTableContext();
   const { paginationStyle: defaultPaginationStyle } = useHTableConfigContext({
     paginationStyle,
   });
-
+  const tableInstance=table||contextTableInstance;
   const tableOnPageChange = onPageChange || contextOnPageChange;
   const { size, current, total } = data || {};
   const pageCurrent = Number.parseInt(current || "1", 10);

package/src/components/TableCustomize.tsx

@@ -13,6 +13,8 @@ const Index: React.FC<HTableProps> = ({
   action = {},
   children,
   rowKey,
+  hideLabel,
+  labelWidth,
   ...props
 }) => {
   const { run, loading, data, error, saveParams } = useReq({
@@ -64,6 +66,8 @@ const Index: React.FC<HTableProps> = ({
         rowKey,
         headerOpen: open,
         setHeaderOpen: setOpen,
+          hideLabel,
+          labelWidth,
       }}
     >
       {children}

package/src/pages/Table/index.tsx

@@ -168,6 +168,9 @@ export default () => {
         />
         <HTable
           configData={configData}
+          onFinish={()=>{
+            console.log("fff")
+          }}
           rowKey={(rowData, index) => {
             return index;
           }}

package/src/pages/TableCustomize/index.tsx

@@ -2,8 +2,6 @@ import {
   TableCustomize,
   HTableHeader,
   HTableBody,
-  HTableFooter,
-  HTablePagination,
   useHTable,
 } from "@/components";
 import { useRequest } from "ahooks";