@zat-design/sisyphus-react 3.13.14-deta.2 → 4.0.0-beta.3

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

@@ -1,18 +1,19 @@
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _typeof from "@babel/runtime/helpers/esm/typeof";
-import "antd/es/button/style";
-import _Button from "antd/es/button";
-import _isFunction from "lodash/isFunction";
-import { jsx as _jsx } from "react/jsx-runtime";
+/* eslint-disable no-lonely-if */
+
+import { isFunction } from 'lodash';
 import { validate } from '@zat-design/utils';
-import valueTypeMap from '../../../utils/valueType';
+import { Button } from 'antd';
+import valueTypeMap from "../../../utils/valueType";
+import { jsx as _jsx } from "react/jsx-runtime";
 /**
  * 插入间隔符
  * @param columns 表单配置数组
  * @returns
  */
 export var insertSeparator = function insertSeparator(columns, space) {
-  if (!(space === null || space === void 0 ? void 0 : space.separator)) {
+  if (!(space !== null && space !== void 0 && space.separator)) {
     return columns;
   }
   var separatorIndexs = function () {
@@ -20,6 +21,7 @@ export var insertSeparator = function insertSeparator(columns, space) {
     if (validate.isEmpty(space === null || space === void 0 ? void 0 : space.separatorIndex)) {
       return reuslt;
     }
+
     // 如果 index 是数字，将其转换为数组
     if (typeof (space === null || space === void 0 ? void 0 : space.separatorIndex) === 'number') {
       reuslt.push(space.separatorIndex);
@@ -32,12 +34,12 @@ export var insertSeparator = function insertSeparator(columns, space) {
   return columns.reduce(function (result, current, index, array) {
     // 将当前元素添加到结果数组中
     result.push(current);
-    if (separatorIndexs === null || separatorIndexs === void 0 ? void 0 : separatorIndexs.length) {
+    if (separatorIndexs !== null && separatorIndexs !== void 0 && separatorIndexs.length) {
       separatorIndexs.forEach(function (separatorIndex) {
         if (index === separatorIndex) {
           result.push({
             separator: true,
-            component: _jsx(_Button, {
+            component: /*#__PURE__*/_jsx(Button, {
               className: "group-separator",
               children: space.separator
             }),
@@ -52,7 +54,7 @@ export var insertSeparator = function insertSeparator(columns, space) {
       if (index < array.length - 1) {
         result.push({
           separator: true,
-          component: _jsx(_Button, {
+          component: /*#__PURE__*/_jsx(Button, {
             className: "group-separator",
             children: space.separator
           }),
@@ -65,6 +67,7 @@ export var insertSeparator = function insertSeparator(columns, space) {
     return result;
   }, []);
 };
+
 /** 带出event的组件默认取值方法 */
 export function defaultGetValueFromEvent(valuePropName) {
   var event = arguments.length <= 1 ? undefined : arguments[1];
@@ -73,6 +76,7 @@ export function defaultGetValueFromEvent(valuePropName) {
   }
   return event;
 }
+
 /** 转换names */
 export var transformNamesString = function transformNamesString(arr) {
   var result = arr.map(function (subArr) {
@@ -83,6 +87,7 @@ export var transformNamesString = function transformNamesString(arr) {
   });
   return result;
 };
+
 /**
  * Input TextArea 小写自动转大写
  * @param type 组件类型
@@ -91,16 +96,16 @@ export var transformNamesString = function transformNamesString(arr) {
  */
 export var isUpperCase = function isUpperCase(type, upperCase) {
   var result = {};
-  if (['Input', 'TextArea', 'ProCombination'].includes(type) && upperCase) {
+  if (['Input', 'TextArea'].includes(type) && upperCase) {
     result.getValueFromEvent = function (event) {
-      var _event$target, _event$target$value;
+      var _event$target;
       if (Array.isArray(event)) {
         return event.map(function (value) {
           var newValue = value === null || value === void 0 ? void 0 : value.replace(/[^a-zA-Z]/g, '');
           return (newValue === null || newValue === void 0 ? void 0 : newValue.toUpperCase()) || '';
         });
       }
-      var newValue = (_event$target = event.target) === null || _event$target === void 0 ? void 0 : (_event$target$value = _event$target.value) === null || _event$target$value === void 0 ? void 0 : _event$target$value.replace(/[^a-zA-Z]/g, '');
+      var newValue = (_event$target = event.target) === null || _event$target === void 0 || (_event$target = _event$target.value) === null || _event$target === void 0 ? void 0 : _event$target.replace(/[^a-zA-Z]/g, '');
       return newValue.toUpperCase() || '';
     };
   }
@@ -117,27 +122,27 @@ export var getReactiveProps = function getReactiveProps(params) {
     fieldProps = params.fieldProps,
     desensitization = params.desensitization;
   var values = namePath ? form.getFieldValue(namePath) : form.getFieldsValue();
-  var _disabled = _isFunction(disabled) ? disabled(values, {
+  var _disabled = isFunction(disabled) ? disabled(values, {
     form: form,
     index: index,
     namePath: namePath
   }) : disabled;
-  var _show = _isFunction(show) ? show(values, {
+  var _show = isFunction(show) ? show(values, {
     form: form,
     index: index,
     namePath: namePath
   }) : show;
-  var _component = _isFunction(component) ? component(values, {
+  var _component = isFunction(component) ? component(values, {
     form: form,
     index: index,
     namePath: namePath
   }) : component;
-  var _fieldProps = _isFunction(fieldProps) ? fieldProps(values, {
+  var _fieldProps = isFunction(fieldProps) ? fieldProps(values, {
     form: form,
     index: index,
     namePath: namePath
   }) : fieldProps;
-  var _desensitization = _isFunction(desensitization) ? desensitization(values, {
+  var _desensitization = isFunction(desensitization) ? desensitization(values, {
     form: form,
     index: index,
     namePath: namePath
@@ -164,6 +169,7 @@ var getUpperCase = function getUpperCase(value) {
   var _value = value === null || value === void 0 ? void 0 : value.replace(/[^a-zA-Z]/g, '');
   return _value.toUpperCase() || '';
 };
+
 /** 执行所有中间件 返回处理后的值 */
 export var getValueMiddleware = function getValueMiddleware(value) {
   var callbacks = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
@@ -171,6 +177,7 @@ export var getValueMiddleware = function getValueMiddleware(value) {
     return cb === null || cb === void 0 ? void 0 : cb(preValue);
   }, value);
 };
+
 /** 获取中间件处理后的value */
 export var valueFromEventWrapper = function valueFromEventWrapper(column, args) {
   var getValueFromEvent = column.getValueFromEvent,

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

@@ -1,7 +1,3 @@
-import "antd/es/tooltip/style";
-import _Tooltip from "antd/es/tooltip";
-import "antd/es/cascader/style";
-import _Cascader from "antd/es/cascader";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
@@ -9,30 +5,27 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import "antd/es/typography/style";
-import _Typography from "antd/es/typography";
-import _isBoolean from "lodash/isBoolean";
-import _find2 from "lodash/find";
-import _omit from "lodash/omit";
 var _excluded = ["className", "hasDetail", "detailMaxLength", "fieldNames", "value", "disabled", "dataSource", "onChange", "useRequest", "transformResponse", "level", "isView", "enumCode", "code", "tooltip", "separator", "detailPlaceholder", "scrollFollowParent", "desensitization", "otherProps"];
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useState, memo, useMemo } from 'react';
-import { transformDataName } from './utils/index';
-import { useProConfig } from '../../../../ProConfigProvider';
-import Input from '../../base/Input';
-import useEnum from '../../../../ProEnum/hooks/useEnum';
-import locale from '../../../../locale';
-import ProForm from '../../..';
-import Container from '../../Container';
-var Text = _Typography.Text;
+import { Cascader, Tooltip } from 'antd';
+import { omit, find as _find, isBoolean, isEqual } from 'lodash';
+import { transformDataName } from "./utils/index";
+import { useProConfig } from "../../../../ProConfigProvider";
+import Input from "../../base/Input";
+import useEnum from "../../../../ProEnum/hooks/useEnum";
+import locale from "../../../../locale";
+import ProForm from "../../..";
+import Container from "../../Container";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
 var defaultFieldNames = {
   label: 'name',
   value: 'code',
   children: 'children'
 };
-var _filterDataSource = function filterDataSource(dataSource, level, fieldNames) {
+var filterDataSource = function filterDataSource(dataSource, level, fieldNames) {
   return dataSource === null || dataSource === void 0 ? void 0 : dataSource.map(function (item) {
-    return _objectSpread(_objectSpread({}, item), {}, _defineProperty({}, (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children', level === 1 ? [] : _filterDataSource(item === null || item === void 0 ? void 0 : item[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'], level - 1, fieldNames)));
+    return _objectSpread(_objectSpread({}, item), {}, _defineProperty({}, (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children', level === 1 ? [] : filterDataSource(item === null || item === void 0 ? void 0 : item[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'], level - 1, fieldNames)));
   });
 };
 var getViewLabel = function getViewLabel(_ref) {
@@ -46,7 +39,7 @@ 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(function (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;
@@ -57,12 +50,12 @@ var getViewLabel = function getViewLabel(_ref) {
   return viewLabel;
 };
 var ProCascader = function ProCascader(props) {
-  var _props$otherProps, _value$slice, _ref5, _ref5$filter, _defaultLabel$filter, _locale$ProAddressBar, _locale$ProAddressBar2;
+  var _props$otherProps, _value$slice, _ref5, _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 ? 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,
@@ -104,18 +97,18 @@ var ProCascader = function ProCascader(props) {
     _useProConfig$dics = _useProConfig.dics,
     dics = _useProConfig$dics === void 0 ? {} : _useProConfig$dics;
   var enumDataSource = useMemo(function () {
-    if (!(props === null || props === void 0 ? void 0 : props.mode)) {
+    if (!(props !== null && props !== void 0 && props.mode)) {
       return (dics === null || dics === void 0 ? void 0 : dics[addressCode]) || [];
     }
     return Array.isArray(enumData) ? enumData[0] : [];
   }, [dics === null || dics === void 0 ? void 0 : dics[addressCode], enumData]);
   var realDataSource = useMemo(function () {
     var innerDataSource = dataSource || (addressCode ? enumDataSource : []);
-    var result = transformDataName(isAddressMode && realLevel === 2 ? _filterDataSource(innerDataSource, level, fieldNames) : innerDataSource, fieldNames);
+    var result = transformDataName(isAddressMode && realLevel === 2 ? filterDataSource(innerDataSource, level, fieldNames) : innerDataSource, fieldNames);
     return result;
   }, [isAddressMode, addressCode, realLevel, dataSource, enumDataSource === null || enumDataSource === void 0 ? void 0 : enumDataSource.length]);
   var lastDisabled = useMemo(function () {
-    if (_isBoolean(disabled) || disabled === undefined) {
+    if (isBoolean(disabled) || disabled === undefined) {
       return [disabled, disabled];
     }
     return disabled;
@@ -133,7 +126,7 @@ var ProCascader = function ProCascader(props) {
     defaultLabel = _useState4[0],
     setDefaultLabel = _useState4[1];
   var getFirstLevelOptions = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _yield$service, data, newData, transFormData, serviceData;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -152,7 +145,7 @@ var ProCascader = function ProCascader(props) {
               value: fieldNames.value,
               children: (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'
             });
-            serviceData = isAddressMode && realLevel === 2 ? _filterDataSource(transFormData, level, fieldNames) : transFormData;
+            serviceData = isAddressMode && realLevel === 2 ? filterDataSource(transFormData, level, fieldNames) : transFormData;
             setServiceData(serviceData);
           case 9:
           case "end":
@@ -164,6 +157,7 @@ var ProCascader = function ProCascader(props) {
       return _ref4.apply(this, arguments);
     };
   }();
+
   // 提取出来默认每次都执行
   if (transformResponse) {
     realDataSource = transformResponse(realDataSource);
@@ -203,6 +197,7 @@ var ProCascader = function ProCascader(props) {
       }
     }
   };
+
   // showSearch中的筛选函数
   var handlefilter = function handlefilter(inputValue, path) {
     return path.some(function (option) {
@@ -214,34 +209,36 @@ var ProCascader = function ProCascader(props) {
       return !!item;
     }).join('/');
   };
-  var addressValue = isAddressMode ? value && ((_value$slice = value.slice(0, realLevel)) === null || _value$slice === void 0 ? void 0 : _value$slice.some(function (item) {
+  var addressValue = isAddressMode ? value && (_value$slice = value.slice(0, realLevel)) !== null && _value$slice !== void 0 && _value$slice.some(function (item) {
     return !!item;
-  })) ? value.slice(0, realLevel) : undefined : value;
-  var viewValue = isAddressMode ? ((_ref5 = [].concat(_toConsumableArray(defaultLabel), [value === null || value === void 0 ? void 0 : value[realLevel]])) === null || _ref5 === void 0 ? void 0 : (_ref5$filter = _ref5.filter(function (item) {
+  }) ? value.slice(0, realLevel) : undefined : value;
+  var viewValue = isAddressMode ? ((_ref5 = [].concat(_toConsumableArray(defaultLabel), [value === null || value === void 0 ? void 0 : value[realLevel]])) === null || _ref5 === void 0 || (_ref5 = _ref5.filter(function (item) {
     return !!item;
-  })) === null || _ref5$filter === void 0 ? void 0 : _ref5$filter.join(separator)) || '-' : (defaultLabel === null || defaultLabel === void 0 ? void 0 : (_defaultLabel$filter = defaultLabel.filter(function (item) {
+  })) === null || _ref5 === void 0 ? void 0 : _ref5.join(separator)) || '-' : (defaultLabel === null || defaultLabel === void 0 || (_defaultLabel$filter = defaultLabel.filter(function (item) {
     return !!item;
   })) === null || _defaultLabel$filter === void 0 ? void 0 : _defaultLabel$filter.join(separator)) || '-';
-  var _findSelectedOptions = function findSelectedOptions(options, value) {
+  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 = _find2(options, {
+    var foundOption = _find(options, {
       value: currentValue
     });
     if (foundOption) {
       // 如果找到了匹配的选项，并且还有更多的 value 需要匹配，递归地在子选项中查找
       if (_value.length > 1 && foundOption.children) {
-        return _findSelectedOptions(foundOption.children, _value.slice(1), [].concat(_toConsumableArray(path), [foundOption]));
+        return findSelectedOptions(foundOption.children, _value.slice(1), [].concat(_toConsumableArray(path), [foundOption]));
       }
       // 如果没有更多的 value 需要匹配，返回当前选项（以及之前的路径）
       return [].concat(_toConsumableArray(path), [foundOption]);
@@ -250,14 +247,14 @@ var ProCascader = function ProCascader(props) {
     return null;
   };
   var _selectedOptions = useMemo(function () {
-    return _findSelectedOptions(service ? serviceData : realDataSource, addressValue);
+    return findSelectedOptions(service ? serviceData : realDataSource, addressValue);
   }, [service, serviceData, realDataSource, addressValue]);
   var handleAddressChange = function 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) {
+      if (!e.target.value && cascaderValue !== null && cascaderValue !== void 0 && cascaderValue.every(function (item) {
         return !item;
-      }))) {
+      })) {
         onChange(undefined);
       } else {
         var realValue = value ? _toConsumableArray(value) : [];
@@ -266,15 +263,15 @@ var ProCascader = function ProCascader(props) {
       }
     }
   };
-  return realIsView ? _jsx(Container, {
+  return realIsView ? /*#__PURE__*/_jsx(Container, {
     tooltip: !!tooltip,
     viewEmpty: viewEmpty,
     children: viewValue
-  }) : _jsxs("div", {
+  }) : /*#__PURE__*/_jsxs("div", {
     className: "pro-address ".concat(className),
-    children: [_jsx(_Cascader, _objectSpread({
+    children: [/*#__PURE__*/_jsx(Cascader, _objectSpread({
       className: hasDetail ? '' : 'no-detail',
-      placeholder: locale === null || locale === void 0 ? void 0 : (_locale$ProAddressBar = locale.ProAddressBar) === null || _locale$ProAddressBar === void 0 ? void 0 : _locale$ProAddressBar.placeholder,
+      placeholder: locale === null || locale === void 0 || (_locale$ProAddressBar = locale.ProAddressBar) === null || _locale$ProAddressBar === void 0 ? void 0 : _locale$ProAddressBar.placeholder,
       value: addressValue,
       options: service ? serviceData : realDataSource,
       disabled: lastDisabled[0],
@@ -287,28 +284,34 @@ var ProCascader = function ProCascader(props) {
       getPopupContainer: function getPopupContainer(trigger) {
         return scrollFollowParent ? trigger.parentElement : document.body;
       }
-    }, _omit(restProps, ['otherProps', 'scrollFollowParent']))), hasDetail && (tooltip && lastDisabled[1] && detail ? _jsx(_Tooltip, {
+    }, omit(restProps, ['otherProps', 'scrollFollowParent']))), hasDetail && (tooltip && lastDisabled[1] && detail ? /*#__PURE__*/_jsx(Tooltip, {
       title: detail,
-      children: _jsx("span", {
+      children: /*#__PURE__*/_jsx("span", {
         className: "pro-address-detail",
-        children: _jsx(Input, {
+        children: /*#__PURE__*/_jsx(Input, {
           disabled: lastDisabled[1],
           desensitization: desensitization,
           otherProps: otherProps,
           value: detail
         })
       })
-    }) : _jsx(Input, {
+    }) : /*#__PURE__*/_jsx(Input, {
       allowClear: true,
       autoComplete: "off",
       disabled: lastDisabled[1],
       value: detail,
       maxLength: detailMaxLength,
-      placeholder: detailPlaceholder || (locale === null || locale === void 0 ? void 0 : (_locale$ProAddressBar2 = locale.ProAddressBar) === null || _locale$ProAddressBar2 === void 0 ? void 0 : _locale$ProAddressBar2.detailPlaceholder),
+      placeholder: detailPlaceholder || (locale === null || locale === void 0 || (_locale$ProAddressBar2 = locale.ProAddressBar) === null || _locale$ProAddressBar2 === void 0 ? void 0 : _locale$ProAddressBar2.detailPlaceholder),
       onChange: handleAddressChange,
       desensitization: desensitization,
       otherProps: otherProps
     }))]
   });
 };
-export default /*#__PURE__*/memo(ProCascader);
+export default /*#__PURE__*/memo(ProCascader, function (prevProps, nextProps) {
+  // 基本props比较, 只比较关键的
+  if (!isEqual(prevProps === null || prevProps === void 0 ? void 0 : prevProps.value, nextProps === null || nextProps === void 0 ? void 0 : nextProps.value) || (prevProps === null || prevProps === void 0 ? void 0 : prevProps.disabled) !== (nextProps === null || nextProps === void 0 ? void 0 : nextProps.disabled) || !isEqual(prevProps === null || prevProps === void 0 ? void 0 : prevProps.dataSource, nextProps === null || nextProps === void 0 ? void 0 : nextProps.dataSource)) {
+    return false;
+  }
+  return true;
+});

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

@@ -28,7 +28,7 @@ export interface ProCascaderType {
     transformResponse?: (data: any[]) => any[];
     level?: number;
     enumCode?: string;
-    code?: string;
+    code?: string | string[];
     otherProps?: any;
     /** 查看分隔符 */
     separator?: string;

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

@@ -1,5 +1,5 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
+/* @root-entry-name: 'default'; */
+/* @import (reference) '~antd/es/style/themes/index.less'; */
 
 .pro-address {
   display: flex;

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

@@ -1,13 +1,13 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-import _omit from "lodash/omit";
 var _excluded = ["label", "value", "children"];
+import { omit } from 'lodash';
 export var transformDataName = function transformDataName(dataSource, fieldNames) {
   var label = fieldNames.label,
     value = fieldNames.value,
     children = fieldNames.children,
     extraFields = _objectWithoutProperties(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) {
@@ -22,7 +22,7 @@ export var transformDataName = function 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 _objectSpread(_objectSpread({}, newNode), omit(node, Object.values(fieldNames)));
   }
   var transformData = function transformData(data) {
     return data.map(transformNode);

package/es/ProForm/components/combination/ProModalSelect/hooks/useRequestList.js

@@ -2,10 +2,10 @@ import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import _isEqual from "lodash/isEqual";
 import { useDebounceFn, usePrevious, useRequest } from 'ahooks';
+import { isEqual } from 'lodash';
 import { useCallback, useEffect, useMemo, useState } from 'react';
-import locale, { formatMessage } from '../../../../../locale';
+import locale, { formatMessage } from "../../../../../locale";
 var defaultPage = {
   pageNum: 1,
   pageSize: 10
@@ -24,7 +24,7 @@ var useDefaultOptions = function useDefaultOptions(options) {
   });
 };
 var defaultService = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -55,6 +55,7 @@ export function useRequestList(service, options, useRequestOptions) {
     _useState4 = _slicedToArray(_useState3, 2),
     searchValues = _useState4[0],
     setSearchValues = _useState4[1];
+
   // 当次执行service的请求,包括page参数
   var params = useMemo(function () {
     var _condition = _objectSpread(_objectSpread({}, _defaultParams), searchValues);
@@ -63,6 +64,7 @@ export function useRequestList(service, options, useRequestOptions) {
     }) : _condition;
     return transformParams ? transformParams(tempParams) : tempParams;
   }, [page, searchValues]);
+
   // 调接口
   var result = useRequest(service || defaultService, _objectSpread(_objectSpread({}, useRequestOptions), {}, {
     defaultParams: [params]
@@ -70,6 +72,7 @@ export function useRequestList(service, options, useRequestOptions) {
   var data = result.data,
     run = result.run,
     loading = result.loading;
+
   // 搜索条件变化时触发
   var prevParams = usePrevious(params);
   var _useDebounceFn = useDebounceFn(function () {
@@ -79,10 +82,11 @@ export function useRequestList(service, options, useRequestOptions) {
     }),
     queryList = _useDebounceFn.run;
   useEffect(function () {
-    if (prevParams && !_isEqual(prevParams, params)) {
+    if (prevParams && !isEqual(prevParams, params)) {
       queryList();
     }
   }, [params, prevParams, queryList]);
+
   // 分页变更
   var onChange = useCallback(function (current, pageSize) {
     onPageChange({
@@ -91,11 +95,12 @@ export function useRequestList(service, options, useRequestOptions) {
     });
   }, [onPageChange]);
   var onSearch = useCallback(function (values) {
-    if (!_isEqual(searchValues, values)) {
+    if (!isEqual(searchValues, values)) {
       onChange(defaultPage.pageNum, defaultPage.pageSize);
       setSearchValues(values);
     }
   }, [onChange, searchValues]);
+
   // 重置查询条件
   var onReset = useCallback(function () {
     onSearch({
@@ -106,9 +111,9 @@ export function useRequestList(service, options, useRequestOptions) {
     if (data) {
       var _data$data;
       if (transformResponse) {
-        return (data === null || data === void 0 ? void 0 : data.data) ? transformResponse(data === null || data === void 0 ? void 0 : data.data) : transformResponse(data);
+        return data !== null && data !== void 0 && data.data ? transformResponse(data === null || data === void 0 ? void 0 : data.data) : transformResponse(data);
       }
-      var list = withPagination ? data === null || data === void 0 ? void 0 : (_data$data = data.data) === null || _data$data === void 0 ? void 0 : _data$data.list : data === null || data === void 0 ? void 0 : data.data;
+      var list = withPagination ? data === null || data === void 0 || (_data$data = data.data) === null || _data$data === void 0 ? void 0 : _data$data.list : data === null || data === void 0 ? void 0 : data.data;
       return list !== null && list !== void 0 ? list : [];
     }
     return [];
@@ -123,17 +128,18 @@ export function useRequestList(service, options, useRequestOptions) {
       current: page.pageNum,
       pageSize: page.pageSize,
       onPaginationChange: true,
-      total: data === null || data === void 0 ? void 0 : (_data$data2 = data.data) === null || _data$data2 === void 0 ? void 0 : _data$data2.total,
+      total: data === null || data === void 0 || (_data$data2 = data.data) === null || _data$data2 === void 0 ? void 0 : _data$data2.total,
       onChange: onChange,
       pageSizeOptions: [10, 20, 50, 100],
       showQuickJumper: true,
       showSizeChanger: true,
       onShowSizeChange: onChange,
       hideOnSinglePage: page.pageSize === 10,
+      // 只有一页时隐藏分页器
       showTotal: function showTotal(total) {
         var _locale$ProEditTable;
         if (!total) return;
-        return formatMessage(locale === null || locale === void 0 ? void 0 : (_locale$ProEditTable = locale.ProEditTable) === null || _locale$ProEditTable === void 0 ? void 0 : _locale$ProEditTable.total, {
+        return formatMessage(locale === null || locale === void 0 || (_locale$ProEditTable = locale.ProEditTable) === null || _locale$ProEditTable === void 0 ? void 0 : _locale$ProEditTable.total, {
           total: total
         });
       }

package/es/ProForm/components/combination/ProModalSelect/index.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
 import type { ProModalSelectType } from './propsType';
-declare const _default: React.ForwardRefExoticComponent<Omit<ProModalSelectType, "ref"> & React.RefAttributes<unknown>>;
+declare const _default: React.ForwardRefExoticComponent<Omit<React.PropsWithChildren<ProModalSelectType>, "ref"> & React.RefAttributes<unknown>>;
 export default _default;