@zat-design/sisyphus-react 4.2.0-beta.2 → 4.2.0-beta.3

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

@@ -1,20 +1,9 @@
-var _excluded = ["className", "hasDetail", "detailMaxLength", "fieldNames", "value", "disabled", "dataSource", "onChange", "useRequest", "transformResponse", "level", "isView", "enumCode", "code", "tooltip", "separator", "detailPlaceholder", "scrollFollowParent", "desensitization", "otherProps"];
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import _isEqual from "lodash/isEqual";
+import _isBoolean from "lodash/isBoolean";
+import _find2 from "lodash/find";
+import _omit from "lodash/omit";
 import { useEffect, useState, memo, useMemo, useCallback } from 'react';
 import { Cascader, Tooltip, message } from 'antd';
-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";
@@ -24,142 +13,132 @@ import locale from "../../../../locale";
 import ProForm from "../../..";
 import Container from "../../Container";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-var defaultFieldNames = {
+const defaultFieldNames = {
   label: 'name',
   value: 'code',
   children: 'children'
 };
-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)
+const filterDataSource = (dataSource, level, fieldNames) => {
+  return dataSource?.map(item => ({
+    ...item,
+    [fieldNames?.children || 'children']: level === 1 ? [] : filterDataSource(item?.[fieldNames?.children || 'children'], level - 1, fieldNames)
   }));
 };
