@zat-design/sisyphus-react 3.14.0-beta.2 → 4.0.0-beta.10

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

@@ -1,5 +1,3 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
 
 .pro-collapse {
   .pro-collapse-icon{
@@ -33,7 +31,8 @@
   .@{ant-prefix}-collapse-header {
     align-items: center !important;
     padding: 10px var(--zaui-space-size-md, 16px) !important;
-    background: var(--zaui-area, #fafafa);
+    background: #e4f2fe;
+    border-radius: 8px !important;
   }
 
   .@{ant-prefix}-collapse-header-text {
@@ -111,6 +110,7 @@
         padding: 0 8px 6px !important;
         border-bottom: 1px solid #dee0e3;
         margin: 0 -8px;
+        border-radius: 0 !important;
         .@{ant-prefix}-collapse-arrow{
           right: 8px;
         }
@@ -118,7 +118,7 @@
 
       .@{ant-prefix}-collapse-extra {
         .extra-info {
-          margin-right: var(--zaui-space-size-lg, 32px);
+          margin-right: 4px;
         }
       }
     }
@@ -306,6 +306,7 @@
       .@{ant-prefix}-collapse-expand-icon {
         display: block !important;
         color: #999;
+        margin-right: 8px;
       }
       
       .@{ant-prefix}-collapse-header {

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

@@ -5,10 +5,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("antd/es/space/style");
-var _space = _interopRequireDefault(require("antd/es/space"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _ahooks = require("ahooks");
+var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _react = require("react");
 var _jsxRuntime = require("react/jsx-runtime");
@@ -48,7 +47,7 @@ var ProFooter = props => {
       zIndex,
       width: `calc(100% - ${size === null || size === void 0 ? void 0 : size.width}px)`
     }, props.style),
-    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_space.default, {
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Space, {
       children: children
     })
   });

package/lib/ProLayout/components/ProFooter/style/index.less

@@ -1,5 +1,3 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
 
 .pro-footer {
   position: fixed;

package/lib/ProLayout/components/ProHeader/components/Copy/index.js

@@ -5,14 +5,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("antd/es/typography/style");
-var _typography = _interopRequireDefault(require("antd/es/typography"));
+var _antd = require("antd");
 var _reactSvg = require("react-svg");
 var _icons = require("@ant-design/icons");
 var _copy = _interopRequireDefault(require("../../../../../assets/copy.svg"));
 var _locale = _interopRequireDefault(require("../../../../../locale"));
 var _jsxRuntime = require("react/jsx-runtime");
-var Paragraph = _typography.default.Paragraph;
+var Paragraph = _antd.Typography.Paragraph;
 var Copy = _ref => {
   var text = _ref.text;
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(Paragraph, {

package/lib/ProLayout/components/ProHeader/components/ProBackBtn/index.js

@@ -5,9 +5,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("antd/es/button/style");
-var _button = _interopRequireDefault(require("antd/es/button"));
 var _icons = require("@ant-design/icons");
+var _antd = require("antd");
 var _locale = _interopRequireDefault(require("../../../../../locale"));
 var _jsxRuntime = require("react/jsx-runtime");
 /**
@@ -25,7 +24,7 @@ var _jsxRuntime = require("react/jsx-runtime");
       window.history.back();
     }
   };
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.default, {
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Button, {
     icon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_icons.ArrowLeftOutlined, {}),
     className: "back-button-container",
     onClick: handleClick,

package/lib/ProLayout/components/ProHeader/components/ProBackBtn/style/index.less

@@ -1,24 +1,22 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
 
 .back-button-container {
   &.@{ant-prefix}-btn {
     color      : var(--zaui-text);
     font-weight: 400;
-    background : var(--zaui-disabled-bg);
-    border     : none;
+    background : var(--zaui-disabled-bg) !important;
+    border     : none !important;
 
     &:hover {
-      color     : var(--zaui-aide-text);
-      background: var(--zaui-disabled-bg);
-      border    : none;
+      color     : var(--zaui-aide-text) !important;
+      background: var(--zaui-disabled-bg) !important;
+      border    : none !important;
     }
 
     &:active,
     &:focus {
-      color      : var(--zaui-text);
+      color      : var(--zaui-text) !important;
       font-weight: 400;
-      background : var(--zaui-disabled-bg);
+      background : var(--zaui-disabled-bg) !important;
     }
   }
 }

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

@@ -1,27 +1,19 @@
 "use strict";
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-require("antd/es/modal/style");
-var _modal = _interopRequireDefault(require("antd/es/modal"));
-require("antd/es/breadcrumb/style");
-var _breadcrumb = _interopRequireDefault(require("antd/es/breadcrumb"));
-require("antd/es/divider/style");
-var _divider = _interopRequireDefault(require("antd/es/divider"));
-require("antd/es/tooltip/style");
-var _tooltip = _interopRequireDefault(require("antd/es/tooltip"));
-require("antd/es/space/style");
-var _space = _interopRequireDefault(require("antd/es/space"));
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _antd = require("antd");
 var _react = _interopRequireWildcard(require("react"));
 var _utils = require("@zat-design/utils");
 var _classnames = _interopRequireDefault(require("classnames"));
-var _moment3 = _interopRequireDefault(require("moment"));
+var _dayjs3 = _interopRequireDefault(require("dayjs"));
 var _ahooks = require("ahooks");
 var _lodash = require("lodash");
 var _reactSvg = require("react-svg");
@@ -31,16 +23,12 @@ var _getEnumLabel = _interopRequireDefault(require("../../../ProEnum/utils/getEn
 var _locale = _interopRequireDefault(require("../../../locale"));
 var _utils2 = require("./utils");
 var _jsxRuntime = require("react/jsx-runtime");
+var _excluded = ["width"];
 /* eslint-disable react/no-array-index-key */
-
 var formatAmount = _utils.tools.formatAmount;
 var ProHeader = props => {
-  var _props$breadcrumbList = props.breadcrumbList,
-    breadcrumbList = _props$breadcrumbList === void 0 ? [] : _props$breadcrumbList,
-    breadcrumbColumns = props.breadcrumbColumns,
+  var breadcrumbColumns = props.breadcrumbColumns,
     actionRender = props.actionRender,
-    _props$describeList = props.describeList,
-    describeList = _props$describeList === void 0 ? [] : _props$describeList,
     describeColumns = props.describeColumns,
     subDescribeColumns = props.subDescribeColumns,
     onBack = props.onBack,
@@ -53,7 +41,7 @@ var ProHeader = props => {
     _props$showShadow = props.showShadow,
     showShadow = _props$showShadow === void 0 ? false : _props$showShadow,
     _props$zIndex = props.zIndex,
-    zIndex = _props$zIndex === void 0 ? 100 : _props$zIndex,
+    zIndex = _props$zIndex === void 0 ? 98 : _props$zIndex,
     title = props.title,
     _props$autoBack = props.autoBack,
     autoBack = _props$autoBack === void 0 ? 2 : _props$autoBack,
@@ -77,10 +65,10 @@ var ProHeader = props => {
   var _title = title;
 
   // 面包屑配置数据源
-  var _breadcrumbColumns = breadcrumbColumns || breadcrumbList;
+  var _breadcrumbColumns = breadcrumbColumns || [];
 
   // 次级配置数据源
-  var _subDescribeColumns = subDescribeColumns || describeList;
+  var _subDescribeColumns = subDescribeColumns || [];
   (0, _react.useEffect)(() => {
     if (bodyOverFlowHidden) {
       var bodyElement = document.querySelector('body');
@@ -130,7 +118,7 @@ var ProHeader = props => {
         var onlyTag = tag && !label && !value;
         var tagRender = params => {
           if (Array.isArray(params === null || params === void 0 ? void 0 : params.tag) && params !== null && params !== void 0 && params.tag.length) {
-            return /*#__PURE__*/(0, _jsxRuntime.jsx)(_space.default, {
+            return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Space, {
               size: 4,
               children: params.tag.map((tagItem, index) => {
                 return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
@@ -148,7 +136,7 @@ var ProHeader = props => {
 
         /** 单行渲染 */
         var valueRender = params => {
-          return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_space.default, {
+          return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Space, {
             size: 4,
             align: params !== null && params !== void 0 && params.tag ? 'baseline' : 'center',
             children: [params !== null && params !== void 0 && params.link ?
@@ -196,9 +184,11 @@ var ProHeader = props => {
                 }, index);
               })
             });
-            return /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.default, {
+            return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Tooltip, {
               placement: "bottomLeft",
-              overlayClassName: "pro-header-describe-items-tip",
+              classNames: {
+                root: 'pro-header-describe-items-tip'
+              },
               title: tipResult,
               children: result
             });
@@ -214,7 +204,7 @@ var ProHeader = props => {
           style: {
             width
           },
-          children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_space.default, {
+          children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Space, {
             size: 4,
             children: [label ? /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
               className: "pro-header-describe-label",
@@ -240,7 +230,7 @@ var ProHeader = props => {
    * 次级描述数据渲染
    */
   var subDescribeRender = describeData => {
-    var _moment, _moment2;
+    var _dayjs, _dayjs2;
     var value = describeData.value,
       type = describeData.type,
       valueType = describeData.valueType,
@@ -271,11 +261,11 @@ var ProHeader = props => {
         break;
       case 'date':
         // 年月日
-        result = value ? (_moment = (0, _moment3.default)(value)) === null || _moment === void 0 ? void 0 : _moment.format('YYYY-MM-DD') : '-';
+        result = value ? (_dayjs = (0, _dayjs3.default)(value)) === null || _dayjs === void 0 ? void 0 : _dayjs.format('YYYY-MM-DD') : '-';
         break;
       case 'dateTime':
         // 年月日 时分秒
-        result = value ? (_moment2 = (0, _moment3.default)(value)) === null || _moment2 === void 0 ? void 0 : _moment2.format('YYYY-MM-DD HH:mm:ss') : '-';
+        result = value ? (_dayjs2 = (0, _dayjs3.default)(value)) === null || _dayjs2 === void 0 ? void 0 : _dayjs2.format('YYYY-MM-DD HH:mm:ss') : '-';
         break;
       default:
         result = String(value).includes('undefined') || !value ? '-' : value;
@@ -296,8 +286,8 @@ var ProHeader = props => {
    */
   var actionsRender = () => {
     if (Array.isArray(actionRender) && actionRender.length) {
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_space.default, {
-        split: /*#__PURE__*/(0, _jsxRuntime.jsx)(_divider.default, {
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Space, {
+        split: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Divider, {
           type: "vertical"
         }),
         children: actionRender.map((item, index) => {
@@ -325,7 +315,7 @@ var ProHeader = props => {
    */
   var breadcrumbRender = () => {
     if (Array.isArray(_breadcrumbColumns) && !_breadcrumbColumns.length) {
-      return '';
+      return [];
     }
     var list = _breadcrumbColumns === null || _breadcrumbColumns === void 0 ? void 0 : _breadcrumbColumns.filter(item => {
       return item.type === 'breadcrumb';
@@ -338,7 +328,7 @@ var ProHeader = props => {
         tag = item.tag;
       var tagRender = () => {
         if (Array.isArray(tag) && tag.length) {
-          return /*#__PURE__*/(0, _jsxRuntime.jsx)(_space.default, {
+          return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Space, {
             size: 8,
             children: tag.map((tagItem, index) => {
               return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
@@ -356,19 +346,20 @@ var ProHeader = props => {
 
       // show或者值不存在为false直接隐藏¸
       if (!show || !value) {
-        return '';
+        return null;
       }
       // 判断第一层dom节点为空
       if (value !== null && value !== void 0 && value.type && !(value !== null && value !== void 0 && (_value$props = value.props) !== null && _value$props !== void 0 && _value$props.children)) {
-        return '';
+        return null;
       }
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_breadcrumb.default.Item, {
-        children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_space.default, {
+      return {
+        key: index,
+        title: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Space, {
           size: 4,
           children: [value, " ", tagRender()]
         })
-      }, index);
-    });
+      };
+    }).filter(Boolean); // 过滤掉null值
   };
 
   /**
@@ -420,7 +411,7 @@ var ProHeader = props => {
             style: {
               width
             },
-            children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_space.default, {
+            children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Space, {
               size: 4,
               children: [val, " ", tag ? /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
                 className: "pro-header-tag",
@@ -430,7 +421,7 @@ var ProHeader = props => {
           });
           if (type === 'copy') {
             return valRender = /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-              children: [width ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.default, {
+              children: [width ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Tooltip, {
                 title: val,
                 children: valRender
               }) : valRender, /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Copy, {
@@ -439,7 +430,7 @@ var ProHeader = props => {
             });
           }
           if (width) {
-            return /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.default, {
+            return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Tooltip, {
               title: val,
               children: valRender
             });
@@ -486,14 +477,20 @@ var ProHeader = props => {
       }
       return false;
     }
-    _modal.default.confirm((0, _objectSpread2.default)({
+    // 处理 Modal.confirm 的 width 类型兼容性问题
+    var _ref = isConfirmBackModalProps || {},
+      width = _ref.width,
+      restModalProps = (0, _objectWithoutProperties2.default)(_ref, _excluded);
+    _antd.Modal.confirm((0, _objectSpread2.default)((0, _objectSpread2.default)({
       title: `${_locale.default.ProHeader.confirmTitle}`,
       okText: `${_locale.default.ProHeader.confirm}`,
       cancelText: `${_locale.default.ProHeader.cancel}`,
       onOk: () => {
         onBack && onBack();
       }
-    }, isConfirmBackModalProps));
+    }, width && (typeof width === 'string' || typeof width === 'number') ? {
+      width
+    } : {}), restModalProps));
   };
   return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
     className: cls,
@@ -512,13 +509,13 @@ var ProHeader = props => {
             'pro-header-left': true,
             'pro-header-left-space': !backState
           }),
-          children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_space.default, {
+          children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Space, {
             size: backState ? 4 : 0,
             children: [backState ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.ProBackBtn, {
               onBack: onConfirm
-            }) : null, /*#__PURE__*/(0, _jsxRuntime.jsx)(_breadcrumb.default, {
+            }) : null, /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Breadcrumb, {
               separator: ">",
-              children: breadcrumbRender()
+              items: breadcrumbRender()
             }), infoRender()]
           })
         }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {

package/lib/ProLayout/components/ProHeader/style/index.less

@@ -1,5 +1,3 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
 @import '../components/ProBackBtn/style/index';
 
 .pro-header {

package/lib/ProLayout/components/TabsManager/components/TabContextMenu.js

@@ -6,10 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.TabContextMenu = TabContextMenu;
 exports.default = void 0;
-require("antd/es/dropdown/style");
-var _dropdown = _interopRequireDefault(require("antd/es/dropdown"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
+var _antd = require("antd");
 var _jsxRuntime = require("react/jsx-runtime");
 /**
  * 右键菜单组件 - 兼容Antd 4.x和5.x
@@ -85,7 +84,7 @@ function TabContextMenu(_ref) {
   var menuItems = customMenuItems && customMenuItems.length > 0 ? [...defaultMenuItems, {
     type: 'divider'
   }, ...customMenuItems] : defaultMenuItems;
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_dropdown.default, {
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Dropdown, {
     menu: {
       items: menuItems,
       onClick: _ref2 => {

package/lib/ProLayout/components/TabsManager/hooks/useTabsState.js

@@ -198,7 +198,6 @@ var useTabsState = options => {
 
         // 直接调用 onTabChange，因为 useEffect 会被跳过
         if (finalConfig.onTabChange) {
-          console.log('[useTabsState] removeTab: Calling onTabChange with empty state');
           setTimeout(() => {
             finalConfig.onTabChange('', undefined, []);
           }, 0);
@@ -286,7 +285,6 @@ var useTabsState = options => {
 
       // 如果关闭后没有标签页了，直接调用 onTabChange
       if (newTabs.length === 0 && finalConfig.onTabChange) {
-        console.log('[useTabsState] closeAllTabs: Calling onTabChange with empty state');
         setTimeout(() => {
           finalConfig.onTabChange('', undefined, []);
         }, 0);

package/lib/ProLayout/index.js

@@ -18,9 +18,8 @@ Object.defineProperty(exports, "useProLayoutTabs", {
   }
 });
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-require("antd/es/message/style");
-var _message2 = _interopRequireDefault(require("antd/es/message"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _antd = require("antd");
 var _react = require("react");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _ahooks = require("ahooks");
@@ -45,9 +44,12 @@ var ProLayout = props => {
   var children = props.children,
     _props$className = props.className,
     className = _props$className === void 0 ? '' : _props$className,
-    pure = props.pure,
-    headerHeight = props.headerHeight,
-    contentStyle = props.contentStyle,
+    _props$pure = props.pure,
+    pure = _props$pure === void 0 ? false : _props$pure,
+    _props$headerHeight = props.headerHeight,
+    headerHeight = _props$headerHeight === void 0 ? 48 : _props$headerHeight,
+    _props$contentStyle = props.contentStyle,
+    contentStyle = _props$contentStyle === void 0 ? {} : _props$contentStyle,
     _props$waterMarkProps = props.waterMarkProps,
     waterMarkProps = _props$waterMarkProps === void 0 ? {} : _props$waterMarkProps,
     headerNotice = props.headerNotice,
@@ -55,10 +57,21 @@ var ProLayout = props => {
     dataSource = props.dataSource,
     _props$pathPrefix = props.pathPrefix,
     pathPrefix = _props$pathPrefix === void 0 ? '' : _props$pathPrefix,
-    theme = props.theme,
+    _props$theme = props.theme,
+    theme = _props$theme === void 0 ? 'dark' : _props$theme,
     target = props.target,
     onCollapsedChange = props.onCollapsedChange,
+    _props$collapsed = props.collapsed,
+    propsCollapsed = _props$collapsed === void 0 ? false : _props$collapsed,
     onMenuClick = props.onMenuClick,
+    headerTitleRender = props.headerTitleRender,
+    headerContentRender = props.headerContentRender,
+    rightContentRender = props.rightContentRender,
+    title = props.title,
+    logo = props.logo,
+    iconfontUrl = props.iconfontUrl,
+    sideMenuFooterRender = props.sideMenuFooterRender,
+    sideMenuHeaderRender = props.sideMenuHeaderRender,
     _props$mode = props.mode,
     mode = _props$mode === void 0 ? 'normal' : _props$mode,
     tabs = props.tabs;
@@ -87,7 +100,7 @@ var ProLayout = props => {
   }, [props.collapsed]);
   (0, _ahooks.useDeepCompareEffect)(() => {
     if (Array.isArray(dataSource) && !dataSource.length) {
-      return _message2.default.warning('Warning: Missing menu data source, or menu data source is not an array');
+      return _antd.message.warning('Warning: Missing menu data source, or menu data source is not an array');
     }
     var userData = (0, _utils.transformMenus)(dataSource, pathPrefix);
     // 确保 menus 始终是一个数组
@@ -99,24 +112,6 @@ var ProLayout = props => {
   var menuDataSource = (0, _react.useMemo)(() => Array.isArray(menus) ? {
     menus
   } : menus, [menus]);
-  var handleMenuClick = (0, _react.useCallback)(params => {
-    if (isTabsLayout) {
-      var _tabsManagerRef$curre, _tabsManagerRef$curre2;
-      // 只有最后一级菜单（叶子节点）才设置选中路径
-      if (params.item && (0, _utils2.isLeafMenuItem)(params.item)) {
-        var _params$item, _params$item2, _params$item3;
-        var targetPath = ((_params$item = params.item) === null || _params$item === void 0 ? void 0 : _params$item.url) || ((_params$item2 = params.item) === null || _params$item2 === void 0 ? void 0 : _params$item2.redirectUrl) || ((_params$item3 = params.item) === null || _params$item3 === void 0 ? void 0 : _params$item3.router);
-        if (targetPath && targetPath !== selectedPath) {
-          setState({
-            selectedPath: targetPath
-          });
-        }
-      }
-      (_tabsManagerRef$curre = tabsManagerRef.current) === null || _tabsManagerRef$curre === void 0 || (_tabsManagerRef$curre2 = _tabsManagerRef$curre.handleMenuClick) === null || _tabsManagerRef$curre2 === void 0 || _tabsManagerRef$curre2.call(_tabsManagerRef$curre, params);
-      return;
-    }
-    onMenuClick === null || onMenuClick === void 0 || onMenuClick(params);
-  }, [isTabsLayout, onMenuClick, selectedPath, setState]);
   var enhancedTabsConfig = (0, _react.useMemo)(() => {
     if (!isTabsLayout || !tabs) {
       return tabs;
@@ -140,7 +135,7 @@ var ProLayout = props => {
         (_tabs$onTabChange = tabs.onTabChange) === null || _tabs$onTabChange === void 0 || _tabs$onTabChange.call(tabs, activeKey, activeTab, allTabs);
       }
     });
-  }, [isTabsLayout, tabs, selectedPath, setState]);
+  }, [isTabsLayout, tabs, selectedPath]);
   var renderContent = () => {
     if (!isTabsLayout || !enhancedTabsConfig) {
       return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
@@ -155,6 +150,24 @@ var ProLayout = props => {
       children: children
     });
   };
+  var handleMenuClick = (0, _react.useCallback)(params => {
+    if (isTabsLayout) {
+      var _tabsManagerRef$curre, _tabsManagerRef$curre2;
+      // 只有最后一级菜单（叶子节点）才设置选中路径
+      if (params.item && (0, _utils2.isLeafMenuItem)(params.item)) {
+        var _params$item, _params$item2, _params$item3;
+        var targetPath = ((_params$item = params.item) === null || _params$item === void 0 ? void 0 : _params$item.url) || ((_params$item2 = params.item) === null || _params$item2 === void 0 ? void 0 : _params$item2.redirectUrl) || ((_params$item3 = params.item) === null || _params$item3 === void 0 ? void 0 : _params$item3.router);
+        if (targetPath && targetPath !== selectedPath) {
+          setState({
+            selectedPath: targetPath
+          });
+        }
+      }
+      (_tabsManagerRef$curre = tabsManagerRef.current) === null || _tabsManagerRef$curre === void 0 || (_tabsManagerRef$curre2 = _tabsManagerRef$curre.handleMenuClick) === null || _tabsManagerRef$curre2 === void 0 || _tabsManagerRef$curre2.call(_tabsManagerRef$curre, params);
+      return;
+    }
+    onMenuClick === null || onMenuClick === void 0 || onMenuClick(params);
+  }, [isTabsLayout, onMenuClick, selectedPath, setState]);
 
   /**
    * 关闭提示框
@@ -172,6 +185,44 @@ var ProLayout = props => {
     'pro-layout-row-left-pure': typeof pure !== 'boolean' && pure.leftMenu
   });
   var noticeHeight = notice ? 32 : 0;
+
+  // 为Header组件创建专门的props对象
+  var headerProps = {
+    headerHeight,
+    pure,
+    headerTitleRender,
+    headerContentRender,
+    rightContentRender,
+    title,
+    logo
+  };
+
+  // 为Notice组件创建专门的props对象
+  var noticeProps = {
+    headerHeight,
+    notice,
+    onCancel: onCancelNotice
+  };
+
+  // 为Menu组件创建专门的props对象
+  var menuProps = {
+    headerHeight,
+    dataSource: Array.isArray(menus) ? {
+      menus
+    } : menus,
+    iconfontUrl,
+    collapsed,
+    notice,
+    onToggle: () => {
+      toggle();
+      onCollapsedChange && onCollapsedChange(!collapsed);
+    },
+    pure,
+    theme,
+    sideMenuFooterRender,
+    sideMenuHeaderRender,
+    onMenuClick: handleMenuClick
+  };
   var layoutDom = /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
     className: (0, _classnames.default)({
       'pro-layout': true,
@@ -179,21 +230,9 @@ var ProLayout = props => {
       'pro-layout-light': theme === 'light',
       [`${className}`]: className
     }),
-    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_index2.Header, (0, _objectSpread2.default)({}, props)), /*#__PURE__*/(0, _jsxRuntime.jsx)(_index2.Notice, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
-      notice: notice,
-      onCancel: onCancelNotice
-    })), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_index2.Header, (0, _objectSpread2.default)({}, headerProps)), /*#__PURE__*/(0, _jsxRuntime.jsx)(_index2.Notice, (0, _objectSpread2.default)({}, noticeProps)), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
       className: contentCls,
-      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_index2.Menu, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
-        dataSource: menuDataSource,
-        notice: notice,
-        collapsed: collapsed,
-        onMenuClick: handleMenuClick,
-        onToggle: () => {
-          toggle();
-          onCollapsedChange && onCollapsedChange(!collapsed);
-        }
-      })), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_index2.Menu, (0, _objectSpread2.default)({}, menuProps)), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
         className: "pro-layout-content",
         style: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, contentStyle), {}, {
           marginTop: headerHeight + noticeHeight

package/lib/ProLayout/style/index.less

@@ -1,5 +1,3 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
 
 @import '../components/Layout/index.less';
 @import '../components/ProCollapse/style/index.less';
@@ -204,6 +202,7 @@
 
     .anticon-caret-down {
       color: #999 !important;
+      inset-inline-end: 8px;
     }
 
     .pro-layout-row .pro-layout-menu {
@@ -236,7 +235,7 @@
       &:before {
         position: absolute;
         left: var(--zaui-space-size-sm, 8px);
-        width: calc(100% - 16px);
+        width: calc(100% - 8px);
         min-height: 38px;
         height: 80%;
         background-color: var(--zaui-brand, #006aff);