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

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

@@ -1,174 +1,255 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+"use strict";
 
-// src/ProForm/components/combination/ProCascader/index.tsx
-var ProCascader_exports = {};
-__export(ProCascader_exports, {
-  default: () => ProCascader_default
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(ProCascader_exports);
-var import_react = require("react");
-var import_antd = require("antd");
-var import_lodash = require("lodash");
-var import_utils = require("./utils/index");
-var import_ProConfigProvider = require("../../../../ProConfigProvider");
-var import_Input = __toESM(require("../../base/Input"));
-var import_useEnum = __toESM(require("../../../../ProEnum/hooks/useEnum"));
-var import_locale = __toESM(require("../../../../locale"));
-var import__ = __toESM(require("../../.."));
-var import_Container = __toESM(require("../../Container"));
-var defaultFieldNames = { label: "name", value: "code", children: "children" };
+exports.default = void 0;
+require("antd/es/tooltip/style");
+var _tooltip = _interopRequireDefault(require("antd/es/tooltip"));
+require("antd/es/cascader/style");
+var _cascader = _interopRequireDefault(require("antd/es/cascader"));
+require("antd/es/message/style");
+var _message2 = _interopRequireDefault(require("antd/es/message"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _react = require("react");
+var _lodash = require("lodash");
+var _ahooks = require("ahooks");
+var _index = require("./utils/index");
+var _ProConfigProvider = require("../../../../ProConfigProvider");
+var _Input = _interopRequireDefault(require("../../base/Input"));
+var _useEnum = _interopRequireDefault(require("../../../../ProEnum/hooks/useEnum"));
+var _locale = _interopRequireDefault(require("../../../../locale"));
+var _ = _interopRequireDefault(require("../../.."));
+var _Container = _interopRequireDefault(require("../../Container"));
+var _jsxRuntime = require("react/jsx-runtime");
+var _excluded = ["className", "hasDetail", "detailMaxLength", "fieldNames", "value", "disabled", "dataSource", "onChange", "useRequest", "transformResponse", "level", "isView", "enumCode", "code", "tooltip", "separator", "detailPlaceholder", "scrollFollowParent", "desensitization", "otherProps"];
+var defaultFieldNames = {
+  label: 'name',
+  value: 'code',
+  children: 'children'
+};
 var filterDataSource = (dataSource, level, fieldNames) => {
-  return dataSource == null ? void 0 : dataSource.map((item) => ({
-    ...item,
-    [(fieldNames == null ? void 0 : fieldNames.children) || "children"]: level === 1 ? [] : filterDataSource(item == null ? void 0 : item[(fieldNames == null ? void 0 : fieldNames.children) || "children"], level - 1, fieldNames)
+  return dataSource === null || dataSource === void 0 ? void 0 : dataSource.map(item => (0, _objectSpread2.default)((0, _objectSpread2.default)({}, 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 = ({ dataSource, value }) => {
-  let _value = value;
-  const viewLabel = [];
+var getViewLabel = _ref => {
+  var _value2;
+  var dataSource = _ref.dataSource,
+    value = _ref.value;
+  var _value = value;
+  var viewLabel = [];
+  // fix: value是string类型，需要转为数组
   if (_value && !Array.isArray(_value)) {
     _value = [value];
   }
-  _value == null ? void 0 : _value.forEach((value2, index) => {
-    const temp = dataSource == null ? void 0 : dataSource.find((item) => (item == null ? void 0 : item.value) === value2);
-    dataSource = (temp == null ? void 0 : temp.children) || [];
-    viewLabel[index] = temp == null ? void 0 : temp.label;
+  // 根据dataSource得到label数组，查看模式展示需要
+  (_value2 = _value) === null || _value2 === void 0 || _value2.forEach((value, index) => {
+    var _dataSource;
+    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 = (props) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i;
-  const {
-    detailMaxLength: configDetailMaxLength,
-    enumCode: configEnumCode,
-    code: configCode
-  } = (0, import_ProConfigProvider.useProConfig)("ProAddressBar") || {};
-  const isAddressMode = (props == null ? void 0 : props.mode) === "address" || ((_a = props == null ? void 0 : props.otherProps) == null ? void 0 : _a.type) === "ProAddressBar";
-  const {
-    className = "",
-    hasDetail = isAddressMode ? true : void 0,
-    detailMaxLength = isAddressMode ? configDetailMaxLength || 100 : 100,
-    fieldNames = defaultFieldNames,
-    value,
-    disabled,
-    dataSource,
-    onChange,
-    useRequest,
-    transformResponse,
-    // 地址组件需要传入level来判断detail的值放在数组的索引
-    level = isAddressMode ? 3 : void 0,
-    isView,
-    enumCode = configEnumCode,
-    code = configCode,
-    tooltip,
-    separator = "/",
-    detailPlaceholder,
-    scrollFollowParent,
-    desensitization,
-    otherProps,
-    ...restProps
-  } = props;
-  const { isView: isViewCon, viewEmpty } = import__.default.useFieldProps() || {};
-  const addressCode = code || enumCode;
-  const realIsView = typeof isView === "boolean" ? isView : isViewCon;
-  const realLevel = Math.max(2, level);
-  const detail = value == null ? void 0 : value[realLevel];
-  const enumData = (0, import_useEnum.default)(addressCode);
-  const { dics = {} } = (0, import_ProConfigProvider.useProConfig)("ProEnum");
-  const enumDataSource = (0, import_react.useMemo)(() => {
-    if (!(props == null ? void 0 : props.mode)) {
-      return (dics == null ? void 0 : dics[addressCode]) || [];
+var ProCascader = props => {
+  var _props$otherProps, _useRequest$options3, _value$slice, _ref7, _defaultLabel$filter, _locale$ProAddressBar, _locale$ProAddressBar2;
+  var _ref2 = (0, _ProConfigProvider.useProConfig)('ProAddressBar') || {},
+    configDetailMaxLength = _ref2.detailMaxLength,
+    configEnumCode = _ref2.enumCode,
+    configCode = _ref2.code;
+  var isAddressMode = (props === null || props === void 0 ? void 0 : props.mode) === 'address' || (props === null || props === void 0 || (_props$otherProps = props.otherProps) === null || _props$otherProps === void 0 ? void 0 : _props$otherProps.type) === 'ProAddressBar';
+  var _props$className = props.className,
+    className = _props$className === void 0 ? '' : _props$className,
+    _props$hasDetail = props.hasDetail,
+    hasDetail = _props$hasDetail === void 0 ? isAddressMode ? true : undefined : _props$hasDetail,
+    _props$detailMaxLengt = props.detailMaxLength,
+    detailMaxLength = _props$detailMaxLengt === void 0 ? isAddressMode ? configDetailMaxLength || 100 : 100 : _props$detailMaxLengt,
+    _props$fieldNames = props.fieldNames,
+    fieldNames = _props$fieldNames === void 0 ? defaultFieldNames : _props$fieldNames,
+    value = props.value,
+    disabled = props.disabled,
+    dataSource = props.dataSource,
+    onChange = props.onChange,
+    useRequest = props.useRequest,
+    transformResponse = props.transformResponse,
+    _props$level = props.level,
+    level = _props$level === void 0 ? isAddressMode ? 3 : undefined : _props$level,
+    isView = props.isView,
+    _props$enumCode = props.enumCode,
+    enumCode = _props$enumCode === void 0 ? configEnumCode : _props$enumCode,
+    _props$code = props.code,
+    code = _props$code === void 0 ? configCode : _props$code,
+    tooltip = props.tooltip,
+    _props$separator = props.separator,
+    separator = _props$separator === void 0 ? '/' : _props$separator,
+    detailPlaceholder = props.detailPlaceholder,
+    scrollFollowParent = props.scrollFollowParent,
+    desensitization = props.desensitization,
+    otherProps = props.otherProps,
+    restProps = (0, _objectWithoutProperties2.default)(props, _excluded);
+  var _ref3 = _.default.useFieldProps() || {},
+    isViewCon = _ref3.isView,
+    viewEmpty = _ref3.viewEmpty;
+  var addressCode = code || enumCode;
+  var realIsView = typeof isView === 'boolean' ? isView : isViewCon;
+  var realLevel = Math.max(2, level);
+  var detail = value === null || value === void 0 ? void 0 : value[realLevel];
+  var enumData = (0, _useEnum.default)(addressCode);
+  var _useProConfig = (0, _ProConfigProvider.useProConfig)('ProEnum'),
+    _useProConfig$dics = _useProConfig.dics,
+    dics = _useProConfig$dics === void 0 ? {} : _useProConfig$dics;
+  var enumDataSource = (0, _react.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 ? void 0 : dics[addressCode], enumData]);
-  let realDataSource = (0, import_react.useMemo)(() => {
-    const innerDataSource = dataSource || (addressCode ? enumDataSource : []);
-    const result = (0, import_utils.transformDataName)(
-      isAddressMode && realLevel === 2 ? filterDataSource(innerDataSource, level, fieldNames) : innerDataSource,
-      fieldNames
-    );
+  }, [dics === null || dics === void 0 ? void 0 : dics[addressCode], enumData]);
+  var realDataSource = (0, _react.useMemo)(() => {
+    var innerDataSource = dataSource || (addressCode ? enumDataSource : []);
+    var result = (0, _index.transformDataName)(isAddressMode && realLevel === 2 ? filterDataSource(innerDataSource, level, fieldNames) : innerDataSource, fieldNames);
     return result;
-  }, [isAddressMode, addressCode, realLevel, dataSource, enumDataSource == null ? void 0 : enumDataSource.length]);
-  const lastDisabled = (0, import_react.useMemo)(() => {
-    if ((0, import_lodash.isBoolean)(disabled) || disabled === void 0) {
+  }, [isAddressMode, addressCode, realLevel, dataSource, enumDataSource === null || enumDataSource === void 0 ? void 0 : enumDataSource.length]);
+  var lastDisabled = (0, _react.useMemo)(() => {
+    if ((0, _lodash.isBoolean)(disabled) || disabled === undefined) {
       return [disabled, disabled];
     }
     return disabled;
   }, [disabled]);
-  const { service, defaultParams = {} } = { ...useRequest };
-  const [serviceData, setServiceData] = (0, import_react.useState)([]);
-  const [defaultLabel, setDefaultLabel] = (0, import_react.useState)([]);
-  const getFirstLevelOptions = async () => {
-    const { data } = await service(defaultParams);
-    let newData = data;
+  var _useState = (0, _react.useState)([]),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    serviceData = _useState2[0],
+    setServiceData = _useState2[1];
+  var _useState3 = (0, _react.useState)([]),
+    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+    defaultLabel = _useState4[0],
+    setDefaultLabel = _useState4[1];
+
+  // 默认成功处理函数
+  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) {
+      _message2.default.error(msg);
+      return;
+    }
+    var newData = data;
     if (transformResponse) {
       newData = transformResponse(data);
     }
-    const transFormData = (0, import_utils.transformDataName)(newData, {
+    var transFormData = (0, _index.transformDataName)(newData, {
       label: fieldNames.label,
       value: fieldNames.value,
-      children: (fieldNames == null ? void 0 : fieldNames.children) || "children"
+      children: (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'
     });
-    const serviceData2 = isAddressMode && realLevel === 2 ? filterDataSource(transFormData, level, fieldNames) : transFormData;
-    setServiceData(serviceData2);
+    var serviceData = isAddressMode && realLevel === 2 ? filterDataSource(transFormData, level, fieldNames) : transFormData;
+    setServiceData(serviceData);
   };
+
+  // 数据转换处理
+  var successTransformDataHandle = (0, _react.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) {
+      _message2.default.error(msg);
+      return;
+    }
+    return data;
+  }, [transformResponse]);
+
+  // 使用ahooks的useRequest
+  var fetchFunction = (0, _ahooks.useRequest)(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+    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 = (0, _index.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);
   }
-  (0, import_react.useEffect)(() => {
-    if (service) {
-      getFirstLevelOptions();
+
+  // 设置缓存数据
+  (0, _ahooks.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);
+      }
     }
-  }, [service]);
-  (0, import_react.useEffect)(() => {
+  }, [fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.data]);
+
+  // 初始化请求数据
+  (0, _ahooks.useDeepCompareEffect)(() => {
+    var _useRequest$options5;
+    if (!(useRequest !== null && useRequest !== void 0 && useRequest.service)) {
+      return;
+    }
+    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]);
+  (0, _react.useEffect)(() => {
     if (realIsView && value) {
-      if (service) {
-        setDefaultLabel(
-          getViewLabel({
-            dataSource: serviceData,
-            value: isAddressMode && hasDetail ? value == null ? void 0 : value.slice(0, realLevel) : value
-          })
-        );
-      } else if ((realDataSource == null ? void 0 : realDataSource.length) > 0) {
-        setDefaultLabel(
-          getViewLabel({
-            dataSource: realDataSource,
-            value: isAddressMode && hasDetail ? value == null ? void 0 : value.slice(0, realLevel) : value
-          })
-        );
+      var _realDataSource;
+      // 传入dataSource + 查看时初始化展示
+      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
+        }));
+      } else if (((_realDataSource = realDataSource) === null || _realDataSource === void 0 ? void 0 : _realDataSource.length) > 0) {
+        setDefaultLabel(getViewLabel({
+          dataSource: realDataSource,
+          value: isAddressMode && hasDetail ? value === null || value === void 0 ? void 0 : value.slice(0, realLevel) : value
+        }));
       }
     }
   }, [realIsView, value, realDataSource, serviceData]);
-  const handleChange = (changeValue, selectedOptions) => {
+  var handleChange = (changeValue, selectedOptions) => {
     if (onChange) {
       if (isAddressMode && hasDetail && detail) {
-        const realValue = changeValue || [];
+        // 有详情地址
+        var realValue = changeValue || [];
         realValue[realLevel] = detail;
         onChange(realValue, selectedOptions);
       } else {
@@ -176,91 +257,112 @@ var ProCascader = (props) => {
       }
     }
   };
-  const handlefilter = (inputValue, path) => {
-    return path.some((option) => {
+
+  // showSearch中的筛选函数
+  var handlefilter = (inputValue, path) => {
+    return path.some(option => {
       return option.label.toLowerCase().indexOf(inputValue.toLowerCase()) > -1;
     });
   };
-  const displayRender = (label) => {
-    return label == null ? void 0 : label.filter((item) => !!item).join("/");
+  var displayRender = label => {
+    return label === null || label === void 0 ? void 0 : label.filter(item => !!item).join('/');
   };
-  const addressValue = isAddressMode ? value && ((_b = value.slice(0, realLevel)) == null ? void 0 : _b.some((item) => !!item)) ? value.slice(0, realLevel) : void 0 : value;
-  const viewValue = isAddressMode ? ((_d = (_c = [...defaultLabel, value == null ? void 0 : value[realLevel]]) == null ? void 0 : _c.filter((item) => !!item)) == null ? void 0 : _d.join(separator)) || "-" : ((_e = defaultLabel == null ? void 0 : defaultLabel.filter((item) => !!item)) == null ? void 0 : _e.join(separator)) || "-";
-  const findSelectedOptions = (options, value2, path = []) => {
-    const _value = value2 ?? [];
-    if ((_value == null ? void 0 : _value.length) === 0 && (path == null ? void 0 : path.length) > 0) {
+  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 : [];
+    // 基准情况：如果 value 数组为空，且 path 不为空，说明找到了完整的路径
+    if ((_value === null || _value === void 0 ? void 0 : _value.length) === 0 && (path === null || path === void 0 ? void 0 : path.length) > 0) {
       return path;
     }
-    if ((_value == null ? void 0 : _value.length) === 0 || !options || options.length === 0) {
+
+    // 如果没有更多的 _value 需要匹配，或者当前选项没有 children，返回 null
+    if ((_value === null || _value === void 0 ? void 0 : _value.length) === 0 || !options || options.length === 0) {
       return null;
     }
-    const currentValue = _value[0];
-    const foundOption = (0, import_lodash.find)(options, { value: currentValue });
+
+    // 尝试在当前层级的选项中查找匹配的 _value
+    var currentValue = _value[0];
+    var foundOption = (0, _lodash.find)(options, {
+      value: currentValue
+    });
     if (foundOption) {
+      // 如果找到了匹配的选项，并且还有更多的 value 需要匹配，递归地在子选项中查找
       if (_value.length > 1 && foundOption.children) {
         return findSelectedOptions(foundOption.children, _value.slice(1), [...path, foundOption]);
       }
+      // 如果没有更多的 value 需要匹配，返回当前选项（以及之前的路径）
       return [...path, foundOption];
     }
+    // 如果没有在当前层级的选项中找到匹配的 value，返回 null
     return null;
   };
-  const _selectedOptions = (0, import_react.useMemo)(() => {
-    return findSelectedOptions(service ? serviceData : realDataSource, addressValue);
-  }, [service, serviceData, realDataSource, addressValue]);
-  const handleAddressChange = (e) => {
-    const cascaderValue = value == null ? void 0 : value.slice(0, realLevel);
+  var _selectedOptions = (0, _react.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 ? void 0 : cascaderValue.every((item) => !item))) {
-        onChange(void 0);
+      if (!e.target.value && cascaderValue !== null && cascaderValue !== void 0 && cascaderValue.every(item => !item)) {
+        onChange(undefined);
       } else {
-        const realValue = value ? [...value] : [];
+        var realValue = value ? [...value] : [];
         realValue[realLevel] = e.target.value;
         onChange(realValue, _selectedOptions);
       }
     }
   };
-  return realIsView ? /* @__PURE__ */ React.createElement(import_Container.default, { tooltip: !!tooltip, viewEmpty }, viewValue) : /* @__PURE__ */ React.createElement("div", { className: `pro-address ${className}` }, /* @__PURE__ */ React.createElement(
-    import_antd.Cascader,
-    {
-      className: hasDetail ? "" : "no-detail",
-      placeholder: (_g = (_f = import_locale.default) == null ? void 0 : _f.ProAddressBar) == null ? void 0 : _g.placeholder,
+  return realIsView ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_Container.default, {
+    tooltip: !!tooltip,
+    viewEmpty: viewEmpty,
+    children: viewValue
+  }) : /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+    className: `pro-address ${className}`,
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_cascader.default, (0, _objectSpread2.default)({
+      className: hasDetail ? '' : 'no-detail',
+      placeholder: _locale.default === null || _locale.default === void 0 || (_locale$ProAddressBar = _locale.default.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],
-      displayRender,
-      showSearch: { filter: handlefilter, limit: 1e3 },
+      loading: fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.loading,
+      displayRender: displayRender,
+      showSearch: {
+        filter: handlefilter,
+        limit: 1000
+      },
       onChange: handleChange,
-      getPopupContainer: (trigger) => {
+      getPopupContainer: trigger => {
         return scrollFollowParent ? trigger.parentElement : document.body;
-      },
-      ...(0, import_lodash.omit)(restProps, ["otherProps", "scrollFollowParent"])
-    }
-  ), hasDetail && (tooltip && lastDisabled[1] && detail ? /* @__PURE__ */ React.createElement(import_antd.Tooltip, { title: detail }, /* @__PURE__ */ React.createElement("span", { className: "pro-address-detail" }, /* @__PURE__ */ React.createElement(
-    import_Input.default,
-    {
-      disabled: lastDisabled[1],
-      desensitization,
-      otherProps,
-      value: detail
-    }
-  ))) : /* @__PURE__ */ React.createElement(
-    import_Input.default,
-    {
+      }
+    }, (0, _lodash.omit)(restProps, ['otherProps', 'scrollFollowParent']))), hasDetail && (tooltip && lastDisabled[1] && detail ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.default, {
+      title: detail,
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+        className: "pro-address-detail",
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Input.default, {
+          disabled: lastDisabled[1],
+          desensitization: desensitization,
+          otherProps: otherProps,
+          value: detail
+        })
+      })
+    }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_Input.default, {
       allowClear: true,
       autoComplete: "off",
       disabled: lastDisabled[1],
       value: detail,
       maxLength: detailMaxLength,
-      placeholder: detailPlaceholder || ((_i = (_h = import_locale.default) == null ? void 0 : _h.ProAddressBar) == null ? void 0 : _i.detailPlaceholder),
+      placeholder: detailPlaceholder || (_locale.default === null || _locale.default === void 0 || (_locale$ProAddressBar2 = _locale.default.ProAddressBar) === null || _locale$ProAddressBar2 === void 0 ? void 0 : _locale$ProAddressBar2.detailPlaceholder),
       onChange: handleAddressChange,
-      desensitization,
-      otherProps
-    }
-  )));
+      desensitization: desensitization,
+      otherProps: otherProps
+    }))]
+  });
 };
-var ProCascader_default = (0, import_react.memo)(ProCascader, (prevProps, nextProps) => {
-  if (!(0, import_lodash.isEqual)(prevProps == null ? void 0 : prevProps.value, nextProps == null ? void 0 : nextProps.value) || (prevProps == null ? void 0 : prevProps.disabled) !== (nextProps == null ? void 0 : nextProps.disabled) || !(0, import_lodash.isEqual)(prevProps == null ? void 0 : prevProps.dataSource, nextProps == null ? void 0 : nextProps.dataSource)) {
+var _default = exports.default = /*#__PURE__*/(0, _react.memo)(ProCascader, (prevProps, nextProps) => {
+  // 基本props比较, 只比较关键的
+  if (!(0, _lodash.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) || !(0, _lodash.isEqual)(prevProps === null || prevProps === void 0 ? void 0 : prevProps.dataSource, nextProps === null || nextProps === void 0 ? void 0 : nextProps.dataSource)) {
     return false;
   }
   return true;
-});
+});

package/lib/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/lib/ProForm/components/combination/ProCascader/propsType.js

@@ -1,17 +1,5 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+"use strict";
 
-// src/ProForm/components/combination/ProCascader/propsType.ts
-var propsType_exports = {};
-module.exports = __toCommonJS(propsType_exports);
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/lib/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%;
     }
   }