@zat-design/sisyphus-react 3.13.19-beta.6 → 3.13.19-beta.8

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

@@ -9,20 +9,15 @@ require("antd/es/tooltip/style");
 var _tooltip = _interopRequireDefault(require("antd/es/tooltip"));
 require("antd/es/cascader/style");
 var _cascader = _interopRequireDefault(require("antd/es/cascader"));
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 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 _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _objectSpread3 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 require("antd/es/typography/style");
 var _typography = _interopRequireDefault(require("antd/es/typography"));
-var _isBoolean2 = _interopRequireDefault(require("lodash/isBoolean"));
-var _find = _interopRequireDefault(require("lodash/find"));
-var _omit2 = _interopRequireDefault(require("lodash/omit"));
-var _jsxRuntime = require("react/jsx-runtime");
 var _react = require("react");
+var _lodash = require("lodash");
 var _ahooks = require("ahooks");
 var _index = require("./utils/index");
 var _ProConfigProvider = require("../../../../ProConfigProvider");
@@ -31,6 +26,7 @@ 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 Text = _typography.default.Text;
 var defaultFieldNames = {
@@ -38,12 +34,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 (0, _objectSpread3.default)((0, _objectSpread3.default)({}, item), {}, (0, _defineProperty2.default)({}, (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 => (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 = function getViewLabel(_ref) {
+var getViewLabel = _ref => {
   var _value2;
   var dataSource = _ref.dataSource,
     value = _ref.value;
@@ -54,23 +50,21 @@ var getViewLabel = function getViewLabel(_ref) {
     _value = [value];
   }
   // 根据dataSource得到label数组，查看模式展示需要
-  (_value2 = _value) === null || _value2 === void 0 ? 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, _useRequest$options3, _value$slice, _ref7, _ref7$filter, _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 = (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 ? void 0 : (_props$otherProps = props.otherProps) === null || _props$otherProps === void 0 ? void 0 : _props$otherProps.type) === 'ProAddressBar';
+  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,
@@ -111,19 +105,19 @@ var ProCascader = function ProCascader(props) {
   var _useProConfig = (0, _ProConfigProvider.useProConfig)('ProEnum'),
     _useProConfig$dics = _useProConfig.dics,
     dics = _useProConfig$dics === void 0 ? {} : _useProConfig$dics;
-  var enumDataSource = (0, _react.useMemo)(function () {
-    if (!(props === null || props === void 0 ? void 0 : props.mode)) {
+  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 || dics === void 0 ? void 0 : dics[addressCode], enumData]);
-  var realDataSource = (0, _react.useMemo)(function () {
+  var realDataSource = (0, _react.useMemo)(() => {
     var innerDataSource = dataSource || (addressCode ? enumDataSource : []);
-    var result = (0, _index.transformDataName)(isAddressMode && realLevel === 2 ? _filterDataSource(innerDataSource, level, fieldNames) : innerDataSource, fieldNames);
+    var result = (0, _index.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 = (0, _react.useMemo)(function () {
-    if ((0, _isBoolean2.default)(disabled) || disabled === undefined) {
+  var lastDisabled = (0, _react.useMemo)(() => {
+    if ((0, _lodash.isBoolean)(disabled) || disabled === undefined) {
       return [disabled, disabled];
     }
     return disabled;
@@ -136,8 +130,9 @@ var ProCascader = function ProCascader(props) {
     _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
     defaultLabel = _useState4[0],
     setDefaultLabel = _useState4[1];
+
   // 默认成功处理函数
-  var defaultOnSuccessFun = function defaultOnSuccessFun(res) {
+  var defaultOnSuccessFun = res => {
     var _ref4 = res || {},
       _ref4$status = _ref4.status,
       status = _ref4$status === void 0 ? 200 : _ref4$status,
@@ -156,11 +151,12 @@ var ProCascader = function ProCascader(props) {
       value: fieldNames.value,
       children: (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'
     });
-    var serviceData = isAddressMode && realLevel === 2 ? _filterDataSource(transFormData, level, fieldNames) : transFormData;
+    var serviceData = isAddressMode && realLevel === 2 ? filterDataSource(transFormData, level, fieldNames) : transFormData;
     setServiceData(serviceData);
   };
+
   // 数据转换处理
-  var successTransformDataHandle = (0, _react.useCallback)(function (res) {
+  var successTransformDataHandle = (0, _react.useCallback)(res => {
     if (transformResponse && typeof transformResponse === 'function') {
       return transformResponse(res);
     }
@@ -175,12 +171,13 @@ var ProCascader = function ProCascader(props) {
     }
     return data;
   }, [transformResponse]);
+
   // 使用ahooks的useRequest
-  var fetchFunction = (0, _ahooks.useRequest)(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, (0, _objectSpread3.default)((0, _objectSpread3.default)({
+  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: function onSuccess(data) {
+    onSuccess: data => {
       var _useRequest$options, _useRequest$options$o, _useRequest$options2;
       if (transformResponse && typeof transformResponse === 'function') {
         var responseData = transformResponse(data);
@@ -189,51 +186,56 @@ var ProCascader = function ProCascader(props) {
           value: fieldNames.value,
           children: (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'
         });
-        var _serviceData = isAddressMode && realLevel === 2 ? _filterDataSource(transFormData, level, fieldNames) : transFormData;
+        var _serviceData = isAddressMode && realLevel === 2 ? filterDataSource(transFormData, level, fieldNames) : transFormData;
         setServiceData(_serviceData);
       } else {
         defaultOnSuccessFun(data);
       }
       // 执行传入的onSuccess
-      useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options = useRequest.options) === null || _useRequest$options === void 0 ? void 0 : (_useRequest$options$o = _useRequest$options.onSuccess) === null || _useRequest$options$o === void 0 ? void 0 : _useRequest$options$o.call(_useRequest$options, data, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options2 = useRequest.options) === null || _useRequest$options2 === void 0 ? void 0 : _useRequest$options2.defaultParams);
+      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 ? void 0 : (_useRequest$options3 = useRequest.options) === null || _useRequest$options3 === void 0 ? void 0 : _useRequest$options3.cacheKey) ? successTransformDataHandle(fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.data) : [];
+  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, _ahooks.useDeepCompareEffect)(function () {
+  (0, _ahooks.useDeepCompareEffect)(() => {
     var _useRequest$options4;
-    if (!(serviceData === null || serviceData === void 0 ? void 0 : serviceData.length) && (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options4 = useRequest.options) === null || _useRequest$options4 === void 0 ? void 0 : _useRequest$options4.cacheKey)) {
-      if (cacheList === null || cacheList === void 0 ? void 0 : cacheList.length) {
+    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]);
+
   // 初始化请求数据
-  (0, _ahooks.useDeepCompareEffect)(function () {
+  (0, _ahooks.useDeepCompareEffect)(() => {
     var _useRequest$options5;
-    if (!(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service)) {
+    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 ? void 0 : cacheList.length)) {
+    if (manual || cacheList !== null && cacheList !== void 0 && cacheList.length) {
       return;
     }
+
     // 向后兼容性：优先使用 options.defaultParams，fallback 到 useRequest.defaultParams
-    var defaultParams = (useRequest === null || useRequest === void 0 ? 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 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)(function () {
+  (0, _react.useEffect)(() => {
     if (realIsView && value) {
       var _realDataSource;
       // 传入dataSource + 查看时初始化展示
-      if (useRequest === null || useRequest === void 0 ? void 0 : useRequest.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
@@ -246,7 +248,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) {
         // 有详情地址
@@ -258,80 +260,73 @@ 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 ? void 0 : _value$slice.some(function (item) {
-    return !!item;
-  })) ? value.slice(0, realLevel) : undefined : value;
-  var viewValue = isAddressMode ? ((_ref7 = [].concat((0, _toConsumableArray2.default)(defaultLabel), [value === null || value === void 0 ? void 0 : value[realLevel]])) === null || _ref7 === void 0 ? void 0 : (_ref7$filter = _ref7.filter(function (item) {
-    return !!item;
-  })) === null || _ref7$filter === void 0 ? void 0 : _ref7$filter.join(separator)) || '-' : (defaultLabel === null || defaultLabel === void 0 ? void 0 : (_defaultLabel$filter = defaultLabel.filter(function (item) {
-    return !!item;
-  })) === null || _defaultLabel$filter === void 0 ? void 0 : _defaultLabel$filter.join(separator)) || '-';
-  var _findSelectedOptions = function findSelectedOptions(options, value) {
+  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;
     }
+
     // 如果没有更多的 _value 需要匹配，或者当前选项没有 children，返回 null
     if ((_value === null || _value === void 0 ? void 0 : _value.length) === 0 || !options || options.length === 0) {
       return null;
     }
+
     // 尝试在当前层级的选项中查找匹配的 _value
     var currentValue = _value[0];
-    var foundOption = (0, _find.default)(options, {
+    var foundOption = (0, _lodash.find)(options, {
       value: currentValue
     });
     if (foundOption) {
       // 如果找到了匹配的选项，并且还有更多的 value 需要匹配，递归地在子选项中查找
       if (_value.length > 1 && foundOption.children) {
-        return _findSelectedOptions(foundOption.children, _value.slice(1), [].concat((0, _toConsumableArray2.default)(path), [foundOption]));
+        return findSelectedOptions(foundOption.children, _value.slice(1), [...path, foundOption]);
       }
       // 如果没有更多的 value 需要匹配，返回当前选项（以及之前的路径）
-      return [].concat((0, _toConsumableArray2.default)(path), [foundOption]);
+      return [...path, foundOption];
     }
     // 如果没有在当前层级的选项中找到匹配的 value，返回 null
     return null;
   };
-  var _selectedOptions = (0, _react.useMemo)(function () {
-    return _findSelectedOptions((useRequest === null || useRequest === void 0 ? void 0 : useRequest.service) ? serviceData : realDataSource, addressValue);
+  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 = function handleAddressChange(e) {
+  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 ? 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 ? (0, _toConsumableArray2.default)(value) : [];
+        var realValue = value ? [...value] : [];
         realValue[realLevel] = e.target.value;
         onChange(realValue, _selectedOptions);
       }
     }
   };
-  return realIsView ? (0, _jsxRuntime.jsx)(_Container.default, {
+  return realIsView ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_Container.default, {
     tooltip: !!tooltip,
     viewEmpty: viewEmpty,
     children: viewValue
-  }) : (0, _jsxRuntime.jsxs)("div", {
-    className: "pro-address ".concat(className),
-    children: [(0, _jsxRuntime.jsx)(_cascader.default, (0, _objectSpread3.default)({
+  }) : /*#__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 ? void 0 : (_locale$ProAddressBar = _locale.default.ProAddressBar) === null || _locale$ProAddressBar === void 0 ? void 0 : _locale$ProAddressBar.placeholder,
+      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: (useRequest === null || useRequest === void 0 ? void 0 : useRequest.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,
@@ -340,27 +335,27 @@ var ProCascader = function ProCascader(props) {
         limit: 1000
       },
       onChange: handleChange,
-      getPopupContainer: function getPopupContainer(trigger) {
+      getPopupContainer: trigger => {
         return scrollFollowParent ? trigger.parentElement : document.body;
       }
-    }, (0, _omit2.default)(restProps, ['otherProps', 'scrollFollowParent']))), hasDetail && (tooltip && lastDisabled[1] && detail ? (0, _jsxRuntime.jsx)(_tooltip.default, {
+    }, (0, _lodash.omit)(restProps, ['otherProps', 'scrollFollowParent']))), hasDetail && (tooltip && lastDisabled[1] && detail ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.default, {
       title: detail,
-      children: (0, _jsxRuntime.jsx)("span", {
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
         className: "pro-address-detail",
-        children: (0, _jsxRuntime.jsx)(_Input.default, {
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Input.default, {
           disabled: lastDisabled[1],
           desensitization: desensitization,
           otherProps: otherProps,
           value: detail
         })
       })
-    }) : (0, _jsxRuntime.jsx)(_Input.default, {
+    }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_Input.default, {
       allowClear: true,
       autoComplete: "off",
       disabled: lastDisabled[1],
       value: detail,
       maxLength: detailMaxLength,
-      placeholder: detailPlaceholder || (_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProAddressBar2 = _locale.default.ProAddressBar) === null || _locale$ProAddressBar2 === void 0 ? void 0 : _locale$ProAddressBar2.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: desensitization,
       otherProps: otherProps

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

@@ -7,14 +7,14 @@ Object.defineProperty(exports, "__esModule", {
 exports.transformDataName = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-var _omit2 = _interopRequireDefault(require("lodash/omit"));
+var _lodash = require("lodash");
 var _excluded = ["label", "value", "children"];
-var transformDataName = exports.transformDataName = function transformDataName(dataSource, fieldNames) {
+var transformDataName = (dataSource, fieldNames) => {
   var label = fieldNames.label,
     value = fieldNames.value,
     children = fieldNames.children,
     extraFields = (0, _objectWithoutProperties2.default)(fieldNames, _excluded);
-  if (!(dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) || 'label' in dataSource[0] && 'value' in dataSource[0] && 'children' in dataSource[0]) {
+  if (!(dataSource !== null && dataSource !== void 0 && dataSource.length) || 'label' in dataSource[0] && 'value' in dataSource[0] && 'children' in dataSource[0]) {
     return dataSource;
   }
   function transformNode(node) {
@@ -23,16 +23,17 @@ var transformDataName = exports.transformDataName = function transformDataName(d
       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])) {
       newNode.children = node[children].map(transformNode);
     }
-    return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, newNode), (0, _omit2.default)(node, Object.values(fieldNames)));
+    return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, newNode), (0, _lodash.omit)(node, Object.values(fieldNames)));
   }
-  var transformData = function transformData(data) {
+  var transformData = data => {
     return data.map(transformNode);
   };
   return transformData(dataSource);
-};
+};
+exports.transformDataName = transformDataName;

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

@@ -6,16 +6,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.childPropsItemProps = exports.ProCombination = void 0;
-require("antd/es/button/style");
-var _button = _interopRequireDefault(require("antd/es/button"));
 require("antd/es/input/style");
 var _input = _interopRequireDefault(require("antd/es/input"));
+require("antd/es/button/style");
+var _button = _interopRequireDefault(require("antd/es/button"));
 require("antd/es/space/style");
 var _space = _interopRequireDefault(require("antd/es/space"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _jsxRuntime = require("react/jsx-runtime");
 var _react = require("react");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _Container = _interopRequireDefault(require("../../Container"));
@@ -24,9 +22,10 @@ var _utils = require("../../../utils");
 var _propsType = require("../../../propsType");
 var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
 require("./style/index.less");
+var _jsxRuntime = require("react/jsx-runtime");
 // @ts-nocheck
 
-var useControlled = function useControlled(props) {
+var useControlled = props => {
   var value = props.value,
     onChange = props.onChange;
   var _useState = (0, _react.useState)(value || []),
@@ -38,19 +37,19 @@ var useControlled = function useControlled(props) {
       rest[_key] = arguments[_key];
     }
     setValues(rest[0]);
-    onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, rest);
+    onChange === null || onChange === void 0 || onChange(...rest);
   };
   if ('value' in props) {
     return [value, function () {
       for (var _len2 = arguments.length, rest = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
         rest[_key2] = arguments[_key2];
       }
-      return onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, rest);
+      return onChange === null || onChange === void 0 ? void 0 : onChange(...rest);
     }];
   }
   return [_values, handleChange];
 };
-var ProCombination = exports.ProCombination = function ProCombination(props) {
+var ProCombination = props => {
   var _childProps$, _childProps$2;
   var disabled = props.disabled,
     _props$childProps = props.childProps,
@@ -66,6 +65,7 @@ var ProCombination = exports.ProCombination = function ProCombination(props) {
     isView = _ref$isView === void 0 ? false : _ref$isView,
     viewEmpty = _ref.viewEmpty,
     form = _ref.form;
+
   // 取到对应组件
   var _ref2 = [componentMap[((_childProps$ = childProps[0]) === null || _childProps$ === void 0 ? void 0 : _childProps$.renderType) || 'Input'], componentMap[((_childProps$2 = childProps[1]) === null || _childProps$2 === void 0 ? void 0 : _childProps$2.renderType) || 'Input']],
     BeforeCom = _ref2[0],
@@ -74,9 +74,9 @@ var ProCombination = exports.ProCombination = function ProCombination(props) {
     _useControlled2 = (0, _slicedToArray2.default)(_useControlled, 2),
     values = _useControlled2[0],
     _handleChange = _useControlled2[1];
-  var handleChange = function handleChange(value, rest, index) {
-    var _value, _value$target, _values2, _values3, _childProps$index, _childProps$index$onC;
-    if (((_value = value) === null || _value === void 0 ? void 0 : (_value$target = _value.target) === null || _value$target === void 0 ? void 0 : _value$target.value) !== undefined) {
+  var handleChange = (value, rest, index) => {
+    var _value, _values2, _values3, _childProps$index, _childProps$index$onC;
+    if (((_value = value) === null || _value === void 0 || (_value = _value.target) === null || _value === void 0 ? void 0 : _value.value) !== undefined) {
       value = value.target.value;
     }
     var _values;
@@ -91,28 +91,29 @@ var ProCombination = exports.ProCombination = function ProCombination(props) {
       _values = [];
     }
     _handleChange(_values, rest === null || rest === void 0 ? void 0 : rest[0], form);
-    (_childProps$index = childProps[index]) === null || _childProps$index === void 0 ? void 0 : (_childProps$index$onC = _childProps$index.onChange) === null || _childProps$index$onC === void 0 ? void 0 : _childProps$index$onC.call(_childProps$index, value, rest === null || rest === void 0 ? void 0 : rest[0], form); // 支持子组件分别传入onChange
+    (_childProps$index = childProps[index]) === null || _childProps$index === void 0 || (_childProps$index$onC = _childProps$index.onChange) === null || _childProps$index$onC === void 0 || _childProps$index$onC.call(_childProps$index, value, rest === null || rest === void 0 ? void 0 : rest[0], form); // 支持子组件分别传入onChange
   };
   var className = (0, _classnames.default)({
     'pro-combination': true,
     'pro-combination-view': isView
   });
-  var addedOtherKeys = (0, _react.useMemo)(function () {
-    return [].concat((0, _toConsumableArray2.default)(_propsType.otherKeys), ['renderType']);
+  var addedOtherKeys = (0, _react.useMemo)(() => {
+    return [..._propsType.otherKeys, 'renderType'];
   }, [_propsType.otherKeys]);
   // 剔除其他参数
-  var _useMemo = (0, _react.useMemo)(function () {
+  var _useMemo = (0, _react.useMemo)(() => {
       return (0, _utils.weedOutProps)(childProps[0] || {}, addedOtherKeys);
     }, [childProps[0]]),
     _useMemo2 = (0, _slicedToArray2.default)(_useMemo, 2),
     beforeProps = _useMemo2[0],
     beforeOtherProps = _useMemo2[1];
-  var _useMemo3 = (0, _react.useMemo)(function () {
+  var _useMemo3 = (0, _react.useMemo)(() => {
       return (0, _utils.weedOutProps)(childProps[1] || {}, addedOtherKeys);
     }, [childProps[1]]),
     _useMemo4 = (0, _slicedToArray2.default)(_useMemo3, 2),
     afterProps = _useMemo4[0],
     afterOtherProps = _useMemo4[1];
+
   // 查看模式
   if (isView) {
     if (!values || !Array.isArray(values)) {
@@ -132,29 +133,30 @@ var ProCombination = exports.ProCombination = function ProCombination(props) {
         renderType: 'Input'
       });
     }
+
     // 第一个值
     var oneValue = '';
     // 第二个值
     var twoValue = '';
-    childData.forEach(function (item, index) {
-      if (index === 0 && (values === null || values === void 0 ? void 0 : values[0])) {
+    childData.forEach((item, index) => {
+      if (index === 0 && values !== null && values !== void 0 && values[0]) {
         if (['ProEnum', 'ProSelect', 'Select'].includes(item.renderType)) {
-          oneValue = (0, _jsxRuntime.jsx)(BeforeCom, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, beforeProps), {}, {
+          oneValue = /*#__PURE__*/(0, _jsxRuntime.jsx)(BeforeCom, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, beforeProps), {}, {
             value: values === null || values === void 0 ? void 0 : values[0],
             otherProps: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, beforeOtherProps), {}, {
-              isView: isView
+              isView
             })
           }));
         } else {
           oneValue = values === null || values === void 0 ? void 0 : values[0];
         }
       }
-      if (index === 1 && (values === null || values === void 0 ? void 0 : values[1])) {
+      if (index === 1 && values !== null && values !== void 0 && values[1]) {
         if (['ProEnum', 'ProSelect', 'Select'].includes(item.renderType)) {
-          twoValue = (0, _jsxRuntime.jsx)(AfterCom, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, afterProps), {}, {
+          twoValue = /*#__PURE__*/(0, _jsxRuntime.jsx)(AfterCom, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, afterProps), {}, {
             value: values === null || values === void 0 ? void 0 : values[1],
             otherProps: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, afterOtherProps), {}, {
-              isView: isView
+              isView
             })
           }));
         } else {
@@ -162,21 +164,21 @@ var ProCombination = exports.ProCombination = function ProCombination(props) {
         }
       }
     });
-    return (0, _jsxRuntime.jsx)(_Container.default, {
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Container.default, {
       viewEmpty: viewEmpty,
-      children: (0, _jsxRuntime.jsx)(_space.default, {
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_space.default, {
         size: 8,
-        children: !oneValue && !twoValue ? viewEmpty : (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+        children: !oneValue && !twoValue ? viewEmpty : /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
           children: [oneValue, separator, twoValue]
         })
       })
     });
   }
-  return (0, _jsxRuntime.jsxs)(_input.default.Group, {
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_input.default.Group, {
     compact: true,
     className: className,
     id: id,
-    children: [(0, _jsxRuntime.jsx)(BeforeCom, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(BeforeCom, (0, _objectSpread2.default)((0, _objectSpread2.default)({
       disabled: disabled
     }, beforeProps), {}, {
       value: values === null || values === void 0 ? void 0 : values[0],
@@ -187,10 +189,10 @@ var ProCombination = exports.ProCombination = function ProCombination(props) {
         return handleChange(value, rest, 0);
       },
       otherProps: beforeOtherProps
-    })), isView ? separator : separator && (0, _jsxRuntime.jsx)(_button.default, {
+    })), isView ? separator : separator && /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.default, {
       disabled: true,
       children: separator
-    }), (0, _jsxRuntime.jsx)(AfterCom, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(AfterCom, (0, _objectSpread2.default)((0, _objectSpread2.default)({
       disabled: disabled
     }, afterProps), {}, {
       value: values === null || values === void 0 ? void 0 : values[1],
@@ -204,10 +206,12 @@ var ProCombination = exports.ProCombination = function ProCombination(props) {
     }))]
   });
 };
+exports.ProCombination = ProCombination;
 ProCombination.defaultProps = {
   disabled: false
 };
-var childPropsItemProps = exports.childPropsItemProps = function childPropsItemProps(props) {
+var childPropsItemProps = props => {
   return null;
 };
+exports.childPropsItemProps = childPropsItemProps;
 var _default = exports.default = ProCombination;