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

package/es/ProIcon/index.js

@@ -1,7 +1,17 @@
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 var _excluded = ["type", "onClick", "size", "color", "className", "style", "spin", "rotate", "theme", "disabled", "mode", "buttonProps", "children", "mapList", "src", "actionMap", "tooltip", "buttonIcon"];
+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); }
 import { useLocalStorageState, useSetState, useDeepCompareLayoutEffect } from 'ahooks';
 import { Button, Tooltip, Space } from 'antd';
 import classNames from 'classnames';

package/es/ProIcon/utils/index.js

@@ -1,4 +1,8 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+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); }
 import { themeMap, themeFillMap } from "../config";
 export var recurseGetNodes = (type, node, queue) => {
   switch (type) {

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

@@ -1,14 +1,19 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+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); }
 import { useContext } from 'react';
 import { Popover, Tooltip } from 'antd';
 import classnames from 'classnames';
-import { useHistory } from 'react-router-dom';
+import { Link as RouterLink } from 'react-router-dom';
 import { Icon } from "../../index";
 import SideMenu from "../SideMenu";
 import { LayoutContext } from "../../../../index";
 import { getUrlParams, getPathNameKey, findMenuItemByKey } from "../../../../utils";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
+var Link = RouterLink;
 var FoldMenu = props => {
   var style = props.style,
     dataSource = props.dataSource,
@@ -19,22 +24,24 @@ var FoldMenu = props => {
     collapsed = dataSource.collapsed,
     headerHeight = dataSource.headerHeight;
   var pathNamePrefix = `/${window.location.pathname.split('/')[1]}`;
-  var history = useHistory();
   var noticeCls = classnames({
     'pro-layout-menu-tooltip': true,
     'pro-layout-menu-tooltip-has-notice': notice,
     'pro-layout-menu-tooltip-nav-open': collapsed
   });
-  var _useContext = useContext(LayoutContext),
-    selectedPath = _useContext.selectedPath,
-    onSelected = _useContext.onSelected;
+  var _ref = useContext(LayoutContext) || {
+      selectedPath: '',
+      onSelected: () => {}
+    },
+    selectedPath = _ref.selectedPath,
+    onSelected = _ref.onSelected;
   return /*#__PURE__*/_jsx("div", {
     className: "pro-layout-menu-fold",
     style: _objectSpread({}, style),
     children: /*#__PURE__*/_jsx("ul", {
       className: "pro-layout-menu-fold-list",
       style: _objectSpread({}, style),
-      children: menus.map((item, index) => {
+      children: menus.filter(item => !item.hideInMenu).map((item, index) => {
         var _url$split;
         var id = item.id,
           url = item.url,
@@ -42,20 +49,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 = getUrlParams('activeMenu');
+        var pathToMatch = selectedPath || selectedMenu || window.location.pathname;
 
         // 取第一级
         var currentKeyIdPath = getPathNameKey({
           menus,
-          pathName: selectedMenu || selectedPath || window.location.pathname // 优先匹配URL中定位菜单
+          pathName: pathToMatch // 优先匹配上下文路径
         }) || [];
         var cls = classnames({
           active: currentKeyIdPath.includes(id)
@@ -80,7 +82,7 @@ var FoldMenu = props => {
               children: name
             })]
           })
-        }, `${id}-${name}`);
+        });
         return hasChildrenMenu ? /*#__PURE__*/_jsx(Popover, {
           mouseEnterDelay: 0,
           content: /*#__PURE__*/_jsx(SideMenu, {
@@ -94,7 +96,7 @@ var FoldMenu = props => {
             root: noticeCls
           },
           styles: {
-            body: {
+            content: {
               marginTop: headerHeight - 48,
               height: `calc(100vh - ${headerHeight + (notice ? 32 : 0)}px)`
             }
@@ -114,11 +116,6 @@ var FoldMenu = props => {
                   keyPath: menuKeyPath
                 });
               }
-
-              // 导航到目标路径
-              if (toPath) {
-                history.push(toPath);
-              }
             },
             children: LiNode
           })
@@ -139,18 +136,16 @@ var FoldMenu = props => {
                   keyPath: menuKeyPath
                 });
               }
-
-              // 导航到目标路径
-              if (toPath) {
-                history.push(toPath);
-              }
               onSelected({
                 selectedPath: toPath
               });
             },
-            children: LiNode
+            children: /*#__PURE__*/_jsx(Link, {
+              to: toPath,
+              children: LiNode
+            })
           })
