@zat-design/sisyphus-react 3.6.6 → 3.6.7-beta.1

package/lib/ProEnum/components/Group.d.ts

@@ -6,5 +6,5 @@ interface Props extends Pick<ProEnum, 'id' | 'value' | 'onChange' | 'dataSource'
     allowClear?: boolean;
     button?: boolean;
 }
-declare const Group: (props: Props) => JSX.Element;
+declare const Group: (props: Props) => import("react/jsx-runtime").JSX.Element;
 export default Group;

package/lib/ProEnum/components/Tag.d.ts

@@ -3,5 +3,5 @@ interface Props extends Pick<ProEnum, 'id' | 'value' | 'onChange' | 'dataSource'
     fieldValue: string;
     fieldLabel: string;
 }
-declare const ProEnumTag: (props: Props) => JSX.Element;
+declare const ProEnumTag: (props: Props) => import("react/jsx-runtime").JSX.Element;
 export default ProEnumTag;

package/lib/ProEnum/index.d.ts

@@ -2,8 +2,8 @@ import useEnum from './hooks/useEnum';
 import { ProEnumProps } from './propsType';
 import './style/index.less';
 declare const ProEnum: {
-    (props: ProEnumProps): JSX.Element;
-    getEnumLabel: (code: string | string[], value: any, compose?: boolean, fieldNameLabel?: string, fieldNameValue?: string) => JSX.Element;
+    (props: ProEnumProps): import("react/jsx-runtime").JSX.Element;
+    getEnumLabel: (code: string | string[], value: any, compose?: boolean, fieldNameLabel?: string, fieldNameValue?: string) => import("react/jsx-runtime").JSX.Element;
     useEnum: typeof useEnum;
 };
 export default ProEnum;

package/lib/ProEnum/utils/eventCenter.js

@@ -10,7 +10,7 @@ var SimpleEventCenter = /*#__PURE__*/function () {
     this.events = void 0;
     this.events = new Map();
   }
