@ccs-ui/rc-pro 2.3.6-alpha-7 → 2.3.6-alpha-9

package/es/ccs.d.ts

@@ -1,5 +1,6 @@
 import { ButtonProps, PaginationProps } from 'antd';
 import { Rule } from 'antd/es/form';
+import { NamePath } from 'antd/es/form/interface';
 import { CSSProperties, MutableRefObject, ReactElement, ReactNode } from 'react';
 import { TableColumn } from './pro-table/table';
 type MenuType = {
@@ -43,13 +44,8 @@ type TableDataType<T> = {
     result?: T[];
 };
 type TableInstance<T = any> = {
-    /**
-     * @deprecated
-     * 获取form表单数据,排序等条件数据
-     */
-    formValues: Record<string, any>;
-    /** 接口请求参数 */
-    searchParam: Record<string, any>;
+    /** 获取当前表单数据 */
+    getFormValues: () => Promise<Record<string, any>>;
     /** 获取当前表单数据 */
     data: TableData<T>;
     /** 查询数据，根据条件，从第一页开始显示 */
@@ -98,11 +94,11 @@ type ShowDependType = {
     name: string;
     value: any;
 };
-export type TableFormItem = {
+type FormItemType = {
     /** label 标题 */
     label?: string;
     /** form name */
-    name: string;
+    name?: string;
     /** form item element */
     value: ReactElement;
     /** 数据依赖、依赖项对应的name数组 */
@@ -113,7 +109,14 @@ export type TableFormItem = {
     rules?: Rule[];
     /** 在发起请求时调用方法，格式化值 */
     onFormat?: (e: any) => any;
+    /** 组表单项名称 */
+    groupItemNames?: NamePath[];
 };
+export type TableFormItem = ({
+    name: string;
+} & Partial<FormItemType>) | ({
+    groupItemNames: NamePath[];
+} & Partial<FormItemType>);
 type TableFormItems = TableFormItem[];
 type TableInstanceRef<T = any> = MutableRefObject<TableInstance<T> | undefined> | React.RefObject<TableInstance<T>>;
 type TableColumns<RecordType = any> = TableColumn<RecordType>[];

package/es/dialog/button.d.ts

@@ -16,7 +16,7 @@ export type DialogButtonsProps<T> = Pick<CcsDialogModalProps, 'okText' | 'onClos
 export type DialogButtonRef = {
     onSetButtons: (e: React.ReactElement) => void;
 };
-export declare const DialogButtonHolder: <TParams, TData>({ auth, extraBtn, formRef, request, onOk, onClose, buttonRef, requestFieldNames, formInitialValues, preventRequestHandle, }: Pick<CcsDialogModalProps<TParams, TData>, "auth" | "onClose" | "request" | "onOk" | "extraBtn" | "requestFieldNames" | "preventRequestHandle"> & {
+export declare const DialogButtonHolder: <TParams, TData>({ auth, extraBtn, formRef, request, onOk, onClose, buttonRef, requestFieldNames, formInitialValues, preventRequestHandle, }: Pick<CcsDialogModalProps<TParams, TData>, "auth" | "request" | "onOk" | "onClose" | "extraBtn" | "requestFieldNames" | "preventRequestHandle"> & {
     formRef: React.RefObject<DialogFormRef<TParams>>;
     formInitialValues: FormProps['initialValues'];
     buttonRef: RefObject<DialogButtonRef>;

package/es/group-form-item/index.d.ts

@@ -0,0 +1,11 @@
+import { FormItemProps } from 'antd';
+import { NamePath } from 'antd/es/form/interface';
+export type GroupFormItemProps = FormItemProps & {
+    /** 组表单项名称 */
+    groupItemNames: NamePath[];
+};
+declare function GroupFormItem({ groupItemNames, name, ...formItemProps }: GroupFormItemProps): import("react/jsx-runtime").JSX.Element;
+declare namespace GroupFormItem {
+    var displayName: string;
+}
+export default GroupFormItem;

package/es/group-form-item/index.js

@@ -0,0 +1,124 @@
+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 = ["groupItemNames", "name"];
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+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 _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 _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; }
+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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread 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); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+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; }
+import { useUpdateEffect } from 'ahooks';
+import { Form } from 'antd';
+import { useEffect, useState } from 'react';
+import { getDataFromFields } from "../select";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+var FormUpdateItem = function FormUpdateItem(_ref) {
+  var name = _ref.name,
+    getFieldsValue = _ref.getFieldsValue,
+    setFieldValue = _ref.setFieldValue,
+    getFieldValue = _ref.getFieldValue,
+    groupItemNames = _ref.groupItemNames;
+  var nameValue = getFieldValue(name);
+  useEffect(function () {
+    // 初始值
+    var initialValues = getFieldsValue(true);
+    var initNameValue = [];
+
+    // 根据子项初始值设置name的默认值
+    groupItemNames.forEach(function (item) {
+      initNameValue.push(getDataFromFields(initialValues, Array.isArray(item) ? item : [item]));
+    });
+
+    // 如果子项有初始值，则设置name的默认值
+    if (initNameValue.filter(function (n) {
+      return n !== undefined;
+    }).length > 0) {
+      setFieldValue(name, initNameValue);
+      return;
+    }
+
+    // 如果子项没有初始值，主项有初始值
+    var groupNameValue = getDataFromFields(initialValues, Array.isArray(name) ? name : [name]);
+    if (Array.isArray(groupNameValue)) {
+      groupItemNames.forEach(function (item, index) {
+        setFieldValue(item, groupNameValue[index]);
+      });
+    }
+  }, []);
+
+  // 依赖主字段变更，更新子项属性值
+  useUpdateEffect(function () {
+    setTimeout(function () {
+      groupItemNames.forEach(function (item, index) {
+        setFieldValue(item, Array.isArray(nameValue) ? nameValue[index] : undefined);
+      });
+    }, 1);
+  }, [nameValue]);
+  return null;
+};
+function onGetNameValue() {
+  var obj = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  var name = arguments.length > 1 ? arguments[1] : undefined;
+  if (!obj) return undefined;
+  if (Array.isArray(name)) {
+    var names = _toConsumableArray(name);
+    var newName = names.shift();
+    if (names.length === 0) return obj[newName];
+    return onGetNameValue(obj[newName], names);
+  }
+  return obj[name];
+}
+function GroupFormItem(_ref2) {
+  var groupItemNames = _ref2.groupItemNames,
+    name = _ref2.name,
+    formItemProps = _objectWithoutProperties(_ref2, _excluded);
+  var _useState = useState(name || "_".concat(JSON.stringify(groupItemNames).replace(/[^a-zA-Z]/g, ''))),
+    _useState2 = _slicedToArray(_useState, 1),
+    itemName = _useState2[0];
+  return /*#__PURE__*/_jsxs(_Fragment, {
+    children: [/*#__PURE__*/_jsx(Form.Item, _objectSpread({
+      name: itemName
+    }, formItemProps)), groupItemNames && groupItemNames.length > 0 && /*#__PURE__*/_jsxs(_Fragment, {
+      children: [/*#__PURE__*/_jsx(Form.Item, {
+        noStyle: true,
+        shouldUpdate: function shouldUpdate(l, r) {
+          return onGetNameValue(l, itemName) !== onGetNameValue(r, itemName);
+        },
+        children: function children(_ref3) {
+          var getFieldsValue = _ref3.getFieldsValue,
+            setFieldValue = _ref3.setFieldValue,
+            getFieldValue = _ref3.getFieldValue;
+          return /*#__PURE__*/_jsx(FormUpdateItem, {
+            getFieldsValue: getFieldsValue,
+            setFieldValue: setFieldValue,
+            getFieldValue: getFieldValue,
+            groupItemNames: groupItemNames,
+            name: itemName
+          });
+        }
+      }), groupItemNames.map(function (item, index) {
+        return /*#__PURE__*/_jsx(Form.Item, {
+          noStyle: true,
+          name: item,
+          hidden: true
+        }, index);
+      })]
+    })]
+  });
+}
+if (process.env.NODE_ENV !== 'production') {
+  GroupFormItem.displayName = 'CcsGroupFormItem';
+}
+export default GroupFormItem;

package/es/hooks/use-selection.js

@@ -161,9 +161,12 @@ export default function useTableSelection(props) {
     }
     handleOnChange();
   });
-  return _objectSpread(_objectSpread({}, selectionRef.current), {}, {
+  return _objectSpread(_objectSpread(_objectSpread({}, selectionRef.current), {}, {
     onChange: onChange,
     onClear: onClear,
     type: type
-  }, rowSelectionProps);
+  }, rowSelectionProps), {}, {
+    // @ts-ignore
+    onClearByProTable: onClear
+  });
 }

package/es/index.d.ts

@@ -9,6 +9,7 @@ export { default as CcsDialog } from './dialog';
 export { default as CcsEditor } from './editor';
 export { default as CcsEllipsis } from './ellipsis';
 export { default as CcsFullScreenButton } from './full-screen';
+export { default as CcsGroupFormItem } from './group-form-item';
 export { default as useAppConfig } from './hooks/use-app';
 export { default as useCcsOnceEvent } from './hooks/use-once-event';
 export { default as useCcsPage } from './hooks/use-page';

package/es/index.js

@@ -9,6 +9,7 @@ export { default as CcsDialog } from "./dialog";
 export { default as CcsEditor } from "./editor";
 export { default as CcsEllipsis } from "./ellipsis";
 export { default as CcsFullScreenButton } from "./full-screen";
+export { default as CcsGroupFormItem } from "./group-form-item";
 export { default as useAppConfig } from "./hooks/use-app";
 export { default as useCcsOnceEvent } from "./hooks/use-once-event";
 export { default as useCcsPage } from "./hooks/use-page";

package/es/pro-table/form-item.d.ts

@@ -3,5 +3,5 @@ import { CcsProTableProps } from './table';
 type PropsType = TableFormItem & {
     dependParam?: any;
 } & Pick<CcsProTableProps<any>, 'formItemLabelWidth'>;
-export default function HeadFormItem({ label, name, rules, value, dependParam, formItemLabelWidth, }: PropsType): import("react/jsx-runtime").JSX.Element;
+export default function HeadFormItem({ label, name, rules, value, dependParam, groupItemNames, formItemLabelWidth, }: PropsType): import("react/jsx-runtime").JSX.Element;
 export {};

package/es/pro-table/form-item.js

@@ -1,5 +1,12 @@
+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); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+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); }
 import { Form } from 'antd';
 import { cloneElement } from 'react';
