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

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

@@ -1,23 +1,26 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import _cloneDeep from "lodash/cloneDeep";
-import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 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 { Link } from 'react-router-dom';
-import { LayoutContext } from '../../../../index';
-import { getIdsByPathName } from '../../../../utils';
-import { Icon } from '../../index';
+import { cloneDeep } from 'lodash';
+import { LayoutContext } from "../../../../index";
+import { getIdsByPathName, findMenuItemByKey } from "../../../../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 OpenMenu = function 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;
+    theme = _props$theme === void 0 ? 'dark' : _props$theme,
+    onMenuClick = props.onMenuClick;
   var _ref = dataSource || {},
     menus = _ref.menus,
     sideMenu = _ref.sideMenu;
@@ -41,40 +44,41 @@ var OpenMenu = function OpenMenu(props) {
   var cls = classnames(_defineProperty({
     'pro-layout-open-menu': true
   }, "".concat(className), className));
+
   // 默认激活菜单优先取activeMenu中，默认取pathName进行匹配
   var selectKeyIdPath = ((_getIdsByPathName = getIdsByPathName(menus, query.get('activeMenu'))) === null || _getIdsByPathName === void 0 ? void 0 : _getIdsByPathName.map(function (item) {
     return String(item);
   })) || [];
   var itemsTransform = useMemo(function () {
-    var result = _cloneDeep(menus);
+    var result = cloneDeep(menus);
     if (!Array.isArray(result) || !result.length) {
       return [];
     }
-    var _menuDeep = function menuDeep(data) {
+    var menuDeep = function menuDeep(data) {
       data.forEach(function (item) {
         var _item$keyIdPath, _item$keyIdPath2, _item$children;
         // 是否是第一级菜单，展开模式一级菜单有icon, 收起模式二级菜单有icon
         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 = _jsxs("div", {
+        item.label = /*#__PURE__*/_jsxs("div", {
           className: classnames({
             'pro-layout-open-menu-lv1': isFirstMenu
           }),
-          children: [_jsx(_Fragment, {
-            children: item.imgUrl && isFirstMenu ? _jsx("img", {
+          children: [/*#__PURE__*/_jsx(_Fragment, {
+            children: item.imgUrl && isFirstMenu ? /*#__PURE__*/_jsx("img", {
               className: "pro-layout-icon",
               src: selectKeyIdPath[0] === String(item.id) ? item.imgActiveUrl || item.imgUrl : item.imgUrl,
               alt: "icon"
-            }) : item.icon && isFirstMenu ? _jsx(Icon, {
+            }) : item.icon && isFirstMenu ? /*#__PURE__*/_jsx(Icon, {
               type: item.icon || '',
               iconfontUrl: (dataSource === null || dataSource === void 0 ? void 0 : dataSource.iconfontUrl) || ''
-            }) : _jsx("span", {
+            }) : /*#__PURE__*/_jsx("span", {
               className: classnames({
                 'pro-layout-icon': true,
                 'pro-layout-icon-empty': isFirstMenu || !item.icon && !item.imgUrl
               })
             })
-          }), _jsx("h2", {
+          }), /*#__PURE__*/_jsx("h2", {
             children: item.name
           })]
         });
@@ -85,13 +89,13 @@ var OpenMenu = function OpenMenu(props) {
         }).forEach(function (_keyItem) {
           delete item[_keyItem];
         });
-        if (Array.isArray(item === null || item === void 0 ? void 0 : item.children) && (item === null || item === void 0 ? void 0 : (_item$children = item.children) === null || _item$children === void 0 ? void 0 : _item$children.length) > 0) {
+        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 ? void 0 : _item.hideInMenu) || ['TAB', 'QUERY', 'BUTTON'].includes(_item === null || _item === void 0 ? void 0 : _item.type)) {
+          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);
+            menuDeep(item.children);
           }
         } else {
           delete item.children;
@@ -99,7 +103,7 @@ var OpenMenu = function OpenMenu(props) {
       });
       return data;
     };
-    _menuDeep(result);
+    menuDeep(result);
     return result;
   }, [dataSource]);
   useDeepCompareEffect(function () {
@@ -110,6 +114,7 @@ var OpenMenu = function OpenMenu(props) {
       });
     }
   }, [menus, selectKeyIdPath]);
+
   // 折叠模式默认展开全部菜单
   useDeepCompareEffect(function () {
     if (sideMenu) {
@@ -121,18 +126,19 @@ var OpenMenu = function OpenMenu(props) {
       });
     }
   }, [sideMenu]);
-  return _jsxs("div", {
+  return /*#__PURE__*/_jsxs("div", {
     className: cls,
     style: style,
-    children: [_jsx(Menu, {
-      mode: "inline",
+    children: [/*#__PURE__*/_jsx(Menu, {
+      mode: "inline"
       // @ts-ignore
+      ,
       theme: theme,
       selectedKeys: selectedKeys,
       openKeys: openKeys,
       items: itemsTransform,
       inlineIndent: 14,
-      expandIcon: _jsx(CaretDownOutlined, {}),
+      expandIcon: /*#__PURE__*/_jsx(CaretDownOutlined, {}),
       onOpenChange: function onOpenChange(openKeys) {
         setState({
           openKeys: openKeys
@@ -141,17 +147,38 @@ var OpenMenu = function OpenMenu(props) {
       onClick: function onClick(_ref2) {
         var _item$props, _item$props2;
         var item = _ref2.item,
-          keyPath = _ref2.keyPath;
+          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 = findMenuItemByKey(menus, key);
+        var menuKeyPath = menuItem !== null && menuItem !== void 0 && menuItem.keyIdPath ? menuItem.keyIdPath.map(function (id) {
+          return String(id);
+        }) : keyPath;
+
+        // 调用用户传入的onMenuClick回调
+        if (onMenuClick) {
+          onMenuClick({
+            item: menuItem,
+            key: key,
+            keyPath: menuKeyPath
+          });
+        }
         setState({
           selectedKeys: keyPath,
-          router: item === null || item === void 0 ? void 0 : (_item$props = item.props) === null || _item$props === void 0 ? void 0 : _item$props.router
+          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 ? void 0 : (_item$props2 = item.props) === null || _item$props2 === void 0 ? void 0 : _item$props2.router
+          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 ? void 0 : (_item$props3 = item.props) === null || _item$props3 === void 0 ? void 0 : _item$props3.router, target);
+          window.open(item === null || item === void 0 || (_item$props3 = item.props) === null || _item$props3 === void 0 ? void 0 : _item$props3.router, target);
         } else {
           setTimeout(function () {
             // 路由变更，且不再demo文档中
@@ -165,7 +192,7 @@ var OpenMenu = function OpenMenu(props) {
         height: dataSource.sideMenu ? 'auto' : "calc(100vh - ".concat((dataSource === null || dataSource === void 0 ? void 0 : dataSource.height) || 0, "px)"),
         color: 'red'
       }
-    }), _jsx(Link, {
+    }), /*#__PURE__*/_jsx(Link, {
       to: router,
       ref: linkRef
     })]

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

@@ -1,10 +1,12 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useRef } from 'react';
 import classnames from 'classnames';
 import { useSize } from 'ahooks';
-import OpenMenu from '../OpenMenu';
+import OpenMenu from "../OpenMenu";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
 var SideMenu = function SideMenu(props) {
-  var dataSource = props.dataSource;
+  var dataSource = props.dataSource,
+    onMenuClick = props.onMenuClick;
   var ref = useRef(null);
   var size = useSize(ref);
   var menus = dataSource.menus,
@@ -15,15 +17,16 @@ var SideMenu = function SideMenu(props) {
   var cls = classnames({
     'pro-layout-sider-menu': true
   });
-  return _jsxs("div", {
+  return /*#__PURE__*/_jsxs("div", {
     className: cls,
-    children: [_jsx("h2", {
+    children: [/*#__PURE__*/_jsx("h2", {
       ref: ref,
       children: (menus === null || menus === void 0 ? void 0 : menus.name) || ''
-    }), _jsx("div", {
-      children: _jsx(OpenMenu, {
+    }), /*#__PURE__*/_jsx("div", {
+      children: /*#__PURE__*/_jsx(OpenMenu, {
         className: "pro-layout-sider-menu-list",
         theme: "light",
+        onMenuClick: onMenuClick,
         dataSource: {
           menus: (menus === null || menus === void 0 ? void 0 : menus.children) || [],
           iconfontUrl: iconfontUrl,

package/es/ProLayout/components/Layout/Menu/SideMenu/style/index.less

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

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

@@ -1,7 +1,9 @@
-import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import classnames from 'classnames';
-import OpenMenu from './OpenMenu';
-import FoldMenu from './FoldMenu'; // 折叠后菜单
+import OpenMenu from "./OpenMenu";
+import FoldMenu from "./FoldMenu"; // 折叠后菜单
+import { Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
 var Menu = function Menu(props) {
   var _ref = props || {},
     headerHeight = _ref.headerHeight,
@@ -13,7 +15,8 @@ var Menu = function Menu(props) {
     pure = _ref.pure,
     theme = _ref.theme,
     sideMenuFooterRender = _ref.sideMenuFooterRender,
-    sideMenuHeaderRender = _ref.sideMenuHeaderRender;
+    sideMenuHeaderRender = _ref.sideMenuHeaderRender,
+    onMenuClick = _ref.onMenuClick;
   var menus = [];
   var menuCls = classnames({
     'pro-layout-menu': true,
@@ -24,25 +27,26 @@ var Menu = function Menu(props) {
   } else if (dataSource) {
     menus = dataSource === null || dataSource === void 0 ? void 0 : dataSource.menus;
   }
-  if ((pure === null || pure === void 0 ? void 0 : pure.leftMenu) || pure === true) {
-    return _jsx(_Fragment, {});
+  if (pure !== null && pure !== void 0 && pure.leftMenu || pure === true) {
+    return /*#__PURE__*/_jsx(_Fragment, {});
   }
-  return _jsxs("div", {
+  return /*#__PURE__*/_jsxs("div", {
     className: menuCls,
     style: {
       top: notice ? 80 + headerHeight - 48 : headerHeight
     },
-    children: [sideMenuHeaderRender, _jsx(OpenMenu, {
+    children: [sideMenuHeaderRender, /*#__PURE__*/_jsx(OpenMenu, {
       dataSource: {
         menus: menus,
         iconfontUrl: iconfontUrl,
         height: headerHeight + (notice ? 32 : 0) + 48
       },
       theme: theme,
+      onMenuClick: onMenuClick,
       style: {
         display: collapsed ? 'block' : 'none'
       }
-    }), _jsx(FoldMenu, {
+    }), /*#__PURE__*/_jsx(FoldMenu, {
       dataSource: {
         menus: menus,
         iconfontUrl: iconfontUrl,
@@ -51,14 +55,15 @@ var Menu = function Menu(props) {
         collapsed: collapsed,
         headerHeight: headerHeight
       },
+      onMenuClick: onMenuClick,
       style: {
         display: collapsed ? 'none' : 'block',
         height: "calc(100vh - ".concat(headerHeight + (notice ? 32 : 0) + 48 || 0, "px)")
       }
-    }), sideMenuFooterRender || _jsx("div", {
+    }), sideMenuFooterRender || /*#__PURE__*/_jsx("div", {
       className: "pro-layout-menu-collapsed",
       onClick: onToggle,
-      children: _jsx("div", {
+      children: /*#__PURE__*/_jsx("div", {
         className: "pro-layout-arrow "
       })
     })]

package/es/ProLayout/components/Layout/Menu/style/index.less

@@ -1,5 +1,3 @@
-/* @root-entry-name: 'default'; */
-/* @import (reference) '~antd/es/style/themes/index.less'; */
 @import '../FoldMenu/style/index.less';
 @import '../OpenMenu/style/index.less';
 @import '../SideMenu/style/index.less';

package/es/ProLayout/components/Layout/Notice/index.js

@@ -1,7 +1,8 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import tipMsg from '../../../images/tipMsg.png';
-import close from '../../../images/close.png';
-import locale from '../../../../locale';
+import tipMsg from "../../../images/tipMsg.png";
+import close from "../../../images/close.png";
+import locale from "../../../../locale";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
 var Notice = function Notice(props) {
   var headerHeight = props.headerHeight,
     notice = props.notice,
@@ -9,18 +10,18 @@ var Notice = function Notice(props) {
   if (!notice) {
     return null;
   }
-  return _jsxs("div", {
+  return /*#__PURE__*/_jsxs("div", {
     className: "pro-layout-header-notice",
     style: {
       top: headerHeight
     },
-    children: [_jsx("img", {
+    children: [/*#__PURE__*/_jsx("img", {
       src: tipMsg,
       alt: "".concat(locale.ProLayout.tipAlt)
-    }), " ", notice, _jsx("span", {
+    }), " ", notice, /*#__PURE__*/_jsx("span", {
       className: "pro-layout-header-notice-close",
       onClick: onCancel,
-      children: _jsx("img", {
+      children: /*#__PURE__*/_jsx("img", {
         src: close,
         alt: "".concat(locale.ProLayout.closeAlt)
       })

package/es/ProLayout/components/Layout/Notice/style/index.less

@@ -1,5 +1,3 @@
-/* @root-entry-name: 'default'; */
-/* @import (reference) '~antd/es/style/themes/index.less'; */
 
   /** 告知区 */
   .pro-layout-header-notice {

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

@@ -1,4 +1,4 @@
-export { default as Header } from './Header';
-export { default as Notice } from './Notice';
-export { default as Menu } from './Menu';
-export { default as Icon } from './Icon';
+export { default as Header } from "./Header";
+export { default as Notice } from "./Notice";
+export { default as Menu } from "./Menu";
+export { default as Icon } from "./Icon";

package/es/ProLayout/components/ProCollapse/PropTypes.d.ts

@@ -1,6 +1,6 @@
 import React, { CSSProperties } from 'react';
 import { CollapseProps, CollapsePanelProps } from 'antd/es/collapse';
-export type levelType = '1' | '2';
+export type levelType = '1' | '2' | '3';
 export interface TitleListType {
     /**
     * @description       描述的标题
@@ -28,12 +28,12 @@ export interface ProCollapseType {
     * @description     自动适应窗口大小
     * @default           -
     */
-    autoHeight?: Boolean;
+    autoHeight?: boolean;
     /**
    * @description       标题前图标
    * @default           -
    */
-    icon?: React.ReactNode | Boolean;
+    icon?: React.ReactNode | boolean;
     /**
     * @description       折叠头部多个标题
     * @default           []
@@ -59,6 +59,11 @@ export interface ProCollapseType {
      * @default           false
      */
     towCollapse?: boolean;
+    /**
+     * @description       三级折叠是否带收起
+     * @default           false
+     */
+    threeCollapse?: boolean;
     /**
     * @description      标题右侧扩展信息
     * @default           -

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

@@ -1,13 +1,13 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _isBoolean from "lodash/isBoolean";
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useLayoutEffect } from 'react';
 import { Collapse, Descriptions, Space } from 'antd';
 import { CaretRightOutlined } from '@ant-design/icons';
 import classNames from 'classnames';
-import foldSvg from '../../../assets/fold.svg';
-import ProIcon from '../../../ProIcon/index';
+import foldSvg from "../../../assets/fold.svg";
+import ProIcon from "../../../ProIcon/index";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
 var ProCollapse = function ProCollapse(props) {
   var title = props.title,
     id = props.id,
@@ -18,6 +18,8 @@ var ProCollapse = function ProCollapse(props) {
     level = _props$level === void 0 ? '1' : _props$level,
     _props$towCollapse = props.towCollapse,
     towCollapse = _props$towCollapse === void 0 ? false : _props$towCollapse,
+    _props$threeCollapse = props.threeCollapse,
+    threeCollapse = _props$threeCollapse === void 0 ? false : _props$threeCollapse,
     titleList = props.titleList,
     extra = props.extra,
     _props$column = props.column,
@@ -34,6 +36,7 @@ var ProCollapse = function ProCollapse(props) {
     autoHeight = _props$autoHeight === void 0 ? true : _props$autoHeight,
     onChange = props.onChange,
     open = props.open;
+
   // 当同时设置了open和collapseProps.activeKey时，以collapseProps.activeKey为准
   // 这样保证了与已有代码的兼容性，并提供了更简便的控制面板展开状态的方式
   var finalCollapseProps = _objectSpread({}, collapseProps);
@@ -43,15 +46,17 @@ var ProCollapse = function ProCollapse(props) {
   var cls = classNames(_defineProperty({
     'pro-collapse': true,
     'pro-collapse-level2': level === '2',
+    'pro-collapse-level3': level === '3',
     'pro-collapse-list': titleList === null || titleList === void 0 ? void 0 : titleList.length,
     'pro-collapse-no-title': !title,
-    'pro-collapse-no-level1-title': !title && level !== '2'
+    'pro-collapse-no-level1-title': !title && level !== '2' && level !== '3'
   }, "".concat(className), className));
-  var content = _jsx("div", {
+  var content = /*#__PURE__*/_jsx("div", {
     className: "pro-collapse-content",
     style: contentStyle,
     children: children
   });
+
   // 生成 Collapse items 配置
   var getCollapseItems = function getCollapseItems() {
     var _title = title;
@@ -67,13 +72,35 @@ var ProCollapse = function ProCollapse(props) {
         panelProps.collapsible = 'disabled';
       }
     }
+    if (level === '3') {
+      var level3Panel = classNames({
+        'pro-collapse-level3-collapse': threeCollapse,
+        'pro-collapse-level3-no-collapse': !threeCollapse,
+        'pro-collapse-panel': true
+      });
+      var hasCollapse = {};
+      if (!threeCollapse) {
+        hasCollapse.collapsible = 'disabled';
+      }
+      return [_objectSpread(_objectSpread({
+        key: '1',
+        label: _title,
+        children: content,
+        extra: /*#__PURE__*/_jsx("div", {
+          className: "extra-info",
+          children: extra
+        }),
+        className: level3Panel,
+        forceRender: true
+      }, hasCollapse), collapsePanelProps)];
+    }
     if (icon) {
-      _title = _jsxs(Space, {
+      _title = /*#__PURE__*/_jsxs(Space, {
         size: 8,
         align: "center",
-        children: [_jsx("div", {
+        children: [/*#__PURE__*/_jsx("div", {
           className: "pro-collapse-icon",
-          children: _isBoolean(icon) ? _jsx(ProIcon, {
+          children: typeof icon === 'boolean' ? /*#__PURE__*/_jsx(ProIcon, {
             src: foldSvg,
             actionMap: {
               fill: []
@@ -86,7 +113,7 @@ var ProCollapse = function ProCollapse(props) {
       key: '1',
       label: _title,
       children: content,
-      extra: _jsx("div", {
+      extra: /*#__PURE__*/_jsx("div", {
         className: "extra-info",
         children: extra
       }),
@@ -95,12 +122,12 @@ var ProCollapse = function ProCollapse(props) {
     }, panelProps), collapsePanelProps)];
   };
   var renderTitleList = function renderTitleList() {
-    return _jsxs("div", {
+    return /*#__PURE__*/_jsxs("div", {
       className: cls,
-      children: [_jsx(Descriptions, {
+      children: [/*#__PURE__*/_jsx(Descriptions, {
         column: column,
         children: titleList === null || titleList === void 0 ? void 0 : titleList.map(function (item) {
-          return _jsx(Descriptions.Item, {
+          return /*#__PURE__*/_jsx(Descriptions.Item, {
             label: item.label,
             children: item.value || '-'
           }, item.label);
@@ -108,6 +135,7 @@ var ProCollapse = function ProCollapse(props) {
       }), content]
     });
   };
+
   // 当pro-layout-content只存在一个card时，高度动态计算
   useLayoutEffect(function () {
     if (!autoHeight) {
@@ -137,15 +165,15 @@ var ProCollapse = function ProCollapse(props) {
       }
     };
   });
-  return _jsx("div", {
+  return /*#__PURE__*/_jsx("div", {
     id: id,
     style: style,
-    children: Array.isArray(titleList) && titleList.length ? renderTitleList() : _jsx(Collapse, _objectSpread({
+    children: Array.isArray(titleList) && titleList.length ? renderTitleList() : /*#__PURE__*/_jsx(Collapse, _objectSpread({
       className: cls,
       bordered: false,
       expandIcon: function expandIcon(_ref) {
         var isActive = _ref.isActive;
-        return _jsx(CaretRightOutlined, {
+        return /*#__PURE__*/_jsx(CaretRightOutlined, {
           rotate: isActive ? -90 : 90
         });
       },