fan-standard-comp 4.1.3 → 4.1.4

package/lib/StandardTablePro/index.js

@@ -9,13 +9,17 @@ var _react = _interopRequireWildcard(require("react"));
 var _ConfigContext = require("../ConfigContext");
 var _StandardFilter = _interopRequireDefault(require("../StandardFilter"));
 var _StandardTable = _interopRequireDefault(require("../StandardTable"));
+var _utils = require("./utils");
 var _index = _interopRequireDefault(require("./style/index"));
 var _classnames = _interopRequireDefault(require("classnames"));
-var _excluded = ["proClassname", "filter", "formConfig", "codes", "permissionCodes", "onSubmit", "onReset", "onChange", "children", "className", "columns", "params"]; // import { FanContext, StandardFilter, StandardTable } from "fan-standard-comp";
+var _excluded = ["proClassname", "filter", "formConfig", "codes", "permissionCodes", "onSubmit", "onReset", "onChange", "children", "className", "columns", "defaultParams", "acceptType", "data", "fetchData", "fetchOptionName", "onAction", "tableActionRef", "filterFormRef", "getDataSource", "localPageInfo"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 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 e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+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); }); }; }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -47,7 +51,28 @@ var StandardTablePro = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref)
     children = _providerConfig$props.children,
     className = _providerConfig$props.className,
     columns = _providerConfig$props.columns,
-    params = _providerConfig$props.params,
+    defaultParams = _providerConfig$props.defaultParams,
+    _providerConfig$props2 = _providerConfig$props.acceptType,
+    acceptType = _providerConfig$props2 === void 0 ? 'data' : _providerConfig$props2,
+    data = _providerConfig$props.data,
+    fetchData = _providerConfig$props.fetchData,
+    _providerConfig$props3 = _providerConfig$props.fetchOptionName,
+    fetchOptionName = _providerConfig$props3 === void 0 ? {
+      dataKey: 'data',
+      listKey: 'records',
+      totalKey: 'total',
+      currentKey: 'current',
+      sizeKey: 'size'
+    } : _providerConfig$props3,
+    onAction = _providerConfig$props.onAction,
+    propsActionRef = _providerConfig$props.tableActionRef,
+    defaultFormRef = _providerConfig$props.filterFormRef,
+    getDataSource = _providerConfig$props.getDataSource,
+    _providerConfig$props4 = _providerConfig$props.localPageInfo,
+    localPageInfo = _providerConfig$props4 === void 0 ? {
+      current: 1,
+      size: 10
+    } : _providerConfig$props4,
     others = _objectWithoutProperties(_providerConfig$props, _excluded);
   var commonConfig = {
     codes: codes,
@@ -58,6 +83,27 @@ var StandardTablePro = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref)
     _useStyle2 = _slicedToArray(_useStyle, 2),
     wrapSSR = _useStyle2[0],
     hashId = _useStyle2[1];
