@hw-component/table 1.10.15 → 1.10.16

package/es/EditTable/hooks.d.ts

@@ -2,12 +2,21 @@ import { HEditTableProps } from "./modal";
 import { MutableRefObject } from "react";
 import type { ActionType } from "@ant-design/pro-table";
 import { EditableFormInstance } from "@ant-design/pro-table/lib/components/EditableTable";
-export declare const useListRequest: ({ request, dataSource, manual, }: HEditTableProps) => import("@ahooksjs/use-request/lib/types").BaseResult<any, [params?: any]>;
+import { ResultModal } from "../modal";
+export declare const useListRequest: ({ request, dataSource, manual, }: HEditTableProps) => {
+    loading: boolean;
+    error: Error | undefined;
+    run: (params?: any) => Promise<void>;
+    data: ResultModal;
+};
 export declare const useCuRef: ({ actionRef, editableFormRef }: HEditTableProps) => {
     cuActionRef: MutableRefObject<ActionType>;
     cuEditableFormRef: MutableRefObject<EditableFormInstance>;
 };
-export declare const useColsMk: ({ configData }: HEditTableProps) => (import("@ant-design/pro-table").ProColumnType<any, "text"> | {
+interface ColProps extends HEditTableProps {
+    reload: VoidFunction;
+}
+export declare const useColsMk: ({ configData, reload }: ColProps) => (import("@ant-design/pro-table").ProColumnType<any, "text"> | {
     render: (dom: any, entity: any, index: any, action: any, schema: any) => any;
     children: import("@ant-design/pro-table").ProColumns<any, "text">[];
     key?: import("react").Key | undefined;
@@ -1555,3 +1564,4 @@ export declare const useColsMk: ({ configData }: HEditTableProps) => (import("@a
     } | undefined) | undefined;
     fieldProps?: any;
 })[] | undefined;
+export {};

package/es/EditTable/hooks.js

@@ -9,11 +9,12 @@ import _Object$defineProperties from '@babel/runtime-corejs3/core-js-stable/obje
 import _Object$defineProperty from '@babel/runtime-corejs3/core-js-stable/object/define-property';
 import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
 import _asyncToGenerator from '@babel/runtime-corejs3/helpers/asyncToGenerator';
+import _slicedToArray from '@babel/runtime-corejs3/helpers/slicedToArray';
 import _regeneratorRuntime from '@babel/runtime-corejs3/regenerator';
 import _Array$isArray from '@babel/runtime-corejs3/core-js-stable/array/is-array';
 import _mapInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/map';
 import { useRequest } from 'ahooks';
-import { useMemo, useRef } from 'react';
+import { useState, useMemo, useEffect, useRef } from 'react';
 import config from '../render/config.js';
 
 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; }
@@ -22,7 +23,15 @@ var useListRequest = function useListRequest(_ref) {
   var request = _ref.request,
     dataSource = _ref.dataSource,
     manual = _ref.manual;
-  var relManual = request ? manual : false;
+  var _useState = useState({
+      records: [],
+      total: "0",
+      size: "10",
+      current: "1"
+    }),
+    _useState2 = _slicedToArray(_useState, 2),
+    tableDataSource = _useState2[0],
+    setTableDataSource = _useState2[1];
   var saveParams = useMemo(function () {
     return {
       params: {
@@ -31,38 +40,60 @@ var useListRequest = function useListRequest(_ref) {
       }
     };
   }, []);
-  return useRequest( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-    var params,
-      newParams,
-      _args = arguments;
-    return _regeneratorRuntime.wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          params = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
-          newParams = _objectSpread(_objectSpread({}, saveParams.params), params);
-          saveParams.params = newParams;
-          if (!request) {
-            _context.next = 5;
-            break;
-          }
-          return _context.abrupt("return", request(newParams));
-        case 5:
-          if (!_Array$isArray(dataSource)) {
-            _context.next = 7;
-            break;
-          }
-          return _context.abrupt("return", dataSource);
-        case 7:
-          return _context.abrupt("return", dataSource);
-        case 8:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee);
-  })), {
-    manual: relManual,
-    refreshDeps: [dataSource]
-  });
+  var _useRequest = useRequest( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+      var params,
+        newParams,
+        result,
+        _args = arguments;
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            params = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
+            newParams = _objectSpread(_objectSpread({}, saveParams.params), params);
+            saveParams.params = newParams;
+            if (!request) {
+              _context.next = 9;
+              break;
+            }
+            _context.next = 6;
+            return request(newParams);
+          case 6:
+            result = _context.sent;
+            setTableDataSource(result);
+            return _context.abrupt("return");
+          case 9:
+            if (!_Array$isArray(dataSource)) {
+              _context.next = 12;
+              break;
+            }
+            setTableDataSource(_objectSpread(_objectSpread({}, tableDataSource), {}, {
+              records: dataSource
+            }));
+            return _context.abrupt("return");
+          case 12:
+            return _context.abrupt("return", setTableDataSource(dataSource || tableDataSource));
+          case 13:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    })), {
+      manual: true
+    }),
+    loading = _useRequest.loading,
+    error = _useRequest.error,
+    run = _useRequest.run;
+  useEffect(function () {
+    if (!manual) {
+      run();
+    }
+  }, [dataSource]);
+  return {
+    loading: loading,
+    error: error,
+    run: run,
+    data: tableDataSource
+  };
 };
 var useCuRef = function useCuRef(_ref3) {
   var actionRef = _ref3.actionRef,
@@ -77,23 +108,35 @@ var useCuRef = function useCuRef(_ref3) {
   };
 };
 var useColsMk = function useColsMk(_ref4) {
-  var configData = _ref4.configData;
+  var configData = _ref4.configData,
+    reload = _ref4.reload;
   return configData === null || configData === void 0 ? void 0 : _mapInstanceProperty(configData).call(configData, function (item) {
     var valueType = item.valueType,
       _render = item.render;
     var configType = valueType;
-    if (!config[configType]) {
-      return item;
+    if (config[configType]) {
+      return _objectSpread(_objectSpread({}, item), {}, {
+        render: function render(dom, entity, index, action, schema) {
+          var node = config[configType](item, entity, index);
+          if (_render) {
+            return _render(node, entity, index, _objectSpread(_objectSpread({}, action), {}, {
+              reload: reload
+            }), schema);
+          }
+          return node;
+        }
+      });
     }
-    return _objectSpread(_objectSpread({}, item), {}, {
-      render: function render(dom, entity, index, action, schema) {
-        var node = config[configType](item, entity, index);
-        if (_render) {
-          return _render(node, entity, index, action, schema);
+    if (_render) {
+      return _objectSpread(_objectSpread({}, item), {}, {
+        render: function render(dom, entity, index, action, schema) {
+          return _render(dom, entity, index, _objectSpread(_objectSpread({}, action), {}, {
+            reload: reload
+          }), schema);
         }
-        return node;
-      }
-    });
+      });
+    }
+    return item;
   });
 };
 

package/es/EditTable/index.js

@@ -1,9 +1,4 @@
 // welcome to hoo hoo hoo
-import _asyncToGenerator from '@babel/runtime-corejs3/helpers/asyncToGenerator';
-import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
-import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
-import _regeneratorRuntime from '@babel/runtime-corejs3/regenerator';
-import _Array$isArray from '@babel/runtime-corejs3/core-js-stable/array/is-array';
 import _Object$keys from '@babel/runtime-corejs3/core-js-stable/object/keys';
 import _Object$getOwnPropertySymbols from '@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols';
 import _filterInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/filter';
@@ -12,6 +7,10 @@ import _forEachInstanceProperty from '@babel/runtime-corejs3/core-js-stable/inst
 import _Object$getOwnPropertyDescriptors from '@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptors';
 import _Object$defineProperties from '@babel/runtime-corejs3/core-js-stable/object/define-properties';
 import _Object$defineProperty from '@babel/runtime-corejs3/core-js-stable/object/define-property';
+import _asyncToGenerator from '@babel/runtime-corejs3/helpers/asyncToGenerator';
+import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
+import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
+import _regeneratorRuntime from '@babel/runtime-corejs3/regenerator';
 import { jsxs, jsx } from 'react/jsx-runtime';
 import { EditableProTable } from '@ant-design/pro-table';
 import { useClassName } from '../hooks/index.js';
@@ -66,8 +65,6 @@ var EditTable = (function (_ref) {
     tableEmptyRender = _useHTableConfigConte2 === void 0 ? emptyDefaultRender : _useHTableConfigConte2,
     _useHTableConfigConte3 = _useHTableConfigConte.errorRender,
     tableErrorRender = _useHTableConfigConte3 === void 0 ? errorDefaultRender : _useHTableConfigConte3;
-  var isLocalData = _Array$isArray(data);
-  var values = isLocalData ? data : data === null || data === void 0 ? void 0 : data.records;
   var _useCuRef = useCuRef({
       actionRef: actionRef,
       editableFormRef: editableFormRef
@@ -75,7 +72,8 @@ var EditTable = (function (_ref) {
     cuActionRef = _useCuRef.cuActionRef,
     cuEditableFormRef = _useCuRef.cuEditableFormRef;
   var columns = useColsMk({
-    configData: configData
+    configData: configData,
+    reload: run
   });
   return jsxs("div", {
     className: tableBody,
@@ -94,10 +92,8 @@ var EditTable = (function (_ref) {
         loading: loading,
         rowKey: rowKey,
         editableFormRef: cuEditableFormRef,
-        manualRequest: true,
-        request: run,
         actionRef: cuActionRef,
-        value: values,
+        value: data === null || data === void 0 ? void 0 : data.records,
         recordCreatorProps: _objectSpread({
           position: "bottom",
           record: function record() {
@@ -169,8 +165,8 @@ var EditTable = (function (_ref) {
           }()
         }, editable)
       }, props))
-    }), jsx(HTablePagination, _objectSpread(_objectSpread({
-      data: isLocalData ? null : data
+    }), pagination === false ? null : jsx(HTablePagination, _objectSpread(_objectSpread({
+      data: data
     }, pagination), {}, {
       onChange: function onChange(page, pageSize) {
         run({

package/es/EditTable/modal.d.ts

@@ -9,7 +9,7 @@ export interface HEditTableProps<T = any> extends Omit<EditableProTableProps<T,
     recordCreatorProps?: Partial<EditableProTableProps<T, ParamsType>["recordCreatorProps"]>;
     dataSource?: any[];
     request?: (params: Record<string, any>) => Promise<T>;
-    pagination?: IPaginationProps;
+    pagination?: IPaginationProps | false;
     manual?: boolean;
     emptyRender?: EmptyPageRender;
     errorRender?: ErrorPageRender;

package/lib/EditTable/hooks.d.ts

@@ -2,12 +2,21 @@ import { HEditTableProps } from "./modal";
 import { MutableRefObject } from "react";
 import type { ActionType } from "@ant-design/pro-table";
 import { EditableFormInstance } from "@ant-design/pro-table/lib/components/EditableTable";
-export declare const useListRequest: ({ request, dataSource, manual, }: HEditTableProps) => import("@ahooksjs/use-request/lib/types").BaseResult<any, [params?: any]>;
+import { ResultModal } from "../modal";
+export declare const useListRequest: ({ request, dataSource, manual, }: HEditTableProps) => {
+    loading: boolean;
+    error: Error | undefined;
+    run: (params?: any) => Promise<void>;
+    data: ResultModal;
+};
 export declare const useCuRef: ({ actionRef, editableFormRef }: HEditTableProps) => {
     cuActionRef: MutableRefObject<ActionType>;
     cuEditableFormRef: MutableRefObject<EditableFormInstance>;
 };
-export declare const useColsMk: ({ configData }: HEditTableProps) => (import("@ant-design/pro-table").ProColumnType<any, "text"> | {
+interface ColProps extends HEditTableProps {
+    reload: VoidFunction;
+}
+export declare const useColsMk: ({ configData, reload }: ColProps) => (import("@ant-design/pro-table").ProColumnType<any, "text"> | {
     render: (dom: any, entity: any, index: any, action: any, schema: any) => any;
     children: import("@ant-design/pro-table").ProColumns<any, "text">[];
     key?: import("react").Key | undefined;
@@ -1555,3 +1564,4 @@ export declare const useColsMk: ({ configData }: HEditTableProps) => (import("@a
     } | undefined) | undefined;
     fieldProps?: any;
 })[] | undefined;
+export {};

package/lib/EditTable/hooks.js

@@ -10,6 +10,7 @@ var _Object$defineProperties = require('@babel/runtime-corejs3/core-js-stable/ob
 var _Object$defineProperty = require('@babel/runtime-corejs3/core-js-stable/object/define-property');
 var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
 var _asyncToGenerator = require('@babel/runtime-corejs3/helpers/asyncToGenerator');
+var _slicedToArray = require('@babel/runtime-corejs3/helpers/slicedToArray');
 var _regeneratorRuntime = require('@babel/runtime-corejs3/regenerator');
 var _Array$isArray = require('@babel/runtime-corejs3/core-js-stable/array/is-array');
 var _mapInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/map');
@@ -23,7 +24,15 @@ var useListRequest = function useListRequest(_ref) {
   var request = _ref.request,
     dataSource = _ref.dataSource,
     manual = _ref.manual;
-  var relManual = request ? manual : false;
+  var _useState = React.useState({
+      records: [],
+      total: "0",
+      size: "10",
+      current: "1"
+    }),
+    _useState2 = _slicedToArray(_useState, 2),
+    tableDataSource = _useState2[0],
+    setTableDataSource = _useState2[1];
   var saveParams = React.useMemo(function () {
     return {
       params: {
@@ -32,38 +41,60 @@ var useListRequest = function useListRequest(_ref) {
       }
     };
   }, []);
-  return ahooks.useRequest( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-    var params,
-      newParams,
-      _args = arguments;
-    return _regeneratorRuntime.wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          params = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
-          newParams = _objectSpread(_objectSpread({}, saveParams.params), params);
-          saveParams.params = newParams;
-          if (!request) {
-            _context.next = 5;
-            break;
-          }
-          return _context.abrupt("return", request(newParams));
-        case 5:
-          if (!_Array$isArray(dataSource)) {
-            _context.next = 7;
-            break;
-          }
-          return _context.abrupt("return", dataSource);
-        case 7:
-          return _context.abrupt("return", dataSource);
-        case 8:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee);
-  })), {
-    manual: relManual,
-    refreshDeps: [dataSource]
-  });
+  var _useRequest = ahooks.useRequest( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+      var params,
+        newParams,
+        result,
+        _args = arguments;
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            params = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
+            newParams = _objectSpread(_objectSpread({}, saveParams.params), params);
+            saveParams.params = newParams;
+            if (!request) {
+              _context.next = 9;
+              break;
+            }
+            _context.next = 6;
+            return request(newParams);
+          case 6:
+            result = _context.sent;
+            setTableDataSource(result);
+            return _context.abrupt("return");
+          case 9:
+            if (!_Array$isArray(dataSource)) {
+              _context.next = 12;
+              break;
+            }
+            setTableDataSource(_objectSpread(_objectSpread({}, tableDataSource), {}, {
+              records: dataSource
+            }));
+            return _context.abrupt("return");
+          case 12:
+            return _context.abrupt("return", setTableDataSource(dataSource || tableDataSource));
+          case 13:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    })), {
+      manual: true
+    }),
+    loading = _useRequest.loading,
+    error = _useRequest.error,
+    run = _useRequest.run;
+  React.useEffect(function () {
+    if (!manual) {
+      run();
+    }
+  }, [dataSource]);
+  return {
+    loading: loading,
+    error: error,
+    run: run,
+    data: tableDataSource
+  };
 };
 var useCuRef = function useCuRef(_ref3) {
   var actionRef = _ref3.actionRef,
@@ -78,23 +109,35 @@ var useCuRef = function useCuRef(_ref3) {
   };
 };
 var useColsMk = function useColsMk(_ref4) {
-  var configData = _ref4.configData;
+  var configData = _ref4.configData,
+    reload = _ref4.reload;
   return configData === null || configData === void 0 ? void 0 : _mapInstanceProperty(configData).call(configData, function (item) {
     var valueType = item.valueType,
       _render = item.render;
     var configType = valueType;
-    if (!config.default[configType]) {
-      return item;
+    if (config.default[configType]) {
+      return _objectSpread(_objectSpread({}, item), {}, {
+        render: function render(dom, entity, index, action, schema) {
+          var node = config.default[configType](item, entity, index);
+          if (_render) {
+            return _render(node, entity, index, _objectSpread(_objectSpread({}, action), {}, {
+              reload: reload
+            }), schema);
+          }
+          return node;
+        }
+      });
     }
-    return _objectSpread(_objectSpread({}, item), {}, {
-      render: function render(dom, entity, index, action, schema) {
-        var node = config.default[configType](item, entity, index);
-        if (_render) {
-          return _render(node, entity, index, action, schema);
+    if (_render) {
+      return _objectSpread(_objectSpread({}, item), {}, {
+        render: function render(dom, entity, index, action, schema) {
+          return _render(dom, entity, index, _objectSpread(_objectSpread({}, action), {}, {
+            reload: reload
+          }), schema);
         }
-        return node;
-      }
-    });
+      });
+    }
+    return item;
   });
 };
 

package/lib/EditTable/index.js

@@ -2,11 +2,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var _asyncToGenerator = require('@babel/runtime-corejs3/helpers/asyncToGenerator');
-var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
-var _objectWithoutProperties = require('@babel/runtime-corejs3/helpers/objectWithoutProperties');
-var _regeneratorRuntime = require('@babel/runtime-corejs3/regenerator');
-var _Array$isArray = require('@babel/runtime-corejs3/core-js-stable/array/is-array');
 var _Object$keys = require('@babel/runtime-corejs3/core-js-stable/object/keys');
 var _Object$getOwnPropertySymbols = require('@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols');
 var _filterInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/filter');
@@ -15,6 +10,10 @@ var _forEachInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/in
 var _Object$getOwnPropertyDescriptors = require('@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptors');
 var _Object$defineProperties = require('@babel/runtime-corejs3/core-js-stable/object/define-properties');
 var _Object$defineProperty = require('@babel/runtime-corejs3/core-js-stable/object/define-property');
+var _asyncToGenerator = require('@babel/runtime-corejs3/helpers/asyncToGenerator');
+var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
+var _objectWithoutProperties = require('@babel/runtime-corejs3/helpers/objectWithoutProperties');
+var _regeneratorRuntime = require('@babel/runtime-corejs3/regenerator');
 var jsxRuntime = require('react/jsx-runtime');
 var ProTable = require('@ant-design/pro-table');
 var index = require('../hooks/index.js');
@@ -69,8 +68,6 @@ var EditTable = (function (_ref) {
     tableEmptyRender = _useHTableConfigConte2 === void 0 ? defaultRender.emptyDefaultRender : _useHTableConfigConte2,
     _useHTableConfigConte3 = _useHTableConfigConte.errorRender,
     tableErrorRender = _useHTableConfigConte3 === void 0 ? defaultRender.errorDefaultRender : _useHTableConfigConte3;
-  var isLocalData = _Array$isArray(data);
-  var values = isLocalData ? data : data === null || data === void 0 ? void 0 : data.records;
   var _useCuRef = hooks.useCuRef({
       actionRef: actionRef,
       editableFormRef: editableFormRef
@@ -78,7 +75,8 @@ var EditTable = (function (_ref) {
     cuActionRef = _useCuRef.cuActionRef,
     cuEditableFormRef = _useCuRef.cuEditableFormRef;
   var columns = hooks.useColsMk({
-    configData: configData
+    configData: configData,
+    reload: run
   });
   return jsxRuntime.jsxs("div", {
     className: tableBody,
@@ -97,10 +95,8 @@ var EditTable = (function (_ref) {
         loading: loading,
         rowKey: rowKey,
         editableFormRef: cuEditableFormRef,
-        manualRequest: true,
-        request: run,
         actionRef: cuActionRef,
-        value: values,
+        value: data === null || data === void 0 ? void 0 : data.records,
         recordCreatorProps: _objectSpread({
           position: "bottom",
           record: function record() {
@@ -172,8 +168,8 @@ var EditTable = (function (_ref) {
           }()
         }, editable)
       }, props))
-    }), jsxRuntime.jsx(index$1.default, _objectSpread(_objectSpread({
-      data: isLocalData ? null : data
+    }), pagination === false ? null : jsxRuntime.jsx(index$1.default, _objectSpread(_objectSpread({
+      data: data
     }, pagination), {}, {
       onChange: function onChange(page, pageSize) {
         run({

package/lib/EditTable/modal.d.ts

@@ -9,7 +9,7 @@ export interface HEditTableProps<T = any> extends Omit<EditableProTableProps<T,
     recordCreatorProps?: Partial<EditableProTableProps<T, ParamsType>["recordCreatorProps"]>;
     dataSource?: any[];
     request?: (params: Record<string, any>) => Promise<T>;
-    pagination?: IPaginationProps;
+    pagination?: IPaginationProps | false;
     manual?: boolean;
     emptyRender?: EmptyPageRender;
     errorRender?: ErrorPageRender;

package/package.json

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

package/src/components/EditTable/hooks.ts

@@ -1,16 +1,22 @@
 import { useRequest } from "ahooks";
 import { HEditTableProps } from "./modal";
-import { MutableRefObject, useEffect, useMemo, useRef } from "react";
+import {MutableRefObject, useEffect, useMemo, useRef, useState} from "react";
 import type { ActionType } from "@ant-design/pro-table";
 import { EditableFormInstance } from "@ant-design/pro-table/lib/components/EditableTable";
 import config from "../render/config";
+import {ResultModal} from "../modal";
 
 export const useListRequest = ({
   request,
   dataSource,
   manual,
 }: HEditTableProps) => {
-  const relManual = request ? manual : false;
+  const [tableDataSource,setTableDataSource]=useState<ResultModal>({
+    records:[],
+    total:"0",
+    size:"10",
+    current:"1"
+  });
   const saveParams = useMemo(() => {
     return {
       params: {
@@ -19,7 +25,7 @@ export const useListRequest = ({
       },
     };
   }, []);
-  return useRequest(
+  const {loading,error,run}=useRequest(
     async (params = {}) => {
       const newParams = {
         ...saveParams.params,
@@ -27,15 +33,32 @@ export const useListRequest = ({
       };
       saveParams.params = newParams;
       if (request) {
-        return request(newParams);
+       const result=await request(newParams);
+       setTableDataSource(result);
+       return ;
       }
       if (Array.isArray(dataSource)) {
-        return dataSource;
+        setTableDataSource({
+          ...tableDataSource,
+          records:dataSource,
+        })
+        return ;
       }
-      return dataSource;
+      return setTableDataSource(dataSource||tableDataSource);
     },
-    { manual: relManual, refreshDeps: [dataSource] }
+    { manual:true}
   );
+  useEffect(() => {
+     if (!manual){
+       run();
+     }
+  }, [dataSource]);
+  return {
+    loading,
+    error,
+    run,
+    data:tableDataSource
+  }
 };
 
 export const useCuRef = ({ actionRef, editableFormRef }: HEditTableProps) => {
@@ -50,23 +73,34 @@ export const useCuRef = ({ actionRef, editableFormRef }: HEditTableProps) => {
     cuEditableFormRef,
   };
 };
+interface ColProps extends HEditTableProps{
+  reload:VoidFunction;
+}
 
-export const useColsMk = ({ configData }: HEditTableProps) => {
+export const useColsMk = ({ configData,reload }: ColProps) => {
   return configData?.map((item) => {
     const { valueType, render } = item;
     const configType = valueType as string;
-    if (!config[configType]) {
-      return item;
+    if (config[configType]) {
+       return {
+        ...item,
+        render: (dom, entity, index, action, schema) => {
+          const node = config[configType](item, entity, index);
+          if (render) {
+            return render(node, entity, index, {...action,reload}, schema);
+          }
+          return node;
+        },
+      };
     }
-    return {
-      ...item,
-      render: (dom, entity, index, action, schema) => {
-        const node = config[configType](item, entity, index);
-        if (render) {
-          return render(node, entity, index, action, schema);
-        }
-        return node;
-      },
-    };
+    if (render){
+      return {
+        ...item,
+        render: (dom, entity, index, action, schema) => {
+          return render(dom, entity, index, {...action,reload}, schema);
+        },
+      };
+    }
+    return item;
   });
 };

package/src/components/EditTable/index.tsx

@@ -41,13 +41,11 @@ export default ({
     errorRender: tableErrorRender = errorDefaultRender,
   } = useHTableConfigContext({ emptyRender, errorRender });
 
-  const isLocalData = Array.isArray(data);
-  const values = isLocalData ? data : data?.records;
   const { cuActionRef, cuEditableFormRef } = useCuRef({
     actionRef,
     editableFormRef,
   });
-  const columns = useColsMk({ configData });
+  const columns = useColsMk({ configData,reload:run});
   return (
     <div className={tableBody}>
       <ConfigProvider
@@ -66,10 +64,8 @@ export default ({
           loading={loading}
           rowKey={rowKey}
           editableFormRef={cuEditableFormRef}
-          manualRequest={true}
-          request={run}
           actionRef={cuActionRef}
-          value={values}
+          value={data?.records}
           recordCreatorProps={{
             position: "bottom",
             record: () => ({ id: "add", ...defaultRecordValue }),
@@ -104,16 +100,16 @@ export default ({
           {...props}
         />
       </ConfigProvider>
-      <HTablePagination
-        data={isLocalData ? null : data}
-        {...pagination}
-        onChange={(page, pageSize) => {
-          run({
-            size: pageSize,
-            current: page,
-          });
-        }}
-      />
+      {pagination===false?null:<HTablePagination
+          data={data}
+          {...pagination}
+          onChange={(page, pageSize) => {
+            run({
+              size: pageSize,
+              current: page,
+            });
+          }}
+      />}
     </div>
   );
 };

package/src/components/EditTable/modal.ts

@@ -16,7 +16,7 @@ export interface HEditTableProps<T = any>
   >;
   dataSource?: any[];
   request?: (params: Record<string, any>) => Promise<T>;
-  pagination?: IPaginationProps;
+  pagination?: IPaginationProps|false;
   manual?: boolean;
   emptyRender?: EmptyPageRender;
   errorRender?: ErrorPageRender;

package/src/pages/ModalEditTable/index.tsx

@@ -40,25 +40,26 @@ export default () => {
       </div>
       <HDwEditTable
         title="编辑"
-        request={async () => {
-          return {
-            records: [
-              {
-                id: "213213",
-                title: "100",
-              },
-            ],
-            current: "1",
-            size: "10",
-            total: "10",
-          };
+        request={() => {
+          return new Promise(resolve => {
+            setTimeout(() => {
+               resolve( {
+                 records: [
+                   {
+                     id: "213213",
+                     title: "100",
+                   },
+                 ],
+                 current: "1",
+                 size: "10",
+                 total: "10",
+               })
+            },2000)
+          })
         }}
         editTableProps={{
           onAdd: async (data) => {},
           onEdit: async (data) => {},
-          defaultRecordValue: {
-            title: "21312",
-          },
         }}
         dialogTable={dialogTable}
         configData={[
@@ -68,17 +69,28 @@ export default () => {
             title: "操作",
             valueType: "option",
             align: "center",
-            render: (text: any, record: any, _: any, action: any) => [
-              <a
-                key="editable"
-                type={"link"}
-                onClick={() => {
-                  action?.startEditable?.(record.id);
-                }}
-              >
-                编辑
-              </a>,
-            ],
+            render: (text: any, record: any, _: any, action: any) =>{
+              return <>
+                <a
+                    key="editable"
+                    type={"link"}
+                    onClick={() => {
+                      action?.startEditable?.(record.id);
+                    }}
+                >
+                  编辑
+                </a>
+                <a
+                    key="editable"
+                    type={"link"}
+                    onClick={() => {
+                      action.reload()
+                    }}
+                >
+                  刷新
+                </a>
+              </>
+            }
           },
         ]}
       />