@zat-design/sisyphus-react 3.11.5-beta.9 → 3.11.6-beta.1

package/.vscode/extensions.json

@@ -0,0 +1,5 @@
+{
+    "recommendations": [
+        "kisstkondoros.vscode-codemetrics"
+    ]
+}

package/es/ProEditTable/index.js

@@ -440,7 +440,8 @@ var ProEditTable = function ProEditTable(_ref, ref) {
             page: page,
             pagination: pagination,
             setState: setState,
-            isView: isView
+            isView: isView,
+            disabled: disabled
           });
         }
       }) : null]

package/es/ProEditTable/utils/tools.d.ts

@@ -35,7 +35,10 @@ export declare const handleScrollToError: () => void;
  * @returns 深拷贝后的对象，其中的React节点会被保留
  */
 export declare function cloneDeepFilterNode(value: any): any;
-export declare const onPageCheck: ({ form, name, value, columns, page, pagination, setState, isView }: {
+/**
+ * 分页校验
+ */
+export declare const onPageCheck: ({ form, name, value, columns, page, pagination, setState, isView, disabled }: {
     form: any;
     name: any;
     value: any;
@@ -44,4 +47,5 @@ export declare const onPageCheck: ({ form, name, value, columns, page, paginatio
     pagination: any;
     setState: any;
     isView: any;
+    disabled: any;
 }) => Promise<void>;

package/es/ProEditTable/utils/tools.js

@@ -334,14 +334,17 @@ var handleCheckCellValue = /*#__PURE__*/function () {
     return _ref6.apply(this, arguments);
   };
 }();
+/**
+ * 分页校验
+ */
 export var onPageCheck = /*#__PURE__*/function () {
   var _ref8 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref7) {
-    var form, name, value, columns, page, pagination, setState, isView, pageNum, pageSize, pageArr, flag, errorNum, errorPageNum, _i, _pageArr, item, start, end, nextValues, _iterator2, _step2, record, _iterator3, _step3, column, result, nextState;
+    var form, name, value, columns, page, pagination, setState, isView, disabled, pageNum, pageSize, pageArr, flag, errorNum, errorPageNum, _i, _pageArr, item, start, end, nextValues, _iterator2, _step2, record, _iterator3, _step3, column, result, nextState;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          form = _ref7.form, name = _ref7.name, value = _ref7.value, columns = _ref7.columns, page = _ref7.page, pagination = _ref7.pagination, setState = _ref7.setState, isView = _ref7.isView;
-          if (!(pagination && !isView)) {
+          form = _ref7.form, name = _ref7.name, value = _ref7.value, columns = _ref7.columns, page = _ref7.page, pagination = _ref7.pagination, setState = _ref7.setState, isView = _ref7.isView, disabled = _ref7.disabled;
+          if (!(pagination && !isView && !disabled)) {
             _context2.next = 75;
             break;
           }

package/es/ProForm/components/combination/ProModalSelect/hooks/useRequestList.js

@@ -104,11 +104,8 @@ export function useRequestList(service, options, useRequestOptions) {
   var dataSource = useMemo(function () {
     if (data) {
       var _data$data;
-      if (transformResponse) {
-        return (data === null || data === void 0 ? void 0 : data.data) ? transformResponse(data === null || data === void 0 ? void 0 : data.data) : transformResponse(data);
-      }
       var list = withPagination ? data === null || data === void 0 ? void 0 : (_data$data = data.data) === null || _data$data === void 0 ? void 0 : _data$data.list : data === null || data === void 0 ? void 0 : data.data;
-      return list !== null && list !== void 0 ? list : [];
+      return transformResponse ? transformResponse(list) : list !== null && list !== void 0 ? list : [];
     }
     return [];
   }, [data, transformResponse, withPagination]);

package/es/ProForm/components/combination/ProModalSelect/index.js

@@ -34,7 +34,7 @@ import viewSvg from '../../../../assets/view.svg';
 import useRequestList from './hooks/useRequestList';
 import locale from '../../../../locale';
 var ProModalSelect = function ProModalSelect(props, ref) {
-  var _useRequest$options9, _formColumns$;
+  var _useRequest$options, _useRequest$options10, _formColumns$;
   var value = props.value,
     onChange = props.onChange,
     disabled = props.disabled,
@@ -74,6 +74,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     withPagination = _configOption$withPag === void 0 ? true : _configOption$withPag,
     modalProps = configOption.modalProps,
     tableProps = configOption.tableProps;
+  // const  useRequest?.options?.defaultParams;
   var _ref = modalProps || {},
     onOk = _ref.onOk,
     restModalProps = _objectWithoutProperties(_ref, _excluded2);
@@ -107,6 +108,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     rowSelection = _ref4.rowSelection,
     restTableProps = _objectWithoutProperties(_ref4, _excluded3);
   var preValue = useRef(value);
+  var defaultParamsRef = useRef(useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options = useRequest.options) === null || _useRequest$options === void 0 ? void 0 : _useRequest$options.defaultParams); // 缓存 defaultParams 的引用
   var _useSetState = useSetState({
       _value: value,
       isInit: true,
@@ -316,7 +318,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     };
   }();
   var handleClose = function handleClose() {
-    var _useRequest$options;
+    var _useRequest$options2;
     form.resetFields();
     setState({
       onOff: false,
@@ -324,7 +326,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       isInit: false
     });
     // 当设置manual为true时，清空当前弹框内已搜索出来的值
-    if (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options = useRequest.options) === null || _useRequest$options === void 0 ? void 0 : _useRequest$options.manual) {
+    if (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options2 = useRequest.options) === null || _useRequest$options2 === void 0 ? void 0 : _useRequest$options2.manual) {
       mutate(function () {
         return [];
       });
@@ -471,7 +473,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   // 初始化回显，当传入initParams时，前端用来回险
   var getInitValues = /*#__PURE__*/function () {
     var _ref10 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
-      var _useRequest$options2, _useRequest$options3, queryBean, page, params, res, _res$data2, _list, list, _data, nextSelectRowKeys;
+      var _useRequest$options3, _useRequest$options4, queryBean, page, params, res, _res$data2, _list, list, _data, nextSelectRowKeys;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
@@ -479,11 +481,11 @@ var ProModalSelect = function ProModalSelect(props, ref) {
               _context4.next = 9;
               break;
             }
-            queryBean = _objectSpread(_objectSpread({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options2 = useRequest.options) === null || _useRequest$options2 === void 0 ? void 0 : _useRequest$options2.defaultParams), initParams || {});
+            queryBean = _objectSpread(_objectSpread({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options3 = useRequest.options) === null || _useRequest$options3 === void 0 ? void 0 : _useRequest$options3.defaultParams), initParams || {});
             page = _objectSpread({
               pageNum: 1,
               pageSize: 10
-            }, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options3 = useRequest.options) === null || _useRequest$options3 === void 0 ? void 0 : _useRequest$options3.page);
+            }, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options4 = useRequest.options) === null || _useRequest$options4 === void 0 ? void 0 : _useRequest$options4.page);
             params = withPagination ? _objectSpread(_objectSpread({}, page), {}, {
               queryBean: queryBean !== null && queryBean !== void 0 ? queryBean : {}
             }) : queryBean;
@@ -532,16 +534,16 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   // 初始化回显，当传入initParams时，前端用来回险
   var getDefaultOneValues = /*#__PURE__*/function () {
     var _ref11 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
-      var _useRequest$options4, _useRequest$options5;
+      var _useRequest$options5, _useRequest$options6;
       var queryBean, page, params, res, _res$data3, _list2, list, _data2, nextSelectRowKeys;
       return _regeneratorRuntime().wrap(function _callee5$(_context5) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
-            queryBean = _objectSpread({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options4 = useRequest.options) === null || _useRequest$options4 === void 0 ? void 0 : _useRequest$options4.defaultParams);
+            queryBean = _objectSpread({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options5 = useRequest.options) === null || _useRequest$options5 === void 0 ? void 0 : _useRequest$options5.defaultParams);
             page = _objectSpread({
               pageNum: 1,
               pageSize: 10
-            }, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options5 = useRequest.options) === null || _useRequest$options5 === void 0 ? void 0 : _useRequest$options5.page);
+            }, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options6 = useRequest.options) === null || _useRequest$options6 === void 0 ? void 0 : _useRequest$options6.page);
             params = withPagination ? _objectSpread(_objectSpread({}, page), {}, {
               queryBean: queryBean !== null && queryBean !== void 0 ? queryBean : {}
             }) : queryBean;
@@ -616,8 +618,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   });
   useEffect(function () {
     if (onOff && !visible) {
-      var _useRequest$options6;
-      if ((useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options6 = useRequest.options) === null || _useRequest$options6 === void 0 ? void 0 : _useRequest$options6.manual) !== true) {
+      var _useRequest$options7;
+      if ((useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options7 = useRequest.options) === null || _useRequest$options7 === void 0 ? void 0 : _useRequest$options7.manual) !== true) {
         onReset();
       }
       var nextState = {
@@ -668,18 +670,51 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       if (useRequest) {
         // 加定时器 修复依赖数据同步更新未取到问题
         setTimeout(function () {
-          var _useRequest$options7, _useRequest$options8;
+          var _useRequest$options8, _useRequest$options9;
           var params = withPagination ? {
             pageNum: 1,
             pageSize: 50,
-            queryBean: _objectSpread(_objectSpread({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options7 = useRequest.options) === null || _useRequest$options7 === void 0 ? void 0 : _useRequest$options7.defaultParams), initParams)
-          } : _objectSpread(_objectSpread({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options8 = useRequest.options) === null || _useRequest$options8 === void 0 ? void 0 : _useRequest$options8.defaultParams), initParams);
+            queryBean: _objectSpread(_objectSpread({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options8 = useRequest.options) === null || _useRequest$options8 === void 0 ? void 0 : _useRequest$options8.defaultParams), initParams)
+          } : _objectSpread(_objectSpread({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options9 = useRequest.options) === null || _useRequest$options9 === void 0 ? void 0 : _useRequest$options9.defaultParams), initParams);
           var nextParams = transformParams ? transformParams(params) : params;
           run(nextParams);
         }, 300);
       }
     }
-  }, [JSON.stringify(value), visible, JSON.stringify(useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options9 = useRequest.options) === null || _useRequest$options9 === void 0 ? void 0 : _useRequest$options9.defaultParams), JSON.stringify(initParams), options === null || options === void 0 ? void 0 : options.length]);
+  }, [JSON.stringify(value), visible, JSON.stringify(useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options10 = useRequest.options) === null || _useRequest$options10 === void 0 ? void 0 : _useRequest$options10.defaultParams), JSON.stringify(initParams), options === null || options === void 0 ? void 0 : options.length]);
+  var handleSelectFocus = function handleSelectFocus() {
+    if (useRequest) {
+      var _useRequest$options11;
+      var queryBean = (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options11 = useRequest.options) === null || _useRequest$options11 === void 0 ? void 0 : _useRequest$options11.defaultParams) || {};
+      var params = withPagination ? {
+        pageNum: 1,
+        pageSize: 50,
+        queryBean: queryBean
+      } : queryBean;
+      var nextParams = transformParams ? transformParams(params) : params;
+      // 减少请求条件一致时，且请求过时，focus的重复请求
+      if (!isEqual(queryBean, defaultParamsRef.current) || !(options === null || options === void 0 ? void 0 : options.length)) {
+        run(nextParams); // 触发 run 请求
+        defaultParamsRef.current = queryBean; // 更新缓存
+      }
+      setState({
+        isInit: false
+      });
+    }
+  };
+  var handleSelectSearch = debounce(function (val) {
+    if (useRequest) {
+      var _useRequest$options12;
+      var queryBean = _objectSpread(_objectSpread({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options12 = useRequest.options) === null || _useRequest$options12 === void 0 ? void 0 : _useRequest$options12.defaultParams), {}, _defineProperty({}, searchKey !== null && searchKey !== void 0 ? searchKey : labelKey, val));
+      var params = withPagination ? {
+        pageNum: 1,
+        pageSize: 50,
+        queryBean: queryBean
+      } : queryBean;
+      var nextParams = transformParams ? transformParams(params) : params;
+      run(nextParams);
+    }
+  }, 1000);
   useDebounceEffect(function () {
     if (!value) {
       if (defaultOne) {
@@ -729,35 +764,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       notFoundContent: selectLoading ? _jsx(_Spin, {
         size: "small"
       }) : null,
-      onFocus: function onFocus() {
-        if (useRequest) {
-          var _useRequest$options10;
-          var queryBean = (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options10 = useRequest.options) === null || _useRequest$options10 === void 0 ? void 0 : _useRequest$options10.defaultParams) || {};
-          var params = withPagination ? {
-            pageNum: 1,
-            pageSize: 50,
-            queryBean: queryBean
-          } : queryBean;
-          var nextParams = transformParams ? transformParams(params) : params;
-          run(nextParams);
-          setState({
-            isInit: false
-          });
-        }
-      },
-      onSearch: debounce(function (val) {
-        if (useRequest) {
-          var _useRequest$options11;
-          var queryBean = _objectSpread(_objectSpread({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options11 = useRequest.options) === null || _useRequest$options11 === void 0 ? void 0 : _useRequest$options11.defaultParams), {}, _defineProperty({}, searchKey !== null && searchKey !== void 0 ? searchKey : labelKey, val));
-          var params = withPagination ? {
-            pageNum: 1,
-            pageSize: 50,
-            queryBean: queryBean
-          } : queryBean;
-          var nextParams = transformParams ? transformParams(params) : params;
-          run(nextParams);
-        }
-      }, 2000),
+      onFocus: handleSelectFocus,
+      onSearch: handleSelectSearch,
       style: {
         width: isView || disabled ? '100%' : 'calc(100% - 30px)'
       }

package/lib/ProEditTable/index.js

@@ -443,7 +443,8 @@ var ProEditTable = function ProEditTable(_ref, ref) {
             page: page,
             pagination: pagination,
             setState: setState,
-            isView: isView
+            isView: isView,
+            disabled: disabled
           });
         }
       }) : null]