+  // data.list, data.pagination
+  var _useState = (0, _react.useState)({
+      list: [],
+      pagination: {},
+      keywords: {}
+    }),
+    _useState2 = _slicedToArray(_useState, 2),
+    resDataSource = _useState2[0],
+    setResDataSource = _useState2[1];
+  var _useState3 = (0, _react.useState)(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    queryLoading = _useState4[0],
+    setQueryLoading = _useState4[1];
+  var _useState5 = (0, _react.useState)(false),
+    _useState6 = _slicedToArray(_useState5, 2),
+    searchLoading = _useState6[0],
+    setSearchLoading = _useState6[1];
+  var _useState7 = (0, _react.useState)(),
+    _useState8 = _slicedToArray(_useState7, 2),
+    sorterParams = _useState8[0],
+    setSorterParams = _useState8[1];
   var handleChange = function handleChange(targetKey, data, defaultParam) {
     if (targetKey === 'filterSearch') {
       onSubmit === null || onSubmit === void 0 || onSubmit(data);
@@ -65,11 +111,8 @@ var StandardTablePro = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref)
     if (targetKey === 'filterReset') {
       onReset === null || onReset === void 0 || onReset();
     }
-    // if (targetKey === 'tableChange') {
-    //   onChange && onChange(data, defaultParam)
-    // }
   };
-  var formItemGroup = (0, _react.useMemo)(function () {
+  var formItemGroupConcat = (0, _react.useMemo)(function () {
     var itemGroupFromColumns = (columns || []).filter(function (item) {
       return item.formItem && JSON.stringify(item.formItem) !== '{}';
     }).map(function (fItem) {
@@ -80,51 +123,193 @@ var StandardTablePro = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref)
     });
     return ((filter === null || filter === void 0 ? void 0 : filter.formItemGroup) || []).concat(itemGroupFromColumns);
   }, [columns, filter === null || filter === void 0 ? void 0 : filter.formItemGroup]);
-
+  var _useState9 = (0, _react.useState)({}),
+    _useState10 = _slicedToArray(_useState9, 2),
+    filterInstance = _useState10[0],
+    setFilterFormInstance = _useState10[1];
+  // const [filterInitialValues, setFilterInitialValues] = useState({})
   // const [filterFields, setFilterFormFields] = useState({})
-  var _useState = (0, _react.useState)({}),
-    _useState2 = _slicedToArray(_useState, 2),
-    filterInstance = _useState2[0],
-    setFilterFormInstance = _useState2[1];
   // const [filterValues, setFilterValues] = useState<any>({})
+
+  var action = {
+    pagination: (resDataSource === null || resDataSource === void 0 ? void 0 : resDataSource.pagination) || localPageInfo,
+    dataSource: resDataSource === null || resDataSource === void 0 ? void 0 : resDataSource.list,
+    keywords: resDataSource === null || resDataSource === void 0 ? void 0 : resDataSource.keywords,
+    loading: queryLoading,
+    reload: function reload(filter) {
+      return loadData('reload', _objectSpread({}, localPageInfo), _objectSpread({}, filter));
+    },
+    // 更新列表
+    refresh: function refresh(filter) {
+      return loadData('refresh', _objectSpread({}, resDataSource.pagination), _objectSpread({}, filter));
+    } // 更新列表
+  };
+  /** 通用的来操作子节点的工具类 */
+  var actionRef = (0, _react.useRef)();
+  (0, _react.useImperativeHandle)(propsActionRef, function () {
+    return actionRef.current;
+  });
+  (0, _react.useImperativeHandle)(defaultFormRef, function () {
+    return filterInstance === null || filterInstance === void 0 ? void 0 : filterInstance.current;
+  });
   // ref 的转发
   (0, _react.useImperativeHandle)(ref, function () {
     return {
-      // ...filter,
-      // filterFields, // 值不会更新，不传给ref
-      filterInstance: filterInstance === null || filterInstance === void 0 ? void 0 : filterInstance.current
-      // dataSource: resDataSource,
-      // setDataSource: setResDataSource,
-      // reload: (filter) => loadData('refresh', {}, filter) // 更新列表
+      filterInstance: filterInstance === null || filterInstance === void 0 ? void 0 : filterInstance.current,
+      tableInstance: actionRef.current
     };
-  }, [filterInstance]);
-  // sortOrder: sortedInfo.columnKey === 'name' ? sortedInfo.order : null,
-  // columns 里面需要把sort添加上去
+  }, [filterInstance, actionRef]);
+
+  /** 绑定 action current */
+  (0, _utils.useActionType)(actionRef, action);
+
+  /**
+   * 加载数据方法
+   * @param {string} updateKey 触发位置
+   * @param {Object} pagination 分页选项
+   * @param {Object} filter 筛选条件或表格排序条件
+   * @param {Object} tableChangeParams (表格默认参数）{pagination, filter, sorter, extra}
+   */
+  var loadData = (0, _react.useCallback)( /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(updateKey, pagination, filters, tableChangeParams) {
+      var parameter, response, responseData;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (updateKey !== 'init' && updateKey !== 'reload' && updateKey !== 'refresh') {
+              onAction === null || onAction === void 0 || onAction(updateKey, updateKey === 'reset' ? {} : _objectSpread(_objectSpread({}, pagination), filters));
+            }
+            if (!(acceptType === 'fetch' && fetchData)) {
+              _context.next = 10;
+              break;
+            }
+            setQueryLoading(true);
+            parameter = Object.assign(_objectSpread({}, defaultParams),
+            // updateKey === 'init' ? { ...params } : {}, // 重置条件下，会清空params
+            {
+              current: (pagination === null || pagination === void 0 ? void 0 : pagination.current) || localPageInfo.current,
+              size: (pagination === null || pagination === void 0 ? void 0 : pagination.size) || localPageInfo.size
+            }, _objectSpread({}, filters) // 排序与筛选待定
+            // (sorter && sorter.field && {
+            //   sortField: sorter.field
+            // }) || {},
+            // (sorter && sorter.order && {
+            //   sortOrder: sorter.order
+            // }) || {},
+            );
+            _context.next = 6;
+            return fetchData(parameter, updateKey, tableChangeParams);
+          case 6:
+            response = _context.sent;
+            setQueryLoading(false);
+            setSearchLoading(false);
+            // 转换列表数据
+            if (response.code == '200') {
+              responseData = response[fetchOptionName.dataKey];
+              if (Array.isArray(responseData)) {
+                // 返回值为数组
+                setResDataSource({
+                  list: responseData,
+                  pagination: null,
+                  keywords: parameter || {}
+                });
+              } else {
+                // 返回值为对象
+                setResDataSource(Object.assign({
+                  list: responseData === null || responseData === void 0 ? void 0 : responseData[fetchOptionName.listKey || 'records'],
+                  pagination: {
+                    total: (responseData === null || responseData === void 0 ? void 0 : responseData[fetchOptionName.totalKey || 'total']) || 0,
+                    current: (responseData === null || responseData === void 0 ? void 0 : responseData[fetchOptionName.currentKey || 'current']) | localPageInfo.current,
+                    size: (responseData === null || responseData === void 0 ? void 0 : responseData[fetchOptionName.sizeKey || 'size']) || localPageInfo.size
+                  },
+                  keywords: parameter || {} // 关键字搜索字段
+                }));
+              }
+            } else {
+              setResDataSource({
+                list: [],
+                pagination: {},
+                keywords: {}
+              });
+            }
+          case 10:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function (_x, _x2, _x3, _x4) {
+      return _ref.apply(this, arguments);
+    };
+  }(), [acceptType, defaultParams, fetchData]);
+  (0, _react.useEffect)(function () {
+    if (acceptType === 'data') {
+      setResDataSource(data);
+    }
+  }, [acceptType, data]);
+  (0, _react.useEffect)(function () {
+    getDataSource && getDataSource(resDataSource);
+  }, [resDataSource]);
+  (0, _react.useEffect)(function () {
+    loadData('init'); // 接口请求调用
+  }, []);
   return wrapSSR( /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)(componentName, proClassname, hashId)