-  (0, _createClass2.default)(SimpleEventCenter, [{
+  return (0, _createClass2.default)(SimpleEventCenter, [{
     key: "subscribe",
     value: function subscribe(eventName, callback) {
       if (!this.events.has(eventName)) {
@@ -37,6 +37,5 @@ var SimpleEventCenter = /*#__PURE__*/function () {
       }
     }
   }]);
-  return SimpleEventCenter;
 }(); // 将 eventCenter 实例添加到 window 对象上
 window.eventCenter = new SimpleEventCenter();

package/lib/ProEnum/utils/getEnumLabel.d.ts

@@ -1,2 +1,2 @@
-declare const getEnumLabel: (code: string | string[], value: any, compose?: boolean, fieldNameLabel?: string, fieldNameValue?: string) => JSX.Element;
+declare const getEnumLabel: (code: string | string[], value: any, compose?: boolean, fieldNameLabel?: string, fieldNameValue?: string) => import("react/jsx-runtime").JSX.Element;
 export default getEnumLabel;

package/lib/ProForm/components/base/Input/index.d.ts

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

package/lib/ProForm/components/base/InputNumber/index.js

@@ -244,9 +244,15 @@ var InputNumber = function InputNumber(props) {
   }
   // 失去焦点时处理数字，
   var handleBlur = function handleBlur(e) {
-    var _e$target, _props$precision5, _valueProps3, _e$target2;
+    var _e$target, _props$precision5, _valueProps3, _e$target3;
     activateRef.current = false;
     var value = e === null || e === void 0 ? void 0 : (_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.value;
+    //  为空直接返回
+    if (value === '') {
+      var _e$target2;
+      onBlur === null || onBlur === void 0 ? void 0 : onBlur(value, e === null || e === void 0 ? void 0 : (_e$target2 = e.target) === null || _e$target2 === void 0 ? void 0 : _e$target2.value);
+      return false;
+    }
     if (_max !== undefined && value > _max) {
       value = _max;
     }
@@ -273,7 +279,7 @@ var InputNumber = function InputNumber(props) {
         value = limitNumber(value, limit);
         break;
     }
-    onBlur === null || onBlur === void 0 ? void 0 : onBlur(value, Number(e === null || e === void 0 ? void 0 : (_e$target2 = e.target) === null || _e$target2 === void 0 ? void 0 : _e$target2.value));
+    onBlur === null || onBlur === void 0 ? void 0 : onBlur(value, Number(e === null || e === void 0 ? void 0 : (_e$target3 = e.target) === null || _e$target3 === void 0 ? void 0 : _e$target3.value));
   };
   // 获得焦点
   var handleFocus = function handleFocus(e) {

package/lib/ProForm/components/combination/ProCascader/index.d.ts

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

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

@@ -28,9 +28,9 @@ var defaultFieldNames = {
   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 (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)));
+    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 getViewLabel = function getViewLabel(_ref) {
@@ -94,7 +94,7 @@ var ProCascader = function ProCascader(props) {
     enumDataSource = _ref5$ === void 0 ? [] : _ref5$;
   var realDataSource = (0, _react.useMemo)(function () {
     var innerDataSource = dataSource || (addressCode ? enumDataSource : []);
-    var result = isAddressMode && realLevel === 2 ? filterDataSource(innerDataSource, level, fieldNames) : innerDataSource;
+    var result = isAddressMode && realLevel === 2 ? _filterDataSource(innerDataSource, level, fieldNames) : innerDataSource;
     return (0, _index.transformDataName)(result, fieldNames);
   }, [isAddressMode, addressCode, realLevel, dataSource, enumDataSource === null || enumDataSource === void 0 ? void 0 : enumDataSource.length]);
   var _useRequest = (0, _objectSpread3.default)({}, useRequest),
@@ -129,7 +129,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":
@@ -194,7 +194,7 @@ var ProCascader = function ProCascader(props) {
   })) === 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 _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 不为空，说明找到了完整的路径
@@ -213,7 +213,7 @@ var ProCascader = function ProCascader(props) {
     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), [].concat((0, _toConsumableArray2.default)(path), [foundOption]));
       }
       // 如果没有更多的 value 需要匹配，返回当前选项（以及之前的路径）
       return [].concat((0, _toConsumableArray2.default)(path), [foundOption]);
@@ -221,7 +221,9 @@ var ProCascader = function ProCascader(props) {
     // 如果没有在当前层级的选项中找到匹配的 value，返回 null
     return null;
   };
-  var _selectedOptions = findSelectedOptions(service ? serviceData : realDataSource, addressValue);
+  var _selectedOptions = (0, _react.useMemo)(function () {
+    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) {

package/lib/ProForm/components/old/InputRange/index.d.ts

@@ -12,5 +12,5 @@ export interface InputRangeProps {
     isPositiveInteger?: boolean;
     precision?: number;
 }
-declare const InputRange: ({ value, onChange, min, max, group, disabled, precision, isPositiveInteger, }: InputRangeProps) => JSX.Element;
+declare const InputRange: ({ value, onChange, min, max, group, disabled, precision, isPositiveInteger, }: InputRangeProps) => import("react/jsx-runtime").JSX.Element;
 export default InputRange;

package/lib/ProForm/components/old/InputWithSuffix/index.d.ts

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

package/lib/ProForm/components/old/ProAddress/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ProAddressPropsType } from './propsTypes';
 export declare const transferAddressInfoToRegion: () => {
     normalize: (value: any) => {
@@ -24,5 +23,5 @@ export declare const transferAddressInfoToRegion: () => {
         };
     };
 };
-export declare function ProAddress({ ...props }: ProAddressPropsType): JSX.Element;
+export declare function ProAddress({ ...props }: ProAddressPropsType): import("react/jsx-runtime").JSX.Element;
 export default ProAddress;

package/lib/ProForm/components/old/ProRangeBox/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 import { ProRangeBoxPropsType } from './propsType';
-export default function ProRangeBox({ configOption }: ProRangeBoxPropsType): JSX.Element;
+export default function ProRangeBox({ configOption }: ProRangeBoxPropsType): import("react/jsx-runtime").JSX.Element;

package/lib/ProForm/utils/index.js

@@ -139,7 +139,7 @@ var splitNameStr = exports.splitNameStr = function splitNameStr(name) {
   });
 };
 // 过滤掉字段名中包含 '-' 的字段
-var filterInternalFields = exports.filterInternalFields = function filterInternalFields(values, optimize) {
+var _filterInternalFields = exports.filterInternalFields = function filterInternalFields(values, optimize) {
   if (optimize) {
     return values;
   }
@@ -153,20 +153,20 @@ var filterInternalFields = exports.filterInternalFields = function filterInterna
   }
   if (Array.isArray(nextValues)) {
     return nextValues.map(function (item) {
-      return filterInternalFields(item);
+      return _filterInternalFields(item);
     });
   }
   if ((0, _lodash.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;
 };
-var getAllNamePath = exports.getAllNamePath = function getAllNamePath(object) {
+var _getAllNamePath = exports.getAllNamePath = function getAllNamePath(object) {
   var currentPath = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
   var keys = Object.keys(object);
   var resultKeys = [];
@@ -180,7 +180,7 @@ var getAllNamePath = exports.getAllNamePath = function getAllNamePath(object) {
     }
     // 深度获取对象key
     if ((0, _lodash.isObject)(value)) {
-      resultKeys.concat(getAllNamePath(value, [].concat((0, _toConsumableArray2.default)(currentPath), [key])));
+      resultKeys.concat(_getAllNamePath(value, [].concat((0, _toConsumableArray2.default)(currentPath), [key])));
     }
     resultKeys.push([].concat((0, _toConsumableArray2.default)(currentPath), [key]));
   });
@@ -371,7 +371,7 @@ var customEqualForFun = exports.customEqualForFun = function customEqualForFun(v
 /**
  * 查询数据中是否包含rowKey
  */
-var hasRowKey = exports.hasRowKey = function hasRowKey(obj) {
+var _hasRowKey = exports.hasRowKey = function hasRowKey(obj) {
   if ((0, _typeof2.default)(obj) !== 'object' || obj === null) {
     return false;
   }
@@ -381,7 +381,7 @@ var hasRowKey = exports.hasRowKey = function hasRowKey(obj) {
     return true;
   }
   return keys.some(function (key) {
-    return hasRowKey(obj[key]);
+    return _hasRowKey(obj[key]);
   });
 };
 /**
@@ -397,7 +397,7 @@ var view = exports.view = function view(obj) {
     return true;
   }
   return keys.some(function (key) {
-    return hasRowKey(obj[key]);
+    return _hasRowKey(obj[key]);
   });
 };
 /**
@@ -433,7 +433,7 @@ var deleteForPath = exports.deleteForPath = function deleteForPath(values, nameP
  * @param value 选中值
  * @returns {}
  */
-var findOptionByValue = exports.findOptionByValue = function findOptionByValue(treeData, value, fieldNames) {
+var _findOptionByValue = exports.findOptionByValue = function findOptionByValue(treeData, value, fieldNames) {
   if ((0, _lodash.isObject)(value)) {
     return value;
   }
@@ -443,7 +443,7 @@ var findOptionByValue = exports.findOptionByValue = function findOptionByValue(t
       return (0, _lodash.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 (0, _lodash.omit)(foundNode, ['children', fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children]);
       }

package/lib/ProForm/utils/useWatch.d.ts

@@ -2,6 +2,5 @@ import { InternalNamePath, FormInstance, NamePath } from 'rc-field-form/es/inter
 export declare function toArray<T>(value?: T | T[] | null): T[];
 export declare function getNamePath(path: NamePath | null): InternalNamePath;
 export declare function stringify(value: any): string | number;
-declare function useWatch(dependencies: string, form?: FormInstance, wait?: number): any;
-declare function useWatch(dependencies: NamePath[], form?: FormInstance, wait?: number): any[];
+declare function useWatch(dependencies: string | NamePath[], form?: FormInstance, wait?: number): any;
 export default useWatch;

package/lib/ProIcon/utils/index.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.recurseGetNodes = exports.onBeforeInjection = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _config = require("../config");
-var recurseGetNodes = exports.recurseGetNodes = function recurseGetNodes(type, node, queue) {
+var _recurseGetNodes = exports.recurseGetNodes = function recurseGetNodes(type, node, queue) {
   switch (type) {
     // 渐变
     case 'gradation':
@@ -26,7 +26,7 @@ var recurseGetNodes = exports.recurseGetNodes = function recurseGetNodes(type, n
   }
   if (node.childNodes) {
     for (var i = 0; i < node.childNodes.length; i++) {
-      recurseGetNodes(type, node.childNodes[i], queue);
+      _recurseGetNodes(type, node.childNodes[i], queue);
     }
   }
 };
@@ -56,7 +56,7 @@ var onBeforeInjection = exports.onBeforeInjection = function onBeforeInjection(_
     // 目前只支持处理渐变及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/lib/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/lib/ProLayout/components/Layout/Menu/OpenMenu/index.js

@@ -56,7 +56,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
@@ -97,7 +97,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;
@@ -105,7 +105,7 @@ var OpenMenu = function OpenMenu(props) {
       });
       return data;
     };
-    menuDeep(result);
+    _menuDeep(result);
     return result;
   }, [dataSource]);
   (0, _ahooks.useDeepCompareEffect)(function () {

package/lib/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/lib/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/lib/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/lib/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/lib/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/lib/ProLayout/utils/index.js

@@ -25,7 +25,7 @@ var getIdsByPathName = exports.getIdsByPathName = function getIdsByPathName(menu
     _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无法选中问题
@@ -34,7 +34,7 @@ var getIdsByPathName = exports.getIdsByPathName = function getIdsByPathName(menu
         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;
@@ -42,7 +42,7 @@ var getIdsByPathName = exports.getIdsByPathName = function getIdsByPathName(menu
       }
     }
   };
-  menuDeep(menus);
+  _menuDeep(menus);
   return result || [];
 };
 /**
@@ -52,7 +52,7 @@ var getIdsByPathName = exports.getIdsByPathName = function getIdsByPathName(menu
  */
 var transformMenu = exports.transformMenu = function transformMenu(menuData, pathPrefix) {
   var data = (0, _toConsumableArray2.default)(menuData);
-  var menuDeep = function menuDeep(menuDeepItem) {
+  var _menuDeep2 = function menuDeep(menuDeepItem) {
     if (!Array.isArray(menuDeepItem) || !menuDeepItem.length) {
       return [];
     }
@@ -85,11 +85,11 @@ var transformMenu = exports.transformMenu = function transformMenu(menuData, pat
           childrenItem.keyUrlPath = (0, _toConsumableArray2.default)(item.keyUrlPath);
           childrenItem.keyIdPath = (0, _toConsumableArray2.default)(item.keyIdPath);
         });
-        menuDeep(item.children);
+        _menuDeep2(item.children);
       }
     });
   };
-  menuDeep(data);
+  _menuDeep2(data);
   return data;
 };
 /**
@@ -144,7 +144,7 @@ var getPathNameKey = exports.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 [];
     }
@@ -158,7 +158,7 @@ var getPathNameKey = exports.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;
@@ -166,6 +166,6 @@ var getPathNameKey = exports.getPathNameKey = function getPathNameKey(_ref) {
       }
     }
   };
-  menuDeep(menus);
+  _menuDeep3(menus);
   return result;
 };

package/lib/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/lib/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/lib/ProSelect/index.js

@@ -341,7 +341,7 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
               title: OptionRender(item),
               children: OptionRender(item)
             }) : (0, _jsxRuntime.jsx)("span", {
-              title: "".concat(item[code], "-").concat(item[label]),
+              title: selectProps.showCodeName ? "".concat(item[code], "-").concat(item[label]) : item[label],
               children: selectProps.showCodeName ? "".concat(item[code], "-").concat(item[label]) : item[label]
             })
           }, item[code])

package/lib/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/lib/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/lib/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/lib/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, ...props }: any) => import("react").DetailedReactHTMLElement<any, HTMLElement>;
 };
 export default ProStep;

package/lib/ProTable/components/DndWrapper/index.d.ts

@@ -5,11 +5,12 @@ interface RowProps extends React.HTMLAttributes<HTMLTableRowElement> {
     disabled?: boolean;
 }
 export declare const Row: FC<RowProps>;
-declare const DndWrapper: ({ draggable, value, onChange, disabled, children }: {
+declare const DndWrapper: ({ draggable, value, onChange, disabled, children, rowKey }: {
     draggable: any;
     value: any;
     onChange: any;
     disabled: any;
     children: any;
+    rowKey: any;
 }) => any;
 export default DndWrapper;

package/lib/ProTable/components/DndWrapper/index.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.Row = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _jsxRuntime = require("react/jsx-runtime");
@@ -12,6 +13,7 @@ var _react = _interopRequireDefault(require("react"));
 var _core = require("@dnd-kit/core");
 var _sortable = require("@dnd-kit/sortable");
 var _utilities = require("@dnd-kit/utilities");
+var _index = require("./utils/index");
 var _ProIcon = _interopRequireDefault(require("../../../ProIcon"));
 var _excluded = ["disabled", "children"];
 var Row = exports.Row = function Row(props) {
@@ -67,30 +69,67 @@ var Row = exports.Row = function Row(props) {
   }));
 };
 var DndWrapper = function DndWrapper(_ref2) {
-  var _value$;
+  var _flatTree$;
   var draggable = _ref2.draggable,
     value = _ref2.value,
     onChange = _ref2.onChange,
     disabled = _ref2.disabled,
-    children = _ref2.children;
+    children = _ref2.children,
+    rowKey = _ref2.rowKey;
   var onDragEnd = function onDragEnd(_ref3) {
     var active = _ref3.active,
       over = _ref3.over;
+    // 为数据源划分层级及parentId
+    var transformedValue = (0, _index.addLevelAndParentId)(value, rowKey);
+    // 同一level层级的且parentId相同的，可以互相之间拖拽替换
     if (active.id !== (over === null || over === void 0 ? void 0 : over.id)) {
-      var activeIndex = value.findIndex(function (i) {
-        return i.rowKey === active.id;
+      var activeObject = (0, _index.treeNodeFind)(transformedValue, function (t) {
+        return t.rowKey === active.id;
       });
-      var overIndex = value.findIndex(function (i) {
-        return i.rowKey === (over === null || over === void 0 ? void 0 : over.id);
+      var overObject = (0, _index.treeNodeFind)(transformedValue, function (t) {
+        return t.rowKey === (over === null || over === void 0 ? void 0 : over.id);
       });
-      var nextValue = (0, _sortable.arrayMove)(value, activeIndex, overIndex);
-      onChange(nextValue);
+      if (activeObject && overObject) {
+        var activeLevel = activeObject.level,
+          activeParentId = activeObject.parentId;
+        var overLevel = overObject.level,
+          overParentId = overObject.parentId;
+        if (activeLevel === overLevel && activeParentId === overParentId) {
+          // 将树平铺
+          var _flatTree = (0, _index.transformTreeToArray)(transformedValue).map(function (item) {
+            return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
+              children: undefined
+            });
+          });
+          var activeIndex = _flatTree.findIndex(function (i) {
+            return i.rowKey === active.id;
+          });
+          var overIndex = _flatTree.findIndex(function (i) {
+            return i.rowKey === (over === null || over === void 0 ? void 0 : over.id);
+          });
+          var nextValue = (0, _sortable.arrayMove)(_flatTree, activeIndex, overIndex);
+          onChange((0, _index.createTreeFromArray)(nextValue, {
+            itemKey: 'rowKey',
+            parentKey: 'parentId',
+            childrenKey: 'children'
+          }));
+        }
+      }
+    } else {
+      onChange((0, _toConsumableArray2.default)(value));
     }
   };
+  // 将树平铺
+  var flatTree = (0, _index.transformTreeToArray)(value).map(function (item) {
+    return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
+      children: undefined
+    });
+  });
   return draggable && !disabled ? (0, _jsxRuntime.jsx)(_core.DndContext, {
     onDragEnd: onDragEnd,
+    collisionDetection: _core.closestCorners,
     children: (0, _jsxRuntime.jsx)(_sortable.SortableContext, {
-      items: (value === null || value === void 0 ? void 0 : (_value$ = value[0]) === null || _value$ === void 0 ? void 0 : _value$.rowKey) ? value.map(function (i) {
+      items: (flatTree === null || flatTree === void 0 ? void 0 : (_flatTree$ = flatTree[0]) === null || _flatTree$ === void 0 ? void 0 : _flatTree$.rowKey) ? flatTree.map(function (i) {
         return i.rowKey;
       }) : [],
       strategy: _sortable.verticalListSortingStrategy,