-var getViewLabel = _ref => {
-  var _value2;
-  var dataSource = _ref.dataSource,
-    value = _ref.value;
-  var _value = value;
-  var viewLabel = [];
+const getViewLabel = ({
+  dataSource,
+  value
+}) => {
+  let _value = value;
+  const viewLabel = [];
   // fix: value是string类型，需要转为数组
   if (_value && !Array.isArray(_value)) {
     _value = [value];
   }
   // 根据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;
+  _value?.forEach((value, index) => {
+    const temp = dataSource?.find(item => item?.value === value);
+    dataSource = temp?.children || [];
+    viewLabel[index] = temp?.label;
   });
   return viewLabel;
 };
-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,
-    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 = _objectWithoutProperties(props, _excluded);
-  var _ref3 = ProForm.useFieldProps() || {},
-    isViewCon = _ref3.isView,
-    viewEmpty = _ref3.viewEmpty;
-  var addressCode = code || enumCode;
-  var realIsView = typeof isView === 'boolean' ? isView : isViewCon;
-  var realLevel = level || 2;
-  var detail = value === null || value === void 0 ? void 0 : value[realLevel];
-  var enumData = useEnum(addressCode);
-  var _useProConfig = useProConfig('ProEnum'),
-    _useProConfig$dics = _useProConfig.dics,
-    dics = _useProConfig$dics === void 0 ? {} : _useProConfig$dics;
-  var enumDataSource = useMemo(() => {
-    if (!(props !== null && props !== void 0 && props.mode)) {
-      return (dics === null || dics === void 0 ? void 0 : dics[addressCode]) || [];
+const ProCascader = props => {
+  const {
+    detailMaxLength: configDetailMaxLength,
+    enumCode: configEnumCode,
+    code: configCode
+  } = useProConfig('ProAddressBar') || {};
+  const isAddressMode = props?.mode === 'address' || props?.otherProps?.type === 'ProAddressBar';
+  const {
+    className = '',
+    hasDetail = isAddressMode ? true : undefined,
+    detailMaxLength = isAddressMode ? configDetailMaxLength || 100 : 100,
+    fieldNames = defaultFieldNames,
+    value,
+    disabled,
+    dataSource,
+    onChange,
+    useRequest,
+    transformResponse,
+    // 地址组件需要传入level来判断detail的值放在数组的索引
+    level = isAddressMode ? 3 : undefined,
+    isView,
+    enumCode = configEnumCode,
+    code = configCode,
+    tooltip,
+    separator = '/',
+    detailPlaceholder,
+    scrollFollowParent,
+    desensitization,
+    otherProps,
+    ...restProps
+  } = props;
+  const {
+    isView: isViewCon,
+    viewEmpty
+  } = ProForm.useFieldProps() || {};
+  const addressCode = code || enumCode;
+  const realIsView = typeof isView === 'boolean' ? isView : isViewCon;
+  const realLevel = level || 2;
+  const detail = value?.[realLevel];
+  const enumData = useEnum(addressCode);
+  const {
+    dics = {}
+  } = useProConfig('ProEnum');
+  const enumDataSource = useMemo(() => {
+    if (!props?.mode) {
+      return dics?.[addressCode] || [];
     }
     return Array.isArray(enumData) ? enumData[0] : [];
-  }, [dics === null || dics === void 0 ? void 0 : dics[addressCode], enumData]);
-  var realDataSource = useMemo(() => {
-    var innerDataSource = dataSource || (addressCode ? enumDataSource : []);
-    var result = transformDataName(isAddressMode && realLevel < 3 ? filterDataSource(innerDataSource, level, fieldNames) : innerDataSource, fieldNames);
+  }, [dics?.[addressCode], enumData]);
+  let realDataSource = useMemo(() => {
+    const innerDataSource = dataSource || (addressCode ? enumDataSource : []);
+    const result = transformDataName(isAddressMode && realLevel < 3 ? filterDataSource(innerDataSource, level, fieldNames) : innerDataSource, fieldNames);
     return result;
-  }, [isAddressMode, addressCode, realLevel, dataSource, enumDataSource === null || enumDataSource === void 0 ? void 0 : enumDataSource.length]);
-  var lastDisabled = useMemo(() => {
-    if (isBoolean(disabled) || disabled === undefined) {
+  }, [isAddressMode, addressCode, realLevel, dataSource, enumDataSource?.length]);
+  const lastDisabled = useMemo(() => {
+    if (_isBoolean(disabled) || disabled === undefined) {
       return [disabled, disabled];
     }
     return disabled;
   }, [disabled]);
-  var _useState = useState([]),
-    _useState2 = _slicedToArray(_useState, 2),
-    serviceData = _useState2[0],
-    setServiceData = _useState2[1];
-  var _useState3 = useState([]),
-    _useState4 = _slicedToArray(_useState3, 2),
-    defaultLabel = _useState4[0],
-    setDefaultLabel = _useState4[1];
+  const [serviceData, setServiceData] = useState([]);
+  const [defaultLabel, setDefaultLabel] = useState([]);
 
   // 默认成功处理函数
-  var defaultOnSuccessFun = res => {
-    var _ref4 = res || {},
-      _ref4$status = _ref4.status,
-      status = _ref4$status === void 0 ? 200 : _ref4$status,
-      msg = _ref4.message,
-      data = _ref4.data;
+  const defaultOnSuccessFun = res => {
+    const {
+      status = 200,
+      message: msg,
+      data
+    } = res || {};
     if (status !== 200) {
       message.error(msg);
       return;
     }
-    var newData = data;
+    let newData = data;
     if (transformResponse) {
       newData = transformResponse(data);
     }
-    var transFormData = transformDataName(newData, {
+    const transFormData = transformDataName(newData, {
       label: fieldNames.label,
       value: fieldNames.value,
-      children: (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'
+      children: fieldNames?.children || 'children'
     });
-    var serviceData = isAddressMode && realLevel < 3 ? filterDataSource(transFormData, level, fieldNames) : transFormData;
+    const serviceData = isAddressMode && realLevel < 3 ? filterDataSource(transFormData, level, fieldNames) : transFormData;
     setServiceData(serviceData);
   };
 
   // 数据转换处理
-  var successTransformDataHandle = useCallback(res => {
+  const 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;
+    const {
+      status = 200,
+      message: msg,
+      data
+    } = res || {};
     if (status !== 200) {
       message.error(msg);
       return;
@@ -168,31 +147,30 @@ var ProCascader = props => {
   }, [transformResponse]);
 
   // 使用ahooks的useRequest
-  var fetchFunction = useRequestFunc(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, _objectSpread(_objectSpread({
+  const fetchFunction = useRequestFunc(useRequest?.service, {
     manual: true,
-    debounceWait: 300
-  }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options), {}, {
+    debounceWait: 300,
+    ...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, {
+        const responseData = transformResponse(data);
+        const transFormData = transformDataName(responseData, {
           label: fieldNames.label,
           value: fieldNames.value,
-          children: (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'
+          children: fieldNames?.children || 'children'
         });
-        var _serviceData = isAddressMode && realLevel < 3 ? filterDataSource(transFormData, level, fieldNames) : transFormData;
-        setServiceData(_serviceData);
+        const serviceData = isAddressMode && realLevel < 3 ? 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);
+      useRequest?.options?.onSuccess?.(data, useRequest?.options?.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) : [];
+  const cacheList = useRequest?.options?.cacheKey ? successTransformDataHandle(fetchFunction?.data) : [];
 
   // 提取出来默认每次都执行
   if (transformResponse) {
@@ -201,53 +179,51 @@ var ProCascader = props => {
 
   // 设置缓存数据
   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) {
+    if (!serviceData?.length && useRequest?.options?.cacheKey) {
+      if (cacheList?.length) {
         setServiceData(cacheList);
       }
     }
-  }, [fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.data]);
+  }, [fetchFunction?.data]);
 
   // 初始化请求数据
   useDeepCompareEffect(() => {
-    var _useRequest$options5;
-    if (!(useRequest !== null && useRequest !== void 0 && useRequest.service)) {
+    if (!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) {
+    const {
+      manual
+    } = useRequest?.options || {};
+    if (manual || 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 || {};
+    const defaultParams = useRequest?.options?.defaultParams || useRequest?.defaultParams;
+    const params = Array.isArray(defaultParams) ? defaultParams?.[0] : defaultParams || {};
     fetchFunction.run(params);
-  }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.options]);
+  }, [useRequest?.options]);
   useEffect(() => {
     if (realIsView && value) {
-      var _realDataSource;
       // 传入dataSource + 查看时初始化展示
-      if (useRequest !== null && useRequest !== void 0 && useRequest.service) {
+      if (useRequest?.service) {
         setDefaultLabel(getViewLabel({
           dataSource: serviceData,
-          value: isAddressMode && hasDetail ? value === null || value === void 0 ? void 0 : value.slice(0, realLevel) : value
+          value: isAddressMode && hasDetail ? value?.slice(0, realLevel) : value
         }));
-      } else if (((_realDataSource = realDataSource) === null || _realDataSource === void 0 ? void 0 : _realDataSource.length) > 0) {
+      } else if (realDataSource?.length > 0) {
         setDefaultLabel(getViewLabel({
           dataSource: realDataSource,
-          value: isAddressMode && hasDetail ? value === null || value === void 0 ? void 0 : value.slice(0, realLevel) : value
+          value: isAddressMode && hasDetail ? value?.slice(0, realLevel) : value
         }));
       }
     }
   }, [realIsView, value, realDataSource, serviceData]);
-  var handleChange = (changeValue, selectedOptions) => {
+  const handleChange = (changeValue, selectedOptions) => {
     if (onChange) {
       if (isAddressMode && hasDetail && detail) {
         // 有详情地址
-        var realValue = changeValue || [];
+        const realValue = changeValue || [];
         realValue[realLevel] = detail;
         onChange(realValue, selectedOptions);
       } else {
@@ -257,32 +233,31 @@ var ProCascader = props => {
   };
 
   // showSearch中的筛选函数
-  var handlefilter = (inputValue, path) => {
+  const handlefilter = (inputValue, path) => {
     return path.some(option => {
       return option.label.toLowerCase().indexOf(inputValue.toLowerCase()) > -1;
     });
   };
-  var displayRender = label => {
-    return label === null || label === void 0 ? void 0 : label.filter(item => !!item).join('/');
+  const displayRender = label => {
+    return label?.filter(item => !!item).join('/');
   };
-  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 : [];
+  const addressValue = isAddressMode ? value && value.slice(0, realLevel)?.some(item => !!item) ? value.slice(0, realLevel) : undefined : value;
+  const viewValue = isAddressMode ? [...defaultLabel, value?.[realLevel]]?.filter(item => !!item)?.join(separator) || '-' : defaultLabel?.filter(item => !!item)?.join(separator) || '-';
+  const findSelectedOptions = (options, value, path = []) => {
+    const _value = value ?? [];
     // 基准情况：如果 value 数组为空，且 path 不为空，说明找到了完整的路径
-    if ((_value === null || _value === void 0 ? void 0 : _value.length) === 0 && (path === null || path === void 0 ? void 0 : path.length) > 0) {
+    if (_value?.length === 0 && path?.length > 0) {
       return path;
     }
 
     // 如果没有更多的 _value 需要匹配，或者当前选项没有 children，返回 null
-    if ((_value === null || _value === void 0 ? void 0 : _value.length) === 0 || !options || options.length === 0) {
+    if (_value?.length === 0 || !options || options.length === 0) {
       return null;
     }
 
     // 尝试在当前层级的选项中查找匹配的 _value
-    var currentValue = _value[0];
-    var foundOption = _find(options, {
+    const currentValue = _value[0];
+    const foundOption = _find2(options, {
       value: currentValue
     });
     if (foundOption) {
@@ -296,16 +271,16 @@ var ProCascader = props => {
     // 如果没有在当前层级的选项中找到匹配的 value，返回 null
     return null;
   };
-  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);
+  const _selectedOptions = useMemo(() => {
+    return findSelectedOptions(useRequest?.service ? serviceData : realDataSource, addressValue);
+  }, [useRequest?.service, serviceData, realDataSource, addressValue]);
+  const handleAddressChange = e => {
+    const cascaderValue = value?.slice(0, realLevel);
     if (onChange) {
-      if (!e.target.value && cascaderValue !== null && cascaderValue !== void 0 && cascaderValue.every(item => !item)) {
+      if (!e.target.value && cascaderValue?.every(item => !item)) {
         onChange(undefined);
       } else {
-        var realValue = value ? [...value] : [];
+        const realValue = value ? [...value] : [];
         realValue[realLevel] = e.target.value;
         onChange(realValue, _selectedOptions);
       }
@@ -317,13 +292,13 @@ var ProCascader = props => {
     children: viewValue
   }) : /*#__PURE__*/_jsxs("div", {
     className: `pro-address ${className}`,
-    children: [/*#__PURE__*/_jsx(Cascader, _objectSpread({
+    children: [/*#__PURE__*/_jsx(Cascader, {
       className: hasDetail ? '' : 'no-detail',
-      placeholder: locale === null || locale === void 0 || (_locale$ProAddressBar = locale.ProAddressBar) === null || _locale$ProAddressBar === void 0 ? void 0 : _locale$ProAddressBar.placeholder,
+      placeholder: locale?.ProAddressBar?.placeholder,
       value: addressValue,
-      options: useRequest !== null && useRequest !== void 0 && useRequest.service ? serviceData : realDataSource,
+      options: useRequest?.service ? serviceData : realDataSource,
       disabled: lastDisabled[0],
-      loading: fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.loading,
+      loading: fetchFunction?.loading,
       displayRender: displayRender,
       showSearch: {
         filter: handlefilter,
@@ -332,8 +307,9 @@ var ProCascader = props => {
       onChange: handleChange,
       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",
@@ -350,7 +326,7 @@ var ProCascader = props => {
       disabled: lastDisabled[1],
       value: detail,
       maxLength: detailMaxLength,
-      placeholder: detailPlaceholder || (locale === null || locale === void 0 || (_locale$ProAddressBar2 = locale.ProAddressBar) === null || _locale$ProAddressBar2 === void 0 ? void 0 : _locale$ProAddressBar2.detailPlaceholder),
+      placeholder: detailPlaceholder || locale?.ProAddressBar?.detailPlaceholder,
       onChange: handleAddressChange,
       desensitization: desensitization,
       otherProps: otherProps
@@ -359,7 +335,7 @@ var ProCascader = props => {
 };
 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)) {
+  if (!_isEqual(prevProps?.value, nextProps?.value) || prevProps?.disabled !== nextProps?.disabled || !_isEqual(prevProps?.dataSource, nextProps?.dataSource)) {
     return false;
   }
   return true;

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

@@ -1,22 +1,16 @@
-var _excluded = ["label", "value", "children"];
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-import { omit } from 'lodash';
-export var transformDataName = (dataSource, fieldNames) => {
-  var label = fieldNames.label,
-    value = fieldNames.value,
-    children = fieldNames.children,
-    extraFields = _objectWithoutProperties(fieldNames, _excluded);
-  if (!(dataSource !== null && dataSource !== void 0 && dataSource.length) || 'label' in dataSource[0] && 'value' in dataSource[0] && 'children' in dataSource[0]) {
+import _omit from "lodash/omit";
+export const transformDataName = (dataSource, fieldNames) => {
+  const {
+    label,
+    value,
+    children,
+    ...extraFields
+  } = fieldNames;
+  if (!dataSource?.length || 'label' in dataSource[0] && 'value' in dataSource[0] && 'children' in dataSource[0]) {
     return dataSource;
   }
   function transformNode(node) {
-    var newNode = {
+    const newNode = {
       label: node[label],
       value: node[value]
     };
@@ -27,9 +21,12 @@ export var transformDataName = (dataSource, fieldNames) => {
     if (children && Array.isArray(node[children])) {
       newNode.children = node[children].map(transformNode);
     }
-    return _objectSpread(_objectSpread({}, newNode), omit(node, Object.values(fieldNames)));
+    return {
+      ...newNode,
+      ..._omit(node, Object.values(fieldNames))
+    };
   }
-  var transformData = data => {
+  const transformData = data => {
     return data.map(transformNode);
   };
   return transformData(dataSource);