+import { CcsGroupFormItem } from '..';
 import { classPrefix } from "./table";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
@@ -9,19 +16,28 @@ export default function HeadFormItem(_ref) {
     rules = _ref.rules,
     value = _ref.value,
     dependParam = _ref.dependParam,
+    groupItemNames = _ref.groupItemNames,
     formItemLabelWidth = _ref.formItemLabelWidth;
+  var props = {
+    name: name,
+    rules: rules,
+    className: "".concat(classPrefix, "-form-label"),
+    label: formItemLabelWidth ? /*#__PURE__*/_jsx("div", {
+      style: {
+        width: formItemLabelWidth
+      },
+      children: label
+    }) : label
+  };
+  if (groupItemNames) {
+    return /*#__PURE__*/_jsx(CcsGroupFormItem, _objectSpread(_objectSpread({}, props), {}, {
+      groupItemNames: groupItemNames,
+      children: dependParam ? /*#__PURE__*/cloneElement(value, dependParam) : value
+    }));
+  }
   return /*#__PURE__*/_jsx(_Fragment, {
-    children: /*#__PURE__*/_jsx(Form.Item, {
-      name: name,
-      rules: rules,
-      className: "".concat(classPrefix, "-form-label"),
-      label: formItemLabelWidth ? /*#__PURE__*/_jsx("div", {
-        style: {
-          width: formItemLabelWidth
-        },
-        children: label
-      }) : label,
+    children: /*#__PURE__*/_jsx(Form.Item, _objectSpread(_objectSpread({}, props), {}, {
       children: dependParam ? /*#__PURE__*/cloneElement(value, dependParam) : value
-    })
+    }))
   });
 }

