@zat-design/sisyphus-react 3.13.6 → 3.13.7-beta.2

package/es/ProTree/components/ProTreeSelect/index.js

@@ -12,20 +12,22 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import "antd/es/tree-select/style";
 import _TreeSelect from "antd/es/tree-select";
-var _excluded = ["disabled", "code", "dataSource", "defaultDisableValue", "onChange", "useRequest", "transformResponse", "fieldNames", "tooltip", "showSearch", "filterTreeNode", "treeNodeFilterProp", "defaultExpandAll", "expandedKeys", "treeCheckable", "onSearch", "otherProps", "width", "dropdownStyle", "popupClassName", "style", "allowClear", "listHeight", "showCodeName", "className", "checkStrictly", "checkable"],
+var _excluded = ["disabled", "code", "dataSource", "defaultDisableValue", "onChange", "useRequest", "transformResponse", "fieldNames", "placeholder", "tooltip", "showSearch", "filterTreeNode", "treeNodeFilterProp", "defaultExpandAll", "expandedKeys", "treeCheckable", "onSearch", "otherProps", "width", "dropdownStyle", "popupClassName", "style", "allowClear", "listHeight", "showCodeName", "className", "checkStrictly", "checkable"],
   _excluded2 = ["children"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 /* eslint-disable react/no-danger */
 /* eslint-disable react/jsx-closing-tag-location */
 import { useDeepCompareEffect, useRequest as useRequestFunc, useSetState } from 'ahooks';
 import classnames from 'classnames';
-import { useImperativeHandle, forwardRef } from 'react';
+import { useImperativeHandle, forwardRef, useCallback } from 'react';
 import { cloneDeep, debounce } from 'lodash';
+import locale from '../../../locale';
 import { useProConfig } from '../../../ProConfigProvider';
 import Container from '../../../ProForm/components/Container';
 import AdaptiveTooltip from '../AdaptiveTooltip';
 var SHOW_PARENT = _TreeSelect.SHOW_PARENT;
 export var ProTreeSelect = function ProTreeSelect(props, ref) {
+  var _useRequest$options;
   // 全局属性配置在ConfigProvider
   var _ref = useProConfig('ProTreeSelect') || {},
     _ref$fieldNames = _ref.fieldNames,
@@ -50,6 +52,7 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
     useRequest = props.useRequest,
     transformResponse = props.transformResponse,
     fieldNames = props.fieldNames,
+    placeholder = props.placeholder,
     _props$tooltip = props.tooltip,
     tooltip = _props$tooltip === void 0 ? false : _props$tooltip,
     _props$showSearch = props.showSearch,
@@ -168,11 +171,26 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
       origDataSource: resultData || []
     });
   };
+  var successTransformDataHandle = useCallback(function (res) {
+    if (transformResponse && typeof transformResponse === 'function') {
+      return transformResponse(res);
+    }
+    var _ref4 = res || {},
+      _ref4$status = _ref4.status,
+      status = _ref4$status === void 0 ? 200 : _ref4$status,
+      msg = _ref4.message,
+      data = _ref4.data;
+    if (status !== 200) {
+      _message.error(msg);
+      return;
+    }
+    return data;
+  }, []);
   // 配置了异步数据源，拉取枚举数据逻辑 如果有code不掉接口从local里根据code取值
   var fetchFunction = useRequestFunc(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, _objectSpread({
     manual: true,
+    debounceWait: 300,
     onSuccess: function onSuccess(data) {
-      // 用户配置了处理枚举函数
       if (transformResponse && typeof transformResponse === 'function') {
         var responseData = transformResponse(data);
         var resultData = transferDataSource(responseData, showCodeName);
@@ -181,16 +199,33 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
           origDataSource: resultData
         });
       } else {
-        defaultOnSuccessFun(data);
+        defaultOnSuccessFun(fetchFunction.data);
       }
-    },
-    debounceWait: 300
+    }
   }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options));
+  var cacheList = (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options = useRequest.options) === null || _useRequest$options === void 0 ? void 0 : _useRequest$options.cacheKey) ? successTransformDataHandle(fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.data) : [];
   useImperativeHandle(ref, function () {
     return {
       useRequestRef: fetchFunction
     };
   });