-        }, toPath) : /*#__PURE__*/_jsx("span", {
+        }, `${id}-${name}`) : /*#__PURE__*/_jsx("span", {
           onClick: () => {
             // 查找完整的菜单项数据
             var menuItem = findMenuItemByKey(menus, String(id));
@@ -164,14 +159,12 @@ var FoldMenu = props => {
                 keyPath: menuKeyPath
               });
             }
-
-            // 导航到目标路径
-            if (toPath) {
-              history.push(toPath);
-            }
           },
-          children: LiNode
-        });
+          children: /*#__PURE__*/_jsx(Link, {
+            to: toPath,
+            children: LiNode
+          })
+        }, `${id}-${name}`);
       })
     })
   });

package/es/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/es/ProLayout/components/Layout/Menu/OpenMenu/index.js

@@ -1,17 +1,24 @@
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+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; }
 import { useMemo, useRef, useContext } from 'react';
 import { Menu } from 'antd';
 import { useDeepCompareEffect, useSetState } from 'ahooks';
 import { CaretDownOutlined } from '@ant-design/icons';
 import classnames from 'classnames';
-import { useHistory } from 'react-router-dom';
+import { Link as RouterLink } from 'react-router-dom';
 import { cloneDeep } from 'lodash';
 import { LayoutContext } from "../../../../index";
 import { getIdsByPathName, findMenuItemByKey } from "../../../../utils";
+import { isLeafMenuItem } from "../../../TabsManager/utils";
 import { Icon } from "../../index";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
