@hw-component/table 0.0.1-beta-v4 → 0.0.1-beta-v6

package/es/Footer/index.js

@@ -1,5 +1,7 @@
 // welcome to hoo hoo hoo
 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 { jsx, Fragment, jsxs } from 'react/jsx-runtime';
 import { Typography, Card, Row, Space, Button, Affix } from 'antd';
 import { useHTableContext } from '../context.js';
@@ -14,13 +16,17 @@ var Footer = (function (_ref) {
     data = _useHTableContext.data,
     selectedRowData = _useHTableContext.selectedRowData,
     tableInstance = _useHTableContext.tableInstance;
+    _useHTableContext.error;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     allCheck = _useState2[0],
     setAllCheck = _useState2[1];
   var _ref2 = data || {},
-    total = _ref2.total;
-  var num = allCheck ? total : 0;
+    _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;
   if (footerRender) {
     return jsx(Fragment, {
       children: footerRender(tableInstance, selectedRowData, data)
@@ -38,6 +44,7 @@ var Footer = (function (_ref) {
         children: [jsx(Button, {
           type: "primary",
           ghost: true,
+          disabled: num == 0,
           style: {
             padding: "4px 24px",
             borderRadius: "4px"

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,7 +12,8 @@ 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(),
     tableInstance = _useHTableContext.tableInstance;
   var form = tableInstance.form;
@@ -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.js

@@ -61,8 +61,9 @@ var Table = (function (_ref) {
     rowOnChange = _useRowObj.rowOnChange;
   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
   });
@@ -83,6 +84,7 @@ var Table = (function (_ref) {
       children: [!hideHeader && jsx(Header, {
         configData: configData,
         onFinish: run,
+        loading: loading,
         searchSpan: searchSpan
       }), jsx(Body, _objectSpread({
         loading: loading,

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

@@ -39,7 +39,7 @@ export interface HTableProps extends Omit<ProTableProps<any, any>, "request"> {
     hideHeader?: boolean;
 }
 export interface TableInstance {
-    reload: (params: ParamsModal) => void;
+    reload: (params?: ParamsModal) => void;
     setSelectedRowData: (keys: React.Key[], data: any) => void;
 }
 export interface HTableInstance {

package/lib/Footer/index.js

@@ -3,6 +3,8 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 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 jsxRuntime = require('react/jsx-runtime');
 var antd = require('antd');
 var context = require('../context.js');
@@ -17,13 +19,17 @@ var Footer = (function (_ref) {
     data = _useHTableContext.data,
     selectedRowData = _useHTableContext.selectedRowData,
     tableInstance = _useHTableContext.tableInstance;
+    _useHTableContext.error;
   var _useState = React.useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     allCheck = _useState2[0],
     setAllCheck = _useState2[1];
   var _ref2 = data || {},
-    total = _ref2.total;
-  var num = allCheck ? total : 0;
+    _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;
   if (footerRender) {
     return jsxRuntime.jsx(jsxRuntime.Fragment, {
       children: footerRender(tableInstance, selectedRowData, data)
@@ -41,6 +47,7 @@ var Footer = (function (_ref) {
         children: [jsxRuntime.jsx(antd.Button, {
           type: "primary",
           ghost: true,
+          disabled: num == 0,
           style: {
             padding: "4px 24px",
             borderRadius: "4px"

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,7 +15,8 @@ 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(),
     tableInstance = _useHTableContext.tableInstance;
   var form$1 = tableInstance.form;
@@ -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.js

@@ -64,8 +64,9 @@ var Table = (function (_ref) {
     rowOnChange = _useRowObj.rowOnChange;
   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
   });
@@ -86,6 +87,7 @@ var Table = (function (_ref) {
       children: [!hideHeader && jsxRuntime.jsx(index.default, {
         configData: configData,
         onFinish: run,
+        loading: loading,
         searchSpan: searchSpan
       }), jsxRuntime.jsx(index$1.default, _objectSpread({
         loading: loading,

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

@@ -39,7 +39,7 @@ export interface HTableProps extends Omit<ProTableProps<any, any>, "request"> {
     hideHeader?: boolean;
 }
 export interface TableInstance {
-    reload: (params: ParamsModal) => void;
+    reload: (params?: ParamsModal) => void;
     setSelectedRowData: (keys: React.Key[], data: any) => void;
 }
 export interface HTableInstance {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hw-component/table",
-  "version": "0.0.1-beta-v4",
+  "version": "0.0.1-beta-v6",
   "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/Footer/index.tsx

@@ -15,10 +15,12 @@ interface IFooterProps {
   ) => React.ReactNode;
 }
 export default ({ actionRender, footerRender }: IFooterProps) => {
-  const { data, selectedRowData, tableInstance } = useHTableContext();
+  const { data, selectedRowData, tableInstance,error } = useHTableContext();
   const [allCheck, setAllCheck] = useState<boolean>(false);
-  const { total } = data || {};
-  const num = allCheck ? total : 0;
+  const { total="0" } = data || {};
+  const totalNum=Number.parseInt(total,10);
+  const showTotalNum=Number.isNaN(totalNum)?0:totalNum;
+  const num = allCheck ? showTotalNum:0;
   if (footerRender) {
     return <>{footerRender(tableInstance, selectedRowData, data)}</>;
   }
@@ -29,6 +31,7 @@ export default ({ actionRender, footerRender }: IFooterProps) => {
           <Button
             type={"primary"}
             ghost
+            disabled={num==0}
             style={{ padding: "4px 24px", borderRadius: "4px" }}
             onClick={() => {
               setAllCheck(!allCheck);

package/src/components/Header/index.tsx

@@ -11,12 +11,14 @@ 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 { tableInstance } = useHTableContext();
   const { form } = tableInstance;
@@ -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

@@ -32,8 +32,9 @@ export default ({
   const { selectedRowData, rowOnChange } = useRowObj();
   const tableInstance = useCurrentTable({
     table,
-    reload: () => {
-      run({ ...saveParams.params });
+    reload: (params) => {
+      const reqParams = params || saveParams.params;
+      run({ ...reqParams });
     },
     changeRowData: rowOnChange,
   });
@@ -52,6 +53,7 @@ export default ({
           <Header
             configData={configData}
             onFinish={run}
+            loading={loading}
             searchSpan={searchSpan}
           />
         )}

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

@@ -59,7 +59,7 @@ export interface HTableProps extends Omit<ProTableProps<any, any>, "request"> {
   hideHeader?: boolean;
 }
 export interface TableInstance {
-  reload: (params: ParamsModal) => void;
+  reload: (params?: ParamsModal) => void;
   setSelectedRowData: (keys: React.Key[], data: any) => void;
 }
 export interface HTableInstance {

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,45 +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"}
-        hideHeader={true}
-        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={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>
+    </>
   );
 };