package/lib/ProEditTable/utils/tools.d.ts

@@ -35,7 +35,10 @@ export declare const handleScrollToError: () => void;
  * @returns 深拷贝后的对象，其中的React节点会被保留
  */
 export declare function cloneDeepFilterNode(value: any): any;
-export declare const onPageCheck: ({ form, name, value, columns, page, pagination, setState, isView }: {
+/**
+ * 分页校验
+ */
+export declare const onPageCheck: ({ form, name, value, columns, page, pagination, setState, isView, disabled }: {
     form: any;
     name: any;
     value: any;
@@ -44,4 +47,5 @@ export declare const onPageCheck: ({ form, name, value, columns, page, paginatio
     pagination: any;
     setState: any;
     isView: any;
+    disabled: any;
 }) => Promise<void>;

package/lib/ProEditTable/utils/tools.js

@@ -343,14 +343,17 @@ var handleCheckCellValue = /*#__PURE__*/function () {
     return _ref6.apply(this, arguments);
   };
 }();
+/**
+ * 分页校验
+ */
 var onPageCheck = exports.onPageCheck = /*#__PURE__*/function () {
   var _ref8 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(_ref7) {
-    var form, name, value, columns, page, pagination, setState, isView, pageNum, pageSize, pageArr, flag, errorNum, errorPageNum, _i, _pageArr, item, start, end, nextValues, _iterator2, _step2, record, _iterator3, _step3, column, result, nextState;
+    var form, name, value, columns, page, pagination, setState, isView, disabled, pageNum, pageSize, pageArr, flag, errorNum, errorPageNum, _i, _pageArr, item, start, end, nextValues, _iterator2, _step2, record, _iterator3, _step3, column, result, nextState;
     return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          form = _ref7.form, name = _ref7.name, value = _ref7.value, columns = _ref7.columns, page = _ref7.page, pagination = _ref7.pagination, setState = _ref7.setState, isView = _ref7.isView;
-          if (!(pagination && !isView)) {
+          form = _ref7.form, name = _ref7.name, value = _ref7.value, columns = _ref7.columns, page = _ref7.page, pagination = _ref7.pagination, setState = _ref7.setState, isView = _ref7.isView, disabled = _ref7.disabled;
+          if (!(pagination && !isView && !disabled)) {
             _context2.next = 75;
             break;
           }

package/lib/ProForm/components/combination/ProModalSelect/hooks/useRequestList.js

@@ -113,11 +113,8 @@ function useRequestList(service, options, useRequestOptions) {
   var dataSource = (0, _react.useMemo)(function () {
     if (data) {
       var _data$data;
-      if (transformResponse) {
-        return (data === null || data === void 0 ? void 0 : data.data) ? transformResponse(data === null || data === void 0 ? void 0 : data.data) : transformResponse(data);
-      }
       var list = withPagination ? data === null || data === void 0 ? void 0 : (_data$data = data.data) === null || _data$data === void 0 ? void 0 : _data$data.list : data === null || data === void 0 ? void 0 : data.data;
-      return list !== null && list !== void 0 ? list : [];
+      return transformResponse ? transformResponse(list) : list !== null && list !== void 0 ? list : [];
     }
     return [];
   }, [data, transformResponse, withPagination]);

package/lib/ProForm/components/combination/ProModalSelect/index.js

@@ -29,7 +29,7 @@ var _excluded = ["value", "onChange", "disabled", "labelInValue", "fieldNames",
   _excluded2 = ["onOk"],
   _excluded3 = ["rowKey", "columns", "rowSelection"];
 var ProModalSelect = function ProModalSelect(props, ref) {
-  var _useRequest$options9, _formColumns$;
+  var _useRequest$options, _useRequest$options10, _formColumns$;
   var value = props.value,
     onChange = props.onChange,
     disabled = props.disabled,
@@ -69,6 +69,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     withPagination = _configOption$withPag === void 0 ? true : _configOption$withPag,
     modalProps = configOption.modalProps,
     tableProps = configOption.tableProps;
+  // const  useRequest?.options?.defaultParams;
   var _ref = modalProps || {},
     onOk = _ref.onOk,
     restModalProps = (0, _objectWithoutProperties2.default)(_ref, _excluded2);
@@ -102,6 +103,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     rowSelection = _ref4.rowSelection,
     restTableProps = (0, _objectWithoutProperties2.default)(_ref4, _excluded3);
   var preValue = (0, _react.useRef)(value);
+  var defaultParamsRef = (0, _react.useRef)(useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options = useRequest.options) === null || _useRequest$options === void 0 ? void 0 : _useRequest$options.defaultParams); // 缓存 defaultParams 的引用
   var _useSetState = (0, _ahooks.useSetState)({
       _value: value,
       isInit: true,
@@ -311,7 +313,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     };
   }();
   var handleClose = function handleClose() {
-    var _useRequest$options;
+    var _useRequest$options2;
     form.resetFields();
     setState({
       onOff: false,
@@ -319,7 +321,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       isInit: false
     });
     // 当设置manual为true时，清空当前弹框内已搜索出来的值
-    if (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options = useRequest.options) === null || _useRequest$options === void 0 ? void 0 : _useRequest$options.manual) {
+    if (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options2 = useRequest.options) === null || _useRequest$options2 === void 0 ? void 0 : _useRequest$options2.manual) {
       mutate(function () {
         return [];
       });
@@ -466,7 +468,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   // 初始化回显，当传入initParams时，前端用来回险
   var getInitValues = /*#__PURE__*/function () {
     var _ref10 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee4() {
-      var _useRequest$options2, _useRequest$options3, queryBean, page, params, res, _res$data2, _list, list, _data, nextSelectRowKeys;
+      var _useRequest$options3, _useRequest$options4, queryBean, page, params, res, _res$data2, _list, list, _data, nextSelectRowKeys;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
@@ -474,11 +476,11 @@ var ProModalSelect = function ProModalSelect(props, ref) {
               _context4.next = 9;
               break;
             }
-            queryBean = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options2 = useRequest.options) === null || _useRequest$options2 === void 0 ? void 0 : _useRequest$options2.defaultParams), initParams || {});
+            queryBean = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options3 = useRequest.options) === null || _useRequest$options3 === void 0 ? void 0 : _useRequest$options3.defaultParams), initParams || {});
             page = (0, _objectSpread3.default)({
               pageNum: 1,
               pageSize: 10
-            }, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options3 = useRequest.options) === null || _useRequest$options3 === void 0 ? void 0 : _useRequest$options3.page);
+            }, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options4 = useRequest.options) === null || _useRequest$options4 === void 0 ? void 0 : _useRequest$options4.page);
             params = withPagination ? (0, _objectSpread3.default)((0, _objectSpread3.default)({}, page), {}, {
               queryBean: queryBean !== null && queryBean !== void 0 ? queryBean : {}
             }) : queryBean;
@@ -527,16 +529,16 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   // 初始化回显，当传入initParams时，前端用来回险
   var getDefaultOneValues = /*#__PURE__*/function () {
     var _ref11 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee5() {
-      var _useRequest$options4, _useRequest$options5;
+      var _useRequest$options5, _useRequest$options6;
       var queryBean, page, params, res, _res$data3, _list2, list, _data2, nextSelectRowKeys;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee5$(_context5) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
-            queryBean = (0, _objectSpread3.default)({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options4 = useRequest.options) === null || _useRequest$options4 === void 0 ? void 0 : _useRequest$options4.defaultParams);
+            queryBean = (0, _objectSpread3.default)({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options5 = useRequest.options) === null || _useRequest$options5 === void 0 ? void 0 : _useRequest$options5.defaultParams);
             page = (0, _objectSpread3.default)({
               pageNum: 1,
               pageSize: 10
-            }, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options5 = useRequest.options) === null || _useRequest$options5 === void 0 ? void 0 : _useRequest$options5.page);
+            }, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options6 = useRequest.options) === null || _useRequest$options6 === void 0 ? void 0 : _useRequest$options6.page);
             params = withPagination ? (0, _objectSpread3.default)((0, _objectSpread3.default)({}, page), {}, {
               queryBean: queryBean !== null && queryBean !== void 0 ? queryBean : {}
             }) : queryBean;
