@zat-design/sisyphus-react 4.0.0-beta.9 → 4.0.1

package/lib/ProIcon/index.js

@@ -1,13 +1,9 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _ahooks = require("ahooks");
 var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
@@ -21,6 +17,20 @@ var _locale = _interopRequireDefault(require("../locale"));
 require("./symbolIcon.js");
 var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["type", "onClick", "size", "color", "className", "style", "spin", "rotate", "theme", "disabled", "mode", "buttonProps", "children", "mapList", "src", "actionMap", "tooltip", "buttonIcon"];
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 var ProIcon = props => {
   var _window, _window2;
   var _useProConfig = (0, _ProConfigProvider.useProConfig)(),
@@ -28,7 +38,7 @@ var ProIcon = props => {
     dispatch = _useProConfig.dispatch;
   var config = state.ProIcon,
     antdTheme = state.theme;
-  var _config = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, config), props !== null && props !== void 0 ? props : {});
+  var _config = _objectSpread(_objectSpread({}, config), props !== null && props !== void 0 ? props : {});
   var _config$type = _config.type,
     type = _config$type === void 0 ? null : _config$type,
     onClick = _config.onClick,
@@ -56,11 +66,11 @@ var ProIcon = props => {
     tooltip = _config.tooltip,
     _config$buttonIcon = _config.buttonIcon,
     buttonIcon = _config$buttonIcon === void 0 ? true : _config$buttonIcon,
-    reset = (0, _objectWithoutProperties2.default)(_config, _excluded);
+    reset = _objectWithoutProperties(_config, _excluded);
   var _useSetState = (0, _ahooks.useSetState)({
       IconInstance: /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {})
     }),
-    _useSetState2 = (0, _slicedToArray2.default)(_useSetState, 2),
+    _useSetState2 = _slicedToArray(_useSetState, 2),
     IconInstance = _useSetState2[0].IconInstance,
     setState = _useSetState2[1];
 
