@hw-component/table 0.0.1-beta-v7 → 0.0.1-beta-v8

package/es/Footer/index.js

@@ -44,7 +44,7 @@ var Footer = (function (_ref) {
         children: [jsx(Button, {
           type: "primary",
           ghost: true,
-          disabled: num == 0,
+          disabled: showTotalNum == 0,
           style: {
             padding: "4px 24px",
             borderRadius: "4px"

package/es/Table.d.ts

@@ -1,3 +1,3 @@
 import type { HTableProps } from "./modal";
-declare const _default: ({ request, configData, searchSpan, table, actionRender, footerRender, hideHeader, ...props }: HTableProps) => JSX.Element;
+declare const _default: ({ request, configData, searchSpan, table, actionRender, footerRender, hideHeader, action, ...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", "hideHeader"],
+var _excluded = ["request", "configData", "searchSpan", "table", "actionRender", "footerRender", "hideHeader", "action"],
   _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; }
@@ -32,6 +32,8 @@ var Table = (function (_ref) {
     actionRender = _ref.actionRender,
     footerRender = _ref.footerRender,
     hideHeader = _ref.hideHeader,
+    _ref$action = _ref.action,
+    action = _ref$action === void 0 ? {} : _ref$action,
     props = _objectWithoutProperties(_ref, _excluded);
   var saveParams = useMemo(function () {
     return {
@@ -56,6 +58,10 @@ var Table = (function (_ref) {
     loading = _useRequest.loading,
     data = _useRequest.data,
     error = _useRequest.error;
+  var dispatch = function dispatch(key, params) {
+    var fn = action[key];
+    fn === null || fn === void 0 || fn(params);
+  };
   var _useRowObj = useRowObj(),
     selectedRowData = _useRowObj.selectedRowData,
     rowOnChange = _useRowObj.rowOnChange;
@@ -65,7 +71,8 @@ var Table = (function (_ref) {
       var reqParams = params || saveParams.params;
       run(_objectSpread({}, reqParams));
     },
-    changeRowData: rowOnChange
+    changeRowData: rowOnChange,
+    dispatch: dispatch
   });
   return jsx(HTableContext.Provider, {
     value: {

package/es/hooks/useCurrentTable.d.ts

@@ -4,6 +4,7 @@ interface currentTableParams {
     table?: HTableInstance;
     reload: (params?: ParamsModal) => void;
     changeRowData: (keys: React.Key[], data: any) => void;
+    dispatch: (key: string, params: any) => void;
 }
-declare const _default: ({ table, reload, changeRowData }: currentTableParams) => HTableInstance;
+declare const _default: ({ table, reload, changeRowData, dispatch, }: currentTableParams) => HTableInstance;
 export default _default;

package/es/hooks/useCurrentTable.js

@@ -5,12 +5,14 @@ import useHTable from './useHTable.js';
 var useCurrentTable = (function (_ref) {
   var table = _ref.table,
     reload = _ref.reload,
-    changeRowData = _ref.changeRowData;
+    changeRowData = _ref.changeRowData,
+    dispatch = _ref.dispatch;
   var useCurrentTable = useHTable();
   return useMemo(function () {
     var resultTable = table || useCurrentTable;
     resultTable.table.reload = reload;
     resultTable.table.setSelectedRowData = changeRowData;
+    resultTable.table.dispatch = dispatch;
     return resultTable;
   }, [table]);
 });

package/es/hooks/useHTable.d.ts

@@ -4,6 +4,7 @@ declare const _default: () => {
     table: {
         reload: (params?: ParamsModal) => ParamsModal | undefined;
         setSelectedRowData: () => void;
+        dispatch: () => void;
     };
 };
 export default _default;

package/es/hooks/useHTable.js

@@ -9,7 +9,8 @@ var useHTable = (function () {
       reload: function reload(params) {
         return params;
       },
-      setSelectedRowData: function setSelectedRowData() {}
+      setSelectedRowData: function setSelectedRowData() {},
+      dispatch: function dispatch() {}
     };
   }, []);
   return {

package/es/modal.d.ts

@@ -26,6 +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;
+type actionFn = (...arg: any[]) => void;
 type FooterRenderFn = (tableInstance: HTableInstance, selectedRowData: RowObj, data?: ResultModal) => React.ReactNode;
 export interface HTableProps extends Omit<ProTableProps<any, any>, "request"> {
     request: (params: ParamsModal) => Promise<ResultModal>;
@@ -37,10 +38,12 @@ export interface HTableProps extends Omit<ProTableProps<any, any>, "request"> {
     errorRender?: (tableInstance: HTableInstance, error: Error) => React.ReactNode;
     footerRender?: FooterRenderFn | false;
     hideHeader?: boolean;
+    action?: Record<string, actionFn>;
 }
 export interface TableInstance {
     reload: (params?: ParamsModal) => void;
     setSelectedRowData: (keys: React.Key[], data: any) => void;
+    dispatch: (key: string, params: any) => void;
 }
 export interface HTableInstance {
     form: HFormInstance;

package/lib/Footer/index.js

@@ -47,7 +47,7 @@ var Footer = (function (_ref) {
         children: [jsxRuntime.jsx(antd.Button, {
           type: "primary",
           ghost: true,
-          disabled: num == 0,
+          disabled: showTotalNum == 0,
           style: {
             padding: "4px 24px",
             borderRadius: "4px"

package/lib/Table.d.ts

@@ -1,3 +1,3 @@
 import type { HTableProps } from "./modal";
-declare const _default: ({ request, configData, searchSpan, table, actionRender, footerRender, hideHeader, ...props }: HTableProps) => JSX.Element;
+declare const _default: ({ request, configData, searchSpan, table, actionRender, footerRender, hideHeader, action, ...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", "hideHeader"],
+var _excluded = ["request", "configData", "searchSpan", "table", "actionRender", "footerRender", "hideHeader", "action"],
   _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; }
@@ -35,6 +35,8 @@ var Table = (function (_ref) {
     actionRender = _ref.actionRender,
     footerRender = _ref.footerRender,
     hideHeader = _ref.hideHeader,
+    _ref$action = _ref.action,
+    action = _ref$action === void 0 ? {} : _ref$action,
     props = _objectWithoutProperties(_ref, _excluded);
   var saveParams = React.useMemo(function () {
     return {
@@ -59,6 +61,10 @@ var Table = (function (_ref) {
     loading = _useRequest.loading,
     data = _useRequest.data,
     error = _useRequest.error;
+  var dispatch = function dispatch(key, params) {
+    var fn = action[key];
+    fn === null || fn === void 0 || fn(params);
+  };
   var _useRowObj = useRowObj.default(),
     selectedRowData = _useRowObj.selectedRowData,
     rowOnChange = _useRowObj.rowOnChange;
@@ -68,7 +74,8 @@ var Table = (function (_ref) {
       var reqParams = params || saveParams.params;
       run(_objectSpread({}, reqParams));
     },
-    changeRowData: rowOnChange
+    changeRowData: rowOnChange,
+    dispatch: dispatch
   });
   return jsxRuntime.jsx(context.HTableContext.Provider, {
     value: {

package/lib/hooks/useCurrentTable.d.ts

@@ -4,6 +4,7 @@ interface currentTableParams {
     table?: HTableInstance;
     reload: (params?: ParamsModal) => void;
     changeRowData: (keys: React.Key[], data: any) => void;
+    dispatch: (key: string, params: any) => void;
 }
-declare const _default: ({ table, reload, changeRowData }: currentTableParams) => HTableInstance;
+declare const _default: ({ table, reload, changeRowData, dispatch, }: currentTableParams) => HTableInstance;
 export default _default;

package/lib/hooks/useCurrentTable.js

@@ -8,12 +8,14 @@ var useHTable = require('./useHTable.js');
 var useCurrentTable = (function (_ref) {
   var table = _ref.table,
     reload = _ref.reload,
-    changeRowData = _ref.changeRowData;
+    changeRowData = _ref.changeRowData,
+    dispatch = _ref.dispatch;
   var useCurrentTable = useHTable.default();
   return React.useMemo(function () {
     var resultTable = table || useCurrentTable;
     resultTable.table.reload = reload;
     resultTable.table.setSelectedRowData = changeRowData;
+    resultTable.table.dispatch = dispatch;
     return resultTable;
   }, [table]);
 });

package/lib/hooks/useHTable.d.ts

@@ -4,6 +4,7 @@ declare const _default: () => {
     table: {
         reload: (params?: ParamsModal) => ParamsModal | undefined;
         setSelectedRowData: () => void;
+        dispatch: () => void;
     };
 };
 export default _default;

package/lib/hooks/useHTable.js

@@ -12,7 +12,8 @@ var useHTable = (function () {
       reload: function reload(params) {
         return params;
       },
-      setSelectedRowData: function setSelectedRowData() {}
+      setSelectedRowData: function setSelectedRowData() {},
+      dispatch: function dispatch() {}
     };
   }, []);
   return {

package/lib/modal.d.ts

@@ -26,6 +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;
+type actionFn = (...arg: any[]) => void;
 type FooterRenderFn = (tableInstance: HTableInstance, selectedRowData: RowObj, data?: ResultModal) => React.ReactNode;
 export interface HTableProps extends Omit<ProTableProps<any, any>, "request"> {
     request: (params: ParamsModal) => Promise<ResultModal>;
@@ -37,10 +38,12 @@ export interface HTableProps extends Omit<ProTableProps<any, any>, "request"> {
     errorRender?: (tableInstance: HTableInstance, error: Error) => React.ReactNode;
     footerRender?: FooterRenderFn | false;
     hideHeader?: boolean;
+    action?: Record<string, actionFn>;
 }
 export interface TableInstance {
     reload: (params?: ParamsModal) => void;
     setSelectedRowData: (keys: React.Key[], data: any) => void;
+    dispatch: (key: string, params: any) => void;
 }
 export interface HTableInstance {
     form: HFormInstance;

package/package.json

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

package/src/components/Footer/index.tsx

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

package/src/components/Table.tsx

@@ -16,6 +16,7 @@ export default ({
   actionRender,
   footerRender,
   hideHeader,
+  action = {},
   ...props
 }: HTableProps) => {
   const saveParams = useMemo(() => {
@@ -29,6 +30,10 @@ export default ({
     saveParams.params = reqParams;
     return request(reqParams);
   });
+  const dispatch = (key: string, params: any) => {
+    const fn = action[key];
+    fn?.(params);
+  };
   const { selectedRowData, rowOnChange } = useRowObj();
   const tableInstance = useCurrentTable({
     table,
@@ -37,6 +42,7 @@ export default ({
       run({ ...reqParams });
     },
     changeRowData: rowOnChange,
+    dispatch,
   });
   return (
     <HTableContext.Provider

package/src/components/hooks/useCurrentTable.ts

@@ -7,13 +7,20 @@ interface currentTableParams {
   table?: HTableInstance;
   reload: (params?: ParamsModal) => void;
   changeRowData: (keys: React.Key[], data: any) => void;
+  dispatch: (key: string, params: any) => void;
 }
-export default ({ table, reload, changeRowData }: currentTableParams) => {
+export default ({
+  table,
+  reload,
+  changeRowData,
+  dispatch,
+}: currentTableParams) => {
   const useCurrentTable = useHTable();
   return useMemo(() => {
     const resultTable = table || useCurrentTable;
     resultTable.table.reload = reload;
     resultTable.table.setSelectedRowData = changeRowData;
+    resultTable.table.dispatch = dispatch;
     return resultTable;
   }, [table]);
 };

package/src/components/hooks/useHTable.tsx

@@ -10,6 +10,7 @@ export default () => {
         return params;
       },
       setSelectedRowData: () => {},
+      dispatch: () => {},
     };
   }, []);
   return {

package/src/components/modal.ts

@@ -39,6 +39,7 @@ export type ActionRenderFn = (
   selectedRowKeys: RowObj,
   tableInstance: HTableInstance
 ) => React.ReactNode;
+type actionFn = (...arg) => void;
 type FooterRenderFn = (
   tableInstance: HTableInstance,
   selectedRowData: RowObj,
@@ -57,10 +58,12 @@ export interface HTableProps extends Omit<ProTableProps<any, any>, "request"> {
   ) => React.ReactNode;
   footerRender?: FooterRenderFn | false;
   hideHeader?: boolean;
+  action?: Record<string, actionFn>;
 }
 export interface TableInstance {
   reload: (params?: ParamsModal) => void;
   setSelectedRowData: (keys: React.Key[], data: any) => void;
+  dispatch: (key: string, params: any) => void;
 }
 export interface HTableInstance {
   form: HFormInstance;

package/src/pages/Test/index.tsx

@@ -23,7 +23,6 @@ export default () => {
           hTable.table.reload();
         }}
       >
-        {" "}
         点我
       </div>
       <HTable
@@ -34,23 +33,22 @@ export default () => {
           console.log(allCheck, selectedRowKeys, xjTable);
           return <Button>点我</Button>;
         }}
-        footerRender={false}
         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",
-              //     },
-              //   ],
-              // });
+              // reject(new Error("错误"));
+              resolve({
+                size: "10",
+                current: "1",
+                total: "100",
+                records: [
+                  {
+                    id: 1,
+                    name: "111",
+                  },
+                ],
+              });
             }, 2000);
           });
         }}