@@ -611,8 +613,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   });
   (0, _react.useEffect)(function () {
     if (onOff && !visible) {
-      var _useRequest$options6;
-      if ((useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options6 = useRequest.options) === null || _useRequest$options6 === void 0 ? void 0 : _useRequest$options6.manual) !== true) {
+      var _useRequest$options7;
+      if ((useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options7 = useRequest.options) === null || _useRequest$options7 === void 0 ? void 0 : _useRequest$options7.manual) !== true) {
         onReset();
       }
       var nextState = {
@@ -663,18 +665,51 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       if (useRequest) {
         // 加定时器 修复依赖数据同步更新未取到问题
         setTimeout(function () {
-          var _useRequest$options7, _useRequest$options8;
+          var _useRequest$options8, _useRequest$options9;
           var params = withPagination ? {
             pageNum: 1,
             pageSize: 50,
-            queryBean: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options7 = useRequest.options) === null || _useRequest$options7 === void 0 ? void 0 : _useRequest$options7.defaultParams), initParams)
-          } : (0, _objectSpread3.default)((0, _objectSpread3.default)({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options8 = useRequest.options) === null || _useRequest$options8 === void 0 ? void 0 : _useRequest$options8.defaultParams), initParams);
+            queryBean: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options8 = useRequest.options) === null || _useRequest$options8 === void 0 ? void 0 : _useRequest$options8.defaultParams), initParams)
+          } : (0, _objectSpread3.default)((0, _objectSpread3.default)({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options9 = useRequest.options) === null || _useRequest$options9 === void 0 ? void 0 : _useRequest$options9.defaultParams), initParams);
           var nextParams = transformParams ? transformParams(params) : params;
           run(nextParams);
         }, 300);
       }
     }
