@zat-design/sisyphus-react 4.0.0-beta.3 → 4.0.0-beta.5

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

@@ -1,118 +1,178 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+"use strict";
 
-// src/ProLayout/components/Layout/Menu/FoldMenu/index.tsx
-var FoldMenu_exports = {};
-__export(FoldMenu_exports, {
-  default: () => FoldMenu_default
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(FoldMenu_exports);
-var import_react = require("react");
-var import_antd = require("antd");
-var import_classnames = __toESM(require("classnames"));
-var import_react_router_dom = require("react-router-dom");
-var import__ = require("../../index");
-var import_SideMenu = __toESM(require("../SideMenu"));
-var import__2 = require("../../../../index");
-var import_utils = require("../../../../utils");
-var FoldMenu = (props) => {
-  const { style, dataSource } = props;
-  const { menus, iconfontUrl, notice, collapsed, headerHeight } = dataSource;
-  const pathNamePrefix = `/${window.location.pathname.split("/")[1]}`;
-  const noticeCls = (0, import_classnames.default)({
-    "pro-layout-menu-tooltip": true,
-    "pro-layout-menu-tooltip-has-notice": notice,
-    "pro-layout-menu-tooltip-nav-open": collapsed
+exports.default = void 0;
+require("antd/es/tooltip/style");
+var _tooltip = _interopRequireDefault(require("antd/es/tooltip"));
+require("antd/es/popover/style");
+var _popover = _interopRequireDefault(require("antd/es/popover"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _react = require("react");
+var _classnames = _interopRequireDefault(require("classnames"));
+var _reactRouterDom = require("react-router-dom");
+var _index = require("../../index");
+var _SideMenu = _interopRequireDefault(require("../SideMenu"));
+var _index2 = require("../../../../index");
+var _utils = require("../../../../utils");
+var _jsxRuntime = require("react/jsx-runtime");
+var FoldMenu = props => {
+  var style = props.style,
+    dataSource = props.dataSource,
+    onMenuClick = props.onMenuClick;
+  var menus = dataSource.menus,
+    iconfontUrl = dataSource.iconfontUrl,
+    notice = dataSource.notice,
+    collapsed = dataSource.collapsed,
+    headerHeight = dataSource.headerHeight;
+  var pathNamePrefix = `/${window.location.pathname.split('/')[1]}`;
+  var noticeCls = (0, _classnames.default)({
+    'pro-layout-menu-tooltip': true,
+    'pro-layout-menu-tooltip-has-notice': notice,
+    'pro-layout-menu-tooltip-nav-open': collapsed
   });
-  const { selectedPath, onSelected } = (0, import_react.useContext)(import__2.LayoutContext);
-  return /* @__PURE__ */ React.createElement("div", { className: "pro-layout-menu-fold", style: { ...style } }, /* @__PURE__ */ React.createElement("ul", { className: "pro-layout-menu-fold-list", style: { ...style } }, menus.map((item, index) => {
-    var _a;
-    const { id, url, name, icon, imgUrl, imgActiveUrl, hideInMenu, children } = item;
-    const toPath = item.redirectUrl || item.url;
-    if (hideInMenu) {
-      return null;
-    }
-    const selectedMenu = (0, import_utils.getUrlParams)("activeMenu");
-    const currentKeyIdPath = (0, import_utils.getPathNameKey)({
-      menus,
-      pathName: selectedMenu || selectedPath || window.location.pathname
-      // 优先匹配URL中定位菜单
-    }) || [];
-    const cls = (0, import_classnames.default)({
-      active: currentKeyIdPath.includes(id)
-    });
-    const hasChildrenMenu = Array.isArray(children) && children.length;
-    const LiNode = /* @__PURE__ */ React.createElement(
-      "li",
-      {
-        key: `${id}-${name}`,
-        id: (_a = url == null ? void 0 : url.split("/")) == null ? void 0 : _a[1],
-        className: `${cls} pro-layout-menu-fold-li`
-      },
-      /* @__PURE__ */ React.createElement("div", null, imgUrl ? /* @__PURE__ */ React.createElement(
-        "img",
-        {
-          className: "pro-layout-icon",
-          src: pathNamePrefix === url ? imgActiveUrl || imgUrl : imgUrl,
-          alt: "icon"
-        }
-      ) : /* @__PURE__ */ React.createElement(import__.Icon, { type: icon || "", iconfontUrl: iconfontUrl || "" }), /* @__PURE__ */ React.createElement("h2", null, name))
-    );
-    return hasChildrenMenu ? /* @__PURE__ */ React.createElement(
-      import_antd.Popover,
-      {
-        key: `${id}-${name}`,
-        mouseEnterDelay: 0,
-        content: /* @__PURE__ */ React.createElement(import_SideMenu.default, { dataSource: { ...dataSource, menus: item } }),
-        color: "#fff",
-        classNames: {
-          root: noticeCls
-        },
-        styles: {
-          body: {
-            marginTop: headerHeight - 48,
-            height: `calc(100vh - ${headerHeight + (notice ? 32 : 0)}px)`
-          }
-        },
-        placement: "rightTop"
-      },
-      LiNode
-    ) : !collapsed ? /* @__PURE__ */ React.createElement(import_antd.Tooltip, { placement: "right", title: name, key: toPath }, /* @__PURE__ */ React.createElement(
-      "span",
-      {
-        onClick: () => {
-          onSelected({
-            selectedPath: toPath
-          });
+  var _useContext = (0, _react.useContext)(_index2.LayoutContext),
+    selectedPath = _useContext.selectedPath,
+    onSelected = _useContext.onSelected;
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+    className: "pro-layout-menu-fold",
+    style: (0, _objectSpread2.default)({}, style),
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)("ul", {
+      className: "pro-layout-menu-fold-list",
+      style: (0, _objectSpread2.default)({}, style),
+      children: menus.map((item, index) => {
+        var _url$split;
+        var id = item.id,
+          url = item.url,
+          name = item.name,
+          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;
         }
-      },
-      /* @__PURE__ */ React.createElement(import_react_router_dom.Link, { to: toPath, key: toPath }, LiNode)
-    )) : /* @__PURE__ */ React.createElement(import_react_router_dom.Link, { to: toPath, key: toPath }, LiNode);
-  })));
+        var selectedMenu = (0, _utils.getUrlParams)('activeMenu');
+
+        // 取第一级
+        var currentKeyIdPath = (0, _utils.getPathNameKey)({
+          menus,
+          pathName: selectedMenu || selectedPath || window.location.pathname // 优先匹配URL中定位菜单
+        }) || [];
+        var cls = (0, _classnames.default)({
+          active: currentKeyIdPath.includes(id)
+        });
+
+        // 是否包含子级菜单
+        var hasChildrenMenu = Array.isArray(children) && children.length;
+
+        // 一级li Dom节点
+        var LiNode = /*#__PURE__*/(0, _jsxRuntime.jsx)("li", {
+          id: url === null || url === void 0 || (_url$split = url.split('/')) === null || _url$split === void 0 ? void 0 : _url$split[1],
+          className: `${cls} pro-layout-menu-fold-li`,
+          children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+            children: [imgUrl ? /*#__PURE__*/(0, _jsxRuntime.jsx)("img", {
+              className: "pro-layout-icon",
+              src: pathNamePrefix === url ? imgActiveUrl || imgUrl : imgUrl,
+              alt: "icon"
+            }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.Icon, {
+              type: icon || '',
+              iconfontUrl: iconfontUrl || ''
+            }), /*#__PURE__*/(0, _jsxRuntime.jsx)("h2", {
+              children: name
+            })]
+          })
+        }, `${id}-${name}`);
+        return hasChildrenMenu ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_popover.default, {
+          mouseEnterDelay: 0,
+          content: /*#__PURE__*/(0, _jsxRuntime.jsx)(_SideMenu.default, {
+            dataSource: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, dataSource), {}, {
+              menus: item
+            }),
+            onMenuClick: onMenuClick
+          }),
+          color: "#fff",
+          classNames: {
+            root: noticeCls
+          },
+          styles: {
+            body: {
+              marginTop: headerHeight - 48,
+              height: `calc(100vh - ${headerHeight + (notice ? 32 : 0)}px)`
+            }
+          },
+          placement: "rightTop",
+          children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+            onClick: () => {
+              // 查找完整的菜单项数据
+              var menuItem = (0, _utils.findMenuItemByKey)(menus, String(id));
+              var menuKeyPath = menuItem !== null && menuItem !== void 0 && menuItem.keyIdPath ? menuItem.keyIdPath.map(id => String(id)) : [String(id)];
+
+              // 调用用户传入的onMenuClick回调
+              if (onMenuClick) {
+                onMenuClick({
+                  item: menuItem,
+                  key: String(id),
+                  keyPath: menuKeyPath
+                });
+              }
+            },
+            children: LiNode
+          })
+        }, `${id}-${name}`) : !collapsed ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.default, {
+          placement: "right",
+          title: name,
+          children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+            onClick: () => {
+              // 查找完整的菜单项数据
+              var menuItem = (0, _utils.findMenuItemByKey)(menus, String(id));
+              var menuKeyPath = menuItem !== null && menuItem !== void 0 && menuItem.keyIdPath ? menuItem.keyIdPath.map(id => String(id)) : [String(id)];
+
+              // 调用用户传入的onMenuClick回调
+              if (onMenuClick) {
+                onMenuClick({
+                  item: menuItem,
+                  key: String(id),
+                  keyPath: menuKeyPath
+                });
+              }
+              onSelected({
+                selectedPath: toPath
+              });
+            },
+            children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactRouterDom.Link, {
+              to: toPath,
+              children: LiNode
+            }, toPath)
+          })
+        }, toPath) : /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+          onClick: () => {
+            // 查找完整的菜单项数据
+            var menuItem = (0, _utils.findMenuItemByKey)(menus, String(id));
+            var menuKeyPath = menuItem !== null && menuItem !== void 0 && menuItem.keyIdPath ? menuItem.keyIdPath.map(id => String(id)) : [String(id)];
+
+            // 调用用户传入的onMenuClick回调
+            if (onMenuClick) {
+              onMenuClick({
+                item: menuItem,
+                key: String(id),
+                keyPath: menuKeyPath
+              });
+            }
+          },
+          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactRouterDom.Link, {
+            to: toPath,
+            children: LiNode
+          }, toPath)
+        });
+      })
+    })
+  });
 };