+var Link = RouterLink;
 var OpenMenu = props => {
   var _getIdsByPathName;
   var className = props.className,
@@ -24,7 +31,6 @@ var OpenMenu = props => {
     menus = _ref.menus,
     sideMenu = _ref.sideMenu;
   var linkRef = useRef(null);
-  var history = useHistory();
   // 通过URL匹配对应的ID用于回显
   var _useSetState = useSetState({
       selectedKeys: [],
@@ -38,16 +44,19 @@ var OpenMenu = props => {
     router = _useSetState2$.router,
     setState = _useSetState2[1];
   var query = new URLSearchParams(window.location.search);
-  var _useContext = useContext(LayoutContext),
-    onSelected = _useContext.onSelected,
-    target = _useContext.target;
+  var layoutContext = useContext(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 = classnames({
     'pro-layout-open-menu': true,
     [`${className}`]: className
   });
 
-  // 默认激活菜单优先取activeMenu中，默认取pathName进行匹配
-  var selectKeyIdPath = ((_getIdsByPathName = 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 = getIdsByPathName(menus, preferredPath)) === null || _getIdsByPathName === void 0 ? void 0 : _getIdsByPathName.map(item => String(item))) || [] : [];
   var itemsTransform = useMemo(() => {
     var result = cloneDeep(menus);
     if (!Array.isArray(result) || !result.length) {
@@ -74,7 +83,7 @@ var OpenMenu = props => {
             }) : /*#__PURE__*/_jsx("span", {
               className: classnames({
                 'pro-layout-icon': true,
-                'pro-layout-icon-empty': isFirstMenu || !item.icon && !item.imgUrl
+                'pro-layout-icon-empty': isFirstMenu
               })
             })
           }), /*#__PURE__*/_jsx("h2", {
@@ -104,11 +113,14 @@ var OpenMenu = props => {
     return result;
   }, [dataSource]);
   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]);
 
@@ -121,10 +133,10 @@ var OpenMenu = props => {
       });
     }
   }, [sideMenu]);
-  return /*#__PURE__*/_jsx("div", {
+  return /*#__PURE__*/_jsxs("div", {
     className: cls,
     style: style,
-    children: /*#__PURE__*/_jsx(Menu, {
+    children: [/*#__PURE__*/_jsx(Menu, {
       mode: "inline"
       // @ts-ignore
       ,
@@ -140,7 +152,6 @@ var OpenMenu = props => {
         });
       },
       onClick: _ref2 => {
-        var _item$props, _item$props2;
         var item = _ref2.item,
           keyPath = _ref2.keyPath,
           key = _ref2.key,
@@ -162,30 +173,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 && 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__*/_jsx(Link, {
+      to: router,
+      ref: linkRef
+    })]
   });
 };
 export default OpenMenu;

package/es/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/es/ProLayout/components/Layout/Notice/style/index.less

@@ -19,6 +19,10 @@
       width       : 16px;
       margin-right: var(--zaui-space-size-sm, 8px);
     }
+    a {
+      color: var(--zaui-brand, #006aff);
+      text-decoration: none;
+    }
 
     .pro-layout-header-notice-close {
       position: absolute;

package/es/ProLayout/components/ProCollapse/index.js

@@ -1,4 +1,8 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+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); }
 import { useLayoutEffect } from 'react';
 import { Collapse, Descriptions, Space } from 'antd';
 import { CaretRightOutlined } from '@ant-design/icons';

package/es/ProLayout/components/ProCollapse/style/index.less

@@ -35,7 +35,7 @@
     border-radius: 8px !important;
   }
 
-  .@{ant-prefix}-collapse-header-text {
+  .@{ant-prefix}-collapse-title {
     color: var(--zaui-text, #343434);
     font-weight: 500;
     font-size: var(--zaui-font-size-lg, 16px);
@@ -48,12 +48,12 @@
   &.@{ant-prefix}-collapse-borderless
     .@{ant-prefix}-collapse-item
     > .@{ant-prefix}-collapse-content
-    > .@{ant-prefix}-collapse-content-box {
+    > .@{ant-prefix}-collapse-body {
     padding: 0;
   }
 
-  .@{ant-prefix}-collapse-content-box {
-    padding: 0;
+  .@{ant-prefix}-collapse-body {
+    padding: 0 !important;
 
     .pro-collapse-content {
       padding: var(--zaui-space-size-md, 16px);
@@ -72,7 +72,7 @@
       padding: 0 !important;
       background: var(--zaui-base-bg, #ffffff);
 
-      .@{ant-prefix}-collapse-header-text {
+      .@{ant-prefix}-collapse-title {
         position: relative;
         padding-left: 15px;
         font-size: var(--zaui-font-size, 14px);
@@ -219,7 +219,7 @@
         &:hover{
           background: #fff !important;
         }
-        .@{ant-prefix}-collapse-header-text {
+        .@{ant-prefix}-collapse-title {
           &:before{
             display: block;
           }
@@ -233,7 +233,7 @@
         }
       }
       .@{ant-prefix}-collapse-content{
-        .@{ant-prefix}-collapse-content-box{
+        .@{ant-prefix}-collapse-body{
           .pro-collapse-content{
             padding: var(--zaui-space-size-sm, 8px) 0 !important;
           }
@@ -274,7 +274,7 @@
       margin: 0 !important;
       border-bottom: none !important;
 
-      .@{ant-prefix}-collapse-header-text {
+      .@{ant-prefix}-collapse-title {
         font-size: var(--zaui-font-size, 14px);
         font-weight: 500;
         color: var(--zaui-text, #343434);
@@ -293,7 +293,7 @@
     }
 
     .@{ant-prefix}-collapse-content {
-      .@{ant-prefix}-collapse-content-box {
+      .@{ant-prefix}-collapse-body {
         .pro-collapse-content {
           padding: var(--zaui-space-size-md, 16px) !important;
           background: var(--zaui-base-bg, #ffffff);

package/es/ProLayout/components/ProFooter/index.js

@@ -1,4 +1,8 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+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); }
 import { useSize } from 'ahooks';
 import { Space } from 'antd';
 import classnames from 'classnames';
@@ -10,7 +14,7 @@ var ProFooter = props => {
     className = props.className,
     children = props.children,
     _props$zIndex = props.zIndex,
-    zIndex = _props$zIndex === void 0 ? 98 : _props$zIndex,
+    zIndex = _props$zIndex === void 0 ? 99 : _props$zIndex,
     _props$sideDom = props.sideDom,
     sideDom = _props$sideDom === void 0 ? '.pro-layout-sider-nav' : _props$sideDom,
     _props$contentDom = props.contentDom,

package/es/ProLayout/components/ProHeader/index.js

@@ -1,7 +1,17 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 var _excluded = ["width"];
+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); }
+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 _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; }
 /* eslint-disable react/no-array-index-key */
 import { Space, Divider, Breadcrumb, Tooltip, Modal } from 'antd';
 import React, { memo, useEffect, useState, useRef } from 'react';
@@ -281,7 +291,7 @@ var ProHeader = props => {
   var actionsRender = () => {
     if (Array.isArray(actionRender) && actionRender.length) {
       return /*#__PURE__*/_jsx(Space, {
-        split: /*#__PURE__*/_jsx(Divider, {
+        separator: /*#__PURE__*/_jsx(Divider, {
           type: "vertical"
         }),
         children: actionRender.map((item, index) => {

package/es/ProLayout/components/TabsManager/components/TabContextMenu.d.ts

@@ -0,0 +1,7 @@
+import { TabContextMenuProps } from '../propTypes';
+/**
+ * 右键菜单组件 - 兼容Antd 4.x和5.x
+ */
+declare function TabContextMenu({ tabId, children, closable, onClose, onCloseOthers, onCloseRight, onCloseAll, menuItems: customMenuItems, tabMenuClick, tab, tabs, }: TabContextMenuProps): import("react/jsx-runtime").JSX.Element;
+export default TabContextMenu;
+export { TabContextMenu };