@zat-design/sisyphus-react 3.10.3 → 3.10.4-beta.1

package/dist/index.esm.css

@@ -2242,6 +2242,9 @@
 .pro-table .ant-table-summary {
   background-color: var(--zaui-table-header-bg, #f2f3f5);
 }
+.pro-table .ant-table-summary td {
+  padding: calc(4px + var(--zaui-size)*8px);
+}
 .pro-table .ant-table-summary .ant-table-cell {
   font-weight: 500;
   background-color: var(--zaui-table-header-bg, #f2f3f5);
@@ -4629,6 +4632,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   color: var(--zaui-text, #343434);
   font-weight: 600;
 }
+.pro-edit-table .ant-table-content > table .ant-table-summary td {
+  padding: 8px 16px;
+}
 .pro-edit-table .ant-table-content > table .ant-table-summary .ant-table-cell-fix-left,
 .pro-edit-table .ant-table-content > table .ant-table-summary .ant-table-cell-fix-right {
   background-color: var(--zaui-table-header-bg, #f2f3f5);

package/dist/less.esm.css

@@ -2242,6 +2242,9 @@
 .pro-table .ant-table-summary {
   background-color: var(--zaui-table-header-bg, #f2f3f5);
 }
+.pro-table .ant-table-summary td {
+  padding: calc(4px + var(--zaui-size)*8px);
+}
 .pro-table .ant-table-summary .ant-table-cell {
   font-weight: 500;
   background-color: var(--zaui-table-header-bg, #f2f3f5);
@@ -4629,6 +4632,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   color: var(--zaui-text, #343434);
   font-weight: 600;
 }
+.pro-edit-table .ant-table-content > table .ant-table-summary td {
+  padding: 8px 16px;
+}
 .pro-edit-table .ant-table-content > table .ant-table-summary .ant-table-cell-fix-left,
 .pro-edit-table .ant-table-content > table .ant-table-summary .ant-table-cell-fix-right {
   background-color: var(--zaui-table-header-bg, #f2f3f5);

package/es/ProEditTable/components/RenderField/index.js

@@ -588,7 +588,7 @@ var RenderField = function RenderField(_ref) {
     }
     FormItem = TargetComponent ? _jsx(_Form.Item, _objectSpread(_objectSpread({
       validateFirst: true
-    }, omit(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name', 'onCell', _fieldProps.shouldUpdate ? 'shouldUpdate' : null])), {}, {
+    }, omit(_formItemProps, ['render', 'key', 'width', 'hiddenNames', 'name', 'onCell', _fieldProps.shouldUpdate ? 'shouldUpdate' : null])), {}, {
       className: _className,
       name: formNamePath ? cellName.slice((formNamePath === null || formNamePath === void 0 ? void 0 : formNamePath.length) - 1) : cellName,
       children: FieldComponent
@@ -598,7 +598,7 @@ var RenderField = function RenderField(_ref) {
     if (type === 'FormList') {
       FormItem = _jsx(_Form.List, _objectSpread(_objectSpread({
         name: formNamePath ? cellName.slice((formNamePath === null || formNamePath === void 0 ? void 0 : formNamePath.length) - 1) : cellName
-      }, omit(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name'])), {}, {
+      }, omit(_formItemProps, ['render', 'key', 'width', 'hiddenNames', 'name'])), {}, {
         children: function children(fields, operation, meta) {
           return _jsx(TargetComponent, _objectSpread(_objectSpread({}, componentProps), {}, {
             otherProps: otherProps,

package/es/ProEditTable/index.js

@@ -2,6 +2,8 @@ import "antd/es/affix/style";
 import _Affix from "antd/es/affix";
 import _typeof from "@babel/runtime/helpers/esm/typeof";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import "antd/es/config-provider/style";
 import _ConfigProvider from "antd/es/config-provider";
@@ -16,7 +18,7 @@ import { get, isArray, isBoolean, set } from 'lodash';
 import { useDeepCompareEffect, useLocalStorageState, useSetState } from 'ahooks';
 import classnames from 'classnames';
 import { transformColumns } from './utils';
-import { getRandom, getNamePath } from './utils/tools';
+import { getRandom, getNamePath, handleScrollToError } from './utils/tools';
 import { Validator, Summary, RenderToolbar } from './components';
 import ProForm from '../ProForm';
 import Empty from '../assets/empty.png';
@@ -110,7 +112,6 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     selectedRows = state.selectedRows,
     page = state.page;
   var virtualRowName = getNamePath(isArray(name) ? name : [name], virtualKey);
-  var cacheMap = useRef({});
   // 样式处理
   var _className = classnames({
     'pro-edit-table': true,
@@ -160,13 +161,51 @@ var ProEditTable = function ProEditTable(_ref, ref) {
       return getRowKey(item) === getRowKey(record);
     }));
   };
+  // 分页变更
+  var handlePageChange = useCallback(/*#__PURE__*/function () {
+    var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(current, pageSize) {
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _context.prev = 0;
+            if (!pagination) {
+              _context.next = 5;
+              break;
+            }
+            _context.next = 4;
+            return form.validateFields([name], {
+              recursive: true
+            });
+          case 4:
+            setState({
+              page: {
+                pageNum: current,
+                pageSize: pageSize !== null && pageSize !== void 0 ? pageSize : page.pageSize
+              }
+            });
+          case 5:
+            _context.next = 10;
+            break;
+          case 7:
+            _context.prev = 7;
+            _context.t0 = _context["catch"](0);
+            handleScrollToError();
+          case 10:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee, null, [[0, 7]]);
+    }));
+    return function (_x, _x2) {
+      return _ref4.apply(this, arguments);
+    };
+  }(), []);
   var config = _objectSpread({
     form: form,
     mode: mode,
     isView: isView,
     viewEmpty: viewEmpty,
     disabled: disabled,
-    cacheMap: cacheMap,
     cellNamePath: cellNamePath,
     forceUpdate: forceUpdate,
     insertType: insertType,
@@ -194,7 +233,8 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     rowDisabled: rowDisabled,
     actionDirection: actionDirection,
     diffConfig: _objectSpread(_objectSpread({}, resetProps === null || resetProps === void 0 ? void 0 : (_resetProps$otherProp = resetProps.otherProps) === null || _resetProps$otherProp === void 0 ? void 0 : _resetProps$otherProp.diffConfig), diffConfig),
-    getIsNew: getIsNew
+    getIsNew: getIsNew,
+    handlePageChange: handlePageChange
   }, resetProps);
   // 编辑行设置下样式
   var _rowClassName = function _rowClassName(record) {
@@ -245,15 +285,6 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     },
     hideSelectAll: isHideCheckBox
   }, rowSelection);
-  // 分页变更
-  var handlePageChange = useCallback(function (current, pageSize) {
-    setState({
-      page: {
-        pageNum: current,
-        pageSize: pageSize
-      }
-    });
-  }, []);
   // 空列表状态
   var empty = function empty() {
     var _toolbarProps$filter;

package/es/ProEditTable/propsType.d.ts

@@ -98,7 +98,6 @@ export interface ProColumnsProps<Values = any, T = any> extends Omit<FormItemPro
     labelRequired?: boolean;
     name?: NamePath;
     names?: NamePath[];
-    cache?: boolean;
     isEditable?: boolean | RequiredFn<T>;
     valueType?: ProFormValueType | ((text?: any, record?: any, options?: OptionsProps) => ProFormValueType);
     tooltip?: string | ({

package/es/ProEditTable/style/index.less

@@ -151,7 +151,9 @@
         background-color: var(--zaui-table-header-bg, #f2f3f5);
         color           : var(--zaui-text, #343434);
         font-weight     : 600;
-
+        td{
+          padding: 8px 16px;
+        }
         .@{ant-prefix}-table-cell-fix-left,
         .@{ant-prefix}-table-cell-fix-right {
           background-color: var(--zaui-table-header-bg, #f2f3f5);

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

@@ -20,6 +20,6 @@ export declare const actions: {
     save: ({ record, editingKeys, setState, form, rowName, virtualRowName, result }: any) => Promise<void>;
     cancel: ({ name, record, editingKeys, setState, form, virtualRowName, virtualKey }: any) => void;
     delete: ({ name, record, editingKeys, setState, form, virtualKey, onlyOneLineMsg }: any) => boolean;
-    add: ({ result, insertType, editingKeys, setState, form, name, virtualName, virtualKey, onlyOneLineMsg, tableRef, prefixCls, }: any) => Promise<boolean>;
+    add: ({ result, insertType, editingKeys, setState, form, name, virtualName, virtualKey, onlyOneLineMsg, tableRef, prefixCls, page, handlePageChange, }: any) => Promise<boolean>;
     mulDelete: ({ form, name, virtualKey, setState, selectedRowKeys, editingKeys }: any) => void;
 };

package/es/ProEditTable/utils/config.js

@@ -7,6 +7,7 @@ import "antd/es/message/style";
 import _message from "antd/es/message";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { PlusOutlined } from '@ant-design/icons';
+import { tools } from '@zat-design/utils';
 import { set } from 'lodash';
 import { onDelete, getRandom } from './tools';
 import locale from '../../locale';
@@ -168,11 +169,11 @@ export var actions = {
   add: function () {
     var _add = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref5) {
       var _tableRef$current$que, _tableRef$current$que2;
-      var result, insertType, editingKeys, setState, form, name, virtualName, virtualKey, onlyOneLineMsg, tableRef, _ref5$prefixCls, prefixCls, nextData, rowKey, addData, nextEditingKeys;
+      var result, insertType, editingKeys, setState, form, name, virtualName, virtualKey, onlyOneLineMsg, tableRef, _ref5$prefixCls, prefixCls, page, handlePageChange, nextData, rowKey, addData, nextPageNum, nextEditingKeys;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            result = _ref5.result, insertType = _ref5.insertType, editingKeys = _ref5.editingKeys, setState = _ref5.setState, form = _ref5.form, name = _ref5.name, virtualName = _ref5.virtualName, virtualKey = _ref5.virtualKey, onlyOneLineMsg = _ref5.onlyOneLineMsg, tableRef = _ref5.tableRef, _ref5$prefixCls = _ref5.prefixCls, prefixCls = _ref5$prefixCls === void 0 ? 'ant' : _ref5$prefixCls;
+            result = _ref5.result, insertType = _ref5.insertType, editingKeys = _ref5.editingKeys, setState = _ref5.setState, form = _ref5.form, name = _ref5.name, virtualName = _ref5.virtualName, virtualKey = _ref5.virtualKey, onlyOneLineMsg = _ref5.onlyOneLineMsg, tableRef = _ref5.tableRef, _ref5$prefixCls = _ref5.prefixCls, prefixCls = _ref5$prefixCls === void 0 ? 'ant' : _ref5$prefixCls, page = _ref5.page, handlePageChange = _ref5.handlePageChange;
             nextData = _toConsumableArray(form.getFieldValue(name) || []); // 单行编辑时，需要先保存，才能进行下面的编辑
             if (!(virtualKey && editingKeys.length >= 1)) {
               _context2.next = 5;
@@ -189,7 +190,14 @@ export var actions = {
               addData.addFlag = true;
               addData.isEditing = true;
             }
-            insertType === 'before' ? nextData.unshift(addData) : nextData.push(addData);
+            if (insertType === 'before') {
+              nextData.unshift(addData);
+              handlePageChange(1);
+            } else {
+              nextData.push(addData);
+              nextPageNum = Math.ceil(tools.calc(nextData.length, '/', page.pageSize));
+              handlePageChange(nextPageNum);
+            }
             // 当单选情况下，存储正在编辑值
             if (virtualKey) {
               nextEditingKeys = _toConsumableArray(editingKeys); // 开启编辑状态

package/es/ProEditTable/utils/index.js

@@ -1,4 +1,3 @@
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import "antd/es/tooltip/style";
 import _Tooltip from "antd/es/tooltip";
@@ -201,13 +200,10 @@ export var transformColumns = function transformColumns() {
     virtualKey = config.virtualKey,
     requiredAlign = config.requiredAlign,
     isView = config.isView,
-    cacheMap = config.cacheMap,
     setState = config.setState,
     page = config.page;
   var isCell = mode === 'cell';
   var _columns = cloneDeepFilterNode(columns);
-  // 你的函数代码
-  var _cacheMap = _objectSpread({}, cacheMap.current);
   var pageNum = tools.calc(page.pageNum, '-', 1);
   var firstIndex = tools.calc(pageNum, '*', page.pageSize);
   _columns.forEach(function (item, index) {
@@ -280,26 +276,6 @@ export var transformColumns = function transformColumns() {
     if (item.className) {
       item.className = _toConsumableArray(new Set(item.className.split(' '))).join(' ');
     }
-    // 当列表配置cache，接口请求静态数据会做数据缓存
-    if (item.cache) {
-      var _item$fieldProps3;
-      // 初始化加载ProSelect，缓存当前useRequest
-      if (item.type === 'ProSelect') {
-        var _cacheMap$item$dataIn, _cacheMap$item$dataIn2;
-        if (!(_cacheMap === null || _cacheMap === void 0 ? void 0 : (_cacheMap$item$dataIn = _cacheMap[item.dataIndex]) === null || _cacheMap$item$dataIn === void 0 ? void 0 : (_cacheMap$item$dataIn2 = _cacheMap$item$dataIn.dataSource) === null || _cacheMap$item$dataIn2 === void 0 ? void 0 : _cacheMap$item$dataIn2.length)) {
-          var _item$fieldProps, _item$fieldProps2;
-          _cacheMap[item.dataIndex] = {
-            useRequest: (_item$fieldProps = item.fieldProps) === null || _item$fieldProps === void 0 ? void 0 : _item$fieldProps.useRequest,
-            dataSource: [],
-            transformResponse: (_item$fieldProps2 = item.fieldProps) === null || _item$fieldProps2 === void 0 ? void 0 : _item$fieldProps2.transformResponse
-          };
-        } else {
-          var _cacheMap$item$dataIn3;
-          item.fieldProps.dataSource = (_cacheMap$item$dataIn3 = _cacheMap[item.dataIndex]) === null || _cacheMap$item$dataIn3 === void 0 ? void 0 : _cacheMap$item$dataIn3.dataSource;
-        }
-      }
-      (_item$fieldProps3 = item.fieldProps) === null || _item$fieldProps3 === void 0 ? true : delete _item$fieldProps3.useRequest;
-    }
     var _render = function _render(text, record, index) {
       var isEditing = !virtualKey || editingKeys.includes(record.rowKey) || record.addFlag;
       var namePath = isArray(name) ? name : [name];
@@ -390,53 +366,6 @@ export var transformColumns = function transformColumns() {
     }));
     actionColumn && _columns.push(actionColumn);
   }
-  // cacheMap 用来存储缓存值，若有值后不再请求
-  if (JSON.stringify(cacheMap.current) === '{}') {
-    Promise.all(Object.entries(_cacheMap).map(/*#__PURE__*/function () {
-      var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(item) {
-        var _item, key, value, _ref5, service, option;
-        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-              _item = _slicedToArray(item, 2), key = _item[0], value = _item[1];
-              _ref5 = (value === null || value === void 0 ? void 0 : value.useRequest) || {}, service = _ref5.service, option = _ref5.option;
-              if (!service) {
-                _context2.next = 8;
-                break;
-              }
-              _context2.t0 = key;
-              _context2.next = 6;
-              return service(_objectSpread({}, option === null || option === void 0 ? void 0 : option.defaultParams));
-            case 6:
-              _context2.t1 = _context2.sent;
-              return _context2.abrupt("return", [_context2.t0, _context2.t1]);
-            case 8:
-              return _context2.abrupt("return", [key, {}]);
-            case 9:
-            case "end":
-              return _context2.stop();
-          }
-        }, _callee2);
-      }));
-      return function (_x3) {
-        return _ref4.apply(this, arguments);
-      };
-    }())).then(function (res) {
-      res.forEach(function (item) {
-        var _item2 = _slicedToArray(item, 2),
-          key = _item2[0],
-          value = _item2[1];
-        var transformResponse = _cacheMap[key].transformResponse;
-        _cacheMap[key].dataSource = (transformResponse ? transformResponse(value) : value === null || value === void 0 ? void 0 : value.data) || [];
-      });
-      cacheMap.current = _cacheMap;
-      if (JSON.stringify(cacheMap.current) !== '{}') {
-        setState({
-          forceUpdate: {}
-        });
-      }
-    });
-  }
   // 渲染操作列
   return _columns;
 };

package/es/ProForm/components/render/ConfirmWrapper.js

@@ -22,25 +22,25 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
   var _ProForm$useFieldProp = ProForm.useFieldProps(),
     form = _ProForm$useFieldProp.form;
   var handleChange = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(value) {
+    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(value) {
       var _len,
         other,
         _key,
         _value,
         confirmProps,
-        _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:
-            for (_len = _args.length, other = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-              other[_key - 1] = _args[_key];
+            for (_len = _args2.length, other = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+              other[_key - 1] = _args2[_key];
             }
             _value = (value === null || value === void 0 ? void 0 : value.target) ? value.target.value : value;
             if (!isFunction(confirm)) {
-              _context.next = 8;
+              _context2.next = 8;
               break;
             }
-            _context.next = 5;
+            _context2.next = 5;
             return confirm(value, form.getFieldsValue(), {
               option: other[0],
               form: form,
@@ -50,13 +50,13 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
               preValue: form.getFieldValue(otherProps.listName || otherProps.name)
             });
           case 5:
-            _context.t0 = _context.sent;
-            _context.next = 9;
+            _context2.t0 = _context2.sent;
+            _context2.next = 9;
             break;
           case 8:
-            _context.t0 = confirm;
+            _context2.t0 = confirm;
           case 9:
-            confirmProps = _context.t0;
+            confirmProps = _context2.t0;
             // 只处理 false, true 和 对象的情况
             if (confirmProps === false) {
               onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, [_value].concat(other));
@@ -70,21 +70,41 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
             }
             if (isObject(confirmProps)) {
               _Modal.confirm(_objectSpread(_objectSpread(_objectSpread({}, 'title' in confirmProps || 'content' in confirmProps ? {} : defaultConfirmProps), confirmProps), {}, {
-                onOk: function onOk() {
-                  var _confirmProps$onOk;
-                  for (var _len2 = arguments.length, arg = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
-                    arg[_key2] = arguments[_key2];
+                onOk: function () {
+                  var _onOk = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+                    var _confirmProps$onOk;
+                    var _len2,
+                      arg,
+                      _key2,
+                      _args = arguments;
+                    return _regeneratorRuntime().wrap(function _callee$(_context) {
+                      while (1) switch (_context.prev = _context.next) {
+                        case 0:
+                          for (_len2 = _args.length, arg = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+                            arg[_key2] = _args[_key2];
+                          }
+                          _context.next = 3;
+                          return (_confirmProps$onOk = confirmProps.onOk) === null || _confirmProps$onOk === void 0 ? void 0 : _confirmProps$onOk.call.apply(_confirmProps$onOk, [confirmProps].concat(arg));
+                        case 3:
+                          onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, [_value].concat(other));
+                        case 4:
+                        case "end":
+                          return _context.stop();
+                      }
+                    }, _callee);
+                  }));
+                  function onOk() {
+                    return _onOk.apply(this, arguments);
                   }
-                  (_confirmProps$onOk = confirmProps.onOk) === null || _confirmProps$onOk === void 0 ? void 0 : _confirmProps$onOk.call.apply(_confirmProps$onOk, [confirmProps].concat(arg));
-                  onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, [_value].concat(other));
-                }
+                  return onOk;
+                }()
               }));
             }
           case 13:
           case "end":
-            return _context.stop();
+            return _context2.stop();
         }
-      }, _callee);
+      }, _callee2);
     }));
     return function handleChange(_x) {
       return _ref.apply(this, arguments);

package/es/ProSelect/index.js

@@ -12,7 +12,7 @@ import _Select from "antd/es/select";
 var _excluded = ["dataSource", "defaultDisableValue", "useRequest", "fieldNames", "tooltip", "otherProps", "labelInValue", "filterInList", "scrollFollowParent", "defaultOne", "onSearch", "optionRender", "onChange", "updateDataSource", "transformResponse", "getValueProps", "isView"];
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useDeepCompareEffect, useRequest as useRequestFunc } from 'ahooks';
-import React, { useImperativeHandle, useState, forwardRef, isValidElement } from 'react';
+import React, { useImperativeHandle, useState, forwardRef, isValidElement, useCallback } from 'react';
 import { isFunction, isObject, isString, omit, isNumber } from 'lodash';
 import { useProConfig } from '../ProConfigProvider';
 import Container from '../ProForm/components/Container';
@@ -23,7 +23,7 @@ import { getSelectList } from './utils';
 import './index.less';
 var Option = _Select.Option;
 export var ProSelect = function ProSelect(props, ref) {
-  var _selectProps$showCode, _locale$ProSelect;
+  var _selectProps$showCode, _useRequest$options, _locale$ProSelect;
   var _ref = useProConfig('ProSelect') || {},
     _ref$fieldNames = _ref.fieldNames,
     proSelectFieldNames = _ref$fieldNames === void 0 ? {} : _ref$fieldNames,
@@ -87,6 +87,21 @@ export var ProSelect = function ProSelect(props, ref) {
     }
     setSelectList(data || []);
   };
+  var successTransformDataHandle = useCallback(function (res) {
+    if (transformResponse && typeof transformResponse === 'function') {
+      return transformResponse(res);
+    }
+    var _ref3 = res || {},
+      _ref3$status = _ref3.status,
+      status = _ref3$status === void 0 ? 200 : _ref3$status,
+      msg = _ref3.message,
+      data = _ref3.data;
+    if (status !== 200) {
+      _message.error(msg);
+      return;
+    }
+    return data;
+  }, []);
   var fetchFunction = useRequestFunc(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, _objectSpread({
     manual: true,
     onSuccess: function onSuccess(data) {
@@ -100,6 +115,7 @@ export var ProSelect = function ProSelect(props, ref) {
     },
     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) : [];
   var getValueObject = function getValueObject(input) {
     if (Array.isArray(input) && input.length) {
       var resArr = [];
@@ -124,15 +140,24 @@ export var ProSelect = function ProSelect(props, ref) {
   useDeepCompareEffect(function () {
     setSelectList(dataSource);
   }, [dataSource]);
+  useDeepCompareEffect(function () {
+    var _useRequest$options2;
+    // 设置cacheKey后使用缓存的数据
+    if (!(selectList === null || selectList === void 0 ? void 0 : selectList.length) && (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options2 = useRequest.options) === null || _useRequest$options2 === void 0 ? void 0 : _useRequest$options2.cacheKey)) {
+      if (cacheList === null || cacheList === void 0 ? void 0 : cacheList.length) {
+        setSelectList(cacheList);
+      }
+    }
+  }, [fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.data]);
   useDeepCompareEffect(function () {
     // 默认disable值时，不查询接口
     if (defaultDisableValue || !useRequest) {
       return;
     }
-    var _ref3 = (useRequest === null || useRequest === void 0 ? void 0 : useRequest.options) || {},
-      defaultParams = _ref3.defaultParams,
-      manual = _ref3.manual;
-    if (manual) {
+    var _ref4 = (useRequest === null || useRequest === void 0 ? void 0 : useRequest.options) || {},
+      defaultParams = _ref4.defaultParams,
+      manual = _ref4.manual;
+    if (manual || (cacheList === null || cacheList === void 0 ? void 0 : cacheList.length)) {
       return;
     }
     fetchFunction.run(defaultParams);