@@ -73,7 +83,7 @@ var ProIcon = props => {
 
   // 本地存储初始化主题
   var _useLocalStorageState = (0, _ahooks.useLocalStorageState)('themeConfig'),
-    _useLocalStorageState2 = (0, _slicedToArray2.default)(_useLocalStorageState, 1),
+    _useLocalStorageState2 = _slicedToArray(_useLocalStorageState, 1),
     themeConfig = _useLocalStorageState2[0];
 
   // 文档内部就不用判断window.top !== window.self了
@@ -136,13 +146,13 @@ var ProIcon = props => {
   var svgProps = {
     className: proIconClassNames,
     fill: 'currentColor',
-    style: (0, _objectSpread2.default)((0, _objectSpread2.default)({
+    style: _objectSpread(_objectSpread({
       width: size,
       height: size
     }, rotateStyle), style)
   };
-  var icon = !src ? /*#__PURE__*/(0, _jsxRuntime.jsx)("svg", (0, _objectSpread2.default)((0, _objectSpread2.default)({}, svgProps), {}, {
-    style: (0, _objectSpread2.default)({
+  var icon = !src ? /*#__PURE__*/(0, _jsxRuntime.jsx)("svg", _objectSpread(_objectSpread({}, svgProps), {}, {
+    style: _objectSpread({
       color
     }, svgProps === null || svgProps === void 0 ? void 0 : svgProps.style),
     onClick: onClick,
@@ -150,7 +160,7 @@ var ProIcon = props => {
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)("use", {
       xlinkHref: `#icon-${_type}`
     })
-  })) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactSvg.ReactSVG, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, svgProps), {}, {
+  })) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactSvg.ReactSVG, _objectSpread(_objectSpread({}, svgProps), {}, {
     // @ts-ignore
     onClick: onClick,
     "aria-hidden": "true",
@@ -166,12 +176,12 @@ var ProIcon = props => {
       }
     }
   }));
-  var RenderIcon = /*#__PURE__*/(0, _jsxRuntime.jsx)("span", (0, _objectSpread2.default)((0, _objectSpread2.default)({
+  var RenderIcon = /*#__PURE__*/(0, _jsxRuntime.jsx)("span", _objectSpread(_objectSpread({
     className: "anticon"
   }, reset), {}, {
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Tooltip, {
       title: iconText,
-      children: buttonIcon ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)({
+      children: buttonIcon ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Button, _objectSpread({
         style: {
           width: size,
           height: size,
@@ -210,7 +220,7 @@ var ProIcon = props => {
               (_Object$values = Object.values((_targetEntries$target = targetEntries === null || targetEntries === void 0 || (_targetEntries$target2 = targetEntries.target) === null || _targetEntries$target2 === void 0 ? void 0 : _targetEntries$target2.attributes) !== null && _targetEntries$target !== void 0 ? _targetEntries$target : {})) === null || _Object$values === void 0 || (_Object$values = _Object$values.find(item => item.nodeName === 'style')
               // @ts-ignore
               ) === null || _Object$values === void 0 || (_Object$values = _Object$values.value) === null || _Object$values === void 0 ? void 0 : _Object$values.match(/--zaui-brand:(.*?);/),
-              _Object$values$find$v2 = (0, _slicedToArray2.default)(_Object$values$find$v, 2),
+              _Object$values$find$v2 = _slicedToArray(_Object$values$find$v, 2),
               label = _Object$values$find$v2[0],
               value = _Object$values$find$v2[1];
             if (label && value) {
@@ -277,7 +287,7 @@ var ProIcon = props => {
   }, [_config, primaryColor, qiankunPrimaryColor, language, svgProps]);
   return !isExtendButtonMode ? IconInstance : /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Tooltip, {
     title: tooltip,
-    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Button, _objectSpread(_objectSpread(_objectSpread({
       type: isIconMode ? 'text' : (buttonProps === null || buttonProps === void 0 ? void 0 : buttonProps.type) || 'link',
       className: proIconClassNames,
       disabled: disabled,

package/lib/ProIcon/utils/index.js

@@ -1,12 +1,15 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.recurseGetNodes = exports.onBeforeInjection = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _config = require("../config");
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 var recurseGetNodes = (type, node, queue) => {
   switch (type) {
     // 渐变
@@ -38,9 +41,9 @@ var onBeforeInjection = _ref => {
   if (actionMap && svg) {
     var _actionMap$themeMap, _actionMap$themeFillM, _actionMap$gradation, _actionMap$fill;
     // 项目内置的四种主题匹配渐变色
-    var mergeThemeMap = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _config.themeMap), (_actionMap$themeMap = actionMap.themeMap) !== null && _actionMap$themeMap !== void 0 ? _actionMap$themeMap : {});
+    var mergeThemeMap = _objectSpread(_objectSpread({}, _config.themeMap), (_actionMap$themeMap = actionMap.themeMap) !== null && _actionMap$themeMap !== void 0 ? _actionMap$themeMap : {});
     // 项目内置的四种双色匹配fill
-    var mergeFillThemeMap = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _config.themeFillMap), (_actionMap$themeFillM = actionMap.themeFillMap) !== null && _actionMap$themeFillM !== void 0 ? _actionMap$themeFillM : {});
+    var mergeFillThemeMap = _objectSpread(_objectSpread({}, _config.themeFillMap), (_actionMap$themeFillM = actionMap.themeFillMap) !== null && _actionMap$themeFillM !== void 0 ? _actionMap$themeFillM : {});
     var _gradList = mergeThemeMap[primaryColor];
     var _fillList = mergeFillThemeMap[primaryColor];
     // 渐变操作序列

package/lib/ProLayout/components/Layout/Header/index.js

@@ -1,6 +1,5 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -8,6 +7,7 @@ exports.default = void 0;
 var _classnames = _interopRequireDefault(require("classnames"));
 var _logoImg = _interopRequireDefault(require("../../../images/logoImg.png"));
 var _jsxRuntime = require("react/jsx-runtime");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 var Header = props => {
   var headerHeight = props.headerHeight,
     pure = props.pure,

package/lib/ProLayout/components/Layout/Icon/Icon.js

@@ -1,12 +1,13 @@
 "use strict";
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _jsxRuntime = require("react/jsx-runtime");
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 var customCache = new Set();
 var Icon = props => {
   // @ts-ignore

package/lib/ProLayout/components/Layout/Icon/index.js

@@ -1,9 +1,9 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
 var _Icon = _interopRequireDefault(require("./Icon"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 var _default = exports.default = _Icon.default;

package/lib/ProLayout/components/Layout/Menu/FoldMenu/index.js

@@ -1,11 +1,9 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _react = require("react");
 var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
@@ -15,6 +13,13 @@ var _SideMenu = _interopRequireDefault(require("../SideMenu"));
 var _index2 = require("../../../../index");
 var _utils = require("../../../../utils");
 var _jsxRuntime = require("react/jsx-runtime");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+var Link = _reactRouterDom.Link;
 var FoldMenu = props => {
   var style = props.style,
     dataSource = props.dataSource,
@@ -25,22 +30,24 @@ var FoldMenu = props => {
     collapsed = dataSource.collapsed,
     headerHeight = dataSource.headerHeight;
   var pathNamePrefix = `/${window.location.pathname.split('/')[1]}`;
-  var history = (0, _reactRouterDom.useHistory)();
   var noticeCls = (0, _classnames.default)({
     'pro-layout-menu-tooltip': true,
     'pro-layout-menu-tooltip-has-notice': notice,
     'pro-layout-menu-tooltip-nav-open': collapsed
   });
-  var _useContext = (0, _react.useContext)(_index2.LayoutContext),
-    selectedPath = _useContext.selectedPath,
-    onSelected = _useContext.onSelected;
+  var _ref = (0, _react.useContext)(_index2.LayoutContext) || {
+      selectedPath: '',
+      onSelected: () => {}
+    },
+    selectedPath = _ref.selectedPath,
+    onSelected = _ref.onSelected;
   return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
     className: "pro-layout-menu-fold",
-    style: (0, _objectSpread2.default)({}, style),
+    style: _objectSpread({}, style),
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)("ul", {
       className: "pro-layout-menu-fold-list",
-      style: (0, _objectSpread2.default)({}, style),
-      children: menus.map((item, index) => {
+      style: _objectSpread({}, style),
+      children: menus.filter(item => !item.hideInMenu).map((item, index) => {
         var _url$split;
         var id = item.id,
           url = item.url,
@@ -48,20 +55,15 @@ var FoldMenu = props => {
           icon = item.icon,
           imgUrl = item.imgUrl,
           imgActiveUrl = item.imgActiveUrl,
-          hideInMenu = item.hideInMenu,
           children = item.children;
         var toPath = item.redirectUrl || item.url;
-
-        // 隐藏菜单
-        if (hideInMenu) {
-          return null;
-        }
         var selectedMenu = (0, _utils.getUrlParams)('activeMenu');
+        var pathToMatch = selectedPath || selectedMenu || window.location.pathname;
 
         // 取第一级
         var currentKeyIdPath = (0, _utils.getPathNameKey)({
           menus,
-          pathName: selectedMenu || selectedPath || window.location.pathname // 优先匹配URL中定位菜单
+          pathName: pathToMatch // 优先匹配上下文路径
         }) || [];
         var cls = (0, _classnames.default)({
           active: currentKeyIdPath.includes(id)
@@ -86,11 +88,11 @@ var FoldMenu = props => {
               children: name
             })]
           })
-        }, `${id}-${name}`);
+        });
         return hasChildrenMenu ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Popover, {
           mouseEnterDelay: 0,
           content: /*#__PURE__*/(0, _jsxRuntime.jsx)(_SideMenu.default, {
-            dataSource: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, dataSource), {}, {
+            dataSource: _objectSpread(_objectSpread({}, dataSource), {}, {
               menus: item
             }),
             onMenuClick: onMenuClick
@@ -100,7 +102,7 @@ var FoldMenu = props => {
             root: noticeCls
           },
           styles: {
-            body: {
+            content: {
               marginTop: headerHeight - 48,
               height: `calc(100vh - ${headerHeight + (notice ? 32 : 0)}px)`
             }
@@ -120,11 +122,6 @@ var FoldMenu = props => {
                   keyPath: menuKeyPath
                 });
               }
-
-              // 导航到目标路径
-              if (toPath) {
-                history.push(toPath);
-              }
             },
             children: LiNode
           })
@@ -145,18 +142,16 @@ var FoldMenu = props => {
                   keyPath: menuKeyPath
                 });
               }
-
-              // 导航到目标路径
-              if (toPath) {
-                history.push(toPath);
-              }
               onSelected({
                 selectedPath: toPath
               });
             },
-            children: LiNode
+            children: /*#__PURE__*/(0, _jsxRuntime.jsx)(Link, {
+              to: toPath,
+              children: LiNode
+            })
           })
-        }, toPath) : /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+        }, `${id}-${name}`) : /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
           onClick: () => {
             // 查找完整的菜单项数据
             var menuItem = (0, _utils.findMenuItemByKey)(menus, String(id));
@@ -170,14 +165,12 @@ var FoldMenu = props => {
                 keyPath: menuKeyPath
               });
             }
-
-            // 导航到目标路径
-            if (toPath) {
-              history.push(toPath);
-            }
           },
-          children: LiNode
-        });
+          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(Link, {
+            to: toPath,
+            children: LiNode
+          })
+        }, `${id}-${name}`);
       })
     })
   });

package/lib/ProLayout/components/Layout/Menu/FoldMenu/style/index.less

@@ -67,6 +67,10 @@
   top: 48px !important;
   transform: none !important;
   transition: none !important;
+  .@{ant-prefix}-popover-container{
+    border-radius: 0;
+    padding: 0;
+  }
 }
 
 .pro-layout-menu-tooltip.pro-layout-menu-tooltip-has-notice {
@@ -90,7 +94,7 @@
   }
 }
 
-.pro-layout-menu-tooltip .@{ant-prefix}-popover-inner-content {
+.pro-layout-menu-tooltip .@{ant-prefix}-popover-content {
   padding: 0;
 }
 
@@ -98,7 +102,7 @@
   display: none;
 }
 
-.pro-layout-menu-tooltip .@{ant-prefix}-popover-content .@{ant-prefix}-popover-inner {
+.pro-layout-menu-tooltip .@{ant-prefix}-popover-content .@{ant-prefix}-popover-container {
   padding: 0;
   box-shadow: 2px 0px 5px 0px rgba(0, 55, 93, 0.1);
 }

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

@@ -1,11 +1,9 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
 var _antd = require("antd");
 var _ahooks = require("ahooks");
@@ -15,8 +13,17 @@ var _reactRouterDom = require("react-router-dom");
 var _lodash = require("lodash");
 var _index = require("../../../../index");
 var _utils = require("../../../../utils");
+var _utils2 = require("../../../TabsManager/utils");
 var _index2 = require("../../index");
 var _jsxRuntime = require("react/jsx-runtime");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+var Link = _reactRouterDom.Link;
 var OpenMenu = props => {
   var _getIdsByPathName;
   var className = props.className,
@@ -29,30 +36,32 @@ var OpenMenu = props => {
     menus = _ref.menus,
     sideMenu = _ref.sideMenu;
   var linkRef = (0, _react.useRef)(null);
-  var history = (0, _reactRouterDom.useHistory)();
   // 通过URL匹配对应的ID用于回显
   var _useSetState = (0, _ahooks.useSetState)({
       selectedKeys: [],
       openKeys: [],
       router: ''
     }),
-    _useSetState2 = (0, _slicedToArray2.default)(_useSetState, 2),
+    _useSetState2 = _slicedToArray(_useSetState, 2),
     _useSetState2$ = _useSetState2[0],
     selectedKeys = _useSetState2$.selectedKeys,
     openKeys = _useSetState2$.openKeys,
     router = _useSetState2$.router,
     setState = _useSetState2[1];
   var query = new URLSearchParams(window.location.search);
-  var _useContext = (0, _react.useContext)(_index.LayoutContext),
-    onSelected = _useContext.onSelected,
-    target = _useContext.target;
+  var layoutContext = (0, _react.useContext)(_index.LayoutContext);
+  var layoutSelectedPath = layoutContext === null || layoutContext === void 0 ? void 0 : layoutContext.selectedPath;
+  var layoutOnSelected = layoutContext === null || layoutContext === void 0 ? void 0 : layoutContext.onSelected;
+  var layoutTarget = layoutContext === null || layoutContext === void 0 ? void 0 : layoutContext.target;
   var cls = (0, _classnames.default)({
     'pro-layout-open-menu': true,
     [`${className}`]: className
   });
 
-  // 默认激活菜单优先取activeMenu中，默认取pathName进行匹配
-  var selectKeyIdPath = ((_getIdsByPathName = (0, _utils.getIdsByPathName)(menus, query.get('activeMenu'))) === null || _getIdsByPathName === void 0 ? void 0 : _getIdsByPathName.map(item => String(item))) || [];
+  // 默认激活菜单优先取selectedPath或activeMenu，默认取pathName进行匹配
+  // 特殊处理：如果layoutSelectedPath是'##EMPTY##'，表示有意清空选中状态
+  var preferredPath = query.get('activeMenu') || (layoutSelectedPath === '##EMPTY##' ? null : layoutSelectedPath) || window.location.pathname;
+  var selectKeyIdPath = preferredPath ? ((_getIdsByPathName = (0, _utils.getIdsByPathName)(menus, preferredPath)) === null || _getIdsByPathName === void 0 ? void 0 : _getIdsByPathName.map(item => String(item))) || [] : [];
   var itemsTransform = (0, _react.useMemo)(() => {
     var result = (0, _lodash.cloneDeep)(menus);
     if (!Array.isArray(result) || !result.length) {
@@ -79,7 +88,7 @@ var OpenMenu = props => {
             }) : /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
               className: (0, _classnames.default)({
                 'pro-layout-icon': true,
-                'pro-layout-icon-empty': isFirstMenu || !item.icon && !item.imgUrl
+                'pro-layout-icon-empty': isFirstMenu
               })
             })
           }), /*#__PURE__*/(0, _jsxRuntime.jsx)("h2", {
@@ -109,11 +118,14 @@ var OpenMenu = props => {
     return result;
   }, [dataSource]);
   (0, _ahooks.useDeepCompareEffect)(() => {
-    if (Array.isArray(selectKeyIdPath) && selectKeyIdPath.length) {
-      setState({
-        selectedKeys: selectKeyIdPath,
-        openKeys: selectKeyIdPath.slice(0, 2)
-      });
+    if (Array.isArray(selectKeyIdPath)) {
+      var newState = {
+        selectedKeys: selectKeyIdPath
+      };
+      if (selectKeyIdPath.length) {
+        newState.openKeys = selectKeyIdPath.slice(0, 2);
+      }
+      setState(newState);
     }
   }, [menus, selectKeyIdPath]);
 
@@ -126,10 +138,10 @@ var OpenMenu = props => {
       });
     }
   }, [sideMenu]);
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
     className: cls,
     style: style,
-    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Menu, {
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Menu, {
       mode: "inline"
       // @ts-ignore
       ,
@@ -145,7 +157,6 @@ var OpenMenu = props => {
         });
       },
       onClick: _ref2 => {
-        var _item$props, _item$props2;
         var item = _ref2.item,
           keyPath = _ref2.keyPath,
           key = _ref2.key,
@@ -167,30 +178,38 @@ var OpenMenu = props => {
             keyPath: menuKeyPath
           });
         }
-        setState({
-          selectedKeys: keyPath,
-          router: item === null || item === void 0 || (_item$props = item.props) === null || _item$props === void 0 ? void 0 : _item$props.router
-        });
-        onSelected({
-          selectedPath: item === null || item === void 0 || (_item$props2 = item.props) === null || _item$props2 === void 0 ? void 0 : _item$props2.router
-        });
-        if (target) {
-          var _item$props3;
-          window.open(item === null || item === void 0 || (_item$props3 = item.props) === null || _item$props3 === void 0 ? void 0 : _item$props3.router, target);
-        } else {
-          setTimeout(() => {
-            // 路由变更，且不再demo文档中
-            if (!window.location.href.includes('~demos/prolayout')) {
-              history.push(router);
-            }
-          }, 100);
+
+        // 只有最后一级菜单（叶子节点）才设置选中状态和路径
+        if (menuItem && (0, _utils2.isLeafMenuItem)(menuItem)) {
+          var _item$props, _item$props2;
+          setState({
+            selectedKeys: keyPath,
+            router: item === null || item === void 0 || (_item$props = item.props) === null || _item$props === void 0 ? void 0 : _item$props.router
+          });
+          layoutOnSelected === null || layoutOnSelected === void 0 || layoutOnSelected({
+            selectedPath: item === null || item === void 0 || (_item$props2 = item.props) === null || _item$props2 === void 0 ? void 0 : _item$props2.router
+          });
+          if (layoutTarget) {
+            var _item$props3;
+            window.open(item === null || item === void 0 || (_item$props3 = item.props) === null || _item$props3 === void 0 ? void 0 : _item$props3.router, layoutTarget);
+          } else {
+            setTimeout(() => {
+              // 路由变更，且不再demo文档中
+              if (!window.location.href.includes('~demos/prolayout')) {
+                linkRef.current.click();
+              }
+            }, 100);
+          }
         }
       },
       style: {
         height: dataSource.sideMenu ? 'auto' : `calc(100vh - ${(dataSource === null || dataSource === void 0 ? void 0 : dataSource.height) || 0}px)`,
         color: 'red'
       }
-    })
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(Link, {
+      to: router,
+      ref: linkRef
+    })]
   });
 };
 var _default = exports.default = OpenMenu;