-var FoldMenu_default = FoldMenu;
+var _default = exports.default = FoldMenu;

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

@@ -1,5 +1,3 @@
-/* @root-entry-name: 'default'; */
-/* @import (reference) '~antd/es/style/themes/index.less'; */
 
 .pro-layout-menu-fold-list {
   padding-top: 4px;

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

@@ -1,108 +1,100 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+"use strict";
 
-// src/ProLayout/components/Layout/Menu/OpenMenu/index.tsx
-var OpenMenu_exports = {};
-__export(OpenMenu_exports, {
-  default: () => OpenMenu_default
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(OpenMenu_exports);
-var import_react = require("react");
-var import_antd = require("antd");
-var import_ahooks = require("ahooks");
-var import_icons = require("@ant-design/icons");
-var import_classnames = __toESM(require("classnames"));
-var import_react_router_dom = require("react-router-dom");
-var import_lodash = require("lodash");
-var import__ = require("../../../../index");
-var import_utils = require("../../../../utils");
-var import__2 = require("../../index");
-var OpenMenu = (props) => {
-  var _a;
-  const { className, dataSource, style, theme = "dark" } = props;
-  const { menus, sideMenu } = dataSource || {};
-  const linkRef = (0, import_react.useRef)(null);
-  const [{ selectedKeys, openKeys, router }, setState] = (0, import_ahooks.useSetState)({
-    selectedKeys: [],
-    openKeys: [],
-    router: ""
-  });
-  const query = new URLSearchParams(window.location.search);
-  const { onSelected, target } = (0, import_react.useContext)(import__.LayoutContext);
-  const cls = (0, import_classnames.default)({
-    "pro-layout-open-menu": true,
+exports.default = void 0;
+require("antd/es/menu/style");
+var _menu = _interopRequireDefault(require("antd/es/menu"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _react = require("react");
+var _ahooks = require("ahooks");
+var _icons = require("@ant-design/icons");
+var _classnames = _interopRequireDefault(require("classnames"));
+var _reactRouterDom = require("react-router-dom");
+var _lodash = require("lodash");
+var _index = require("../../../../index");
+var _utils = require("../../../../utils");
+var _index2 = require("../../index");
+var _jsxRuntime = require("react/jsx-runtime");
+var OpenMenu = props => {
+  var _getIdsByPathName;
+  var className = props.className,
+    dataSource = props.dataSource,
+    style = props.style,
+    _props$theme = props.theme,
+    theme = _props$theme === void 0 ? 'dark' : _props$theme,
+    onMenuClick = props.onMenuClick;
+  var _ref = dataSource || {},
+    menus = _ref.menus,
+    sideMenu = _ref.sideMenu;
+  var linkRef = (0, _react.useRef)(null);
+  // 通过URL匹配对应的ID用于回显
+  var _useSetState = (0, _ahooks.useSetState)({
+      selectedKeys: [],
+      openKeys: [],
+      router: ''
+    }),
+    _useSetState2 = (0, _slicedToArray2.default)(_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 cls = (0, _classnames.default)({
+    'pro-layout-open-menu': true,
     [`${className}`]: className
   });
-  const selectKeyIdPath = ((_a = (0, import_utils.getIdsByPathName)(menus, query.get("activeMenu"))) == null ? void 0 : _a.map((item) => String(item))) || [];
-  const itemsTransform = (0, import_react.useMemo)(() => {
-    const result = (0, import_lodash.cloneDeep)(menus);
+
+  // 默认激活菜单优先取activeMenu中，默认取pathName进行匹配
+  var selectKeyIdPath = ((_getIdsByPathName = (0, _utils.getIdsByPathName)(menus, query.get('activeMenu'))) === 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) {
       return [];
     }
-    const menuDeep = (data) => {
-      data.forEach((item) => {
-        var _a2, _b, _c;
-        const isFirstMenu = ((_a2 = item.keyIdPath) == null ? void 0 : _a2.length) === 1 || sideMenu && ((_b = item.keyIdPath) == null ? void 0 : _b.length) === 2;
-        item.label = /* @__PURE__ */ React.createElement(
-          "div",
-          {
-            className: (0, import_classnames.default)({
-              "pro-layout-open-menu-lv1": isFirstMenu
-            })
-          },
-          /* @__PURE__ */ React.createElement(React.Fragment, null, item.imgUrl && isFirstMenu ? /* @__PURE__ */ React.createElement(
-            "img",
-            {
+    var menuDeep = data => {
+      data.forEach(item => {
+        var _item$keyIdPath, _item$keyIdPath2, _item$children;
+        // 是否是第一级菜单，展开模式一级菜单有icon, 收起模式二级菜单有icon
+        var isFirstMenu = ((_item$keyIdPath = item.keyIdPath) === null || _item$keyIdPath === void 0 ? void 0 : _item$keyIdPath.length) === 1 || sideMenu && ((_item$keyIdPath2 = item.keyIdPath) === null || _item$keyIdPath2 === void 0 ? void 0 : _item$keyIdPath2.length) === 2;
+        // 第一级菜单显示icon
+        item.label = /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+          className: (0, _classnames.default)({
+            'pro-layout-open-menu-lv1': isFirstMenu
+          }),
+          children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
+            children: item.imgUrl && isFirstMenu ? /*#__PURE__*/(0, _jsxRuntime.jsx)("img", {
               className: "pro-layout-icon",
               src: selectKeyIdPath[0] === String(item.id) ? item.imgActiveUrl || item.imgUrl : item.imgUrl,
               alt: "icon"
-            }
-          ) : item.icon && isFirstMenu ? /* @__PURE__ */ React.createElement(import__2.Icon, { type: item.icon || "", iconfontUrl: (dataSource == null ? void 0 : dataSource.iconfontUrl) || "" }) : /* @__PURE__ */ React.createElement(
-            "span",
-            {
-              className: (0, import_classnames.default)({
-                "pro-layout-icon": true,
-                "pro-layout-icon-empty": isFirstMenu || !item.icon && !item.imgUrl
+            }) : item.icon && isFirstMenu ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_index2.Icon, {
+              type: item.icon || '',
+              iconfontUrl: (dataSource === null || dataSource === void 0 ? void 0 : dataSource.iconfontUrl) || ''
+            }) : /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+              className: (0, _classnames.default)({
+                'pro-layout-icon': true,
+                'pro-layout-icon-empty': isFirstMenu || !item.icon && !item.imgUrl
               })
-            }
-          )),
-          /* @__PURE__ */ React.createElement("h2", null, item.name)
-        );
+            })
+          }), /*#__PURE__*/(0, _jsxRuntime.jsx)("h2", {
+            children: item.name
+          })]
+        });
         item.key = String(item.id);
         item.router = item.redirectUrl || item.router || item.url;
-        Object.keys(item).filter(
-          (keyItem) => !["label", "key", "children", "onTitleClick", "router"].includes(keyItem)
-        ).forEach((_keyItem) => {
+        Object.keys(item).filter(keyItem => !['label', 'key', 'children', 'onTitleClick', 'router'].includes(keyItem)).forEach(_keyItem => {
           delete item[_keyItem];
         });
-        if (Array.isArray(item == null ? void 0 : item.children) && ((_c = item == null ? void 0 : item.children) == null ? void 0 : _c.length) > 0) {
-          const _item = item == null ? void 0 : item.children[0];
-          if ((_item == null ? void 0 : _item.hideInMenu) || ["TAB", "QUERY", "BUTTON"].includes(_item == null ? void 0 : _item.type)) {
+        if (Array.isArray(item === null || item === void 0 ? void 0 : item.children) && (item === null || item === void 0 || (_item$children = item.children) === null || _item$children === void 0 ? void 0 : _item$children.length) > 0) {
+          var _item = item === null || item === void 0 ? void 0 : item.children[0];
+          // 移除不需要显示的菜单
+          if (_item !== null && _item !== void 0 && _item.hideInMenu || ['TAB', 'QUERY', 'BUTTON'].includes(_item === null || _item === void 0 ? void 0 : _item.type)) {
             delete item.children;
           } else {
             menuDeep(item.children);
@@ -116,7 +108,7 @@ var OpenMenu = (props) => {
     menuDeep(result);
     return result;
   }, [dataSource]);
-  (0, import_ahooks.useDeepCompareEffect)(() => {
+  (0, _ahooks.useDeepCompareEffect)(() => {
     if (Array.isArray(selectKeyIdPath) && selectKeyIdPath.length) {
       setState({
         selectedKeys: selectKeyIdPath,
@@ -124,53 +116,84 @@ var OpenMenu = (props) => {
       });
     }
   }, [menus, selectKeyIdPath]);
-  (0, import_ahooks.useDeepCompareEffect)(() => {
+
+  // 折叠模式默认展开全部菜单
+  (0, _ahooks.useDeepCompareEffect)(() => {
     if (sideMenu) {
-      const keys = menus.map((item) => String(item.id));
+      var keys = menus.map(item => String(item.id));
       setState({
         openKeys: keys
       });
     }
   }, [sideMenu]);
-  return /* @__PURE__ */ React.createElement("div", { className: cls, style }, /* @__PURE__ */ React.createElement(
-    import_antd.Menu,
-    {
-      mode: "inline",
-      theme,
-      selectedKeys,
-      openKeys,
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+    className: cls,
+    style: style,
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_menu.default, {
+      mode: "inline"
+      // @ts-ignore
+      ,
+      theme: theme,
+      selectedKeys: selectedKeys,
+      openKeys: openKeys,
       items: itemsTransform,
       inlineIndent: 14,
-      expandIcon: /* @__PURE__ */ React.createElement(import_icons.CaretDownOutlined, null),
-      onOpenChange: (openKeys2) => {
+      expandIcon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_icons.CaretDownOutlined, {}),
+      onOpenChange: openKeys => {
         setState({
-          openKeys: openKeys2
+          openKeys
         });
       },
-      onClick: ({ item, keyPath }) => {
-        var _a2, _b, _c;
+      onClick: _ref2 => {
+        var _item$props, _item$props2;
+        var item = _ref2.item,
+          keyPath = _ref2.keyPath,
+          key = _ref2.key,
+          domEvent = _ref2.domEvent;
+        // console.log('item', item);
+        // console.log('keyPath', keyPath);
+        // console.log('key', key);
+        // console.log('domEvent', domEvent);
+
+        // 查找完整的菜单项数据
+        var menuItem = (0, _utils.findMenuItemByKey)(menus, key);
+        var menuKeyPath = menuItem !== null && menuItem !== void 0 && menuItem.keyIdPath ? menuItem.keyIdPath.map(id => String(id)) : keyPath;
+
+        // 调用用户传入的onMenuClick回调
+        if (onMenuClick) {
+          onMenuClick({
+            item: menuItem,
+            key,
+            keyPath: menuKeyPath
+          });
+        }
         setState({
           selectedKeys: keyPath,
-          router: (_a2 = item == null ? void 0 : item.props) == null ? void 0 : _a2.router
+          router: item === null || item === void 0 || (_item$props = item.props) === null || _item$props === void 0 ? void 0 : _item$props.router
         });
         onSelected({
-          selectedPath: (_b = item == null ? void 0 : item.props) == null ? void 0 : _b.router
+          selectedPath: item === null || item === void 0 || (_item$props2 = item.props) === null || _item$props2 === void 0 ? void 0 : _item$props2.router
         });
         if (target) {
-          window.open((_c = item == null ? void 0 : item.props) == null ? void 0 : _c.router, 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(() => {
-            if (!window.location.href.includes("~demos/prolayout")) {
+            // 路由变更，且不再demo文档中
+            if (!window.location.href.includes('~demos/prolayout')) {
               linkRef.current.click();
             }
           }, 100);
         }
       },
       style: {
-        height: dataSource.sideMenu ? "auto" : `calc(100vh - ${(dataSource == null ? void 0 : dataSource.height) || 0}px)`,
-        color: "red"
+        height: dataSource.sideMenu ? 'auto' : `calc(100vh - ${(dataSource === null || dataSource === void 0 ? void 0 : dataSource.height) || 0}px)`,
+        color: 'red'
       }
-    }
-  ), /* @__PURE__ */ React.createElement(import_react_router_dom.Link, { to: router, ref: linkRef }));
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactRouterDom.Link, {
+      to: router,
+      ref: linkRef
+    })]
+  });
 };
-var OpenMenu_default = OpenMenu;
+var _default = exports.default = OpenMenu;

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

@@ -1,17 +1,5 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+"use strict";
 
-// src/ProLayout/components/Layout/Menu/OpenMenu/propsType.ts
-var propsType_exports = {};
-module.exports = __toCommonJS(propsType_exports);
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});