@zat-design/sisyphus-react 4.0.0-beta.3 → 4.0.0-beta.5

package/es/ProForm/components/combination/Group/utils.js

@@ -1,10 +1,9 @@
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import _typeof from "@babel/runtime/helpers/esm/typeof";
+import "antd/es/button/style";
+import _Button from "antd/es/button";
 /* eslint-disable no-lonely-if */
 
 import { isFunction } from 'lodash';
 import { validate } from '@zat-design/utils';
-import { Button } from 'antd';
 import valueTypeMap from "../../../utils/valueType";
 import { jsx as _jsx } from "react/jsx-runtime";
 /**
@@ -12,11 +11,11 @@ import { jsx as _jsx } from "react/jsx-runtime";
  * @param columns 表单配置数组
  * @returns
  */
-export var insertSeparator = function insertSeparator(columns, space) {
+export var insertSeparator = (columns, space) => {
   if (!(space !== null && space !== void 0 && space.separator)) {
     return columns;
   }
-  var separatorIndexs = function () {
+  var separatorIndexs = (() => {
     var reuslt = [];
     if (validate.isEmpty(space === null || space === void 0 ? void 0 : space.separatorIndex)) {
       return reuslt;
@@ -30,16 +29,16 @@ export var insertSeparator = function insertSeparator(columns, space) {
       reuslt = reuslt.concat(space.separatorIndex);
     }
     return reuslt;
-  }();
-  return columns.reduce(function (result, current, index, array) {
+  })();
+  return columns.reduce((result, current, index, array) => {
     // 将当前元素添加到结果数组中
     result.push(current);
     if (separatorIndexs !== null && separatorIndexs !== void 0 && separatorIndexs.length) {
-      separatorIndexs.forEach(function (separatorIndex) {
+      separatorIndexs.forEach(separatorIndex => {
         if (index === separatorIndex) {
           result.push({
             separator: true,
-            component: /*#__PURE__*/_jsx(Button, {
+            component: /*#__PURE__*/_jsx(_Button, {
               className: "group-separator",
               children: space.separator
             }),
@@ -54,7 +53,7 @@ export var insertSeparator = function insertSeparator(columns, space) {
       if (index < array.length - 1) {
         result.push({
           separator: true,
-          component: /*#__PURE__*/_jsx(Button, {
+          component: /*#__PURE__*/_jsx(_Button, {
             className: "group-separator",
             children: space.separator
           }),
@@ -71,15 +70,15 @@ export var insertSeparator = function insertSeparator(columns, space) {
 /** 带出event的组件默认取值方法 */
 export function defaultGetValueFromEvent(valuePropName) {
   var event = arguments.length <= 1 ? undefined : arguments[1];
-  if (event && event.target && _typeof(event.target) === 'object' && valuePropName in event.target) {
+  if (event && event.target && typeof event.target === 'object' && valuePropName in event.target) {
     return event.target[valuePropName];
   }
   return event;
 }
 
 /** 转换names */
-export var transformNamesString = function transformNamesString(arr) {
-  var result = arr.map(function (subArr) {
+export var transformNamesString = arr => {
+  var result = arr.map(subArr => {
     if (Array.isArray(subArr)) {
       return subArr.join('_');
     }
@@ -94,13 +93,13 @@ export var transformNamesString = function transformNamesString(arr) {
  * @param upperCase 是否小写转大写
  * @returns {}
  */
-export var isUpperCase = function isUpperCase(type, upperCase) {
+export var isUpperCase = (type, upperCase) => {
   var result = {};
   if (['Input', 'TextArea'].includes(type) && upperCase) {
-    result.getValueFromEvent = function (event) {
+    result.getValueFromEvent = event => {
       var _event$target;
       if (Array.isArray(event)) {
-        return event.map(function (value) {
+        return event.map(value => {
           var newValue = value === null || value === void 0 ? void 0 : value.replace(/[^a-zA-Z]/g, '');
           return (newValue === null || newValue === void 0 ? void 0 : newValue.toUpperCase()) || '';
         });
@@ -112,7 +111,7 @@ export var isUpperCase = function isUpperCase(type, upperCase) {
   return result;
 };
 /** 计算响应式参数的值 */
-export var getReactiveProps = function getReactiveProps(params) {
+export var getReactiveProps = params => {
   var form = params.form,
     index = params.index,
     namePath = params.namePath,
@@ -123,29 +122,29 @@ export var getReactiveProps = function getReactiveProps(params) {
     desensitization = params.desensitization;
   var values = namePath ? form.getFieldValue(namePath) : form.getFieldsValue();
   var _disabled = isFunction(disabled) ? disabled(values, {
-    form: form,
-    index: index,
-    namePath: namePath
+    form,
+    index,
+    namePath
   }) : disabled;
   var _show = isFunction(show) ? show(values, {
-    form: form,
-    index: index,
-    namePath: namePath
+    form,
+    index,
+    namePath
   }) : show;
   var _component = isFunction(component) ? component(values, {
-    form: form,
-    index: index,
-    namePath: namePath
+    form,
+    index,
+    namePath
   }) : component;
   var _fieldProps = isFunction(fieldProps) ? fieldProps(values, {
-    form: form,
-    index: index,
-    namePath: namePath
+    form,
+    index,
+    namePath
   }) : fieldProps;
   var _desensitization = isFunction(desensitization) ? desensitization(values, {
-    form: form,
-    index: index,
-    namePath: namePath
+    form,
+    index,
+    namePath
   }) : desensitization;
   return {
     disabled: _disabled,
@@ -156,16 +155,16 @@ export var getReactiveProps = function getReactiveProps(params) {
   };
 };
 /** 获取当前字段的转换函数 */
-export var getValueTypeTrans = function getValueTypeTrans(params) {
+export var getValueTypeTrans = params => {
   var _valueTypeMap$valueTy;
   var valueType = params.valueType;
   var transform = (_valueTypeMap$valueTy = valueTypeMap[valueType]) === null || _valueTypeMap$valueTy === void 0 ? void 0 : _valueTypeMap$valueTy.call(valueTypeMap, params);
   return transform;
 };
-var getTrim = function getTrim(value) {
+var getTrim = value => {
   return (value === null || value === void 0 ? void 0 : value.trim()) || '';
 };
-var getUpperCase = function getUpperCase(value) {
+var getUpperCase = value => {
   var _value = value === null || value === void 0 ? void 0 : value.replace(/[^a-zA-Z]/g, '');
   return _value.toUpperCase() || '';
 };
@@ -173,13 +172,13 @@ var getUpperCase = function getUpperCase(value) {
 /** 执行所有中间件 返回处理后的值 */
 export var getValueMiddleware = function getValueMiddleware(value) {
   var callbacks = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-  return callbacks.reduce(function (preValue, cb) {
+  return callbacks.reduce((preValue, cb) => {
     return cb === null || cb === void 0 ? void 0 : cb(preValue);
   }, value);
 };
 
 /** 获取中间件处理后的value */
-export var valueFromEventWrapper = function valueFromEventWrapper(column, args) {
+export var valueFromEventWrapper = (column, args) => {
   var getValueFromEvent = column.getValueFromEvent,
     _column$valuePropName = column.valuePropName,
     valuePropName = _column$valuePropName === void 0 ? 'value' : _column$valuePropName,
@@ -187,9 +186,9 @@ export var valueFromEventWrapper = function valueFromEventWrapper(column, args)
     upperCase = column.upperCase;
   var newValue;
   if (getValueFromEvent) {
-    newValue = getValueFromEvent.apply(void 0, _toConsumableArray(args));
+    newValue = getValueFromEvent(...args);
   } else {
-    newValue = defaultGetValueFromEvent.apply(void 0, [valuePropName].concat(_toConsumableArray(args)));
+    newValue = defaultGetValueFromEvent(valuePropName, ...args);
   }
   var list = [];
   if (trim) list.push(getTrim);

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

@@ -1,14 +1,16 @@
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
-import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import "antd/es/tooltip/style";
+import _Tooltip from "antd/es/tooltip";
+import "antd/es/cascader/style";
+import _Cascader from "antd/es/cascader";
+import "antd/es/message/style";
+import _message from "antd/es/message";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 var _excluded = ["className", "hasDetail", "detailMaxLength", "fieldNames", "value", "disabled", "dataSource", "onChange", "useRequest", "transformResponse", "level", "isView", "enumCode", "code", "tooltip", "separator", "detailPlaceholder", "scrollFollowParent", "desensitization", "otherProps"];
-import { useEffect, useState, memo, useMemo } from 'react';
-import { Cascader, Tooltip } from 'antd';
+import { useEffect, useState, memo, useMemo, useCallback } from 'react';
 import { omit, find as _find, isBoolean, isEqual } from 'lodash';
+import { useRequest as useRequestFunc, useDeepCompareEffect } from 'ahooks';
 import { transformDataName } from "./utils/index";
 import { useProConfig } from "../../../../ProConfigProvider";
 import Input from "../../base/Input";
@@ -23,12 +25,12 @@ var defaultFieldNames = {
   value: 'code',
   children: 'children'
 };
-var filterDataSource = function filterDataSource(dataSource, level, fieldNames) {
-  return dataSource === null || dataSource === void 0 ? void 0 : dataSource.map(function (item) {
-    return _objectSpread(_objectSpread({}, item), {}, _defineProperty({}, (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children', level === 1 ? [] : filterDataSource(item === null || item === void 0 ? void 0 : item[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'], level - 1, fieldNames)));
-  });
+var filterDataSource = (dataSource, level, fieldNames) => {
+  return dataSource === null || dataSource === void 0 ? void 0 : dataSource.map(item => _objectSpread(_objectSpread({}, item), {}, {
+    [(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children']: level === 1 ? [] : filterDataSource(item === null || item === void 0 ? void 0 : item[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'], level - 1, fieldNames)
+  }));
 };
-var getViewLabel = function getViewLabel(_ref) {
+var getViewLabel = _ref => {
   var _value2;
   var dataSource = _ref.dataSource,
     value = _ref.value;
@@ -39,18 +41,16 @@ var getViewLabel = function getViewLabel(_ref) {
     _value = [value];
   }
   // 根据dataSource得到label数组，查看模式展示需要
-  (_value2 = _value) === null || _value2 === void 0 || _value2.forEach(function (value, index) {
+  (_value2 = _value) === null || _value2 === void 0 || _value2.forEach((value, index) => {
     var _dataSource;
-    var temp = (_dataSource = dataSource) === null || _dataSource === void 0 ? void 0 : _dataSource.find(function (item) {
-      return (item === null || item === void 0 ? void 0 : item.value) === value;
-    });
+    var temp = (_dataSource = dataSource) === null || _dataSource === void 0 ? void 0 : _dataSource.find(item => (item === null || item === void 0 ? void 0 : item.value) === value);
     dataSource = (temp === null || temp === void 0 ? void 0 : temp.children) || [];
     viewLabel[index] = temp === null || temp === void 0 ? void 0 : temp.label;
   });
   return viewLabel;
 };
-var ProCascader = function ProCascader(props) {
-  var _props$otherProps, _value$slice, _ref5, _defaultLabel$filter, _locale$ProAddressBar, _locale$ProAddressBar2;
+var ProCascader = props => {
+  var _props$otherProps, _useRequest$options3, _value$slice, _ref7, _defaultLabel$filter, _locale$ProAddressBar, _locale$ProAddressBar2;
   var _ref2 = useProConfig('ProAddressBar') || {},
     configDetailMaxLength = _ref2.detailMaxLength,
     configEnumCode = _ref2.enumCode,
@@ -96,27 +96,23 @@ var ProCascader = function ProCascader(props) {
   var _useProConfig = useProConfig('ProEnum'),
     _useProConfig$dics = _useProConfig.dics,
     dics = _useProConfig$dics === void 0 ? {} : _useProConfig$dics;
-  var enumDataSource = useMemo(function () {
+  var enumDataSource = useMemo(() => {
     if (!(props !== null && props !== void 0 && props.mode)) {
       return (dics === null || dics === void 0 ? void 0 : dics[addressCode]) || [];
     }
     return Array.isArray(enumData) ? enumData[0] : [];
   }, [dics === null || dics === void 0 ? void 0 : dics[addressCode], enumData]);
-  var realDataSource = useMemo(function () {
+  var realDataSource = useMemo(() => {
     var innerDataSource = dataSource || (addressCode ? enumDataSource : []);
     var result = transformDataName(isAddressMode && realLevel === 2 ? filterDataSource(innerDataSource, level, fieldNames) : innerDataSource, fieldNames);
     return result;
   }, [isAddressMode, addressCode, realLevel, dataSource, enumDataSource === null || enumDataSource === void 0 ? void 0 : enumDataSource.length]);
-  var lastDisabled = useMemo(function () {
+  var lastDisabled = useMemo(() => {
     if (isBoolean(disabled) || disabled === undefined) {
       return [disabled, disabled];
     }
     return disabled;
   }, [disabled]);
-  var _useRequest = _objectSpread({}, useRequest),
-    service = _useRequest.service,
-    _useRequest$defaultPa = _useRequest.defaultParams,
-    defaultParams = _useRequest$defaultPa === void 0 ? {} : _useRequest$defaultPa;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     serviceData = _useState2[0],
@@ -125,54 +121,112 @@ var ProCascader = function ProCascader(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     defaultLabel = _useState4[0],
     setDefaultLabel = _useState4[1];
-  var getFirstLevelOptions = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var _yield$service, data, newData, transFormData, serviceData;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            _context.next = 2;
-            return service(defaultParams);
-          case 2:
-            _yield$service = _context.sent;
-            data = _yield$service.data;
-            newData = data;
-            if (transformResponse) {
-              newData = transformResponse(data);
-            }
-            transFormData = transformDataName(newData, {
-              label: fieldNames.label,
-              value: fieldNames.value,
-              children: (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'
-            });
-            serviceData = isAddressMode && realLevel === 2 ? filterDataSource(transFormData, level, fieldNames) : transFormData;
-            setServiceData(serviceData);
-          case 9:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee);
-    }));
-    return function getFirstLevelOptions() {
-      return _ref4.apply(this, arguments);
-    };
-  }();
+
+  // 默认成功处理函数
+  var defaultOnSuccessFun = 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;
+    }
+    var newData = data;
+    if (transformResponse) {
+      newData = transformResponse(data);
+    }
+    var transFormData = transformDataName(newData, {
+      label: fieldNames.label,
+      value: fieldNames.value,
+      children: (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'
+    });
+    var serviceData = isAddressMode && realLevel === 2 ? filterDataSource(transFormData, level, fieldNames) : transFormData;
+    setServiceData(serviceData);
+  };
+
+  // 数据转换处理
+  var successTransformDataHandle = useCallback(res => {
+    if (transformResponse && typeof transformResponse === 'function') {
+      return transformResponse(res);
+    }
+    var _ref5 = res || {},
+      _ref5$status = _ref5.status,
+      status = _ref5$status === void 0 ? 200 : _ref5$status,
+      msg = _ref5.message,
+      data = _ref5.data;
+    if (status !== 200) {
+      _message.error(msg);
+      return;
+    }
+    return data;
+  }, [transformResponse]);
+
+  // 使用ahooks的useRequest
+  var fetchFunction = useRequestFunc(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, _objectSpread(_objectSpread({
+    manual: true,
+    debounceWait: 300
+  }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options), {}, {
+    onSuccess: data => {
+      var _useRequest$options, _useRequest$options$o, _useRequest$options2;
+      if (transformResponse && typeof transformResponse === 'function') {
+        var responseData = transformResponse(data);
+        var transFormData = transformDataName(responseData, {
+          label: fieldNames.label,
+          value: fieldNames.value,
+          children: (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'
+        });
+        var _serviceData = isAddressMode && realLevel === 2 ? filterDataSource(transFormData, level, fieldNames) : transFormData;
+        setServiceData(_serviceData);
+      } else {
+        defaultOnSuccessFun(data);
+      }
+      // 执行传入的onSuccess
+      useRequest === null || useRequest === void 0 || (_useRequest$options = useRequest.options) === null || _useRequest$options === void 0 || (_useRequest$options$o = _useRequest$options.onSuccess) === null || _useRequest$options$o === void 0 || _useRequest$options$o.call(_useRequest$options, data, useRequest === null || useRequest === void 0 || (_useRequest$options2 = useRequest.options) === null || _useRequest$options2 === void 0 ? void 0 : _useRequest$options2.defaultParams);
+    }
+  }));
+
+  // 缓存数据处理
+  var cacheList = useRequest !== null && useRequest !== void 0 && (_useRequest$options3 = useRequest.options) !== null && _useRequest$options3 !== void 0 && _useRequest$options3.cacheKey ? successTransformDataHandle(fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.data) : [];
 
   // 提取出来默认每次都执行
   if (transformResponse) {
     realDataSource = transformResponse(realDataSource);
   }
-  useEffect(function () {
-    if (service) {
-      // 传入useRequest时，初次加载级联第一级数据源
-      getFirstLevelOptions();
+
+  // 设置缓存数据
+  useDeepCompareEffect(() => {
+    var _useRequest$options4;
+    if (!(serviceData !== null && serviceData !== void 0 && serviceData.length) && useRequest !== null && useRequest !== void 0 && (_useRequest$options4 = useRequest.options) !== null && _useRequest$options4 !== void 0 && _useRequest$options4.cacheKey) {
+      if (cacheList !== null && cacheList !== void 0 && cacheList.length) {
+        setServiceData(cacheList);
+      }
+    }
+  }, [fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.data]);
+
+  // 初始化请求数据
+  useDeepCompareEffect(() => {
+    var _useRequest$options5;
+    if (!(useRequest !== null && useRequest !== void 0 && useRequest.service)) {
+      return;
     }
-  }, [service]);
-  useEffect(function () {
+    var _ref6 = (useRequest === null || useRequest === void 0 ? void 0 : useRequest.options) || {},
+      manual = _ref6.manual;
+    if (manual || cacheList !== null && cacheList !== void 0 && cacheList.length) {
+      return;
+    }
+
+    // 向后兼容性：优先使用 options.defaultParams，fallback 到 useRequest.defaultParams
+    var defaultParams = (useRequest === null || useRequest === void 0 || (_useRequest$options5 = useRequest.options) === null || _useRequest$options5 === void 0 ? void 0 : _useRequest$options5.defaultParams) || (useRequest === null || useRequest === void 0 ? void 0 : useRequest.defaultParams);
+    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.options]);
+  useEffect(() => {
     if (realIsView && value) {
       var _realDataSource;
       // 传入dataSource + 查看时初始化展示
-      if (service) {
+      if (useRequest !== null && useRequest !== void 0 && useRequest.service) {
         setDefaultLabel(getViewLabel({
           dataSource: serviceData,
           value: isAddressMode && hasDetail ? value === null || value === void 0 ? void 0 : value.slice(0, realLevel) : value
@@ -185,7 +239,7 @@ var ProCascader = function ProCascader(props) {
       }
     }
   }, [realIsView, value, realDataSource, serviceData]);
-  var handleChange = function handleChange(changeValue, selectedOptions) {
+  var handleChange = (changeValue, selectedOptions) => {
     if (onChange) {
       if (isAddressMode && hasDetail && detail) {
         // 有详情地址
@@ -199,24 +253,16 @@ var ProCascader = function ProCascader(props) {
   };
 
   // showSearch中的筛选函数
-  var handlefilter = function handlefilter(inputValue, path) {
-    return path.some(function (option) {
+  var handlefilter = (inputValue, path) => {
+    return path.some(option => {
       return option.label.toLowerCase().indexOf(inputValue.toLowerCase()) > -1;
     });
   };
-  var displayRender = function displayRender(label) {
-    return label === null || label === void 0 ? void 0 : label.filter(function (item) {
-      return !!item;
-    }).join('/');
+  var displayRender = label => {
+    return label === null || label === void 0 ? void 0 : label.filter(item => !!item).join('/');
   };
-  var addressValue = isAddressMode ? value && (_value$slice = value.slice(0, realLevel)) !== null && _value$slice !== void 0 && _value$slice.some(function (item) {
-    return !!item;
-  }) ? value.slice(0, realLevel) : undefined : value;
-  var viewValue = isAddressMode ? ((_ref5 = [].concat(_toConsumableArray(defaultLabel), [value === null || value === void 0 ? void 0 : value[realLevel]])) === null || _ref5 === void 0 || (_ref5 = _ref5.filter(function (item) {
-    return !!item;
-  })) === null || _ref5 === void 0 ? void 0 : _ref5.join(separator)) || '-' : (defaultLabel === null || defaultLabel === void 0 || (_defaultLabel$filter = defaultLabel.filter(function (item) {
-    return !!item;
-  })) === null || _defaultLabel$filter === void 0 ? void 0 : _defaultLabel$filter.join(separator)) || '-';
+  var addressValue = isAddressMode ? value && (_value$slice = value.slice(0, realLevel)) !== null && _value$slice !== void 0 && _value$slice.some(item => !!item) ? value.slice(0, realLevel) : undefined : value;
+  var viewValue = isAddressMode ? ((_ref7 = [...defaultLabel, value === null || value === void 0 ? void 0 : value[realLevel]]) === null || _ref7 === void 0 || (_ref7 = _ref7.filter(item => !!item)) === null || _ref7 === void 0 ? void 0 : _ref7.join(separator)) || '-' : (defaultLabel === null || defaultLabel === void 0 || (_defaultLabel$filter = defaultLabel.filter(item => !!item)) === null || _defaultLabel$filter === void 0 ? void 0 : _defaultLabel$filter.join(separator)) || '-';
   var findSelectedOptions = function findSelectedOptions(options, value) {
     var path = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
     var _value = value !== null && value !== void 0 ? value : [];
@@ -238,26 +284,24 @@ var ProCascader = function ProCascader(props) {
     if (foundOption) {
       // 如果找到了匹配的选项，并且还有更多的 value 需要匹配，递归地在子选项中查找
       if (_value.length > 1 && foundOption.children) {
-        return findSelectedOptions(foundOption.children, _value.slice(1), [].concat(_toConsumableArray(path), [foundOption]));
+        return findSelectedOptions(foundOption.children, _value.slice(1), [...path, foundOption]);
       }
       // 如果没有更多的 value 需要匹配，返回当前选项（以及之前的路径）
-      return [].concat(_toConsumableArray(path), [foundOption]);
+      return [...path, foundOption];
     }
     // 如果没有在当前层级的选项中找到匹配的 value，返回 null
     return null;
   };
-  var _selectedOptions = useMemo(function () {
-    return findSelectedOptions(service ? serviceData : realDataSource, addressValue);
-  }, [service, serviceData, realDataSource, addressValue]);
-  var handleAddressChange = function handleAddressChange(e) {
+  var _selectedOptions = useMemo(() => {
+    return findSelectedOptions(useRequest !== null && useRequest !== void 0 && useRequest.service ? serviceData : realDataSource, addressValue);
+  }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, serviceData, realDataSource, addressValue]);
+  var handleAddressChange = e => {
     var cascaderValue = value === null || value === void 0 ? void 0 : value.slice(0, realLevel);
     if (onChange) {
-      if (!e.target.value && cascaderValue !== null && cascaderValue !== void 0 && cascaderValue.every(function (item) {
-        return !item;
-      })) {
+      if (!e.target.value && cascaderValue !== null && cascaderValue !== void 0 && cascaderValue.every(item => !item)) {
         onChange(undefined);
       } else {
-        var realValue = value ? _toConsumableArray(value) : [];
+        var realValue = value ? [...value] : [];
         realValue[realLevel] = e.target.value;
         onChange(realValue, _selectedOptions);
       }
@@ -268,23 +312,24 @@ var ProCascader = function ProCascader(props) {
     viewEmpty: viewEmpty,
     children: viewValue
   }) : /*#__PURE__*/_jsxs("div", {
-    className: "pro-address ".concat(className),
-    children: [/*#__PURE__*/_jsx(Cascader, _objectSpread({
+    className: `pro-address ${className}`,
+    children: [/*#__PURE__*/_jsx(_Cascader, _objectSpread({
       className: hasDetail ? '' : 'no-detail',
       placeholder: locale === null || locale === void 0 || (_locale$ProAddressBar = locale.ProAddressBar) === null || _locale$ProAddressBar === void 0 ? void 0 : _locale$ProAddressBar.placeholder,
       value: addressValue,
-      options: service ? serviceData : realDataSource,
+      options: useRequest !== null && useRequest !== void 0 && useRequest.service ? serviceData : realDataSource,
       disabled: lastDisabled[0],
+      loading: fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.loading,
       displayRender: displayRender,
       showSearch: {
         filter: handlefilter,
         limit: 1000
       },
       onChange: handleChange,
-      getPopupContainer: function getPopupContainer(trigger) {
+      getPopupContainer: trigger => {
         return scrollFollowParent ? trigger.parentElement : document.body;
       }
-    }, omit(restProps, ['otherProps', 'scrollFollowParent']))), hasDetail && (tooltip && lastDisabled[1] && detail ? /*#__PURE__*/_jsx(Tooltip, {
+    }, omit(restProps, ['otherProps', 'scrollFollowParent']))), hasDetail && (tooltip && lastDisabled[1] && detail ? /*#__PURE__*/_jsx(_Tooltip, {
       title: detail,
       children: /*#__PURE__*/_jsx("span", {
         className: "pro-address-detail",
@@ -308,7 +353,7 @@ var ProCascader = function ProCascader(props) {
     }))]
   });
 };
-export default /*#__PURE__*/memo(ProCascader, function (prevProps, nextProps) {
+export default /*#__PURE__*/memo(ProCascader, (prevProps, nextProps) => {
   // 基本props比较, 只比较关键的
   if (!isEqual(prevProps === null || prevProps === void 0 ? void 0 : prevProps.value, nextProps === null || nextProps === void 0 ? void 0 : nextProps.value) || (prevProps === null || prevProps === void 0 ? void 0 : prevProps.disabled) !== (nextProps === null || nextProps === void 0 ? void 0 : nextProps.disabled) || !isEqual(prevProps === null || prevProps === void 0 ? void 0 : prevProps.dataSource, nextProps === null || nextProps === void 0 ? void 0 : nextProps.dataSource)) {
     return false;

package/es/ProForm/components/combination/ProCascader/propsType.d.ts

@@ -1,6 +1,6 @@
 import { ReactNode } from 'react';
 import { DefaultOptionType } from 'rc-select/lib/Select';
-import { Service } from 'ahooks/lib/useRequest/src/types';
+import { Service, Options } from 'ahooks/lib/useRequest/src/types';
 export interface FieldNamesType {
     label: string;
     value: string;
@@ -19,10 +19,18 @@ export interface ProCascaderType {
     fieldNames?: FieldNamesType;
     dataSource?: DefaultOptionType[];
     useRequest?: {
-        loadData?: boolean;
-        service: Service<any, any>;
+        /**
+         * @description 请求服务函数
+         */
+        service?: Service<any, any>;
+        /**
+         * @description 请求选项
+         */
+        options?: Options<any, any>;
+        /**
+         * @deprecated 保留向后兼容性，使用 options.defaultParams 替代
+         */
         defaultParams?: any;
-        parentKey?: string;
     };
     onChange?: (value: string[], selectedOptions?: any[]) => void;
     transformResponse?: (data: any[]) => any[];

package/es/ProForm/components/combination/ProCascader/style/index.less

@@ -1,5 +1,3 @@
-/* @root-entry-name: 'default'; */
-/* @import (reference) '~antd/es/style/themes/index.less'; */
 
 .pro-address {
   display: flex;
@@ -9,7 +7,7 @@
     width: 45%;
 
     &.no-detail {
-      width: 100% !important;
+      width: 100%;
     }
   }
 

package/es/ProForm/components/combination/ProCascader/utils/index.js

@@ -2,7 +2,7 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["label", "value", "children"];
 import { omit } from 'lodash';
-export var transformDataName = function transformDataName(dataSource, fieldNames) {
+export var transformDataName = (dataSource, fieldNames) => {
   var label = fieldNames.label,
     value = fieldNames.value,
     children = fieldNames.children,
@@ -16,7 +16,7 @@ export var transformDataName = function transformDataName(dataSource, fieldNames
       value: node[value]
     };
     // 处理额外的字段
-    Object.keys(extraFields).forEach(function (key) {
+    Object.keys(extraFields).forEach(key => {
       newNode[key] = node[extraFields[key]];
     });
     if (children && Array.isArray(node[children])) {
@@ -24,7 +24,7 @@ export var transformDataName = function transformDataName(dataSource, fieldNames
     }
     return _objectSpread(_objectSpread({}, newNode), omit(node, Object.values(fieldNames)));
   }
-  var transformData = function transformData(data) {
+  var transformData = data => {
     return data.map(transformNode);
   };
   return transformData(dataSource);