@zat-design/sisyphus-react 3.10.1-beta.1 → 3.10.1-beta.2

package/es/ProForm/components/render/Render.js

@@ -31,7 +31,7 @@ import ConfirmWrapper from './ConfirmWrapper';
 import ChangedWrapper from './ChangedWrapper';
 // 这个组件只管渲染, 参数的整理在外部处理
 var Render = function Render(props) {
-  var _ref3, _ref4, _ref5, _ref6, _otherProps$names2;
+  var _ref2, _ref3, _ref4, _ref5, _otherProps$names2;
   var component = props.component,
     originComponent = props.originComponent,
     _props$formItemProps = props.formItemProps,
@@ -116,9 +116,7 @@ var Render = function Render(props) {
    */
   var valueTypeTransform = function valueTypeTransform() {
     var _ref = otherProps || {},
-      desensitizationKey = _ref.desensitizationKey;
-    var _ref2 = otherProps || {},
-      valueType = _ref2.valueType;
+      valueType = _ref.valueType;
     // SwitchCheckbox默认YN, 兼容已有组件
     if (type === 'SwitchCheckbox') {
       valueType = 'switch';
@@ -126,18 +124,11 @@ var Render = function Render(props) {
     if (type === 'Input') {
       valueType = valueType || 'trim';
     }
-    var isDesensit = sessionStorage.getItem(desensitizationKey);
-    // 仅查看模式下进行数据脱敏
-    if ((_desensitization === null || _desensitization === void 0 ? void 0 : _desensitization.length) && _disabled && isDesensit === 'ON') {
-      valueType = 'desensitization';
-    }
     // 不存在valueType返回空
     if (!valueType) {
       return {};
     }
-    var params = _objectSpread(_objectSpread(_objectSpread({}, otherProps), otherFormItemProps), {}, {
-      desensitization: _desensitization
-    });
+    var params = _objectSpread(_objectSpread({}, otherProps), otherFormItemProps);
     return isFunction(valueTypeMap[valueType]) ? valueTypeMap[valueType](params) : {};
   };
   /**
@@ -153,7 +144,7 @@ var Render = function Render(props) {
    * globalControl true时，优先级 全局【formDisabled】> formitem上【column.disabled】 > 组件上【fieldProps.disabled】
    * globalControl false时，优先级 组件上【fieldProps.disabled】 > formitem上【column.disabled】 >  全局【formDisabled】
    */
-  var lastDisabled = globalControl ? (_ref3 = (_ref4 = formDisabled !== null && formDisabled !== void 0 ? formDisabled : _disabled) !== null && _ref4 !== void 0 ? _ref4 : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref3 !== void 0 ? _ref3 : componentProps === null || componentProps === void 0 ? void 0 : componentProps.disabled : (_ref5 = (_ref6 = _disabled !== null && _disabled !== void 0 ? _disabled : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref6 !== void 0 ? _ref6 : componentProps === null || componentProps === void 0 ? void 0 : componentProps.disabled) !== null && _ref5 !== void 0 ? _ref5 : formDisabled;
+  var lastDisabled = globalControl ? (_ref2 = (_ref3 = formDisabled !== null && formDisabled !== void 0 ? formDisabled : _disabled) !== null && _ref3 !== void 0 ? _ref3 : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref2 !== void 0 ? _ref2 : componentProps === null || componentProps === void 0 ? void 0 : componentProps.disabled : (_ref4 = (_ref5 = _disabled !== null && _disabled !== void 0 ? _disabled : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref5 !== void 0 ? _ref5 : componentProps === null || componentProps === void 0 ? void 0 : componentProps.disabled) !== null && _ref4 !== void 0 ? _ref4 : formDisabled;
   // ↑↑↑↑↑↑  formItem参数整理  ↑↑↑↑↑↑
   Object.assign(otherFormItemProps, transforms, {
     names: otherProps.names
@@ -183,7 +174,8 @@ var Render = function Render(props) {
    * 最新fieldProps: 更新后的组件Props
    */
   var lastComponentProps = _objectSpread(_objectSpread(_objectSpread({}, componentProps), _fieldProps), {}, {
-    disabled: lastDisabled
+    disabled: lastDisabled,
+    desensitization: _desensitization
   });
   var _className = classNames(_defineProperty(_defineProperty({}, className, className), 'pro-form-item-width-auto', ['Switch'].includes(type)));
   if (formItemProps.hidden === true || _show === false) {
@@ -206,8 +198,8 @@ var Render = function Render(props) {
   var functionArgs = function functionArgs(args) {
     var _otherFormItemProps$n;
     var _args = _toConsumableArray(args);
-    var _ref7 = otherProps || {},
-      valueType = _ref7.valueType;
+    var _ref6 = otherProps || {},
+      valueType = _ref6.valueType;
     _args[1] = form.getFieldsValue();
     _args[2] = {
       form: form
@@ -257,7 +249,7 @@ var Render = function Render(props) {
       _args = functionArgs([].concat(args));
     }
     var inList = _otherFormItemProps === null || _otherFormItemProps === void 0 ? void 0 : (_otherFormItemProps$n3 = _otherFormItemProps.namePath) === null || _otherFormItemProps$n3 === void 0 ? void 0 : _otherFormItemProps$n3.length;
-    if ( /*#__PURE__*/React.isValidElement(AutoComponent)) {
+    if (/*#__PURE__*/React.isValidElement(AutoComponent)) {
       var _AutoComponent$props$, _AutoComponent$props, _lastComponentProps$c;
       ((_AutoComponent$props$ = (_AutoComponent$props = AutoComponent === null || AutoComponent === void 0 ? void 0 : AutoComponent.props)[changeKey]) === null || _AutoComponent$props$ === void 0 ? void 0 : _AutoComponent$props$.call.apply(_AutoComponent$props$, [_AutoComponent$props].concat(_toConsumableArray(_args)))) || ((_lastComponentProps$c = lastComponentProps[changeKey]) === null || _lastComponentProps$c === void 0 ? void 0 : _lastComponentProps$c.call.apply(_lastComponentProps$c, [lastComponentProps].concat(_toConsumableArray(_args))));
       return false;
@@ -307,7 +299,7 @@ var Render = function Render(props) {
    * onBlur参数重置 (value, record, { form, index, namePath, option }) => void
    */
   var handleBlur = /*#__PURE__*/function () {
-    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref7 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _len3,
         args,
         _key3,
@@ -334,7 +326,7 @@ var Render = function Render(props) {
       }, _callee);
     }));
     return function handleBlur() {
-      return _ref8.apply(this, arguments);
+      return _ref7.apply(this, arguments);
     };
   }();
   var renderItem = function renderItem() {
@@ -390,7 +382,7 @@ var Render = function Render(props) {
     if (originComponent) {
       delete childProps.otherProps;
     }
-    var child = /*#__PURE__*/React.isValidElement(AutoComponent) ? ( /*#__PURE__*/React.cloneElement(AutoComponent, childProps)) : _jsx(AutoComponent, _objectSpread(_objectSpread({}, omit(lastComponentProps, [].concat(lastComponentPropsFilter, ['debounceWait']))), {}, {
+    var child = /*#__PURE__*/React.isValidElement(AutoComponent) ? (/*#__PURE__*/React.cloneElement(AutoComponent, childProps)) : _jsx(AutoComponent, _objectSpread(_objectSpread({}, omit(lastComponentProps, [].concat(lastComponentPropsFilter, ['debounceWait']))), {}, {
       otherProps: _objectSpread(_objectSpread({}, otherProps), {}, {
         show: show,
         disabled: lastDisabled,

package/es/ProForm/index.js

@@ -176,7 +176,7 @@ var ProForm = function ProForm(props, ref) {
     if (isView || disabled) {
       // 查看或禁用模式
       footerEle = null;
-    } else if ( /*#__PURE__*/React.isValidElement(footer)) {
+    } else if (/*#__PURE__*/React.isValidElement(footer)) {
       // 传入组件渲染组件
       footerEle = footer;
     } else if (footer === undefined || footer || isObject(footer)) {

package/es/ProForm/utils/index.js

@@ -120,7 +120,7 @@ export var splitNameStr = function splitNameStr(name) {
   });
 };
 // 过滤掉字段名中包含 '-' 的字段
-export var filterInternalFields = function filterInternalFields(values, optimize) {
+var _filterInternalFields = function filterInternalFields(values, optimize) {
   if (optimize) {
     return values;
   }
@@ -134,20 +134,21 @@ export var filterInternalFields = function filterInternalFields(values, optimize
   }
   if (Array.isArray(nextValues)) {
     return nextValues.map(function (item) {
-      return filterInternalFields(item);
+      return _filterInternalFields(item);
     });
   }
   if (isObject(nextValues)) {
     var result = {};
     Object.keys(nextValues).forEach(function (key) {
       if (key.includes('-')) return;
-      result[key] = filterInternalFields(nextValues[key]);
+      result[key] = _filterInternalFields(nextValues[key]);
     });
     return result;
   }
   return nextValues;
 };
-export var getAllNamePath = function getAllNamePath(object) {
+export { _filterInternalFields as filterInternalFields };
+var _getAllNamePath = function getAllNamePath(object) {
   var currentPath = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
   var keys = Object.keys(object);
   var resultKeys = [];
@@ -161,13 +162,14 @@ export var getAllNamePath = function getAllNamePath(object) {
     }
     // 深度获取对象key
     if (isObject(value)) {
-      resultKeys.concat(getAllNamePath(value, [].concat(_toConsumableArray(currentPath), [key])));
+      resultKeys.concat(_getAllNamePath(value, [].concat(_toConsumableArray(currentPath), [key])));
     }
     resultKeys.push([].concat(_toConsumableArray(currentPath), [key]));
   });
   return resultKeys;
 };
 // 判断一个字段值是否算空
+export { _getAllNamePath as getAllNamePath };
 var nullList = [undefined, 'null', '""', '[]'];
 export var isNullValue = function isNullValue(value) {
   return nullList.includes(JSON.stringify(value));
@@ -304,7 +306,7 @@ export var customEqualForFun = function customEqualForFun(value, other) {
 /**
  * 查询数据中是否包含rowKey
  */
-export var hasRowKey = function hasRowKey(obj) {
+var _hasRowKey = function hasRowKey(obj) {
   if (_typeof(obj) !== 'object' || obj === null) {
     return false;
   }
@@ -314,12 +316,13 @@ export var hasRowKey = function hasRowKey(obj) {
     return true;
   }
   return keys.some(function (key) {
-    return hasRowKey(obj[key]);
+    return _hasRowKey(obj[key]);
   });
 };
 /**
  * 查询数据中是否包含rowKey
  */
+export { _hasRowKey as hasRowKey };
 export var view = function view(obj) {
   if (_typeof(obj) !== 'object' || obj === null) {
     return false;
@@ -330,7 +333,7 @@ export var view = function view(obj) {
     return true;
   }
   return keys.some(function (key) {
-    return hasRowKey(obj[key]);
+    return _hasRowKey(obj[key]);
   });
 };
 /**
@@ -366,7 +369,7 @@ export var deleteForPath = function deleteForPath(values, namePath) {
  * @param value 选中值
  * @returns {}
  */
-export var findOptionByValue = function findOptionByValue(treeData, value, fieldNames) {
+var _findOptionByValue = function findOptionByValue(treeData, value, fieldNames) {
   if (isObject(value)) {
     return value;
   }
@@ -376,7 +379,7 @@ export var findOptionByValue = function findOptionByValue(treeData, value, field
       return omit(node, ['children', fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children]);
     }
     if (node.children) {
-      var foundNode = findOptionByValue(node[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'], value, fieldNames);
+      var foundNode = _findOptionByValue(node[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'], value, fieldNames);
       if (foundNode) {
         return omit(foundNode, ['children', fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children]);
       }
@@ -386,6 +389,7 @@ export var findOptionByValue = function findOptionByValue(treeData, value, field
 /**
  * 对比依赖列表中的 值是否变更
  */
+export { _findOptionByValue as findOptionByValue };
 export var equalDependencies = function equalDependencies(dependencies, prevValues, currentValues) {
   if (dependencies === null || dependencies === void 0 ? void 0 : dependencies.length) {
     return dependencies.some(function (namePath) {

package/es/ProForm/utils/transformValue.js

@@ -20,13 +20,17 @@ export var transformValue = function transformValue(names, form, fieldName, _nor
       });
       return _value;
     },
-    getValueProps: function getValueProps(value) {
+    getValueProps: function getValueProps(value, isOrg) {
       var _curValue;
       var _value = [];
-      names.forEach(function (name, index) {
-        var value = form.getFieldValue(name);
-        _value[index] = value;
-      });
+      if (!isOrg) {
+        names.forEach(function (name, index) {
+          var value = form.getFieldValue(name);
+          _value[index] = value;
+        });
+      } else {
+        _value = value;
+      }
       // 支持外部传入转换函数
       var res = (_getValueProps === null || _getValueProps === void 0 ? void 0 : _getValueProps(_value)) || {
         value: _value

package/es/ProForm/utils/useForm.js

@@ -47,7 +47,7 @@ export var useForm = function useForm(originForm, options) {
     return getFieldsValue(nameList, filterFunc);
   };
   var _validateFields = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(nameList) {
+    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(nameList) {
       var _rest$,
         _len,
         rest,

package/es/ProForm/utils/valueType.d.ts

@@ -66,11 +66,5 @@ declare const _default: {
             value: any;
         };
     };
-    /**  脱敏 转换 */
-    desensitization: (props: any) => {
-        getValueProps: (value: any) => {
-            value: any;
-        };
-    };
 };
 export default _default;

package/es/ProForm/utils/valueType.js

@@ -191,6 +191,7 @@ var dateTransform = function dateTransform(_ref2) {
 };
 /** 脱敏处理函数 */
 export var maskStringRangeWithRegex = function maskStringRangeWithRegex(input, range) {
+  var _input$replace;
   var _ref3 = range || [],
     _ref4 = _slicedToArray(_ref3, 2),
     start = _ref4[0],
@@ -198,13 +199,13 @@ export var maskStringRangeWithRegex = function maskStringRangeWithRegex(input, r
   if (start < 0) {
     throw new Error('脱敏数据: start index cannot be negative');
   }
-  var adjustedEnd = Math.min(end, input.length - 1);
-  if (start >= input.length) {
+  var adjustedEnd = Math.min(end, (input === null || input === void 0 ? void 0 : input.length) - 1);
+  if (start >= (input === null || input === void 0 ? void 0 : input.length)) {
     return '';
   }
   var regexPattern = "^(.{".concat(start, "})(.{").concat(adjustedEnd - start + 1, "})(.*)$");
   var regex = new RegExp(regexPattern);
-  var maskedValue = input.replace(regex, "$1".concat('*'.repeat(adjustedEnd - start + 1), "$3"));
+  var maskedValue = input === null || input === void 0 ? void 0 : (_input$replace = input.replace) === null || _input$replace === void 0 ? void 0 : _input$replace.call(input, regex, "$1".concat('*'.repeat(adjustedEnd - start + 1), "$3"));
   return maskedValue;
 };
 export default {
@@ -302,51 +303,5 @@ export default {
   switch: function _switch(_ref12) {
     var switchValue = _ref12.switchValue;
     return switchTransform(switchValue);
-  },
-  /**  脱敏 转换 */
-  desensitization: function desensitization(props) {
-    var desensitization = props.desensitization,
-      type = props.type,
-      mode = props.mode,
-      names = props.names;
-    // 判断是否是地址控件，并带地址详情场景
-    if (type === 'ProCascader' && mode === 'address' && (names === null || names === void 0 ? void 0 : names.length) === 4) {
-      return {
-        getValueProps: function getValueProps(value) {
-          try {
-            if (value === null || value === void 0 ? void 0 : value.length) {
-              var _value = _slicedToArray(value, 4),
-                province = _value[0],
-                city = _value[1],
-                county = _value[2],
-                address = _value[3];
-              return {
-                value: [province, city, county, maskStringRangeWithRegex(address, desensitization)]
-              };
-            }
-            return {
-              value: value
-            };
-          } catch (error) {
-            return {
-              value: value
-            }; // 如果发生错误，返回原始值
-          }
-        }
-      };
-    }
-    return {
-      getValueProps: function getValueProps(value) {
-        try {
-          return {
-            value: maskStringRangeWithRegex(value, desensitization)
-          };
-        } catch (error) {
-          return {
-            value: value
-          }; // 如果发生错误，返回原始值
-        }
-      }
-    };
   }
 };

package/es/ProIcon/utils/index.js

@@ -1,6 +1,6 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { themeMap, themeFillMap } from '../config';
-export var recurseGetNodes = function recurseGetNodes(type, node, queue) {
+var _recurseGetNodes = function recurseGetNodes(type, node, queue) {
   switch (type) {
     // 渐变
     case 'gradation':
@@ -19,10 +19,11 @@ export var recurseGetNodes = function recurseGetNodes(type, node, queue) {
   }
   if (node.childNodes) {
     for (var i = 0; i < node.childNodes.length; i++) {
-      recurseGetNodes(type, node.childNodes[i], queue);
+      _recurseGetNodes(type, node.childNodes[i], queue);
     }
   }
 };
+export { _recurseGetNodes as recurseGetNodes };
 export var onBeforeInjection = function onBeforeInjection(_ref) {
   var svg = _ref.svg,
     actionMap = _ref.actionMap,
@@ -49,7 +50,7 @@ export var onBeforeInjection = function onBeforeInjection(_ref) {
     // 目前只支持处理渐变及fill填充
     var types = Reflect.ownKeys(nodeMap !== null && nodeMap !== void 0 ? nodeMap : {});
     types.forEach(function (typeKey) {
-      recurseGetNodes(typeKey, svg, nodeMap[typeKey]);
+      _recurseGetNodes(typeKey, svg, nodeMap[typeKey]);
     });
     if ((gradList === null || gradList === void 0 ? void 0 : gradList.length) > 0) {
       nodeMap.gradation.forEach(function (item, index) {

package/es/ProLayout/components/Layout/Menu/OpenMenu/index.d.ts

@@ -1,3 +1,3 @@
 import type { OpenMenuPropsType } from './propsType';
-declare const OpenMenu: (props: OpenMenuPropsType) => JSX.Element;
+declare const OpenMenu: (props: OpenMenuPropsType) => import("react/jsx-runtime").JSX.Element;
 export default OpenMenu;

package/es/ProLayout/components/Layout/Menu/OpenMenu/index.js

@@ -50,7 +50,7 @@ var OpenMenu = function OpenMenu(props) {
     if (!Array.isArray(result) || !result.length) {
       return [];
     }
-    var menuDeep = function menuDeep(data) {
+    var _menuDeep = function menuDeep(data) {
       data.forEach(function (item) {
         var _item$keyIdPath, _item$keyIdPath2, _item$children;
         // 是否是第一级菜单，展开模式一级菜单有icon, 收起模式二级菜单有icon
@@ -91,7 +91,7 @@ var OpenMenu = function OpenMenu(props) {
           if ((_item === null || _item === void 0 ? void 0 : _item.hideInMenu) || ['TAB', 'QUERY', 'BUTTON'].includes(_item === null || _item === void 0 ? void 0 : _item.type)) {
             delete item.children;
           } else {
-            menuDeep(item.children);
+            _menuDeep(item.children);
           }
         } else {
           delete item.children;
@@ -99,7 +99,7 @@ var OpenMenu = function OpenMenu(props) {
       });
       return data;
     };
-    menuDeep(result);
+    _menuDeep(result);
     return result;
   }, [dataSource]);
   useDeepCompareEffect(function () {

package/es/ProLayout/components/ProCollapse/index.d.ts

@@ -1,3 +1,3 @@
 import { ProCollapseProps } from './PropTypes';
-declare const ProCollapse: (props: ProCollapseProps) => JSX.Element;
+declare const ProCollapse: (props: ProCollapseProps) => import("react/jsx-runtime").JSX.Element;
 export default ProCollapse;

package/es/ProLayout/components/ProFooter/index.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
 import { ProFooterProps } from './PropTypes';
-declare const _default: import("react").MemoExoticComponent<(props: ProFooterProps) => JSX.Element>;
+declare const _default: import("react").MemoExoticComponent<(props: ProFooterProps) => import("react/jsx-runtime").JSX.Element>;
 export default _default;

package/es/ProLayout/components/ProHeader/components/Copy/index.d.ts

@@ -1,4 +1,4 @@
 declare const Copy: ({ text }: {
     text: any;
-}) => JSX.Element;
+}) => import("react/jsx-runtime").JSX.Element;
 export default Copy;

package/es/ProLayout/components/ProHeader/index.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
 import type { ProHeaderProps } from './PropTypes';
-declare const _default: React.MemoExoticComponent<(props: ProHeaderProps) => JSX.Element>;
+declare const _default: React.MemoExoticComponent<(props: ProHeaderProps) => import("react/jsx-runtime").JSX.Element>;
 export default _default;

package/es/ProLayout/index.d.ts

@@ -5,7 +5,7 @@ export declare const LayoutContext: import("react").Context<{
     onSelected: (params: any) => void;
 }>;
 declare const ProLayout: {
-    (props: ProLayoutProps): JSX.Element;
+    (props: ProLayoutProps): import("react/jsx-runtime").JSX.Element;
     defaultProps: {
         menus: any[];
         iconfontUrl: string;
@@ -17,8 +17,8 @@ declare const ProLayout: {
         headerHeight: number;
         contentStyle: {};
     };
-    ProCollapse: (props: import("./components/ProCollapse/PropTypes").ProCollapseProps) => JSX.Element;
-    ProFooter: import("react").MemoExoticComponent<(props: import("./components/ProFooter/PropTypes").ProFooterProps) => JSX.Element>;
-    ProHeader: import("react").MemoExoticComponent<(props: import("./components/ProHeader/PropTypes").ProHeaderProps) => JSX.Element>;
+    ProCollapse: (props: import("./components/ProCollapse/PropTypes").ProCollapseProps) => import("react/jsx-runtime").JSX.Element;
+    ProFooter: import("react").MemoExoticComponent<(props: import("./components/ProFooter/PropTypes").ProFooterProps) => import("react/jsx-runtime").JSX.Element>;
+    ProHeader: import("react").MemoExoticComponent<(props: import("./components/ProHeader/PropTypes").ProHeaderProps) => import("react/jsx-runtime").JSX.Element>;
 };
 export default ProLayout;

package/es/ProLayout/utils/index.js

@@ -15,7 +15,7 @@ export var getIdsByPathName = function getIdsByPathName(menus, activeMenu) {
     _pathName = activeMenu;
   }
   var result;
-  var menuDeep = function menuDeep(menuDeepItem) {
+  var _menuDeep = function menuDeep(menuDeepItem) {
     for (var i = 0; i <= menuDeepItem.length - 1; i++) {
       var item = menuDeepItem[i];
       // 只包含一级菜单时，解决URL：/endorsement/demo/123无法选中问题
@@ -24,7 +24,7 @@ export var getIdsByPathName = function getIdsByPathName(menus, activeMenu) {
         break;
       }
       if (Array.isArray(item.children) && item.children.length) {
-        menuDeep(item.children);
+        _menuDeep(item.children);
       } else if (((item === null || item === void 0 ? void 0 : item.url) && _pathName.includes(item.url.split('?')[0]) || (item === null || item === void 0 ? void 0 : item.redirectUrl) && _pathName.includes(item.redirectUrl.split('?')[0])) && !result) {
         // 当循环到最后一层时判断URL是否包含最后一层的URL，解决URL在URL中不存在的场景
         result = item.keyIdPath;
@@ -32,7 +32,7 @@ export var getIdsByPathName = function getIdsByPathName(menus, activeMenu) {
       }
     }
   };
-  menuDeep(menus);
+  _menuDeep(menus);
   return result || [];
 };
 /**
@@ -42,7 +42,7 @@ export var getIdsByPathName = function getIdsByPathName(menus, activeMenu) {
  */
 export var transformMenu = function transformMenu(menuData, pathPrefix) {
   var data = _toConsumableArray(menuData);
-  var menuDeep = function menuDeep(menuDeepItem) {
+  var _menuDeep2 = function menuDeep(menuDeepItem) {
     if (!Array.isArray(menuDeepItem) || !menuDeepItem.length) {
       return [];
     }
@@ -75,11 +75,11 @@ export var transformMenu = function transformMenu(menuData, pathPrefix) {
           childrenItem.keyUrlPath = _toConsumableArray(item.keyUrlPath);
           childrenItem.keyIdPath = _toConsumableArray(item.keyIdPath);
         });
-        menuDeep(item.children);
+        _menuDeep2(item.children);
       }
     });
   };
-  menuDeep(data);
+  _menuDeep2(data);
   return data;
 };
 /**
@@ -134,7 +134,7 @@ export var getPathNameKey = function getPathNameKey(_ref) {
   var menus = _ref.menus,
     pathName = _ref.pathName;
   var result;
-  var menuDeep = function menuDeep(menuDeepItem) {
+  var _menuDeep3 = function menuDeep(menuDeepItem) {
     if (!Array.isArray(menuDeepItem) || !menuDeepItem.length) {
       return [];
     }
@@ -148,7 +148,7 @@ export var getPathNameKey = function getPathNameKey(_ref) {
         break;
       }
       if (Array.isArray(item.children) && item.children.length) {
-        menuDeep(item.children);
+        _menuDeep3(item.children);
       } else if (((item === null || item === void 0 ? void 0 : item.url) && pathName.includes(item.url.split('?')[0]) || (item === null || item === void 0 ? void 0 : item.redirectUrl) && pathName.includes(item.redirectUrl.split('?')[0])) && !result) {
         // URL未匹配时，循环到最后一层时判断URL是否包含最后一层的URL，解决URL在URL中不存在的场景
         result = item.keyIdPath;
@@ -156,6 +156,6 @@ export var getPathNameKey = function getPathNameKey(_ref) {
       }
     }
   };
-  menuDeep(menus);
+  _menuDeep3(menus);
   return result;
 };

package/es/ProSelect/components/AdaptiveTooltip.d.ts

@@ -1,4 +1,4 @@
 declare const AdaptiveTooltip: ({ children }: {
     children: any;
-}) => JSX.Element;
+}) => import("react/jsx-runtime").JSX.Element;
 export default AdaptiveTooltip;

package/es/ProSelect/index.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { PropSelectProps, ProSelectAction } from './propsType';
 import './index.less';
-export declare const ProSelect: (props: PropSelectProps, ref: React.Ref<ProSelectAction> | undefined) => JSX.Element;
+export declare const ProSelect: (props: PropSelectProps, ref: React.Ref<ProSelectAction> | undefined) => import("react/jsx-runtime").JSX.Element;
 declare const _default: React.ForwardRefExoticComponent<PropSelectProps & React.RefAttributes<ProSelectAction>>;
 export default _default;

package/es/ProSelect/index.js

@@ -12,7 +12,7 @@ import _Select from "antd/es/select";
 var _excluded = ["dataSource", "defaultDisableValue", "useRequest", "fieldNames", "tooltip", "otherProps", "labelInValue", "filterInList", "scrollFollowParent", "defaultOne", "onSearch", "optionRender", "onChange", "updateDataSource", "transformResponse", "getValueProps", "isView"];
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useDeepCompareEffect, useRequest as useRequestFunc } from 'ahooks';
-import React, { useImperativeHandle, useState, forwardRef } from 'react';
+import React, { useImperativeHandle, useState, forwardRef, isValidElement } from 'react';
 import { isFunction, isObject, isString, omit, isNumber } from 'lodash';
 import { useProConfig } from '../ProConfigProvider';
 import Container from '../ProForm/components/Container';
@@ -216,7 +216,15 @@ export var ProSelect = function ProSelect(props, ref) {
     }
     return props.children;
   };
-  var handleChange = function handleChange(value, option) {
+  var isReactElement = function isReactElement(element) {
+    return /*#__PURE__*/isValidElement(element);
+  };
+  var handleChange = function handleChange(value, _option) {
+    // option/其第一层子节点是react节点且是labelInValue就拿record
+    var option = _option;
+    if (labelInValue && (isReactElement(_option) || isReactElement(_option === null || _option === void 0 ? void 0 : _option.children))) {
+      option = _option === null || _option === void 0 ? void 0 : _option.record;
+    }
     var getChangeValue = selectProps.getChangeValue;
     if (selectProps.mode && selectProps.mode === 'multiple') {
       if (Array.isArray(option)) {
@@ -234,7 +242,7 @@ export var ProSelect = function ProSelect(props, ref) {
     } else if (!selectProps.mode && labelInValue) {
       onChange(getChangeValue ? getChangeValue(getValueObject(value)) : getValueObject(value), option);
     } else {
-      onChange === null || onChange === void 0 ? void 0 : onChange(getChangeValue ? getChangeValue(value) : value, option === null || option === void 0 ? void 0 : option.record);
+      onChange === null || onChange === void 0 ? void 0 : onChange(getChangeValue ? getChangeValue(value) : value, _option === null || _option === void 0 ? void 0 : _option.record);
     }
   };
   /**

package/es/ProStep/components/Anchor/index.d.ts

@@ -1,2 +1,2 @@
-export declare const MenuItem: (props: any) => JSX.Element;
+export declare const MenuItem: (props: any) => import("react/jsx-runtime").JSX.Element;
 export default MenuItem;

package/es/ProStep/components/Item/index.d.ts

@@ -1,3 +1,3 @@
 import { ProStepItem } from '../../propsType';
-declare const _default: ({ id, title, collapse: collapseItem, children, ...restProps }: ProStepItem) => JSX.Element;
+declare const _default: ({ id, title, collapse: collapseItem, children, ...restProps }: ProStepItem) => import("react/jsx-runtime").JSX.Element;
 export default _default;

package/es/ProStep/components/Listener/index.js

@@ -14,7 +14,7 @@ export default (function (_ref) {
   var _useStep = useStep(),
     notify = _useStep.notify;
   return /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, props), {}, {
-    onClick: throttle( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    onClick: throttle(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var values;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {

package/es/ProStep/components/Step/index.d.ts

@@ -1,5 +1,5 @@
 import { ProStepPropsType } from '../../propsType';
 export declare const Step: ({ fixedTop, dataSource, activeKey, errorCollection, style, targetOffset, scrollToError, }: ProStepPropsType & {
     errorCollection: object;
-}) => JSX.Element;
+}) => import("react/jsx-runtime").JSX.Element;
 export default Step;

package/es/ProStep/index.d.ts

@@ -4,9 +4,9 @@ import './style/index.less';
 export declare const ProStepContext: import("react").Context<any>;
 export declare const useStep: () => any;
 declare const ProStep: {
-    ({ children, ...resetProps }: ProStepPropsType): JSX.Element;
+    ({ children, ...resetProps }: ProStepPropsType): import("react/jsx-runtime").JSX.Element;
     useStep: () => any;
-    Item: ({ id, title, collapse: collapseItem, children, ...restProps }: import("./propsType").ProStepItem) => JSX.Element;
+    Item: ({ id, title, collapse: collapseItem, children, ...restProps }: import("./propsType").ProStepItem) => import("react/jsx-runtime").JSX.Element;
     Listener: ({ children, delayTime, excludes, ...props }: any) => import("react").DetailedReactHTMLElement<any, HTMLElement>;
 };
 export default ProStep;