fan-standard-comp 4.1.3 → 4.1.4

package/es/StandardTable/index.js

@@ -14,7 +14,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useContext } from 'react';
+import React, { useContext, memo } from 'react';
 import classNames from 'classnames';
 import { Table, Card } from 'antd';
 import ButtonGroup from "../ButtonGroup/index";
@@ -232,7 +232,13 @@ var StandardTable = function StandardTable(props) {
       });
       rest === null || rest === void 0 || (_rest$onChange = rest.onChange) === null || _rest$onChange === void 0 || _rest$onChange.call(rest, _objectSpread(_objectSpread({}, pagination), {}, {
         size: pagination.pageSize,
-        // orders,   // 对象
+        orders: sorters.map(function (item) {
+          return {
+            column: item.columnKey,
+            asc: item.order == 'ascend'
+          };
+        }),
+        // 对象
         sorters: sorters,
         // 数组
         sorterParams: sorterParams // 对象
@@ -240,4 +246,4 @@ var StandardTable = function StandardTable(props) {
     }
   }))));
 };
-export default StandardTable;
+export default /*#__PURE__*/memo(StandardTable);

package/es/StandardTablePro/index.d.ts

@@ -1,17 +1,7 @@
 import React from 'react';
-import type { StandardTableProps } from '../StandardTable/types';
-interface StandardTableProType extends StandardTableProps {
-    proClassname?: string;
-    filter?: any;
-    formConfig?: any;
-    onChange?: (pageParams?: any) => void;
-    onSubmit?: (searchParams?: any) => void;
-    onReset?: () => void;
-    params?: any;
-    [k: string]: any;
-}
+import { StandardTableProType } from './types';
 /**
  * 复合表格：筛选+表格列表
  * */
-declare const StandardTablePro: React.ForwardRefExoticComponent<React.RefAttributes<StandardTableProType>>;
+declare const StandardTablePro: React.ForwardRefExoticComponent<Omit<StandardTableProType, "ref"> & React.RefAttributes<HTMLDivElement>>;
 export default StandardTablePro;

package/es/StandardTablePro/index.js

@@ -1,6 +1,9 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _excluded = ["proClassname", "filter", "formConfig", "codes", "permissionCodes", "onSubmit", "onReset", "onChange", "children", "className", "columns", "params"];
+var _excluded = ["proClassname", "filter", "formConfig", "codes", "permissionCodes", "onSubmit", "onReset", "onChange", "children", "className", "columns", "defaultParams", "acceptType", "data", "fetchData", "fetchOptionName", "onAction", "tableActionRef", "filterFormRef", "getDataSource", "localPageInfo"];
 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); }
@@ -14,13 +17,14 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 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; }
-import React, { useContext, useImperativeHandle, forwardRef, useState, useMemo } from 'react';
-// import { FanContext, StandardFilter, StandardTable } from "fan-standard-comp";
+import React, { useContext, useImperativeHandle, forwardRef, useState, useMemo, useCallback, useEffect, useRef } from 'react';
 import { FanContext } from "../ConfigContext";
 import StandardFilter from "../StandardFilter";
 import StandardTable from "../StandardTable";
+import { useActionType } from "./utils";
 import useStyle from "./style/index";
 import classNames from "classnames";
+
 /**
  * 复合表格：筛选+表格列表
  * */
@@ -39,7 +43,28 @@ var StandardTablePro = /*#__PURE__*/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,
@@ -50,6 +75,27 @@ var StandardTablePro = /*#__PURE__*/forwardRef(function (props, ref) {
     _useStyle2 = _slicedToArray(_useStyle, 2),
     wrapSSR = _useStyle2[0],
     hashId = _useStyle2[1];
+  // data.list, data.pagination
+  var _useState = useState({
+      list: [],
+      pagination: {},
+      keywords: {}
+    }),
+    _useState2 = _slicedToArray(_useState, 2),
+    resDataSource = _useState2[0],
+    setResDataSource = _useState2[1];
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    queryLoading = _useState4[0],
+    setQueryLoading = _useState4[1];
+  var _useState5 = useState(false),
+    _useState6 = _slicedToArray(_useState5, 2),
+    searchLoading = _useState6[0],
+    setSearchLoading = _useState6[1];
+  var _useState7 = 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);
@@ -57,11 +103,8 @@ var StandardTablePro = /*#__PURE__*/forwardRef(function (props, ref) {
     if (targetKey === 'filterReset') {
       onReset === null || onReset === void 0 || onReset();
     }
-    // if (targetKey === 'tableChange') {
-    //   onChange && onChange(data, defaultParam)
-    // }
   };
-  var formItemGroup = useMemo(function () {
+  var formItemGroupConcat = useMemo(function () {
     var itemGroupFromColumns = (columns || []).filter(function (item) {
       return item.formItem && JSON.stringify(item.formItem) !== '{}';
     }).map(function (fItem) {
@@ -72,51 +115,193 @@ var StandardTablePro = /*#__PURE__*/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 = useState({}),
+    _useState10 = _slicedToArray(_useState9, 2),
+    filterInstance = _useState10[0],
+    setFilterFormInstance = _useState10[1];
+  // const [filterInitialValues, setFilterInitialValues] = useState({})
   // const [filterFields, setFilterFormFields] = useState({})
-  var _useState = 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 = useRef();
+  useImperativeHandle(propsActionRef, function () {
+    return actionRef.current;
+  });
+  useImperativeHandle(defaultFormRef, function () {
+    return filterInstance === null || filterInstance === void 0 ? void 0 : filterInstance.current;
+  });
   // ref 的转发
   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 */
+  useActionType(actionRef, action);
+
+  /**
+   * 加载数据方法
+   * @param {string} updateKey 触发位置
+   * @param {Object} pagination 分页选项
+   * @param {Object} filter 筛选条件或表格排序条件
+   * @param {Object} tableChangeParams (表格默认参数）{pagination, filter, sorter, extra}
+   */
+  var loadData = 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]);
+  useEffect(function () {
+    if (acceptType === 'data') {
+      setResDataSource(data);
+    }
+  }, [acceptType, data]);
+  useEffect(function () {
+    getDataSource && getDataSource(resDataSource);
+  }, [resDataSource]);
+  useEffect(function () {
+    loadData('init'); // 接口请求调用
+  }, []);
   return wrapSSR( /*#__PURE__*/React.createElement("div", {
     className: classNames(componentName, proClassname, hashId)
-  }, /*#__PURE__*/React.createElement(StandardFilter, _extends({}, commonConfig, filter, {
-    // initialValue={filterValues}
-    formItemGroup: formItemGroup,
+  }, formItemGroupConcat !== null && formItemGroupConcat !== void 0 && formItemGroupConcat.length ? /*#__PURE__*/React.createElement(StandardFilter, _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: classNames('spec-standard-table-pro-filter', filter === null || filter === void 0 ? void 0 : filter.className)
-  })), /*#__PURE__*/React.createElement(StandardTable, _extends({}, commonConfig, others, {
-    columns: columns
+  })) : null, /*#__PURE__*/React.createElement(StandardTable, _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: classNames('spec-standard-table-pro-table', className)
   })), children));

package/es/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/es/StandardTablePro/types.js

@@ -0,0 +1 @@
+export {};