package/lib/ProLayout/components/Layout/Menu/OpenMenu/style/index.less

@@ -1,10 +1,6 @@
 .pro-layout-open-menu {
   color: #fff;
 
-  .@{ant-prefix}-menu-root > .@{ant-prefix}-menu-submenu > .@{ant-prefix}-menu > .@{ant-prefix}-menu-item-only-child  {
-    padding-left: 16px !important;
-  }
-
   .@{ant-prefix}-menu-root {
     overflow-y: auto !important;
 
@@ -16,17 +12,12 @@
     & > .@{ant-prefix}-menu-submenu {
       .@{ant-prefix}-menu-sub {
         background: #1a202d;
-        .@{ant-prefix}-menu-submenu.@{ant-prefix}-menu-submenu-inline{
-          .@{ant-prefix}-menu-submenu-title{
-            padding-left: 16px !important;
-          }
-        }
       }
 
       & > .@{ant-prefix}-menu-sub > .@{ant-prefix}-menu-submenu > .@{ant-prefix}-menu-submenu-title,
       & > .@{ant-prefix}-menu-item-only-child,
       & > .@{ant-prefix}-menu-sub > .@{ant-prefix}-menu-item-only-child {
-        padding-left: 16px;
+        padding-left: 16px !important;
       }
     }
 
@@ -48,7 +39,7 @@
     }
 
     .@{ant-prefix}-menu-item {
-      padding-left: 24px !important;
+      padding-left: 30px !important;
 
       &::after {
         display: none;
@@ -101,7 +92,7 @@
     height: auto !important;
     min-height: 48px;
     margin: 0;
-    padding: 8px 0;
+    padding: 12px 0;
     line-height: initial !important;
     white-space: pre-wrap;
   }

package/lib/ProLayout/components/Layout/Menu/SideMenu/index.js

@@ -1,6 +1,5 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -10,6 +9,7 @@ var _classnames = _interopRequireDefault(require("classnames"));
 var _ahooks = require("ahooks");
 var _OpenMenu = _interopRequireDefault(require("../OpenMenu"));
 var _jsxRuntime = require("react/jsx-runtime");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 var SideMenu = props => {
   var dataSource = props.dataSource,
     onMenuClick = props.onMenuClick;

package/lib/ProLayout/components/Layout/Menu/index.js

@@ -1,6 +1,5 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -9,6 +8,7 @@ var _classnames = _interopRequireDefault(require("classnames"));
 var _OpenMenu = _interopRequireDefault(require("./OpenMenu"));
 var _FoldMenu = _interopRequireDefault(require("./FoldMenu"));
 var _jsxRuntime = require("react/jsx-runtime");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 // 折叠后菜单
 
 var Menu = props => {