+  // 设置cacheKey后使用缓存的数据
+  useDeepCompareEffect(function () {
+    var _useRequest$options2;
+    if (fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.data, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options2 = useRequest.options) === null || _useRequest$options2 === void 0 ? void 0 : _useRequest$options2.cacheKey) {
+      if (transformResponse && typeof transformResponse === 'function') {
+        var responseData = transformResponse(fetchFunction.data);
+        // debugger;
+        var resultData = transferDataSource(responseData, showCodeName);
+        setState({
+          selectList: countChild(resultData),
+          origDataSource: resultData
+        });
+      } else {
+        defaultOnSuccessFun(fetchFunction.data);
+      }
+    }
+  }, [fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.data]);
   useDeepCompareEffect(function () {
     if (enumCode) {
       var dictEnum = dics[enumCode] || [];
@@ -212,17 +247,21 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
     if (enumCode || dataSource) {
       return undefined;
     }
+    // 如果配置手动加载，不执行请求
+    var _ref5 = (useRequest === null || useRequest === void 0 ? void 0 : useRequest.options) || {},
+      defaultParams = _ref5.defaultParams,
+      manual = _ref5.manual;
     // disabled 状态时，不查询接口
     if (defaultDisableValue || !useRequest) {
       return undefined;
     }
-    // 如果配置手动加载，不执行请求
-    var _ref4 = (useRequest === null || useRequest === void 0 ? void 0 : useRequest.options) || {},
-      defaultParams = _ref4.defaultParams;
+    if (manual || (cacheList === null || cacheList === void 0 ? void 0 : cacheList.length)) {
+      return;
+    }
     var params = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
     // 执行用户配置的枚举服务，拉取枚举数据进行更新
     fetchFunction.run(params);
-  }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, defaultDisableValue]);
+  }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.options, defaultDisableValue]);
   // disable默认值
   if (defaultDisableValue) {
     return _jsx("span", {
@@ -399,7 +438,7 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
     return sourceList;
   }
   var searchTreeEvent = debounce(/*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(searchVal) {
+    var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(searchVal) {
       var result;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -424,7 +463,7 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
       }, _callee);
     }));
     return function (_x) {
-      return _ref5.apply(this, arguments);
+      return _ref6.apply(this, arguments);
     };
   }(), 500);
   function findTreeNode(treeList, nodeValue) {
@@ -565,6 +604,7 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
     onClick: nodeChangeEvent,
     className: cls,
     children: _jsx(_TreeSelect, _objectSpread(_objectSpread({
+      placeholder: placeholder || locale.ProForm.treeSelectPlaceholder,
       maxTagPlaceholder: function maxTagPlaceholder(rest) {
         var _rest = rest.map(function (tag) {
           var _tag$label, _tag$label$props, _tag$label2, _tag$label2$props, _tag$label2$props$chi, _tag$label2$props$chi2, _tag$label2$props$chi3, _tag$label3, _tag$label3$props, _tag$label3$props$dan;

package/es/locale/en_US.d.ts

@@ -25,6 +25,7 @@ declare const _default: {
         unfold: string;
         packUp: string;
         inputPlaceholder: string;
+        treeSelectPlaceholder: string;
         selectPlaceHolder: string;
         switchText: string[];
         ruleStartEndText: string[];

package/es/locale/en_US.js

@@ -25,6 +25,7 @@ export default {
     unfold: 'Unfold',
     packUp: 'PackUp',
     inputPlaceholder: 'Please enter',
+    treeSelectPlaceholder: 'Please select',
     selectPlaceHolder: 'Please select',
     switchText: ['Yes', 'No'],
     ruleStartEndText: ['start value', 'end value'],

package/es/locale/zh_CN.d.ts

@@ -25,6 +25,7 @@ declare const _default: {
         unfold: string;
         packUp: string;
         inputPlaceholder: string;
+        treeSelectPlaceholder: string;
         selectPlaceHolder: string;
         switchText: string[];
         ruleStartEndText: string[];

package/es/locale/zh_CN.js

@@ -25,6 +25,7 @@ export default {
     unfold: '展开',
     packUp: '收起',
     inputPlaceholder: '请输入',
+    treeSelectPlaceholder: '请选择',
     selectPlaceHolder: '请选择',
     switchText: ['是', '否'],
     ruleStartEndText: ['起始值', '截止值'],

package/lib/ProAction/components/CheckModalContent/index.css

@@ -0,0 +1,22 @@
+.pro-action-check-modal-box .res-err-list .err-tip {
+  color: #666;
+}
+.pro-action-check-modal-box .res-err-list .err-item {
+  box-sizing: border-box;
+  padding-left: 6px;
+  color: #333;
+  border-radius: 4px;
+}
+.pro-action-check-modal-box .res-err-list .err-item:hover {
+  background-color: #f0f0f0;
+}
+.pro-action-check-modal-box .res-err-list .list-wrap {
+  box-sizing: border-box;
+  height: 50vh;
+  margin: 12px 0;
+  padding: 4px;
+  overflow-y: auto;
+  line-height: 1.8;
+  border: 1px solid #ccc;
+  border-radius: 6px;
+}

package/lib/ProAction/components/CheckModalContent/index.d.ts

@@ -0,0 +1,8 @@
+import './index.less';
+interface propsWithCheckModal {
+    errorTitle?: string;
+    list?: string[];
+    [key: string]: any;
+}
+declare const CheckModalContent: (props: propsWithCheckModal) => import("react/jsx-runtime").JSX.Element;
+export default CheckModalContent;

package/lib/ProAction/components/CheckModalContent/index.js

@@ -0,0 +1,49 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _jsxRuntime = require("react/jsx-runtime");
+var _antd = require("antd");
+require("./index.less");
+/*
+ * @Author: za-xuwenli xuwenli@zhongan.io
+ * @Date: 2025-02-17 11:49:02
+ * @LastEditors: za-xuwenli xuwenli@zhongan.io
+ * @LastEditTime: 2025-05-28 18:23:47
+ * @FilePath: /zat-wjs-pro-product-web/src/components/CheckModalContent/index.tsx
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
+
+var CheckModalContent = function CheckModalContent(props) {
+  var _ref = props !== null && props !== void 0 ? props : {},
+    errorTitle = _ref.errorTitle,
+    _ref$list = _ref.list,
+    list = _ref$list === void 0 ? [] : _ref$list;
+  return (0, _jsxRuntime.jsx)("div", {
+    className: "pro-action-check-modal-box",
+    children: (0, _jsxRuntime.jsxs)("div", {
+      className: "res-err-list",
+      children: [(0, _jsxRuntime.jsx)("span", {
+        className: "err-tip",
+        children: errorTitle
+      }), (0, _jsxRuntime.jsxs)(_antd.Tooltip, {
+        title: list.join('\n') || [],
+        children: [Array.isArray(list) && list.length === 1 ? (0, _jsxRuntime.jsx)("span", {
+          className: "err-item",
+          children: list[0]
+        }) : null, Array.isArray(list) && list.length > 1 ? (0, _jsxRuntime.jsx)("div", {
+          className: "list-wrap",
+          children: list.map(function (item) {
+            return (0, _jsxRuntime.jsx)("div", {
+              className: "err-item",
+              children: item
+            });
+          })
+        }) : null]
+      })]
+    })
+  });
+};
+var _default = exports.default = CheckModalContent;

package/lib/ProAction/components/CheckModalContent/index.less

@@ -0,0 +1,28 @@
+.pro-action-check-modal-box {
+  .res-err-list {
+    .err-tip {
+      color: #666;
+    }
+
+    .err-item {
+      box-sizing: border-box;
+      padding-left: 6px;
+      color: #333;
+      border-radius: 4px;
+      &:hover {
+        background-color: #f0f0f0;
+      }
+    }
+
+    .list-wrap {
+      box-sizing: border-box;
+      height: 50vh;
+      margin: 12px 0;
+      padding: 4px;
+      overflow-y: auto;
+      line-height: 1.8;
+      border: 1px solid #ccc;
+      border-radius: 6px;
+    }
+  }
+}

package/lib/ProAction/index.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
@@ -14,6 +15,7 @@ var _react = _interopRequireDefault(require("react"));
 var _ahooks = require("ahooks");
 var _antd = require("antd");
 var _lodash = require("lodash");
+var _CheckModalContent = _interopRequireDefault(require("./components/CheckModalContent"));
 var _index = require("../index");
 var _locale = _interopRequireDefault(require("../locale"));
 require("./index.less");
@@ -28,7 +30,8 @@ var ProAction = function ProAction(props) {
       index: 0,
       open: false,
       servicesArray: [],
-      loading: false
+      loading: false,
+      errorModalData: null
     }),
     _useSetState2 = (0, _slicedToArray2.default)(_useSetState, 2),
     state = _useSetState2[0],
@@ -41,12 +44,12 @@ var ProAction = function ProAction(props) {
     });
   }
   var index = state.index,
-    servicesArray = state.servicesArray;
+    errorModalData = state.errorModalData;
   var length = config.length;
   var _onActionRun = /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(currentIndex, array) {
       var _actionProps$useReque, _options$defaultParam, _options$onSuccess, _newServicesArray$cur, _newServicesArray$cur2, _newServicesArray$cur3, _actionProps$onAction, _actionProps$continue;
-      var actionProps, newServicesArray, _ref2, service, options, transformResponse, params, res, data, open, _newServicesArray$cur4, _newServicesArray$cur5, _newServicesArray$cur6, list, errorTitle, isContinue;
+      var actionProps, newServicesArray, _ref2, service, options, transformResponse, params, res, data, open, _newServicesArray$cur4, _newServicesArray$cur5, list, errorTitle, isContinue;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -113,14 +116,15 @@ var ProAction = function ProAction(props) {
               _context.next = 37;
               break;
             }
-            list = ((_newServicesArray$cur4 = newServicesArray[currentIndex]) === null || _newServicesArray$cur4 === void 0 ? void 0 : (_newServicesArray$cur5 = _newServicesArray$cur4.list) === null || _newServicesArray$cur5 === void 0 ? void 0 : _newServicesArray$cur5.join('\n')) || [];
-            errorTitle = (_newServicesArray$cur6 = newServicesArray[currentIndex]) === null || _newServicesArray$cur6 === void 0 ? void 0 : _newServicesArray$cur6.errorTitle;
+            list = ((_newServicesArray$cur4 = newServicesArray[currentIndex]) === null || _newServicesArray$cur4 === void 0 ? void 0 : _newServicesArray$cur4.list) || [];
+            errorTitle = (_newServicesArray$cur5 = newServicesArray[currentIndex]) === null || _newServicesArray$cur5 === void 0 ? void 0 : _newServicesArray$cur5.errorTitle;
             form.setFieldsValue({
               errorTitle: errorTitle,
               list: list
             });
             setState({
-              loading: false
+              loading: false,
+              errorModalData: newServicesArray[currentIndex]
             });
             return _context.abrupt("return");
           case 37:
@@ -168,6 +172,27 @@ var ProAction = function ProAction(props) {
       open: false
     });
   };
+  var errorModalConfig = config === null || config === void 0 ? void 0 : config[index];
+  var _ref3 = errorModalConfig || {},
+    contextRender = _ref3.contextRender;
+  var renderContent = function renderContent() {
+    var TargetComponent = (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {});
+    if (typeof contextRender === 'function') {
+      var View = contextRender(errorModalData);
+      TargetComponent = (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
+        children: View
+      });
+    } else if (typeof contextRender === 'string' || typeof contextRender === 'number') {
+      TargetComponent = (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
+        children: contextRender
+      });
+    } else if (/*#__PURE__*/_react.default.isValidElement(contextRender)) {
+      TargetComponent = (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
+        children: contextRender
+      });
+    }
+    return TargetComponent;
+  };
   return (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
     children: [((_config$ = config[0]) === null || _config$ === void 0 ? void 0 : _config$.mode) === 'confirm' ? (0, _jsxRuntime.jsx)(_antd.Popconfirm, {
       onConfirm: function onConfirm() {
@@ -180,8 +205,10 @@ var ProAction = function ProAction(props) {
       mode: "Modal",
       title: config === null || config === void 0 ? void 0 : (_config$index = config[index]) === null || _config$index === void 0 ? void 0 : _config$index.title,
       onCancel: function onCancel() {
+        form.resetFields();
         setState({
-          open: false
+          open: false,
+          errorModalData: null
         });
       },
       modalProps: {
@@ -190,37 +217,7 @@ var ProAction = function ProAction(props) {
       size: "small",
       onOk: onOk,
       form: form,
-      proFormProps: {
-        span: 24,
-        isView: true,
-        columns: [{
-          type: 'Input',
-          name: 'errorTitle',
-          viewRender: function viewRender(value) {
-            var _servicesArray$index;
-            var list = ((_servicesArray$index = servicesArray[index]) === null || _servicesArray$index === void 0 ? void 0 : _servicesArray$index.list) || [];
-            return (0, _jsxRuntime.jsxs)("div", {
-              className: "pro-action-view-tile",
-              children: [value, list.length === 1 ? (0, _jsxRuntime.jsxs)("span", {
-                children: [" ", list[0]]
-              }) : '']
-            });
-          }
-        }, {
-          type: 'TextArea',
-          name: 'list',
-          fieldProps: {
-            autoSize: {
-              minRows: 4,
-              maxRows: 7
-            }
-          },
-          show: function show() {
-            var _servicesArray$index2, _servicesArray$index3;
-            return ((_servicesArray$index2 = servicesArray[index]) === null || _servicesArray$index2 === void 0 ? void 0 : (_servicesArray$index3 = _servicesArray$index2.list) === null || _servicesArray$index3 === void 0 ? void 0 : _servicesArray$index3.length) > 1;
-          }
-        }]
-      }
+      children: !contextRender ? (0, _jsxRuntime.jsx)(_CheckModalContent.default, (0, _objectSpread2.default)({}, errorModalData !== null && errorModalData !== void 0 ? errorModalData : {})) : renderContent()
     }) : null]
   });
 };

package/lib/ProAction/propsType.d.ts

@@ -13,32 +13,34 @@ export interface ProActionType {
     title?: string | ReactNode;
     /**
      * @description 操作回调函数
-     * @param previouData 接上一个 useRequest 返回的值
+     * @param previousData 接上一个 useRequest 返回的值
      * @param args 接所有链式 useRequest 返回的值
      * @param index 当前操作的索引
      * @returns void或Promise<void>
      * @default -
      */
-    onAction?: (previouData?: any, args?: any[], index?: number) => void | Promise<void>;
+    onAction?: (previousData?: any, args?: any[], index?: number) => void | Promise<void>;
     /**
      * @description 自定义请求
-     * @param previouData 接上一个 useRequest 返回的值
+     * @param previousData 接上一个 useRequest 返回的值
      * @param args 接所有链式 useRequest 返回的值
      * @returns 包含service、options和transformResponse的对象
      * @default -
      */
-    useRequest?: (previouData: any, args: any) => {
+    useRequest?: (previousData: any, args: any) => {
         service?: Service<any, any>;
         options?: Options<any, any>;
         transformResponse?: (data: any) => any;
     };
     /**
      * @description 是否中断链式操作
-     * @param previouData 上一个操作的返回数据
+     * @param previousData 上一个操作的返回数据
      * @param args 所有链式的数据合集
      * @returns 布尔值，返回true继续执行，返回false中断操作
      * @default -
      */
-    continue?: (previouData: any, args: any[]) => boolean;
+    continue?: (previousData: any, args: any[]) => boolean;
+    /** 自定义错误弹窗内容视图渲染 */
+    contextRender?: (data: any) => string | ReactNode;
 }
 export type ProActionProps = ProActionType;

package/lib/ProTable/components/FormatColumn/index.js

@@ -136,8 +136,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         if ((0, _lodash.isFunction)(otherProps === null || otherProps === void 0 ? void 0 : otherProps.viewRender)) {
           var _originalObj$record$r;
           var diffResult = otherProps.viewRender({
-            originalValue: originalValue,
-            originalRecord: (_originalObj$record$r = originalObj === null || originalObj === void 0 ? void 0 : originalObj[record === null || record === void 0 ? void 0 : record[rowKey]]) !== null && _originalObj$record$r !== void 0 ? _originalObj$record$r : {},
+            originValue: originalValue,
+            originRecord: (_originalObj$record$r = originalObj === null || originalObj === void 0 ? void 0 : originalObj[record === null || record === void 0 ? void 0 : record[rowKey]]) !== null && _originalObj$record$r !== void 0 ? _originalObj$record$r : {},
             value: value,
             record: record,
             index: index
@@ -173,8 +173,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         if ((0, _lodash.isFunction)(onDiff)) {
           var _originalObj$record$r2;
           var _diffResult = onDiff({
-            originalValue: originalValue,
-            originalRecord: (_originalObj$record$r2 = originalObj === null || originalObj === void 0 ? void 0 : originalObj[record === null || record === void 0 ? void 0 : record[rowKey]]) !== null && _originalObj$record$r2 !== void 0 ? _originalObj$record$r2 : {},
+            originValue: originalValue,
+            originRecord: (_originalObj$record$r2 = originalObj === null || originalObj === void 0 ? void 0 : originalObj[record === null || record === void 0 ? void 0 : record[rowKey]]) !== null && _originalObj$record$r2 !== void 0 ? _originalObj$record$r2 : {},
             value: value,
             record: record,
             index: index

package/lib/ProTable/hooks/useAntdTable.js

@@ -43,7 +43,8 @@ function useAntdTable(service, options, useRequestOptions) {
         filters: undefined,
         sorter: undefined
       },
-      allSelected: false
+      allSelected: false,
+      searchValues: {}
     }),
     _useSetState2 = (0, _slicedToArray2.default)(_useSetState, 2),
     _useSetState2$ = _useSetState2[0],
@@ -53,9 +54,10 @@ function useAntdTable(service, options, useRequestOptions) {
     selectedRowKeys = _useSetState2$.selectedRowKeys,
     extraFilter = _useSetState2$.extraFilter,
     allSelected = _useSetState2$.allSelected,
+    searchValues = _useSetState2$.searchValues,
     setState = _useSetState2[1];
   var _useDefaultOptions = useDefaultOptions(options),
-    form = _useDefaultOptions.form,
+    _form = _useDefaultOptions.form,
     page = _useDefaultOptions.page,
     extraParams = _useDefaultOptions.extraParams,
     rowKey = _useDefaultOptions.rowKey,
@@ -71,12 +73,15 @@ function useAntdTable(service, options, useRequestOptions) {
     transformParams = _useDefaultOptions.transformParams,
     transformResponse = _useDefaultOptions.transformResponse,
     disabled = _useDefaultOptions.disabled;
+  var _Form$useForm = _antd.Form.useForm(_form),
+    _Form$useForm2 = (0, _slicedToArray2.default)(_Form$useForm, 1),
+    form = _Form$useForm2[0];
   var _ref = useRequestOptions || {},
     defaultParams = _ref.defaultParams;
   var defaultParam = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
   var initPage = (options === null || options === void 0 ? void 0 : options.page) || _index.defaultPage;
   var previousPage = (0, _ahooks.usePrevious)(page || _index.defaultPage);
-  var getTransformParams = (0, _react.useCallback)(function (params) {
+  var getTransformParams = function getTransformParams(params) {
     var _pickBy;
     var realParams = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultParam), extraParams), params);
     var _realParams$page = realParams.page,
@@ -97,7 +102,7 @@ function useAntdTable(service, options, useRequestOptions) {
       return transformParams(realParams, requestParams);
     }
     return requestParams;
-  }, [defaultParam, extraParams]);
+  };
   // 仅清数据源相关，查询相关
   var handleSetStateCallback = function handleSetStateCallback(values) {
     setState((0, _objectSpread2.default)({
@@ -142,13 +147,13 @@ function useAntdTable(service, options, useRequestOptions) {
   var run = result.run,
     refreshAsync = result.refreshAsync;
   // service变化时触发 (禁止掉防止service变更时导致的死循环)
-  var clearSelected = (0, _react.useCallback)(function () {
+  var clearSelected = function clearSelected() {
     setState({
       allSelected: false,
       selectedRecords: [],
       selectedRowKeys: []
     });
-  }, []);
+  };
   /**
    * 手动触发时，手动调用run
    */
@@ -194,7 +199,7 @@ function useAntdTable(service, options, useRequestOptions) {
     };
   }, []);
   // 分页变更
-  var handlePageChange = (0, _react.useCallback)(function (current, pageSize) {
+  var handlePageChange = function handlePageChange(current, pageSize) {
     var _form$getFieldsValue;
     var page = {
       pageNum: current,
@@ -212,8 +217,8 @@ function useAntdTable(service, options, useRequestOptions) {
     run(getTransformParams((0, _objectSpread2.default)((0, _objectSpread2.default)({
       page: page
     }, nextValues), extraFilter)));
-  }, [allSelected, extraFilter, data, getTransformParams]);
-  var handleTableChange = (0, _react.useCallback)(function (pagination, filters, sorter, extra) {
+  };
+  var handleTableChange = function handleTableChange(pagination, filters, sorter, extra) {
     var _form$getFieldsValue2;
     // 跳过分页改变，使用pagination的onChange
     if (extra.action === 'paginate') {
@@ -232,15 +237,15 @@ function useAntdTable(service, options, useRequestOptions) {
         sorter: sorter
       }
     });
-    var _values = (_form$getFieldsValue2 = form.getFieldsValue()) !== null && _form$getFieldsValue2 !== void 0 ? _form$getFieldsValue2 : {};
+    var _values = (_form$getFieldsValue2 = form === null || form === void 0 ? void 0 : form.getFieldsValue()) !== null && _form$getFieldsValue2 !== void 0 ? _form$getFieldsValue2 : {};
     run(getTransformParams((0, _objectSpread2.default)((0, _objectSpread2.default)({
       page: page
     }, _values), {}, {
       filters: filters,
       sorter: sorter
     })));
-  }, [allSelected, getTransformParams]);
-  var onSearch = (0, _react.useCallback)(function (values) {
+  };
+  var onSearch = function onSearch(values) {
     var newPage = {
       pageNum: 1,
       pageSize: page.pageSize
@@ -254,6 +259,7 @@ function useAntdTable(service, options, useRequestOptions) {
     if ((selectedRecords === null || selectedRecords === void 0 ? void 0 : selectedRecords.length) || (0, _utils.isNonEmptyObject)(_values) || !(0, _lodash.isEqual)(previousSearchValues, _values)) {
       previousSearchValues = _values;
       setState({
+        searchValues: _values,
         allSelected: false,
         selectedRecords: [],
         selectedRowKeys: []
@@ -262,9 +268,10 @@ function useAntdTable(service, options, useRequestOptions) {
     run(getTransformParams((0, _objectSpread2.default)((0, _objectSpread2.default)({
       page: newPage
     }, extraFilter), _values)));
-  }, [extraFilter, page.pageSize, previousPage, getTransformParams]);
-  var resetParams = (0, _react.useCallback)(function (page) {
+  };
+  var resetParams = function resetParams(page) {
     setState({
+      searchValues: {},
       allSelected: false,
       selectedRecords: [],
       selectedRowKeys: [],
@@ -273,9 +280,9 @@ function useAntdTable(service, options, useRequestOptions) {
         sorter: undefined
       }
     });
-  }, []);
+  };
   // 重置查询条件: 页码还原、勾选清空
-  var onReset = (0, _react.useCallback)(function () {
+  var onReset = function onReset() {
     form === null || form === void 0 ? void 0 : form.resetFields();
     var newPage = {
       pageNum: 1,
@@ -288,7 +295,7 @@ function useAntdTable(service, options, useRequestOptions) {
         page: newPage
       }));
     }
-  }, [page.pageSize, run, resetParams, getTransformParams]);
+  };
   var refreshPage = function refreshPage(res) {
     var transformResult = transformResponse ? transformResponse(res) : res || {};
     var _ref3 = (0, _utils.isListResult)(transformResult) ? transformResult : (transformResult === null || transformResult === void 0 ? void 0 : transformResult.data) || {},
@@ -482,7 +489,7 @@ function useAntdTable(service, options, useRequestOptions) {
     data: data,
     params: (result === null || result === void 0 ? void 0 : (_result$params = result.params) === null || _result$params === void 0 ? void 0 : _result$params[0]) || {},
     rowSelection: rowSelection,
-    searchValues: (_form$getFieldsValue3 = form.getFieldsValue()) !== null && _form$getFieldsValue3 !== void 0 ? _form$getFieldsValue3 : {},
+    searchValues: (_form$getFieldsValue3 = form === null || form === void 0 ? void 0 : form.getFieldsValue()) !== null && _form$getFieldsValue3 !== void 0 ? _form$getFieldsValue3 : {},
     allSelected: allSelected,
     selectedTip: selectedTip,
     selectedRowKeys: selectedRowKeys,