@hw-component/table 0.0.2-beta-v15 → 0.0.3-beta-v2

package/es/HTableBody/index.d.ts

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

package/es/HTableBody/index.js

@@ -18,7 +18,7 @@ import { useHTableContext } from '../context.js';
 import { ConfigProvider, Empty } from 'antd';
 import { useHTableConfigContext } from '../TableConfig.js';
 
-var _excluded = ["loading", "configData", "pagination", "onPageChange", "rowSelection", "rowKey", "emptyRender", "errorRender", "tableStyle"];
+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; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context, _context2; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(t), !0)).call(_context, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context2 = ownKeys(Object(t))).call(_context2, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 var defaultRender = function defaultRender() {
@@ -27,8 +27,7 @@ var defaultRender = function defaultRender() {
   });
 };
 var Body = (function (_ref) {
-  var loading = _ref.loading,
-    configData = _ref.configData,
+  var configData = _ref.configData,
     _ref$pagination = _ref.pagination,
     pagination = _ref$pagination === void 0 ? {} : _ref$pagination,
     onPageChange = _ref.onPageChange,
@@ -47,7 +46,8 @@ var Body = (function (_ref) {
     data = _useHTableContext.data,
     selectedRowData = _useHTableContext.selectedRowData,
     rowOnChange = _useHTableContext.rowOnChange,
-    error = _useHTableContext.error;
+    error = _useHTableContext.error,
+    loading = _useHTableContext.loading;
   var _useHTableConfigConte = useHTableConfigContext({
       emptyRender: emptyRender,
       errorRender: errorRender

package/es/HTableFooter/index.js

@@ -1,8 +1,8 @@
 // welcome to hoo hoo hoo
 import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
-import _slicedToArray from '@babel/runtime-corejs3/helpers/slicedToArray';
 import _Number$parseInt from '@babel/runtime-corejs3/core-js/number/parse-int';
 import _Number$isNaN from '@babel/runtime-corejs3/core-js/number/is-nan';
+import _keysInstanceProperty from '@babel/runtime-corejs3/core-js/instance/keys';
 import _Object$keys from '@babel/runtime-corejs3/core-js/object/keys';
 import _Object$getOwnPropertySymbols from '@babel/runtime-corejs3/core-js/object/get-own-property-symbols';
 import _filterInstanceProperty from '@babel/runtime-corejs3/core-js/instance/filter';
@@ -14,7 +14,6 @@ import _Object$defineProperty from '@babel/runtime-corejs3/core-js/object/define
 import { jsx, Fragment, jsxs } from 'react/jsx-runtime';
 import { Typography, Card, Row, Space, Button, Affix } from 'antd';
 import { useHTableContext } from '../context.js';
-import { useState } from 'react';
 
 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; }
@@ -26,19 +25,21 @@ var Footer = (function (_ref) {
     footerStyle = _ref.footerStyle;
   var _useHTableContext = useHTableContext(),
     data = _useHTableContext.data,
-    selectedRowData = _useHTableContext.selectedRowData,
+    _useHTableContext$sel = _useHTableContext.selectedRowData,
+    selectedRowData = _useHTableContext$sel === void 0 ? {} : _useHTableContext$sel,
+    allSelectChange = _useHTableContext.allSelectChange,
     tableInstance = _useHTableContext.tableInstance;
     _useHTableContext.error;
-  var _useState = useState(false),
-    _useState2 = _slicedToArray(_useState, 2),
-    allCheck = _useState2[0],
-    setAllCheck = _useState2[1];
   var _ref2 = data || {},
     _ref2$total = _ref2.total,
     total = _ref2$total === void 0 ? "0" : _ref2$total;
   var totalNum = _Number$parseInt(total, 10);
   var showTotalNum = _Number$isNaN(totalNum) ? 0 : totalNum;
-  var num = allCheck ? showTotalNum : 0;
+  var _selectedRowData$keys = _keysInstanceProperty(selectedRowData),
+    keys = _selectedRowData$keys === void 0 ? [] : _selectedRowData$keys,
+    _selectedRowData$sele = selectedRowData.selectAll,
+    selectAll = _selectedRowData$sele === void 0 ? false : _selectedRowData$sele;
+  var num = selectAll ? showTotalNum : keys.length;
   if (footerRender) {
     return jsx(Fragment, {
       children: footerRender(tableInstance, selectedRowData, data)
@@ -62,10 +63,8 @@ var Footer = (function (_ref) {
             padding: "4px 24px",
             borderRadius: "4px"
           },
-          onClick: function onClick() {
-            setAllCheck(!allCheck);
-          },
-          children: !allCheck ? "选择全部" : "取消选择"
+          onClick: allSelectChange,
+          children: !selectAll ? "选择全部" : "取消选择"
         }), jsxs(Text, {
           type: "secondary",
           children: ["\u5171", total, "\u6761"]
@@ -75,7 +74,7 @@ var Footer = (function (_ref) {
             children: num
           }), "\u6761"]
         })]
-      }), actionRender === null || actionRender === void 0 ? void 0 : actionRender(allCheck, selectedRowData, tableInstance)]
+      }), actionRender === null || actionRender === void 0 ? void 0 : actionRender(selectedRowData, tableInstance)]
     })
   });
   if (!data) {

package/es/HTableHeader/index.d.ts

@@ -8,5 +8,5 @@ interface IHeaderProps {
     loading?: boolean;
     headerStyle?: React.CSSProperties;
 }
-declare const _default: ({ configData, onFinish, searchSpan, loading, headerStyle, }: IHeaderProps) => JSX.Element;
+declare const _default: ({ configData, onFinish, searchSpan, headerStyle, }: IHeaderProps) => JSX.Element;
 export default _default;

package/es/HTableHeader/index.js

@@ -24,10 +24,10 @@ var Header = (function (_ref) {
     searchSpan = _ref$searchSpan === void 0 ? {
       span: 6
     } : _ref$searchSpan,
-    loading = _ref.loading,
     headerStyle = _ref.headerStyle;
   var _useHTableContext = useHTableContext(),
-    tableInstance = _useHTableContext.tableInstance;
+    tableInstance = _useHTableContext.tableInstance,
+    loading = _useHTableContext.loading;
   var form = tableInstance.form;
   var nConfigData = useMemo(function () {
     return formConfigDataProvider(configData);

package/es/Table.js

@@ -73,7 +73,8 @@ var Table = (function (_ref) {
   };
   var _useRowObj = useRowObj(),
     selectedRowData = _useRowObj.selectedRowData,
-    rowOnChange = _useRowObj.rowOnChange;
+    rowOnChange = _useRowObj.rowOnChange,
+    allSelectChange = _useRowObj.allSelectChange;
   var tableInstance = useCurrentTable({
     table: table,
     reload: function reload(params) {
@@ -89,7 +90,9 @@ var Table = (function (_ref) {
       selectedRowData: selectedRowData,
       rowOnChange: rowOnChange,
       data: data,
-      error: error
+      error: error,
+      loading: loading,
+      allSelectChange: allSelectChange
     },
     children: jsxs(Space, {
       size: spaceSize,
@@ -101,11 +104,9 @@ var Table = (function (_ref) {
       children: [!hideHeader && jsx(Header, {
         configData: configData,
         onFinish: run,
-        loading: loading,
         searchSpan: searchSpan,
         headerStyle: headerStyle
       }), jsx(Body, _objectSpread({
-        loading: loading,
         configData: configData,
         tableStyle: tableStyle,
         onPageChange: function onPageChange(page) {

package/es/context.d.ts

@@ -6,6 +6,8 @@ interface HContextModal {
     selectedRowData: RowObj;
     rowOnChange: (keys: React.Key[], rowData: any[]) => void;
     error?: Error;
+    loading?: boolean;
+    allSelectChange?: VoidFunction;
 }
 export declare const HTableContext: React.Context<HContextModal | null>;
 export declare const useHTableContext: () => HContextModal;

package/es/hooks/useRowObj.d.ts

@@ -3,5 +3,6 @@ import type { RowObj } from "../modal";
 declare const _default: () => {
     rowOnChange: (keys: React.Key[], rowData: any[]) => void;
     selectedRowData: RowObj;
+    allSelectChange: () => void;
 };
 export default _default;

package/es/hooks/useRowObj.js

@@ -7,15 +7,23 @@ var useRowObj = (function () {
     _useState2 = _slicedToArray(_useState, 2),
     selectedRowData = _useState2[0],
     setSelectedRowData = _useState2[1];
+  var _selectedRowData$sele = selectedRowData.selectAll,
+    selectAll = _selectedRowData$sele === void 0 ? false : _selectedRowData$sele;
   var rowOnChange = function rowOnChange(keys, rowData) {
     setSelectedRowData({
       keys: keys,
       rowData: rowData
     });
   };
+  var allSelectChange = function allSelectChange() {
+    setSelectedRowData({
+      selectAll: !selectAll
+    });
+  };
   return {
     rowOnChange: rowOnChange,
-    selectedRowData: selectedRowData
+    selectedRowData: selectedRowData,
+    allSelectChange: allSelectChange
   };
 });
 

package/es/index.d.ts

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

package/es/index.js

@@ -2,5 +2,4 @@
 export { default as HTable } from './Table.js';
 export { default as useHTable } from './hooks/useHTable.js';
 export { default as HTableConfig } from './TableConfig.js';
-export { default as TestProTable } from './TestProTable/index.js';
 // powered by hdj

package/es/modal.d.ts

@@ -6,6 +6,7 @@ import type React from "react";
 export interface RowObj {
     keys?: React.Key[];
     rowData?: any[];
+    selectAll?: boolean;
 }
 export interface ResultModal {
     records: any[];
@@ -25,7 +26,7 @@ interface HColumns extends Omit<ProColumns, "render"> {
 }
 export type ConfigItemModal = Omit<HItemProps, "render" | "type"> & HColumns;
 export type ConfigDataModal = ConfigItemModal[];
-export type ActionRenderFn = (allCheck: boolean, selectedRowKeys: RowObj, tableInstance: HTableInstance) => React.ReactNode;
+export type ActionRenderFn = (selectedRowKeys: RowObj, tableInstance: HTableInstance) => React.ReactNode;
 type actionFn = (...arg: any[]) => void;
 type FooterRenderFn = (tableInstance: HTableInstance, selectedRowData: RowObj, data?: ResultModal) => React.ReactNode;
 export interface HTableProps extends Omit<ProTableProps<any, any>, "request"> {

package/lib/HTableBody/index.d.ts

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

package/lib/HTableBody/index.js

@@ -21,7 +21,7 @@ var context = require('../context.js');
 var antd = require('antd');
 var TableConfig = require('../TableConfig.js');
 
-var _excluded = ["loading", "configData", "pagination", "onPageChange", "rowSelection", "rowKey", "emptyRender", "errorRender", "tableStyle"];
+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; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context, _context2; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(t), !0)).call(_context, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context2 = ownKeys(Object(t))).call(_context2, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 var defaultRender = function defaultRender() {
@@ -30,8 +30,7 @@ var defaultRender = function defaultRender() {
   });
 };
 var Body = (function (_ref) {
-  var loading = _ref.loading,
-    configData = _ref.configData,
+  var configData = _ref.configData,
     _ref$pagination = _ref.pagination,
     pagination = _ref$pagination === void 0 ? {} : _ref$pagination,
     onPageChange = _ref.onPageChange,
@@ -50,7 +49,8 @@ var Body = (function (_ref) {
     data = _useHTableContext.data,
     selectedRowData = _useHTableContext.selectedRowData,
     rowOnChange = _useHTableContext.rowOnChange,
-    error = _useHTableContext.error;
+    error = _useHTableContext.error,
+    loading = _useHTableContext.loading;
   var _useHTableConfigConte = TableConfig.useHTableConfigContext({
       emptyRender: emptyRender,
       errorRender: errorRender

package/lib/HTableFooter/index.js

@@ -3,9 +3,9 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
-var _slicedToArray = require('@babel/runtime-corejs3/helpers/slicedToArray');
 var _Number$parseInt = require('@babel/runtime-corejs3/core-js/number/parse-int');
 var _Number$isNaN = require('@babel/runtime-corejs3/core-js/number/is-nan');
+var _keysInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/keys');
 var _Object$keys = require('@babel/runtime-corejs3/core-js/object/keys');
 var _Object$getOwnPropertySymbols = require('@babel/runtime-corejs3/core-js/object/get-own-property-symbols');
 var _filterInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/filter');
@@ -17,7 +17,6 @@ var _Object$defineProperty = require('@babel/runtime-corejs3/core-js/object/defi
 var jsxRuntime = require('react/jsx-runtime');
 var antd = require('antd');
 var context = require('../context.js');
-var React = require('react');
 
 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; }
@@ -29,19 +28,21 @@ var Footer = (function (_ref) {
     footerStyle = _ref.footerStyle;
   var _useHTableContext = context.useHTableContext(),
     data = _useHTableContext.data,
-    selectedRowData = _useHTableContext.selectedRowData,
+    _useHTableContext$sel = _useHTableContext.selectedRowData,
+    selectedRowData = _useHTableContext$sel === void 0 ? {} : _useHTableContext$sel,
+    allSelectChange = _useHTableContext.allSelectChange,
     tableInstance = _useHTableContext.tableInstance;
     _useHTableContext.error;
-  var _useState = React.useState(false),
-    _useState2 = _slicedToArray(_useState, 2),
-    allCheck = _useState2[0],
-    setAllCheck = _useState2[1];
   var _ref2 = data || {},
     _ref2$total = _ref2.total,
     total = _ref2$total === void 0 ? "0" : _ref2$total;
   var totalNum = _Number$parseInt(total, 10);
   var showTotalNum = _Number$isNaN(totalNum) ? 0 : totalNum;
-  var num = allCheck ? showTotalNum : 0;
+  var _selectedRowData$keys = _keysInstanceProperty(selectedRowData),
+    keys = _selectedRowData$keys === void 0 ? [] : _selectedRowData$keys,
+    _selectedRowData$sele = selectedRowData.selectAll,
+    selectAll = _selectedRowData$sele === void 0 ? false : _selectedRowData$sele;
+  var num = selectAll ? showTotalNum : keys.length;
   if (footerRender) {
     return jsxRuntime.jsx(jsxRuntime.Fragment, {
       children: footerRender(tableInstance, selectedRowData, data)
@@ -65,10 +66,8 @@ var Footer = (function (_ref) {
             padding: "4px 24px",
             borderRadius: "4px"
           },
-          onClick: function onClick() {
-            setAllCheck(!allCheck);
-          },
-          children: !allCheck ? "选择全部" : "取消选择"
+          onClick: allSelectChange,
+          children: !selectAll ? "选择全部" : "取消选择"
         }), jsxRuntime.jsxs(Text, {
           type: "secondary",
           children: ["\u5171", total, "\u6761"]
@@ -78,7 +77,7 @@ var Footer = (function (_ref) {
             children: num
           }), "\u6761"]
         })]
-      }), actionRender === null || actionRender === void 0 ? void 0 : actionRender(allCheck, selectedRowData, tableInstance)]
+      }), actionRender === null || actionRender === void 0 ? void 0 : actionRender(selectedRowData, tableInstance)]
     })
   });
   if (!data) {

package/lib/HTableHeader/index.d.ts

@@ -8,5 +8,5 @@ interface IHeaderProps {
     loading?: boolean;
     headerStyle?: React.CSSProperties;
 }
-declare const _default: ({ configData, onFinish, searchSpan, loading, headerStyle, }: IHeaderProps) => JSX.Element;
+declare const _default: ({ configData, onFinish, searchSpan, headerStyle, }: IHeaderProps) => JSX.Element;
 export default _default;

package/lib/HTableHeader/index.js

@@ -27,10 +27,10 @@ var Header = (function (_ref) {
     searchSpan = _ref$searchSpan === void 0 ? {
       span: 6
     } : _ref$searchSpan,
-    loading = _ref.loading,
     headerStyle = _ref.headerStyle;
   var _useHTableContext = context.useHTableContext(),
-    tableInstance = _useHTableContext.tableInstance;
+    tableInstance = _useHTableContext.tableInstance,
+    loading = _useHTableContext.loading;
   var form$1 = tableInstance.form;
   var nConfigData = React.useMemo(function () {
     return utils.formConfigDataProvider(configData);

package/lib/Table.js

@@ -76,7 +76,8 @@ var Table = (function (_ref) {
   };
   var _useRowObj = useRowObj.default(),
     selectedRowData = _useRowObj.selectedRowData,
-    rowOnChange = _useRowObj.rowOnChange;
+    rowOnChange = _useRowObj.rowOnChange,
+    allSelectChange = _useRowObj.allSelectChange;
   var tableInstance = useCurrentTable.default({
     table: table,
     reload: function reload(params) {
@@ -92,7 +93,9 @@ var Table = (function (_ref) {
       selectedRowData: selectedRowData,
       rowOnChange: rowOnChange,
       data: data,
-      error: error
+      error: error,
+      loading: loading,
+      allSelectChange: allSelectChange
     },
     children: jsxRuntime.jsxs(antd.Space, {
       size: spaceSize,
@@ -104,11 +107,9 @@ var Table = (function (_ref) {
       children: [!hideHeader && jsxRuntime.jsx(index.default, {
         configData: configData,
         onFinish: run,
-        loading: loading,
         searchSpan: searchSpan,
         headerStyle: headerStyle
       }), jsxRuntime.jsx(index$1.default, _objectSpread({
-        loading: loading,
         configData: configData,
         tableStyle: tableStyle,
         onPageChange: function onPageChange(page) {

package/lib/context.d.ts

@@ -6,6 +6,8 @@ interface HContextModal {
     selectedRowData: RowObj;
     rowOnChange: (keys: React.Key[], rowData: any[]) => void;
     error?: Error;
+    loading?: boolean;
+    allSelectChange?: VoidFunction;
 }
 export declare const HTableContext: React.Context<HContextModal | null>;
 export declare const useHTableContext: () => HContextModal;

package/lib/hooks/useRowObj.d.ts

@@ -3,5 +3,6 @@ import type { RowObj } from "../modal";
 declare const _default: () => {
     rowOnChange: (keys: React.Key[], rowData: any[]) => void;
     selectedRowData: RowObj;
+    allSelectChange: () => void;
 };
 export default _default;

package/lib/hooks/useRowObj.js

@@ -10,15 +10,23 @@ var useRowObj = (function () {
     _useState2 = _slicedToArray(_useState, 2),
     selectedRowData = _useState2[0],
     setSelectedRowData = _useState2[1];
+  var _selectedRowData$sele = selectedRowData.selectAll,
+    selectAll = _selectedRowData$sele === void 0 ? false : _selectedRowData$sele;
   var rowOnChange = function rowOnChange(keys, rowData) {
     setSelectedRowData({
       keys: keys,
       rowData: rowData
     });
   };
+  var allSelectChange = function allSelectChange() {
+    setSelectedRowData({
+      selectAll: !selectAll
+    });
+  };
   return {
     rowOnChange: rowOnChange,
-    selectedRowData: selectedRowData
+    selectedRowData: selectedRowData,
+    allSelectChange: allSelectChange
   };
 });
 

package/lib/index.d.ts

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

package/lib/index.js

@@ -3,12 +3,10 @@
 var Table = require('./Table.js');
 var useHTable = require('./hooks/useHTable.js');
 var TableConfig = require('./TableConfig.js');
-var index = require('./TestProTable/index.js');
 
 
 
 exports.HTable = Table.default;
 exports.useHTable = useHTable.default;
 exports.HTableConfig = TableConfig.default;
-exports.TestProTable = index.default;
 // powered by h

package/lib/modal.d.ts

@@ -6,6 +6,7 @@ import type React from "react";
 export interface RowObj {
     keys?: React.Key[];
     rowData?: any[];
+    selectAll?: boolean;
 }
 export interface ResultModal {
     records: any[];
@@ -25,7 +26,7 @@ interface HColumns extends Omit<ProColumns, "render"> {
 }
 export type ConfigItemModal = Omit<HItemProps, "render" | "type"> & HColumns;
 export type ConfigDataModal = ConfigItemModal[];
-export type ActionRenderFn = (allCheck: boolean, selectedRowKeys: RowObj, tableInstance: HTableInstance) => React.ReactNode;
+export type ActionRenderFn = (selectedRowKeys: RowObj, tableInstance: HTableInstance) => React.ReactNode;
 type actionFn = (...arg: any[]) => void;
 type FooterRenderFn = (tableInstance: HTableInstance, selectedRowData: RowObj, data?: ResultModal) => React.ReactNode;
 export interface HTableProps extends Omit<ProTableProps<any, any>, "request"> {

package/package.json

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

package/src/components/HTableBody/index.tsx

@@ -22,7 +22,6 @@ const defaultRender = () => {
   return <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />;
 };
 export default ({
-  loading,
   configData,
   pagination = {},
   onPageChange,
@@ -35,7 +34,7 @@ export default ({
 }: HTableBodyProps) => {
   // @ts-ignore
   const { selectedRowKeys, onChange } = rowSelection;
-  const { tableInstance, data, selectedRowData, rowOnChange, error } =
+  const { tableInstance, data, selectedRowData, rowOnChange, error, loading } =
     useHTableContext();
   const {
     emptyRender: tableEmptyRender = defaultRender,
@@ -80,13 +79,17 @@ export default ({
             const { pageSize: ps, current: pn } = paginationData;
             onPageChange?.({ size: ps, current: pn });
           }}
-          pagination={pagination===false?pagination:{
-            current: Number.parseInt(current || "1", 10),
-            total: Number.parseInt(total || "0", 10),
-            pageSize: Number.parseInt(size || "10", 10),
-            showQuickJumper: true,
-            ...pagination,
-          }}
+          pagination={
+            pagination === false
+              ? pagination
+              : {
+                  current: Number.parseInt(current || "1", 10),
+                  total: Number.parseInt(total || "0", 10),
+                  pageSize: Number.parseInt(size || "10", 10),
+                  showQuickJumper: true,
+                  ...pagination,
+                }
+          }
         />
       </ConfigProvider>
     </div>

package/src/components/HTableFooter/index.tsx

@@ -2,7 +2,7 @@ import { Card, Affix, Row, Space, Button } from "antd";
 import { Typography } from "antd";
 import type { ActionRenderFn } from "../modal";
 import { useHTableContext } from "../context";
-import React, { useState } from "react";
+import React, { useEffect, useState } from "react";
 import type { HTableInstance, ResultModal, RowObj } from "../modal";
 
 const { Text, Link } = Typography;
@@ -16,12 +16,18 @@ interface IFooterProps {
   footerStyle?: React.CSSProperties;
 }
 export default ({ actionRender, footerRender, footerStyle }: IFooterProps) => {
-  const { data, selectedRowData, tableInstance, error } = useHTableContext();
-  const [allCheck, setAllCheck] = useState<boolean>(false);
+  const {
+    data,
+    selectedRowData = {},
+    allSelectChange,
+    tableInstance,
+    error,
+  } = useHTableContext();
   const { total = "0" } = data || {};
   const totalNum = Number.parseInt(total, 10);
   const showTotalNum = Number.isNaN(totalNum) ? 0 : totalNum;
-  const num = allCheck ? showTotalNum : 0;
+  const { keys = [], selectAll = false } = selectedRowData;
+  const num = selectAll ? showTotalNum : keys.length;
   if (footerRender) {
     return <>{footerRender(tableInstance, selectedRowData, data)}</>;
   }
@@ -38,18 +44,16 @@ export default ({ actionRender, footerRender, footerStyle }: IFooterProps) => {
             ghost
             disabled={showTotalNum == 0}
             style={{ padding: "4px 24px", borderRadius: "4px" }}
-            onClick={() => {
-              setAllCheck(!allCheck);
-            }}
+            onClick={allSelectChange}
           >
-            {!allCheck ? "选择全部" : "取消选择"}
+            {!selectAll ? "选择全部" : "取消选择"}
           </Button>
           <Text type={"secondary"}>共{total}条</Text>
           <Text type={"secondary"}>
             已选择<Link>{num}</Link>条
           </Text>
         </Space>
-        {actionRender?.(allCheck, selectedRowData, tableInstance)}
+        {actionRender?.(selectedRowData, tableInstance)}
       </Row>
     </Card>
   );

package/src/components/HTableHeader/index.tsx

@@ -19,10 +19,9 @@ export default ({
   configData,
   onFinish,
   searchSpan = { span: 6 },
-  loading,
   headerStyle,
 }: IHeaderProps) => {
-  const { tableInstance } = useHTableContext();
+  const { tableInstance, loading } = useHTableContext();
   const { form } = tableInstance;
 
   const nConfigData: HItemProps[] = useMemo(

package/src/components/HTableHeader/utils.ts

@@ -6,7 +6,7 @@ const defaultSubItem = {
   itemProps: {
     extraList: ["submit", "reset"],
     style: { padding: "4px 24px", borderRadius: "4px" },
-    text:"查询"
+    text: "查询",
   },
 };
 

package/src/components/Table.tsx

@@ -39,7 +39,7 @@ export default ({
     const fn = action[key];
     fn?.(params);
   };
-  const { selectedRowData, rowOnChange } = useRowObj();
+  const { selectedRowData, rowOnChange, allSelectChange } = useRowObj();
   const tableInstance = useCurrentTable({
     table,
     reload: (params) => {
@@ -57,6 +57,8 @@ export default ({
         rowOnChange,
         data,
         error,
+        loading,
+        allSelectChange,
       }}
     >
       <Space
@@ -69,13 +71,11 @@ export default ({
           <Header
             configData={configData}
             onFinish={run}
-            loading={loading}
             searchSpan={searchSpan}
             headerStyle={headerStyle}
           />
         )}
         <Body
-          loading={loading}
           configData={configData}
           tableStyle={tableStyle}
           onPageChange={(page) => {

package/src/components/context.ts

@@ -7,6 +7,8 @@ interface HContextModal {
   selectedRowData: RowObj;
   rowOnChange: (keys: React.Key[], rowData: any[]) => void;
   error?: Error;
+  loading?: boolean;
+  allSelectChange?: VoidFunction;
 }
 
 export const HTableContext = React.createContext<HContextModal | null>(null);

package/src/components/hooks/useRowObj.ts

@@ -4,14 +4,21 @@ import type { RowObj } from "../modal";
 
 export default () => {
   const [selectedRowData, setSelectedRowData] = useState<RowObj>({});
+  const { selectAll = false } = selectedRowData;
   const rowOnChange = (keys: React.Key[], rowData: any[]) => {
     setSelectedRowData({
       keys,
       rowData,
     });
   };
+  const allSelectChange = () => {
+    setSelectedRowData({
+      selectAll: !selectAll,
+    });
+  };
   return {
     rowOnChange,
     selectedRowData,
+    allSelectChange,
   };
 };

package/src/components/index.tsx

@@ -1,5 +1,3 @@
 export { default as HTable } from "./Table";
 export { default as useHTable } from "./hooks/useHTable";
 export { default as HTableConfig } from "./TableConfig";
-export { default as TestProTable } from "./TestProTable";
-

package/src/components/modal.ts

@@ -10,6 +10,7 @@ import type React from "react";
 export interface RowObj {
   keys?: React.Key[];
   rowData?: any[];
+  selectAll?: boolean;
 }
 export interface ResultModal {
   records: any[];
@@ -35,7 +36,6 @@ interface HColumns extends Omit<ProColumns, "render"> {
 export type ConfigItemModal = Omit<HItemProps, "render" | "type"> & HColumns;
 export type ConfigDataModal = ConfigItemModal[];
 export type ActionRenderFn = (
-  allCheck: boolean,
   selectedRowKeys: RowObj,
   tableInstance: HTableInstance
 ) => React.ReactNode;

package/src/pages/Test/index.tsx

@@ -1,7 +1,5 @@
 import { HTable, useHTable } from "../../components";
 import { Button } from "antd";
-import Body from "../../components/HTableBody";
-import {HTableContext} from "../../components/context";
 const configData = [
   {
     title: "座位",
@@ -27,47 +25,39 @@ export default () => {
       >
         点我
       </div>
-      <HTableContext.Provider value={{
-        tableInstance:hTable,
-        selectedRowData:{},
-        rowOnChange:()=>{},
-        error:new Error("错误")
-      }}>
-        <Body configData={[{title:"sss"}]} onPageChange={()=>{}}/>
-      </HTableContext.Provider>
-      {/*<HTable*/}
-      {/*  configData={configData}*/}
-      {/*  rowKey={"id"}*/}
-      {/*  headerStyle={{ borderRadius: 0 }}*/}
-      {/*  tableStyle={{ borderRadius: 0, background: "#fff" }}*/}
-      {/*  spaceSize={0}*/}
-      {/*  pagination={false}*/}
-      {/*  footerStyle={{ marginTop: 20 }}*/}
-      {/*  table={hTable}*/}
-      {/*  actionRender={(allCheck, selectedRowKeys, xjTable) => {*/}
-      {/*    console.log(allCheck, selectedRowKeys, xjTable);*/}
-      {/*    return <Button>点我</Button>;*/}
-      {/*  }}*/}
-      {/*  request={(a) => {*/}
-      {/*    console.log(a);*/}
-      {/*    return new Promise((resolve, reject) => {*/}
-      {/*      setTimeout(() => {*/}
-      {/*        // reject(new Error("错误"));*/}
-      {/*        resolve({*/}
-      {/*          size: "10",*/}
-      {/*          current: "1",*/}
-      {/*          total: "100",*/}
-      {/*          records: [*/}
-      {/*            {*/}
-      {/*              id: 1,*/}
-      {/*              name: "111",*/}
-      {/*            },*/}
-      {/*          ],*/}
-      {/*        });*/}
-      {/*      }, 2000);*/}
-      {/*    });*/}
-      {/*  }}*/}
-      {/*/>*/}
+      <HTable
+        configData={configData}
+        rowKey={"id"}
+        headerStyle={{ borderRadius: 0 }}
+        tableStyle={{ borderRadius: 0, background: "#fff" }}
+        spaceSize={0}
+        pagination={false}
+        footerStyle={{ marginTop: 20 }}
+        table={hTable}
+        actionRender={(allCheck, selectedRowKeys, xjTable) => {
+          console.log(allCheck, selectedRowKeys, xjTable);
+          return <Button>点我</Button>;
+        }}
+        request={(a) => {
+          console.log(a);
+          return new Promise((resolve, reject) => {
+            setTimeout(() => {
+              // reject(new Error("错误"));
+              resolve({
+                size: "10",
+                current: "1",
+                total: "100",
+                records: [
+                  {
+                    id: 1,
+                    name: "111",
+                  },
+                ],
+              });
+            }, 2000);
+          });
+        }}
+      />
     </>
   );
 };

package/es/TestProTable/index.d.ts

@@ -1,2 +0,0 @@
-declare const _default: () => JSX.Element;
-export default _default;

package/es/TestProTable/index.js

@@ -1,14 +0,0 @@
-// welcome to hoo hoo hoo
-import { jsx } from 'react/jsx-runtime';
-import ProTable from '@ant-design/pro-table';
-
-var index = (function () {
-  return jsx(ProTable, {
-    columns: [],
-    tableAlertRender: false,
-    search: false
-  });
-});
-
-export { index as default };
-// powered by hdj

package/lib/TestProTable/index.d.ts

@@ -1,2 +0,0 @@
-declare const _default: () => JSX.Element;
-export default _default;

package/lib/TestProTable/index.js

@@ -1,17 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var jsxRuntime = require('react/jsx-runtime');
-var ProTable = require('@ant-design/pro-table');
-
-var index = (function () {
-  return jsxRuntime.jsx(ProTable, {
-    columns: [],
-    tableAlertRender: false,
-    search: false
-  });
-});
-
-exports.default = index;
-// powered by h

package/src/components/TestProTable/index.tsx

@@ -1,10 +0,0 @@
-import ProTable from "@ant-design/pro-table";
-import React from "react";
-
-export default ()=>{
-  return  <ProTable
-      columns={[]}
-      tableAlertRender={false}
-      search={false}
-  />
-}