-  }, [JSON.stringify(value), visible, JSON.stringify(useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options9 = useRequest.options) === null || _useRequest$options9 === void 0 ? void 0 : _useRequest$options9.defaultParams), JSON.stringify(initParams), options === null || options === void 0 ? void 0 : options.length]);
+  }, [JSON.stringify(value), visible, JSON.stringify(useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options10 = useRequest.options) === null || _useRequest$options10 === void 0 ? void 0 : _useRequest$options10.defaultParams), JSON.stringify(initParams), options === null || options === void 0 ? void 0 : options.length]);
+  var handleSelectFocus = function handleSelectFocus() {
+    if (useRequest) {
+      var _useRequest$options11;
+      var queryBean = (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options11 = useRequest.options) === null || _useRequest$options11 === void 0 ? void 0 : _useRequest$options11.defaultParams) || {};
+      var params = withPagination ? {
+        pageNum: 1,
+        pageSize: 50,
+        queryBean: queryBean
+      } : queryBean;
+      var nextParams = transformParams ? transformParams(params) : params;
+      // 减少请求条件一致时，且请求过时，focus的重复请求
+      if (!(0, _lodash.isEqual)(queryBean, defaultParamsRef.current) || !(options === null || options === void 0 ? void 0 : options.length)) {
+        run(nextParams); // 触发 run 请求
+        defaultParamsRef.current = queryBean; // 更新缓存
+      }
+      setState({
+        isInit: false
+      });
+    }
+  };
+  var handleSelectSearch = (0, _lodash.debounce)(function (val) {
+    if (useRequest) {
+      var _useRequest$options12;
+      var queryBean = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options12 = useRequest.options) === null || _useRequest$options12 === void 0 ? void 0 : _useRequest$options12.defaultParams), {}, (0, _defineProperty2.default)({}, searchKey !== null && searchKey !== void 0 ? searchKey : labelKey, val));
+      var params = withPagination ? {
+        pageNum: 1,
+        pageSize: 50,
+        queryBean: queryBean
+      } : queryBean;
+      var nextParams = transformParams ? transformParams(params) : params;
+      run(nextParams);
+    }
+  }, 1000);
   (0, _ahooks.useDebounceEffect)(function () {
     if (!value) {
       if (defaultOne) {
@@ -724,35 +759,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       notFoundContent: selectLoading ? (0, _jsxRuntime.jsx)(_antd.Spin, {
         size: "small"
       }) : null,
-      onFocus: function onFocus() {
-        if (useRequest) {
-          var _useRequest$options10;
-          var queryBean = (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options10 = useRequest.options) === null || _useRequest$options10 === void 0 ? void 0 : _useRequest$options10.defaultParams) || {};
-          var params = withPagination ? {
-            pageNum: 1,
-            pageSize: 50,
-            queryBean: queryBean
-          } : queryBean;
-          var nextParams = transformParams ? transformParams(params) : params;
-          run(nextParams);
-          setState({
-            isInit: false
-          });
-        }
-      },
-      onSearch: (0, _lodash.debounce)(function (val) {
-        if (useRequest) {
-          var _useRequest$options11;
-          var queryBean = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options11 = useRequest.options) === null || _useRequest$options11 === void 0 ? void 0 : _useRequest$options11.defaultParams), {}, (0, _defineProperty2.default)({}, searchKey !== null && searchKey !== void 0 ? searchKey : labelKey, val));
-          var params = withPagination ? {
-            pageNum: 1,
-            pageSize: 50,
-            queryBean: queryBean
-          } : queryBean;
-          var nextParams = transformParams ? transformParams(params) : params;
-          run(nextParams);
-        }
-      }, 2000),
+      onFocus: handleSelectFocus,
+      onSearch: handleSelectSearch,
       style: {
         width: isView || disabled ? '100%' : 'calc(100% - 30px)'
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.11.5-beta.9",
+  "version": "3.11.6-beta.1",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",