@deepinnet-components/pc 0.0.7 → 0.0.8

package/dist/Table/demo/actionRef.d.ts

@@ -3,5 +3,5 @@
  * description: 供外部调用的事件 reload、reloadCurrentPage、reset
  */
 import type { FC } from 'react';
-declare const Demo1: FC;
-export default Demo1;
+declare const Demo: FC;
+export default Demo;

package/dist/Table/demo/actionRef.js

@@ -7,10 +7,9 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
  * description: 供外部调用的事件 reload、reloadCurrentPage、reset
  */
 
-// import { ShenduTable } from '@deepinnet-components/pc';
+import { ShenduTable } from "../..";
 import { Button } from 'antd';
-import React from 'react';
-import ShenduTable from "../index";
+import React, { useRef } from 'react';
 var getDataPromise = function getDataPromise() {
   return new Promise(function (resolve) {
     setTimeout(function () {
@@ -31,7 +30,7 @@ var getDataPromise = function getDataPromise() {
     }, 300);
   });
 };
-var Demo1 = function Demo1() {
+var Demo = function Demo() {
   var columns = [{
     title: '姓名',
     dataIndex: 'name',
@@ -48,6 +47,7 @@ var Demo1 = function Demo1() {
     width: 150,
     align: 'left'
   }];
+  var tableRef = useRef();
   return /*#__PURE__*/React.createElement(ShenduTable, {
     request: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var data;
@@ -71,15 +71,35 @@ var Demo1 = function Demo1() {
     })),
     columns: columns,
     rowKey: "id",
+    actionRef: tableRef,
     toolbar: {
       title: /*#__PURE__*/React.createElement("div", {
         style: {
           marginBottom: 20
         }
       }, /*#__PURE__*/React.createElement(Button, {
-        type: "primary"
-      }, "\u65B0\u589E"))
+        type: "primary",
+        onClick: function onClick() {
+          tableRef.current.reloadCurrentPage();
+        }
+      }, "\u5F53\u524D\u9875\u641C\u7D22"), /*#__PURE__*/React.createElement(Button, {
+        type: "primary",
+        style: {
+          marginLeft: 10
+        },
+        onClick: function onClick() {
+          tableRef.current.reload();
+        }
+      }, "\u9875\u7801\u53D8\u62101 & \u91CD\u65B0\u641C\u7D22"), /*#__PURE__*/React.createElement(Button, {
+        type: "primary",
+        style: {
+          marginLeft: 10
+        },
+        onClick: function onClick() {
+          tableRef.current.reset();
+        }
+      }, "\u9875\u7801\u53D8\u62101\u91CD\u7F6E\u6240\u6709\u641C\u7D22\u6761\u4EF6"))
     }
   });
 };
-export default Demo1;
+export default Demo;

package/dist/Table/demo/request.js