-  }, /*#__PURE__*/_react.default.createElement(_StandardFilter.default, _extends({}, commonConfig, filter, {
-    // initialValue={filterValues}
-    formItemGroup: formItemGroup,
+  }, formItemGroupConcat !== null && formItemGroupConcat !== void 0 && formItemGroupConcat.length ? /*#__PURE__*/_react.default.createElement(_StandardFilter.default, _extends({}, commonConfig, {
+    forceListener: false
+  }, filter, {
+    confirmButtonProps: _objectSpread({
+      loading: acceptType === 'fetch' ? searchLoading : false
+    }, filter === null || filter === void 0 ? void 0 : filter.confirmButtonProps),
+    formItemGroup: formItemGroupConcat,
     getFormFields: function getFormFields(fieldValues, form) {
       var _filter$getFormFields;
       // setFilterFormFields(fieldValues) // 获取表单内部控件值
       setFilterFormInstance(form); // 获取表单实例
       filter === null || filter === void 0 || (_filter$getFormFields = filter.getFormFields) === null || _filter$getFormFields === void 0 || _filter$getFormFields.call(filter, fieldValues, form);
     },
-    onFilterSearch: function onFilterSearch(values) {
-      return handleChange('filterSearch', values);
+    onFilterSearch: function onFilterSearch(fields) {
+      if (acceptType === 'fetch') {
+        setSearchLoading(true);
+        loadData('search', _objectSpread({}, localPageInfo), fields);
+      }
+      handleChange('filterSearch', fields);
     },
     onFilterReset: function onFilterReset() {
-      return handleChange('filterReset');
+      if (acceptType === 'fetch') {
+        loadData('reset', _objectSpread({}, localPageInfo), {});
+      }
+      handleChange('filterReset');
     },
     className: (0, _classnames.default)('spec-standard-table-pro-filter', filter === null || filter === void 0 ? void 0 : filter.className)
-  })), /*#__PURE__*/_react.default.createElement(_StandardTable.default, _extends({}, commonConfig, others, {
-    columns: columns
+  })) : null, /*#__PURE__*/_react.default.createElement(_StandardTable.default, _extends({}, commonConfig, others, {
+    data: resDataSource,
+    columns: columns,
+    sortOrders: others.sortOrders || sorterParams,
+    loading: acceptType === 'fetch' ? queryLoading || (others === null || others === void 0 ? void 0 : others.loading) : others === null || others === void 0 ? void 0 : others.loading
     // @ts-ignore
     ,
     onChange: function onChange(pagination, filters, sorter, extra) {
+      console.log('pagination', pagination);
+      if (acceptType === 'fetch') {
+        var _pagination$orders;
+        setSorterParams(pagination.sorterParams);
+        loadData(extra.action, {
+          current: pagination.current,
+          size: pagination.size
+        }, (_pagination$orders = pagination.orders) !== null && _pagination$orders !== void 0 && _pagination$orders.length ? {
+          orders: pagination.orders,
+          sorterParams: pagination.sorterParams
+        } : {},
+        // 有筛选条件才传
+        {
+          pagination: pagination,
+          filters: filters,
+          sorter: sorter,
+          extra: extra
+        });
+      }
       _onChange && _onChange(pagination, filters, sorter, extra);
-      // handleChange('tableChange', { pagination, filters, sorter, extra, action: extra.action })
     },
     className: (0, _classnames.default)('spec-standard-table-pro-table', className)
   })), children));

package/lib/StandardTablePro/types.d.ts

@@ -0,0 +1,29 @@
+import type { StandardTableProps } from '../StandardTable/types';
+export interface StandardTableProType extends StandardTableProps {
+    proClassname?: string;
+    filter?: any;
+    formConfig?: any;
+    onChange?: (pageParams?: any) => void;
+    onSubmit?: (searchParams?: any) => void;
+    onReset?: () => void;
+    params?: any;
+    acceptType?: 'data' | 'fetch' | string;
+    fetchData?: () => void;
+    parseTransform?: () => void;
+    [k: string]: any;
+}
+export type ActionType = {
+    reload?: () => void;
+    [k: string]: any;
+};
+export type PageInfo = {
+    size?: number;
+    total?: number;
+    current?: number;
+    [k: string]: any;
+};
+export type UseFetchDataAction<T = any> = {
+    dataSource?: T[];
+    pagination?: PageInfo;
+    [k: string]: any;
+};

package/lib/StandardTablePro/types.js

@@ -1 +1,5 @@
-"use strict";
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/lib/StandardTablePro/useFetchData.js

@@ -0,0 +1,276 @@
+// import {
+//   runFunction,
+//   useDebounceFn,
+//   useDeepCompareEffect,
+//   useMountMergeState,
+//   usePrevious,
+//   useRefFunction,
+// } from '@ant-design/pro-utils';
+// import { useEffect, useLayoutEffect, useRef } from 'react';
+// import type { PageInfo, RequestData, UseFetchDataAction, UseFetchProps } from './typing';
+// import { postDataPipeline } from './utils/index';
+//
+// /**
+//  * 组合用户的配置和默认值
+//  *
+//  * @param param0
+//  */
+// const mergeOptionAndPageInfo = ({ pageInfo }: UseFetchProps) => {
+//   if (pageInfo) {
+//     const { current, defaultCurrent, pageSize, defaultPageSize } = pageInfo;
+//     return {
+//       current: current || defaultCurrent || 1,
+//       total: 0,
+//       pageSize: pageSize || defaultPageSize || 20,
+//     };
+//   }
+//   return { current: 1, total: 0, pageSize: 20 };
+// };
+//
+// const useFetchData = <T extends RequestData<any>>(
+//   getData: undefined | ((params?: { pageSize: number; current: number }) => Promise<T>),
+//   defaultData: any[] | undefined,
+//   options: UseFetchProps,
+// ): UseFetchDataAction => {
+//   const umountRef = useRef<boolean>(false);
+//   const { onLoad, manual, polling, onRequestError, debounceTime = 20 } = options || {};
+//
+//   /** 是否首次加载的指示器 */
+//   const manualRequestRef = useRef<boolean>(manual);
+//
+//   /** 轮询的setTime ID 存储 */
+//   const pollingSetTimeRef = useRef<any>();
+//   const [list, setList] = useMountMergeState<any[] | undefined>(defaultData, {
+//     value: options?.dataSource,
+//     onChange: options?.onDataSourceChange,
+//   });
+//
+//   const [tableLoading, setTableLoading] = useMountMergeState<UseFetchDataAction['loading']>(false, {
+//     value: options?.loading,
+//     onChange: options?.onLoadingChange,
+//   });
+//
+//   const requesting = useRef(false);
+//
+//   const [pageInfo, setPageInfoState] = useMountMergeState<PageInfo>(
+//     () => mergeOptionAndPageInfo(options),
+//     {
+//       onChange: options?.onPageInfoChange,
+//     },
+//   );
+//   const setPageInfo = useRefFunction((changePageInfo: PageInfo) => {
+//     if (
+//       changePageInfo.current !== pageInfo.current ||
+//       changePageInfo.pageSize !== pageInfo.pageSize ||
+//       changePageInfo.total !== pageInfo.total
+//     ) {
+//       setPageInfoState(changePageInfo);
+//     }
+//   });
+//
+//   const [pollingLoading, setPollingLoading] = useMountMergeState(false);
+//
+//   // Batching update  https://github.com/facebook/react/issues/14259
+//   const setDataAndLoading = (newData: T[], dataTotal: number) => {
+//     setList(newData);
+//
+//     if (pageInfo?.total !== dataTotal) {
+//       setPageInfo({
+//         ...pageInfo,
+//         total: dataTotal || newData.length,
+//       });
+//     }
+//   };
+//
+//   // pre state
+//   const prePage = usePrevious(pageInfo?.current);
+//   const prePageSize = usePrevious(pageInfo?.pageSize);
+//   const prePolling = usePrevious(polling);
+//
+//   const { effects = [] } = options || {};
+//
+//   /**
+//    * 不这样做会导致状态不更新
+//    *
+//    * https://github.com/ant-design/pro-components/issues/4390
+//    */
+//   const requestFinally = useRefFunction(() => {
+//     if (typeof tableLoading === 'object') {
+//       setTableLoading({ ...tableLoading, spinning: false });
+//     } else {
+//       setTableLoading(false);
+//     }
+//     setPollingLoading(false);
+//   });
+//   /** 请求数据 */
+//   const fetchList = async (isPolling: boolean) => {
+//     if ((tableLoading && typeof tableLoading === 'boolean') || requesting.current || !getData) {
+//       return [];
+//     }
+//
+//     // 需要手动触发的首次请求
+//     if (manualRequestRef.current) {
+//       manualRequestRef.current = false;
+//       return [];
+//     }
+//     if (!isPolling) {
+//       if (typeof tableLoading === 'object') {
+//         setTableLoading({ ...tableLoading, spinning: true });
+//       } else {
+//         setTableLoading(true);
+//       }
+//     } else {
+//       setPollingLoading(true);
+//     }
+//
+//     requesting.current = true;
+//     const { pageSize, current } = pageInfo || {};
+//     try {
+//       const pageParams =
+//         options?.pageInfo !== false
+//           ? {
+//               current,
+//               pageSize,
+//             }
+//           : undefined;
+//
+//       const { data = [], success, total = 0, ...rest } = (await getData(pageParams)) || {};
+//       // 如果失败了，直接返回，不走剩下的逻辑了
+//       if (success === false) return [];
+//
+//       const responseData = postDataPipeline<T[]>(
+//         data!,
+//         [options.postData].filter((item) => item) as any,
+//       );
+//       setDataAndLoading(responseData, total);
+//       onLoad?.(responseData, rest);
+//       return responseData;
+//     } catch (e) {
+//       // 如果没有传递这个方法的话，需要把错误抛出去，以免吞掉错误
+//       if (onRequestError === undefined) throw new Error(e as string);
+//       if (list === undefined) setList([]);
+//       onRequestError(e as Error);
+//     } finally {
+//       requesting.current = false;
+//       requestFinally();
+//     }
+//
+//     return [];
+//   };
+//
+//   const fetchListDebounce = useDebounceFn(async (isPolling: boolean) => {
+//     if (pollingSetTimeRef.current) {
+//       clearTimeout(pollingSetTimeRef.current);
+//     }
+//     const msg = await fetchList(isPolling);
+//
+//     // 把判断要不要轮询的逻辑放到后面来这样可以保证数据是根据当前来
+//     // 放到请求前面会导致数据是上一次的
+//     const needPolling = runFunction(polling, msg);
+//
+//     // 如果需要轮询，搞个一段时间后执行
+//     // 如果解除了挂载，删除一下
+//     if (needPolling && !umountRef.current) {
+//       pollingSetTimeRef.current = setTimeout(() => {
+//         fetchListDebounce.run(needPolling);
+//         // 这里判断最小要2000ms，不然一直loading
+//       }, Math.max(needPolling, 2000));
+//     }
+//     return msg;
+//   }, debounceTime || 10);
+//
+//   // 如果轮询结束了，直接销毁定时器
+//   useEffect(() => {
+//     if (!polling) {
+//       clearTimeout(pollingSetTimeRef.current);
+//     }
+//     if (!prePolling && polling) {
+//       fetchListDebounce.run(true);
+//     }
+//     return () => {
+//       clearTimeout(pollingSetTimeRef.current);
+//     };
+//     // eslint-disable-next-line react-hooks/exhaustive-deps
+//   }, [polling]);
+//
+//   useLayoutEffect(() => {
+//     umountRef.current = false;
+//
+//     return () => {
+//       umountRef.current = true;
+//     };
+//   }, []);
+//
+//   /** PageIndex 改变的时候自动刷新 */
+//   useEffect(() => {
+//     const { current, pageSize } = pageInfo || {};
+//     // 如果上次的页码为空或者两次页码等于是没必要查询的
+//     // 如果 pageSize 发生变化是需要查询的，所以又加了 prePageSize
+//     if ((!prePage || prePage === current) && (!prePageSize || prePageSize === pageSize)) {
+//       return;
+//     }
+//
+//     if ((options.pageInfo && list && list?.length > pageSize) || 0) {
+//       return;
+//     }
+//
+//     // 如果 list 的长度大于 pageSize 的长度
+//     // 说明是一个假分页
+//     // (pageIndex - 1 || 1) 至少要第一页
+//     // 在第一页大于 10
+//     // 第二页也应该是大于 10
+//     if (current !== undefined && list && list.length <= pageSize) {
+//       fetchListDebounce.run(false);
+//     }
+//     // eslint-disable-next-line react-hooks/exhaustive-deps
+//   }, [pageInfo?.current]);
+//
+//   // pageSize 修改后返回第一页
+//   useEffect(() => {
+//     if (!prePageSize) {
+//       return;
+//     }
+//     fetchListDebounce.run(false);
+//     // eslint-disable-next-line react-hooks/exhaustive-deps
+//   }, [pageInfo?.pageSize]);
+//
+//   useDeepCompareEffect(() => {
+//     fetchListDebounce.run(false);
+//     if (!manual) {
+//       manualRequestRef.current = false;
+//     }
+//     return () => {
+//       fetchListDebounce.cancel();
+//     };
+//   }, [...effects, manual]);
+//
+//   return {
+//     dataSource: list!,
+//     setDataSource: setList,
+//     loading: tableLoading,
+//     reload: async () => {
+//       await fetchListDebounce.run(false);
+//     },
+//     pageInfo,
+//     pollingLoading,
+//     reset: async () => {
+//       const { pageInfo: optionPageInfo } = options || {};
+//       const { defaultCurrent = 1, defaultPageSize = 20 } = optionPageInfo || {};
+//       const initialPageInfo = {
+//         current: defaultCurrent,
+//         total: 0,
+//         pageSize: defaultPageSize,
+//       };
+//       setPageInfo(initialPageInfo);
+//     },
+//     setPageInfo: async (info) => {
+//       setPageInfo({
+//         ...pageInfo,
+//         ...info,
+//       });
+//     },
+//   };
+// };
+//
+// export default useFetchData;
+"use strict";

package/lib/StandardTablePro/utils.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+import { ActionType, UseFetchDataAction } from './types';
+export declare function useActionType<T>(ref: React.MutableRefObject<ActionType | undefined>, action: UseFetchDataAction<T>): void;