package/es/pro-table/head.js

@@ -105,39 +105,44 @@ function HeadComponent(_ref) {
     }), toolbar ? null : tableOperation]
   });
   var renderFormItems = function renderFormItems() {
-    return allFormItems.map(function (item) {
-      if (item.depends || item.showDepends) {
+    return allFormItems.map(function (_ref2, index) {
+      var depends = _ref2.depends,
+        showDepends = _ref2.showDepends,
+        name = _ref2.name,
+        groupItemNames = _ref2.groupItemNames,
+        label = _ref2.label,
+        rules = _ref2.rules,
+        value = _ref2.value;
+      if (depends || showDepends) {
         return /*#__PURE__*/_jsx(React.Fragment, {
           children: /*#__PURE__*/_jsx(Form.Item, {
             noStyle: true,
             shouldUpdate: function shouldUpdate(l, n) {
-              var _item$depends, _item$showDepends;
-              return ((_item$depends = item.depends) === null || _item$depends === void 0 ? void 0 : _item$depends.some(function (i) {
+              return (depends === null || depends === void 0 ? void 0 : depends.some(function (i) {
                 return l[i] !== n[i];
-              })) || ((_item$showDepends = item.showDepends) === null || _item$showDepends === void 0 ? void 0 : _item$showDepends.some(function (i) {
+              })) || (showDepends === null || showDepends === void 0 ? void 0 : showDepends.some(function (i) {
                 return l[i.name] !== n[i.name];
               })) || false;
             },
-            children: function children(_ref2) {
-              var _item$depends2;
-              var getFieldValue = _ref2.getFieldValue;
+            children: function children(_ref3) {
+              var getFieldValue = _ref3.getFieldValue;
               var dependParam = {};
-              (_item$depends2 = item.depends) === null || _item$depends2 === void 0 || _item$depends2.forEach(function (i) {
+              depends === null || depends === void 0 || depends.forEach(function (i) {
                 var value = getFieldValue(i);
                 dependParam[i] = value;
               });
               var isShow = true;
-              if (item.showDepends && item.showDepends.length > 0) {
-                var _item$showDepends2;
-                isShow = (_item$showDepends2 = item.showDepends) === null || _item$showDepends2 === void 0 ? void 0 : _item$showDepends2.every(function (i) {
+              if (showDepends && showDepends.length > 0) {
+                isShow = showDepends === null || showDepends === void 0 ? void 0 : showDepends.every(function (i) {
                   return getFieldValue(i.name) === i.value;
                 });
               }
               var itemContent = /*#__PURE__*/_jsx(HeadFormItem, {
-                name: item.name,
-                label: item.label,
-                rules: item.rules,
-                value: item.value,
+                name: name,
+                groupItemNames: groupItemNames,
+                label: label,
+                rules: rules,
+                value: value,
                 dependParam: dependParam,
                 formItemLabelWidth: formItemLabelWidth
               });
@@ -145,18 +150,19 @@ function HeadComponent(_ref) {
               return itemContent;
             }
           })
-        }, item.name);
+        }, name);
       }
       var itemContent = /*#__PURE__*/_jsx(HeadFormItem, {
-        name: item.name,
-        value: item.value,
-        rules: item.rules,
-        label: item.label,
+        groupItemNames: groupItemNames,
+        name: name,
+        value: value,
+        rules: rules,
+        label: label,
         formItemLabelWidth: formItemLabelWidth
       });
       return /*#__PURE__*/_jsx(React.Fragment, {
         children: itemContent
-      }, item.name);
+      }, index);
     });
   };
   var formStyles = {

package/es/pro-table/table.js

@@ -1,9 +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); }
-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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+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 ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -124,8 +124,6 @@ var InternalProTable = function InternalProTable(props) {
   var filterOrderRef = useRef(defaultColumnValues);
   // table content
   var tableContentRef = useRef(null);
-  // 接口查询条件
-  var searchParamRef = useRef({});
   // container
   var containerRef = useRef(null);
   // table ref
@@ -167,14 +165,49 @@ var InternalProTable = function InternalProTable(props) {
     });
   }, []);
 
+  // 构建查询条件:表单数据、请求额外参数、分页参数、其他参数
+  var getFormValues = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var _formRef$current;
+      var formValues;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.validateFields();
+          case 2:
+            formValues = _context.sent;
+            // 格式化条件
+            if (formatFormItems.length) {
+              Object.keys(formValues).forEach(function (k) {
+                if (formValues[k] !== undefined) {
+                  var s = formatFormItems.find(function (f) {
+                    return f.name === k;
+                  });
+                  if (s) formValues[k] = s.onFormat && s.onFormat(formValues[k]);
+                }
+              });
+            }
+            return _context.abrupt("return", _objectSpread(_objectSpread(_objectSpread({}, requestParam), formInitValues), formValues));
+          case 5:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function getFormValues() {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+
   // 获取数据
   var onRequest = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(eventType) {
-      var _formRef$current, _props$table;
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(eventType) {
+      var _props$table;
       var pageNo,
         pageSize,
         record,
-        formValues,
+        allParams,
         fieldNames,
         _fieldNames$requestPa,
         _fieldNames$requestPa2,
@@ -195,43 +228,31 @@ var InternalProTable = function InternalProTable(props) {
         dataSource,
         total,
         newData,
-        _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:
-            pageNo = _args.length > 1 && _args[1] !== undefined ? _args[1] : 1;
-            pageSize = _args.length > 2 && _args[2] !== undefined ? _args[2] : (pagination ? pagination.defaultPageSize : 10) || 10;
-            record = _args.length > 3 ? _args[3] : undefined;
+            pageNo = _args2.length > 1 && _args2[1] !== undefined ? _args2[1] : 1;
+            pageSize = _args2.length > 2 && _args2[2] !== undefined ? _args2[2] : (pagination ? pagination.defaultPageSize : 10) || 10;
+            record = _args2.length > 3 ? _args2[3] : undefined;
             if (!(!isAuth || !httpRequest)) {
-              _context.next = 5;
+              _context2.next = 5;
               break;
             }
-            return _context.abrupt("return");
+            return _context2.abrupt("return");
           case 5:
-            _context.next = 7;
-            return (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.validateFields();
+            _context2.next = 7;
+            return getFormValues();
           case 7:
-            formValues = _context.sent;
+            allParams = _context2.sent;
             // 接口字段指定
-            fieldNames = _objectSpread(_objectSpread({}, globalFieldNames), (_props$table = props.table) === null || _props$table === void 0 ? void 0 : _props$table.fieldNames); // 格式化条件
-            if (formatFormItems.length) {
-              Object.keys(formValues).forEach(function (k) {
-                if (formValues[k] !== undefined) {
-                  var s = formatFormItems.find(function (f) {
-                    return f.name === k;
-                  });
-                  if (s) formValues[k] = s.onFormat && s.onFormat(formValues[k]);
-                }
-              });
-            }
-
-            // 请求字段
+            fieldNames = _objectSpread(_objectSpread({}, globalFieldNames), (_props$table = props.table) === null || _props$table === void 0 ? void 0 : _props$table.fieldNames); // 请求字段
             _fieldNames$requestPa = fieldNames.requestParam, _fieldNames$requestPa2 = _fieldNames$requestPa.filters, fsFilters = _fieldNames$requestPa2 === void 0 ? ['filters'] : _fieldNames$requestPa2, _fieldNames$requestPa3 = _fieldNames$requestPa.pageNo, fsPageNo = _fieldNames$requestPa3 === void 0 ? ['pageNo'] : _fieldNames$requestPa3, _fieldNames$requestPa4 = _fieldNames$requestPa.pageSize, fsPageSize = _fieldNames$requestPa4 === void 0 ? ['pageSize'] : _fieldNames$requestPa4, _fieldNames$requestPa5 = _fieldNames$requestPa.orderProps, fsOrderProps = _fieldNames$requestPa5 === void 0 ? ['orderProps'] : _fieldNames$requestPa5, fsQuery = _fieldNames$requestPa.query; // 构建请求参数
             params = {};
             if (fsQuery && fsQuery.length > 0) {
-              onSetObj(params, _toConsumableArray(fsQuery), _objectSpread(_objectSpread(_objectSpread({}, requestParam), formInitValues), formValues));
+              onSetObj(params, _toConsumableArray(fsQuery), allParams);
             } else {
-              params = _objectSpread(_objectSpread(_objectSpread({}, requestParam), formInitValues), formValues);
+              params = allParams;
             }
             if (pagination !== false) {
               // 分页
@@ -250,14 +271,12 @@ var InternalProTable = function InternalProTable(props) {
 
             // 异步树
             if (!parentFieldName) {
-              _context.next = 20;
+              _context2.next = 19;
               break;
             }
             (_treeRef$current = treeRef.current) === null || _treeRef$current === void 0 || _treeRef$current.onRequestTree(params.query, record);
-            return _context.abrupt("return");
-          case 20:
-            // 记录查询条件
-            searchParamRef.current = params;
+            return _context2.abrupt("return");
+          case 19:
             onEvent === null || onEvent === void 0 || onEvent(eventType, {
               loading: true,
               params: params
@@ -269,10 +288,10 @@ var InternalProTable = function InternalProTable(props) {
                 loading: true
               });
             });
-            _context.next = 25;
+            _context2.next = 23;
             return httpRequest(params);
-          case 25:
-            requestResult = _context.sent;
+          case 23:
+            requestResult = _context2.sent;
             onEvent === null || onEvent === void 0 || onEvent(eventType, {
               loading: false,
               params: params,
@@ -281,7 +300,7 @@ var InternalProTable = function InternalProTable(props) {
 
             // 请求结果
             if (!requestResult) {
-              _context.next = 37;
+              _context2.next = 35;
               break;
             }
             // 获取table数据
@@ -291,7 +310,7 @@ var InternalProTable = function InternalProTable(props) {
             }
             total = getDataFromFields(requestResult, fieldNames.total);
             if (!(total === undefined || dataSource === undefined)) {
-              _context.next = 35;
+              _context2.next = 33;
               break;
             }
             newData = {
@@ -302,8 +321,8 @@ var InternalProTable = function InternalProTable(props) {
               loading: false
             };
             setData(newData);
-            return _context.abrupt("return");
-          case 35:
+            return _context2.abrupt("return");
+          case 33:
             // 当前页无数据，返回上一页
             if (!dataSource.length && pageNo !== 1) {
               onRequest(TableEvent.Reload, pageNo - 1);
@@ -316,21 +335,21 @@ var InternalProTable = function InternalProTable(props) {
                 total: total || 0
               });
             }
-            return _context.abrupt("return");
-          case 37:
+            return _context2.abrupt("return");
+          case 35:
             setData(function (d) {
               return _objectSpread(_objectSpread({}, d), {}, {
                 loading: false
               });
             });
-          case 38:
+          case 36:
           case "end":
-            return _context.stop();
+            return _context2.stop();
         }
-      }, _callee);
+      }, _callee2);
     }));
     return function onRequest(_x) {
-      return _ref2.apply(this, arguments);
+      return _ref3.apply(this, arguments);
     };
   }();
 
@@ -382,12 +401,17 @@ var InternalProTable = function InternalProTable(props) {
 
   // 查询按钮
   var onSearch = function onSearch() {
+    var _table$rowSelection, _table$rowSelection$o;
+    // @ts-ignore
+    table === null || table === void 0 || (_table$rowSelection = table.rowSelection) === null || _table$rowSelection === void 0 || (_table$rowSelection$o = _table$rowSelection.onClearByProTable) === null || _table$rowSelection$o === void 0 || _table$rowSelection$o.call(_table$rowSelection);
     onRequest(TableEvent.Search);
   };
 
   // 重置
   var onReset = function onReset() {
-    var _formRef$current2;
+    var _table$rowSelection2, _table$rowSelection2$, _formRef$current2;
+    // @ts-ignore
+    table === null || table === void 0 || (_table$rowSelection2 = table.rowSelection) === null || _table$rowSelection2 === void 0 || (_table$rowSelection2$ = _table$rowSelection2.onClearByProTable) === null || _table$rowSelection2$ === void 0 || _table$rowSelection2$.call(_table$rowSelection2);
     // 重置表单
     (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 || _formRef$current2.resetFields();
     // 清空columns显示filter和sort值
@@ -406,16 +430,17 @@ var InternalProTable = function InternalProTable(props) {
 
   // 刷新
   var onReload = function onReload() {
+    var _table$rowSelection3, _table$rowSelection3$;
+    // @ts-ignore
+    table === null || table === void 0 || (_table$rowSelection3 = table.rowSelection) === null || _table$rowSelection3 === void 0 || (_table$rowSelection3$ = _table$rowSelection3.onClearByProTable) === null || _table$rowSelection3$ === void 0 || _table$rowSelection3$.call(_table$rowSelection3);
     onRequest(TableEvent.Reload, data.current, data.pageSize);
   };
 
   // form 数据 查询，重载，重置方法
   useImperativeHandle(proRef, function () {
-    var _formRef$current3;
     return {
       data: data,
-      formValues: (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 ? void 0 : _formRef$current3.getFieldsValue(),
-      searchParam: searchParamRef.current,
+      getFormValues: getFormValues,
       onSearch: onSearch,
       onReload: onReload,
       onPartialReload: function onPartialReload(param) {
@@ -550,9 +575,9 @@ var InternalProTable = function InternalProTable(props) {
     }, rootStyle);
   }
   var onFullScreen = function onFullScreen(isFull) {
-    var _ref3 = containerRef.current || {},
-      classList = _ref3.classList,
-      style = _ref3.style;
+    var _ref4 = containerRef.current || {},
+      classList = _ref4.classList,
+      style = _ref4.style;
     if (isFull) {
       classList === null || classList === void 0 || classList.add('css-table-full');
       style.backgroundColor = token.colorBgContainer;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ccs-ui/rc-pro",
-  "version": "2.3.6-alpha-7",
+  "version": "2.3.6-alpha-9",
   "description": "",
   "license": "MIT",
   "author": {