@@ -1,5 +1,8 @@
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+var _excluded = ["current", "pageSize"];
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 /**
@@ -48,26 +51,33 @@ var Demo1 = function Demo1() {
     align: 'left'
   }];
   return /*#__PURE__*/React.createElement(ShenduTable, {
-    request: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var data;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            _context.next = 2;
-            return getDataPromise();
-          case 2:
-            data = _context.sent;
-            return _context.abrupt("return", {
-              data: data.list,
-              success: true,
-              total: data.total || 0
-            });
-          case 4:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee);
-    })),
+    request: /*#__PURE__*/function () {
+      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(searchInfo) {
+        var pageNum, pageSize, search, data;
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              // searchInfo 搜索参数
+              pageNum = searchInfo.current, pageSize = searchInfo.pageSize, search = _objectWithoutProperties(searchInfo, _excluded);
+              _context.next = 3;
+              return getDataPromise();
+            case 3:
+              data = _context.sent;
+              return _context.abrupt("return", {
+                data: data.list,
+                success: true,
+                total: data.total || 0
+              });
+            case 5:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      }));
+      return function (_x) {
+        return _ref.apply(this, arguments);
+      };
+    }(),
     columns: columns,
     rowKey: "id",
     toolbar: {

package/dist/Table/index.d.ts

@@ -1,13 +1,10 @@
 import type { PaginationProps, TableProps } from 'antd';
-import { ColumnType } from 'antd/lib/table';
 import React from 'react';
 interface SearchConfig {
     labelWidth: number | string;
 }
-interface Columns extends ColumnType<any> {
-    align?: 'left' | 'right' | 'center' | any;
-    hideInTable?: boolean;
-    searchConfig?: {
+interface Columns {
+    searchConfig: {
         sort?: number;
         title?: string;
         labelWidth?: number | string;
@@ -21,11 +18,12 @@ declare type RequestData<T> = {
     success?: boolean;
     total?: number;
 } & Record<string, any>;
-interface ShenduTableProps<T> extends Omit<TableProps<T>, 'columns' | 'pagination' | 'align'> {
+declare type ShenduTableProps<T> = {
     searchComponents?: Record<string, any>;
+    searchRenderEffect?: number;
     className?: string;
     params?: Record<string, any>;
-    pagination?: PaginationProps | false;
+    pagination?: PaginationProps;
     actionRef?: {
         current: any;
     };
@@ -34,17 +32,25 @@ interface ShenduTableProps<T> extends Omit<TableProps<T>, 'columns' | 'paginatio
         className?: string;
     };
     request?: (data: any) => Promise<RequestData<T>>;
-    columns: Columns[];
+    columns: any[] | Columns[];
     search?: SearchConfig | false;
     initSearchKey?: string;
     ignoreSearchParamsKey?: string[];
-}
+    pageSizeOptions?: number[];
+    onSearch?: any;
+    hiddenFooterBlock?: boolean;
+    searchParamsKeyLocalFormat?: any;
+    ignoreResetSearchField?: string[];
+    resetSearchValues?: any;
+    initSearchValues?: any;
+} & Omit<TableProps<T>, 'columns'>;
 /**
  * Table + formily
  * 基本用法类似 Protable
  * 新功能：
  * 2、toolbar: { title: ReactNode, className: '' }
  * 3、search: { labelWidth: '统一设置搜索字段label宽度' }
+ * 4、actionRef: 绑定了内部方法 reload，可以手动更新
  */
 declare const ShenduTable: <T extends Record<string, any>>(props: ShenduTableProps<T>) => React.JSX.Element | null;
 export default ShenduTable;

package/dist/Table/index.js

@@ -1,5 +1,5 @@
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-var _excluded = ["initSearchKey", "ignoreSearchParamsKey", "toolbar", "columns", "search", "params", "className", "dataSource", "searchComponents"];
+var _excluded = ["initSearchKey", "ignoreSearchParamsKey", "ignoreResetSearchField", "resetSearchValues", "toolbar", "columns", "search", "params", "className", "dataSource", "searchComponents", "searchRenderEffect", "pageSizeOptions", "searchParamsKeyLocalFormat", "initSearchValues"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
@@ -18,23 +18,36 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 /* eslint-disable */
-import { Form, FormGrid, FormItem, Input, Reset, Select, Submit } from '@formily/antd-v5';
+import { DatePicker as DatePickerFormily, Form, FormGrid, FormItem, Input, Select, Submit } from '@formily/antd-v5';
 import { createForm } from '@formily/core';
 import { createSchemaField } from '@formily/react';
-import { DatePicker, Pagination, Table } from 'antd';
+import { Button, ConfigProvider, DatePicker, Empty, Pagination, Table } from 'antd';
 import { cloneDeep, isEmpty, isEqual } from 'lodash-es';
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+var renderEmpty = function renderEmpty(componentName) {
+  if (componentName === 'Table' /** 👈 5.20.0+ */) {
+    return /*#__PURE__*/React.createElement(Empty, {
+      image: Empty.PRESENTED_IMAGE_SIMPLE,
+      description: "\u6682\u65E0\u6570\u636E"
+    });
+  }
+};
 /**
  * Table + formily
  * 基本用法类似 Protable
  * 新功能：
  * 2、toolbar: { title: ReactNode, className: '' }
  * 3、search: { labelWidth: '统一设置搜索字段label宽度' }
+ * 4、actionRef: 绑定了内部方法 reload，可以手动更新
  */
 var ShenduTable = function ShenduTable(props) {
+  var _beforeSearch, _beforeSearch2;
   var initSearchKey = props.initSearchKey,
     _props$ignoreSearchPa = props.ignoreSearchParamsKey,
     ignoreSearchParamsKey = _props$ignoreSearchPa === void 0 ? [] : _props$ignoreSearchPa,
+    _props$ignoreResetSea = props.ignoreResetSearchField,
+    ignoreResetSearchField = _props$ignoreResetSea === void 0 ? [] : _props$ignoreResetSea,
+    resetSearchValues = props.resetSearchValues,
     toolbar = props.toolbar,
     columns = props.columns,
     search = props.search,
@@ -42,24 +55,35 @@ var ShenduTable = function ShenduTable(props) {
     className = props.className,
     dataSource = props.dataSource,
     searchComponents = props.searchComponents,
+    _props$searchRenderEf = props.searchRenderEffect,
+    searchRenderEffect = _props$searchRenderEf === void 0 ? 0 : _props$searchRenderEf,
+    _props$pageSizeOption = props.pageSizeOptions,
+    pageSizeOptions = _props$pageSizeOption === void 0 ? [10, 20, 50] : _props$pageSizeOption,
+    searchParamsKeyLocalFormat = props.searchParamsKeyLocalFormat,
+    initSearchValues = props.initSearchValues,
     extra = _objectWithoutProperties(props, _excluded);
   var beforeSearch;
   var sessionSearch;
   if (initSearchKey) {
     sessionSearch = 'SEARCH::' + initSearchKey;
-    var str = sessionStorage.getItem(sessionSearch);
+    var str = window.sessionStorage.getItem(sessionSearch);
     if (str) {
       beforeSearch = JSON.parse(str);
-      // console.log(beforeSearch, 'beforeSearch')
+      var keys = Object.keys(beforeSearch);
+      keys.forEach(function (key) {
+        if (searchParamsKeyLocalFormat !== null && searchParamsKeyLocalFormat !== void 0 && searchParamsKeyLocalFormat[key]) {
+          beforeSearch[key] = searchParamsKeyLocalFormat[key].get(beforeSearch[key]);
+        }
+      });
     }
   }
-
   var SchemaField = createSchemaField({
     components: _objectSpread({
       FormItem: FormItem,
       FormGrid: FormGrid,
       Input: Input,
       DatePicker: DatePicker,
+      DatePickerFormily: DatePickerFormily,
       Select: Select
     }, searchComponents || {})
   });
@@ -83,13 +107,13 @@ var ShenduTable = function ShenduTable(props) {
       size: 'default',
       showSizeChanger: true,
       showQuickJumper: true,
-      showTotal: function showTotal() {
-        return '';
+      showTotal: function showTotal(v) {
+        return "\u5171 ".concat(v, " \u6761\u6570\u636E");
       },
-      pageSize: beforeSearch ? beforeSearch.pageSize : 10,
-      current: beforeSearch ? beforeSearch.current : 1,
+      pageSize: ((_beforeSearch = beforeSearch) === null || _beforeSearch === void 0 ? void 0 : _beforeSearch.pageSize) || 10,
+      current: ((_beforeSearch2 = beforeSearch) === null || _beforeSearch2 === void 0 ? void 0 : _beforeSearch2.current) || 1,
       total: 0,
-      pageSizeOptions: [10, 20, 50]
+      pageSizeOptions: pageSizeOptions
     }),
     _useState10 = _slicedToArray(_useState9, 2),
     pagination = _useState10[0],
@@ -106,32 +130,53 @@ var ShenduTable = function ShenduTable(props) {
   useMemo(function () {
     var initialValues = {};
     if (beforeSearch) {
-      initialValues = _objectSpread({}, beforeSearch);
+      initialValues = beforeSearch;
     }
+    initialValues = _objectSpread(_objectSpread({}, initialValues), initSearchValues || {});
     setForm(createForm({
       validateFirst: true,
       values: initialValues
     }));
   }, []);
-  var reset = function reset() {
+  var reset = function reset(params) {
+    var _ref = params || {},
+      isRequest = _ref.isRequest;
     deleteSearch();
-    form.reset();
+    if ((ignoreResetSearchField === null || ignoreResetSearchField === void 0 ? void 0 : ignoreResetSearchField.length) > 0) {
+      var resetKey = [];
+      Object.keys(form.values || {}).forEach(function (key) {
+        if (!ignoreResetSearchField.includes(key)) {
+          resetKey.push(key);
+        }
+      });
+      form.deleteValuesIn(resetKey);
+    } else if (resetSearchValues) {
+      var resetVal = {};
+      Object.keys(form.values || {}).forEach(function (key) {
+        resetVal[key] = null;
+      });
+      var newVal = _objectSpread(_objectSpread({}, resetVal || {}), resetSearchValues);
+      form.setValues(newVal);
+    } else {
+      form.reset();
+    }
     resetPagination();
-    request({
-      current: 1
-    }, true, true);
+    if (isRequest !== false) {
+      request({
+        current: 1
+      }, true, true);
+    }
   };
-  var RenderActions = function RenderActions() {
+  var RenderActions = function RenderActions(props) {
     return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Submit, {
       onSubmit: onAutoSubmit,
-      type: "primary",
-      ghost: true
-      // loading={props.loading}
-      ,
       style: {
         marginRight: 10
-      }
-    }, "\u67E5\u8BE2"), /*#__PURE__*/React.createElement(Reset, {
+      },
+      type: "primary",
+      ghost: true,
+      loading: props.loading
+    }, "\u67E5\u8BE2"), /*#__PURE__*/React.createElement(Button, {
       onClick: reset
     }, "\u91CD\u7F6E"));
   };
@@ -162,8 +207,8 @@ var ShenduTable = function ShenduTable(props) {
           'x-component': 'FormGrid',
           'x-component-props': {
             columnGap: 32,
-            maxColumns: 3,
-            minColumns: 3
+            maxColumns: 4,
+            minColumns: 4
           },
           properties: {}
         }
@@ -175,12 +220,12 @@ var ShenduTable = function ShenduTable(props) {
     }).forEach(function (field) {
       if (field.searchConfig) {
         var _field$searchConfig;
-        var _ref = field.searchConfig || {},
-          title = _ref.title,
-          labelWidth = _ref.labelWidth,
-          searchKey = _ref.searchKey,
-          component = _ref.component,
-          _props = _ref.props;
+        var _ref2 = field.searchConfig || {},
+          title = _ref2.title,
+          labelWidth = _ref2.labelWidth,
+          searchKey = _ref2.searchKey,
+          component = _ref2.component,
+          _props = _ref2.props;
         var searchLabelWidth = search ? search.labelWidth : '';
         var componentProps = _objectSpread({}, _props);
         if (component) {
@@ -224,37 +269,59 @@ var ShenduTable = function ShenduTable(props) {
     };
     setSchema(schemaObj);
   };
+  useEffect(function () {
+    if (searchRenderEffect > 0) {
+      initSchema();
+    }
+  }, [searchRenderEffect]);
   var handleColumns = function handleColumns() {
     return cloneDeep(columns).filter(function (column) {
       return column.hideInTable !== true;
     });
   };
-  var onAutoSubmit = function onAutoSubmit(searchInfo) {
-    resetPagination();
-    request(_objectSpread(_objectSpread({}, searchInfo), {}, {
-      current: 1
-    }), true);
-  };
+  var onAutoSubmit = /*#__PURE__*/function () {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(searchInfo) {
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            resetPagination();
+            request(_objectSpread(_objectSpread({}, searchInfo), {}, {
+              current: 1
+            }), true);
+          case 2:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function onAutoSubmit(_x2) {
+      return _ref3.apply(this, arguments);
+    };
+  }();
 
   // 保存搜索条件
   var saveSearch = function saveSearch() {
     var req = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     req = _objectSpread({}, req);
     if (initSearchKey) {
-      var keys = Object.keys(req);
-      keys.forEach(function (key) {
+      var _keys = Object.keys(req);
+      _keys.forEach(function (key) {
         if (ignoreSearchParamsKey.includes(key)) {
           delete req[key];
+          return;
+        }
+        if (searchParamsKeyLocalFormat !== null && searchParamsKeyLocalFormat !== void 0 && searchParamsKeyLocalFormat[key]) {
+          req[key] = searchParamsKeyLocalFormat[key].set(req[key]);
         }
       });
-      sessionStorage.setItem(sessionSearch, JSON.stringify(req));
+      window.sessionStorage.setItem(sessionSearch, JSON.stringify(req));
     }
   };
 
   // 删除搜索条件
   var deleteSearch = function deleteSearch() {
     if (initSearchKey) {
-      sessionStorage.removeItem(sessionSearch);
+      window.sessionStorage.removeItem(sessionSearch);
     }
   };
   var resetPagination = function resetPagination() {
@@ -263,51 +330,54 @@ var ShenduTable = function ShenduTable(props) {
     }));
   };
   var request = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(req) {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(reqParams) {
+      var _reqDataRef$current$p, _reqDataRef$current$p2, _props$onSearch;
       var flag,
         isReset,
         searchValue,
+        req,
         result,
-        _args = arguments;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
+        _args2 = arguments;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            flag = _args.length > 1 && _args[1] !== undefined ? _args[1] : false;
-            isReset = _args.length > 2 && _args[2] !== undefined ? _args[2] : false;
+            flag = _args2.length > 1 && _args2[1] !== undefined ? _args2[1] : false;
+            isReset = _args2.length > 2 && _args2[2] !== undefined ? _args2[2] : false;
+            // return
             searchValue = form.values;
             req = _objectSpread(_objectSpread(_objectSpread({}, reqDataRef.current.params || {}), searchValue), {}, {
-              pageSize: reqDataRef.current.pagination.pageSize,
-              current: reqDataRef.current.pagination.current
-            }, req);
-            // 去除为空内容
+              pageSize: (_reqDataRef$current$p = reqDataRef.current.pagination) === null || _reqDataRef$current$p === void 0 ? void 0 : _reqDataRef$current$p.pageSize,
+              current: (_reqDataRef$current$p2 = reqDataRef.current.pagination) === null || _reqDataRef$current$p2 === void 0 ? void 0 : _reqDataRef$current$p2.current
+            }, reqParams); // 去除为空内容
             Object.keys(req).forEach(function (key) {
               if (!req[key] && req[key] !== 0) delete req[key];
             });
             setLoading(true);
             !isReset && flag && saveSearch(req);
-            _context.prev = 7;
-            _context.t1 = props.request;
-            if (!_context.t1) {
-              _context.next = 13;
+            (_props$onSearch = props.onSearch) === null || _props$onSearch === void 0 ? void 0 : _props$onSearch.call(props, req);
+            _context2.prev = 8;
+            _context2.t1 = props.request;
+            if (!_context2.t1) {
+              _context2.next = 14;
               break;
             }
-            _context.next = 12;
+            _context2.next = 13;
             return props.request(req);
-          case 12:
-            _context.t1 = _context.sent;
           case 13:
-            _context.t0 = _context.t1;
-            if (_context.t0) {
-              _context.next = 16;
+            _context2.t1 = _context2.sent;
+          case 14:
+            _context2.t0 = _context2.t1;
+            if (_context2.t0) {
+              _context2.next = 17;
               break;
             }
-            _context.t0 = {
+            _context2.t0 = {
               data: [],
               total: 0,
               success: true
             };
-          case 16:
-            result = _context.t0;
+          case 17:
+            result = _context2.t0;
             if (result.success) {
               // 外部不传 dataSource 时，table 内部更新数据
               if (!dataSource && Array.isArray(result.data)) {
@@ -319,30 +389,41 @@ var ShenduTable = function ShenduTable(props) {
               });
             }
             setLoading(false);
-            _context.next = 24;
+            _context2.next = 27;
             break;
-          case 21:
-            _context.prev = 21;
-            _context.t2 = _context["catch"](7);
+          case 22:
+            _context2.prev = 22;
+            _context2.t2 = _context2["catch"](8);
+            if (!dataSource) {
+              setTableDataSource([]);
+            }
+            setPagination(function (pagination) {
+              pagination.total = 0;
+              return pagination;
+            });
             setLoading(false);
-          case 24:
+          case 27:
           case "end":
-            return _context.stop();
+            return _context2.stop();
         }
-      }, _callee, null, [[7, 21]]);
+      }, _callee2, null, [[8, 22]]);
     }));
-    return function request(_x2) {
-      return _ref2.apply(this, arguments);
+    return function request(_x3) {
+      return _ref4.apply(this, arguments);
     };
   }();
   var handlePaginationChange = function handlePaginationChange(page, pageSize) {
-    if (pageSize !== pagination.pageSize) {
+    if (pageSize !== (pagination === null || pagination === void 0 ? void 0 : pagination.pageSize)) {
       page = 1;
     }
     setPagination(_objectSpread(_objectSpread({}, pagination), {}, {
       current: page,
       pageSize: pageSize
     }));
+    reqDataRef.current.pagination = _objectSpread(_objectSpread({}, pagination), {}, {
+      current: page,
+      pageSize: pageSize
+    });
     var searchValue = form.values;
     request(Object.assign({}, searchValue, {
       pageSize: pageSize,
@@ -352,12 +433,12 @@ var ShenduTable = function ShenduTable(props) {
 
   // 缓存优化 防止重复渲染
   var renderSearchForm = useCallback(function () {
-    return isEmpty(schema) || isEmpty(form) ? null : /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Form, {
+    return isEmpty(schema) || isEmpty(form) ? null : /*#__PURE__*/React.createElement(Form, {
       form: form,
       onAutoSubmit: onAutoSubmit
     }, /*#__PURE__*/React.createElement(SchemaField, {
       schema: schema
-    })));
+    }));
   }, [schema, form]);
   useEffect(function () {
     reqDataRef.current = {
@@ -366,12 +447,17 @@ var ShenduTable = function ShenduTable(props) {
     };
   }, [pagination, params]);
   useEffect(function () {
+    // setTimeout 处理外部设置 pagination 时，由于异步更新数据问题，导致 request 调用拿不到最新的 pagination
     if (params && !isEqual(params, parmasData)) {
       setParmasData(params);
-      request(params, true);
+      setTimeout(function () {
+        return request(params, true);
+      }, 100);
       return;
     }
-    if (!params) request({});
+    if (!params) setTimeout(function () {
+      return request({});
+    }, 100);
   }, [params]);
   useEffect(function () {
     // 优化渲染， 外部传 {} 会导致每次都渲染，在此做个比较阻止重复渲染
@@ -381,6 +467,10 @@ var ShenduTable = function ShenduTable(props) {
     }
   }, [search]);
   useEffect(function () {
+    reqDataRef.current = {
+      pagination: pagination,
+      params: params
+    };
     setPagination(Object.assign(pagination, props.pagination || {}));
   }, [props.pagination]);
   useEffect(function () {
@@ -402,24 +492,39 @@ var ShenduTable = function ShenduTable(props) {
     return null;
   }
   return /*#__PURE__*/React.createElement("div", {
-    className: "".concat(className)
+    className: "".concat(className, " table-search-form")
   }, renderSearchForm(), toolbar !== null && toolbar !== void 0 && toolbar.title ? /*#__PURE__*/React.createElement("div", {
-    className: "mb-4 ".concat(toolbar === null || toolbar === void 0 ? void 0 : toolbar.className)
-  }, toolbar === null || toolbar === void 0 ? void 0 : toolbar.title) : null, /*#__PURE__*/React.createElement(Table, _extends({
+    className: "".concat(toolbar === null || toolbar === void 0 ? void 0 : toolbar.className),
+    style: {
+      marginBottom: 16
+    }
+  }, toolbar === null || toolbar === void 0 ? void 0 : toolbar.title) : null, /*#__PURE__*/React.createElement(ConfigProvider, {
+    renderEmpty: renderEmpty
+  }, /*#__PURE__*/React.createElement(Table, _extends({
     columns: handleColumns(),
     dataSource: tableDataSource,
     loading: loading
   }, extra, {
-    pagination: false
-  })), props.pagination !== false && Number(pagination.total) > 0 ? /*#__PURE__*/React.createElement(Pagination, _extends({
+    pagination: false,
+    style: {
+      borderRadius: 100
+    }
+  }))), props.pagination !== false && Number(pagination.total) > 10 ? /*#__PURE__*/React.createElement("div", {
+    style: {
+      display: 'flex',
+      justifyContent: 'flex-end'
+    }
+  }, /*#__PURE__*/React.createElement(Pagination, _extends({
     style: {
-      textAlign: 'right',
-      padding: '10px 0'
+      paddingTop: 16,
+      paddingBottom: 16
     }
   }, pagination, {
     onChange: handlePaginationChange
-  })) : /*#__PURE__*/React.createElement("div", {
+  }))) : /*#__PURE__*/React.createElement("div", {
+    className: "footer-block",
     style: {
+      display: props.hiddenFooterBlock ? 'none' : 'block',
       height: 54
     }
   }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deepinnet-components/pc",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "description": "A react library developed with dumi",
   "license": "MIT",
   "module": "dist/index.js",
@@ -44,9 +44,9 @@
     ]
   },
   "dependencies": {
-    "@formily/antd-v5": "^1.1.0",
-    "@formily/core": "^2.2.29",
-    "@formily/react": "^2.2.29",
+    "@formily/antd-v5": "^1.2.3",
+    "@formily/core": "^2.3.2",
+    "@formily/react": "^2.3.2",
     "antd": "^5.16.1",
     "axios": "^1.5.1",
     "lodash-es": "^4.17.21"