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

package/dist/index.esm.css

@@ -789,6 +789,9 @@
 .pro-collapse.pro-collapse-level2 .pro-collapse-level2-no-collapse .ant-collapse-expand-icon {
   display: none;
 }
+.pro-collapse.pro-collapse-level2 .pro-collapse-level2-no-collapse .pro-collapse-content {
+  padding: var(--zaui-space-size-sm, 8px) 0 !important;
+}
 .pro-collapse .ant-collapse-extra .extra-info {
   margin-right: 24px;
 }

package/dist/less.esm.css

@@ -789,6 +789,9 @@
 .pro-collapse.pro-collapse-level2 .pro-collapse-level2-no-collapse .ant-collapse-expand-icon {
   display: none;
 }
+.pro-collapse.pro-collapse-level2 .pro-collapse-level2-no-collapse .pro-collapse-content {
+  padding: var(--zaui-space-size-sm, 8px) 0 !important;
+}
 .pro-collapse .ant-collapse-extra .extra-info {
   margin-right: 24px;
 }

package/es/ProForm/components/combination/ProModalSelect/hooks/useRequestList.js

@@ -98,9 +98,7 @@ export function useRequestList(service, options, useRequestOptions) {
   }, [onChange, searchValues]);
   // 重置查询条件
   var onReset = useCallback(function () {
-    onSearch({
-      d: Date.now()
-    });
+    onSearch({});
   }, [onSearch]);
   var dataSource = useMemo(function () {
     if (data) {

package/es/ProForm/components/combination/ProModalSelect/index.js

@@ -23,7 +23,7 @@ import _isFunction from "lodash/isFunction";
 import _isEqual from "lodash/isEqual";
 import _isArray from "lodash/isArray";
 import _debounce from "lodash/debounce";
-var _excluded = ["value", "onChange", "disabled", "labelInValue", "fieldNames", "readOnly", "addonAfter", "configOption", "title", "onFormat", "showCodeName", "optionRender", "customRender", "style", "className", "beforeOpen", "afterOpen", "isTooltip", "searchForm", "searchKey", "defaultOne", "otherProps"],
+var _excluded = ["value", "onChange", "disabled", "labelInValue", "fieldNames", "readOnly", "mode", "addonAfter", "configOption", "title", "onFormat", "showCodeName", "optionRender", "customRender", "style", "className", "beforeOpen", "afterOpen", "isTooltip", "tooltip", "searchForm", "searchKey", "defaultOne", "otherProps"],
   _excluded2 = ["onOk"],
   _excluded3 = ["rowKey", "columns", "rowSelection"];
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
@@ -48,6 +48,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     fieldNames = props.fieldNames,
     _props$readOnly = props.readOnly,
     readOnly = _props$readOnly === void 0 ? true : _props$readOnly,
+    _props$mode = props.mode,
+    mode = _props$mode === void 0 ? 'select' : _props$mode,
     addonAfter = props.addonAfter,
     configOption = props.configOption,
     title = props.title,
@@ -60,11 +62,22 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     beforeOpen = props.beforeOpen,
     afterOpen = props.afterOpen,
     isTooltip = props.isTooltip,
+    tooltip = props.tooltip,
     searchForm = props.searchForm,
     searchKey = props.searchKey,
     defaultOne = props.defaultOne,
     otherProps = props.otherProps,
     restProps = _objectWithoutProperties(props, _excluded);
+  var _tooltip = tooltip !== null && tooltip !== void 0 ? tooltip : isTooltip;
+  var _readOnly = readOnly;
+  if (mode) {
+    if (String(mode) === 'input') {
+      _readOnly = false;
+    }
+    if (String(mode) === 'select') {
+      _readOnly = true;
+    }
+  }
   var contentForm = _Form.useFormInstance();
   if (!configOption || Object.prototype.toString.call(configOption) !== '[object Object]') {
     throw new Error('error: 请检查枚举选择弹框的配置项【configOption】');
@@ -172,7 +185,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       transformResponse: transformResponse
     }, _objectSpread({
       manual: true,
-      ready: (initParams || defaultOne) && !readOnly || visible
+      ready: (initParams || defaultOne) && !_readOnly || visible
     }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options)),
     data = _useRequestList2.data,
     loading = _useRequestList2.loading,
@@ -262,7 +275,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   var handleChangeValue = function handleChangeValue(e) {
     onChange(e.target.value);
     preValue.current = e.target.value;
-    if (!readOnly) {
+    if (!_readOnly) {
       setState({
         _value: e.target.value
       });
@@ -520,7 +533,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
                   selectedRows: list,
                   selectedRowKeys: nextSelectRowKeys
                 });
-              } else if (!readOnly) {
+              } else if (!_readOnly) {
                 // 当传入initParams且文本框非只读时，不调用接口获取初始化数据
                 setState({
                   _value: value,
@@ -663,12 +676,12 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     hideTooltipIfOpen(fieldRef.current, visible);
   }, [visible]);
   useEffect(function () {
-    if (value && !visible && isInit && !readOnly) {
+    if (value && !visible && isInit && !_readOnly) {
       getInitValues();
     }
   }, [JSON.stringify(value), visible, isInit]);
   useDebounceEffect(function () {
-    if (value && !visible && readOnly && (!_isEqual(value, preValue.current) || (options === null || options === void 0 ? void 0 : options.length) === 0)) {
+    if (value && !visible && _readOnly && (!_isEqual(value, preValue.current) || (options === null || options === void 0 ? void 0 : options.length) === 0)) {
       var _options$some;
       preValue.current = value;
       var _data3 = labelInValue ? value[valueKey] : value;
@@ -735,7 +748,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
         });
       }
     }
-    if (!readOnly) {
+    if (!_readOnly) {
       if (labelInValue && _value && !_isEqual(value, _value)) {
         setState({
           _value: value,
@@ -758,7 +771,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       width: '100%'
     },
     block: true,
-    children: [readOnly ? _jsx(ProSelect, _objectSpread({
+    children: [_readOnly ? _jsx(ProSelect, _objectSpread({
       value: value,
       onChange: handleSelectValue,
       disabled: disabled,
@@ -799,7 +812,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     });
   }
   useDeepCompareEffect(function () {
-    if (isTooltip && value) {
+    if (_tooltip && value) {
       var dom = document.getElementById(uuid);
       dom.addEventListener('mouseover', function (e) {
         if (value && e.target.tagName === 'INPUT') {
@@ -832,7 +845,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
         });
       };
     }
-  }, [value, isTooltip]);
+  }, [value, _tooltip]);
   useDeepCompareEffect(function () {
     setState({
       options: (tableProps === null || tableProps === void 0 ? void 0 : tableProps.dataSource) || []
@@ -870,7 +883,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       className: _className,
       style: style,
       ref: fieldRef,
-      children: isTooltip && viewText ? _jsx(_Tooltip, {
+      children: _tooltip && viewText ? _jsx(_Tooltip, {
         placement: "topLeft",
         open: open,
         title: viewText,

package/es/ProForm/components/combination/ProModalSelect/propsType.d.ts

@@ -80,14 +80,18 @@ interface ProModalPropsType {
     beforeOpen?: any;
     /** 打开弹框后的回调函数 */
     afterOpen?: any;
-    /** 是否启用tooltip提示 */
+    /** 废弃 是否启用tooltip提示 */
     isTooltip?: boolean;
+    /** 是否启用tooltip提示 */
+    tooltip?: boolean;
     /** 是否以"值-名称"形式展示 */
     showCodeName?: boolean;
     /** 查询表单实例，用于获取查询表单数据 */
     searchForm?: FormInstance;
     /** 模糊查询的字段名 */
     searchKey?: string;
+    /** 展示形式 */
+    mode?: 'input' | 'select';
 }
 /** 模态框选择器属性类型（结合Select和Input属性） */
 export declare type ProModalSelectPropsType = SelectProps & InputProps & ProModalPropsType;

package/es/ProForm/components/combination/ProModalSelect/style/index.less

@@ -53,7 +53,7 @@
     }
   }
 
-  // 新加适用于 readonly false
+  // 新加适用于 _readOnly false
   .@{ant-prefix}-input-affix-wrapper {
     border-top-right-radius: 0;
     border-bottom-right-radius: 0;
@@ -100,7 +100,7 @@
   }
 
   .@{ant-prefix}-input-affix-wrapper-status-error{
-    
+
   }
 
 

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

@@ -10,10 +10,11 @@ import { Link } from 'react-router-dom';
 import { Icon } from '../../index';
 import SideMenu from '../SideMenu';
 import { LayoutContext } from '../../../../index';
-import { getUrlParams, getPathNameKey } from '../../../../utils';
+import { getUrlParams, getPathNameKey, findMenuItemByKey } from '../../../../utils';
 var FoldMenu = function FoldMenu(props) {
   var style = props.style,
-    dataSource = props.dataSource;
+    dataSource = props.dataSource,
+    onMenuClick = props.onMenuClick;
   var menus = dataSource.menus,
     iconfontUrl = dataSource.iconfontUrl,
     notice = dataSource.notice,
@@ -82,7 +83,8 @@ var FoldMenu = function FoldMenu(props) {
           content: _jsx(SideMenu, {
             dataSource: _objectSpread(_objectSpread({}, dataSource), {}, {
               menus: item
-            })
+            }),
+            onMenuClick: onMenuClick
           }),
           color: "#fff",
           overlayClassName: noticeCls,
@@ -91,12 +93,42 @@ var FoldMenu = function FoldMenu(props) {
             height: "calc(100vh - ".concat(headerHeight + (notice ? 32 : 0), "px)")
           },
           placement: "rightTop",
-          children: LiNode
+          children: _jsx("span", {
+            onClick: function onClick() {
+              // 查找完整的菜单项数据
+              var menuItem = findMenuItemByKey(menus, String(id));
+              var menuKeyPath = (menuItem === null || menuItem === void 0 ? void 0 : menuItem.keyIdPath) ? menuItem.keyIdPath.map(function (id) {
+                return String(id);
+              }) : [String(id)];
+              // 调用用户传入的onMenuClick回调
+              if (onMenuClick) {
+                onMenuClick({
+                  item: menuItem,
+                  key: String(id),
+                  keyPath: menuKeyPath
+                });
+              }
+            },
+            children: LiNode
+          })
         }, "".concat(id, "-").concat(name)) : !collapsed ? _jsx(_Tooltip, {
           placement: "right",
           title: name,
           children: _jsx("span", {
             onClick: function onClick() {
+              // 查找完整的菜单项数据
+              var menuItem = findMenuItemByKey(menus, String(id));
+              var menuKeyPath = (menuItem === null || menuItem === void 0 ? void 0 : menuItem.keyIdPath) ? menuItem.keyIdPath.map(function (id) {
+                return String(id);
+              }) : [String(id)];
+              // 调用用户传入的onMenuClick回调
+              if (onMenuClick) {
+                onMenuClick({
+                  item: menuItem,
+                  key: String(id),
+                  keyPath: menuKeyPath
+                });
+              }
               onSelected({
                 selectedPath: toPath
               });
@@ -106,10 +138,27 @@ var FoldMenu = function FoldMenu(props) {
               children: LiNode
             }, toPath)
           })
-        }, toPath) : _jsx(Link, {
-          to: toPath,
-          children: LiNode
-        }, toPath);
+        }, toPath) : _jsx("span", {
+          onClick: function onClick() {
+            // 查找完整的菜单项数据
+            var menuItem = findMenuItemByKey(menus, String(id));
+            var menuKeyPath = (menuItem === null || menuItem === void 0 ? void 0 : menuItem.keyIdPath) ? menuItem.keyIdPath.map(function (id) {
+              return String(id);
+            }) : [String(id)];
+            // 调用用户传入的onMenuClick回调
+            if (onMenuClick) {
+              onMenuClick({
+                item: menuItem,
+                key: String(id),
+                keyPath: menuKeyPath
+              });
+            }
+          },
+          children: _jsx(Link, {
+            to: toPath,
+            children: LiNode
+          }, toPath)
+        });
       })
     })
   });

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

@@ -10,7 +10,7 @@ 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 { getIdsByPathName, findMenuItemByKey } from '../../../../utils';
 import { Icon } from '../../index';
 var OpenMenu = function OpenMenu(props) {
   var _getIdsByPathName;
@@ -18,7 +18,8 @@ var OpenMenu = function OpenMenu(props) {
     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;
@@ -142,7 +143,26 @@ 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 ? 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

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

@@ -4,7 +4,8 @@ import classnames from 'classnames';
 import { useSize } from 'ahooks';
 import OpenMenu from '../OpenMenu';
 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,
@@ -24,6 +25,7 @@ var SideMenu = function SideMenu(props) {
       children: _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/index.js

@@ -13,7 +13,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,
@@ -39,6 +40,7 @@ var Menu = function Menu(props) {
         height: headerHeight + (notice ? 32 : 0) + 48
       },
       theme: theme,
+      onMenuClick: onMenuClick,
       style: {
         display: collapsed ? 'block' : 'none'
       }
@@ -51,6 +53,7 @@ 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)")

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

@@ -150,6 +150,9 @@
       .@{ant-prefix}-collapse-expand-icon {
         display: none;
       }
+      .pro-collapse-content{
+        padding: var(--zaui-space-size-sm, 8px) 0 !important;
+      }
     }
   }
 

package/es/ProLayout/index.js

@@ -30,7 +30,8 @@ var ProLayout = function ProLayout(props) {
     pathPrefix = _props$pathPrefix === void 0 ? '' : _props$pathPrefix,
     theme = props.theme,
     target = props.target,
-    onCollapsedChange = props.onCollapsedChange;
+    onCollapsedChange = props.onCollapsedChange,
+    onMenuClick = props.onMenuClick;
   var _useSetState = useSetState({
       notice: headerNotice || noticeIn,
       menus: [],
@@ -95,6 +96,7 @@ var ProLayout = function ProLayout(props) {
         } : menus,
         notice: notice,
         collapsed: collapsed,
+        onMenuClick: onMenuClick,
         onToggle: function onToggle() {
           toggle();
           onCollapsedChange && onCollapsedChange(!collapsed);

package/es/ProLayout/propTypes.d.ts

@@ -180,6 +180,15 @@ export interface ProLayoutType {
      * @default -
      */
     onCollapsedChange?: (collapsed: boolean) => void;
+    /**
+     * @description 菜单点击回调事件，返回命中的菜单项数据和完整路径
+     * @default -
+     */
+    onMenuClick?: (params: {
+        item: MenusType | null;
+        key: string;
+        keyPath: string[];
+    }) => void;
     /**
      * @description 规定在何处打开被链接文档
      * @default "_self"

package/es/ProLayout/utils/index.d.ts

@@ -34,3 +34,10 @@ export declare const getPathNameKey: ({ menus, pathName, }: {
     menus: any[];
     pathName: string;
 }) => any;
+/**
+ * 根据key查找完整的菜单项数据
+ * @param menus 菜单数据数组
+ * @param key 要查找的菜单项key
+ * @returns 找到的菜单项数据或null
+ */
+export declare const findMenuItemByKey: (menus: any[], key: string) => any;

package/es/ProLayout/utils/index.js

@@ -1,3 +1,4 @@
+import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _isPlainObject from "lodash/isPlainObject";
@@ -159,4 +160,33 @@ export var getPathNameKey = function getPathNameKey(_ref) {
   };
   _menuDeep3(menus);
   return result;
-};
+};
+/**
+ * 根据key查找完整的菜单项数据
+ * @param menus 菜单数据数组
+ * @param key 要查找的菜单项key
+ * @returns 找到的菜单项数据或null
+ */
+var _findMenuItemByKey = function findMenuItemByKey(menus, key) {
+  // eslint-disable-next-line no-restricted-syntax
+  var _iterator = _createForOfIteratorHelper(menus),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var item = _step.value;
+      if (String(item.id) === key) {
+        return item;
+      }
+      if (Array.isArray(item.children) && item.children.length) {
+        var found = _findMenuItemByKey(item.children, key);
+        if (found) return found;
+      }
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  return null;
+};
+export { _findMenuItemByKey as findMenuItemByKey };

package/lib/ProForm/components/combination/ProModalSelect/hooks/useRequestList.js

@@ -107,9 +107,7 @@ function useRequestList(service, options, useRequestOptions) {
   }, [onChange, searchValues]);
   // 重置查询条件
   var onReset = (0, _react.useCallback)(function () {
-    onSearch({
-      d: Date.now()
-    });
+    onSearch({});
   }, [onSearch]);
   var dataSource = (0, _react.useMemo)(function () {
     if (data) {

package/lib/ProForm/components/combination/ProModalSelect/index.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 require("antd/es/tooltip/style");
-var _tooltip = _interopRequireDefault(require("antd/es/tooltip"));
+var _tooltip2 = _interopRequireDefault(require("antd/es/tooltip"));
 require("antd/es/button/style");
 var _button = _interopRequireDefault(require("antd/es/button"));
 require("antd/es/input/style");
@@ -43,7 +43,7 @@ var _view = _interopRequireDefault(require("../../../../assets/view.svg"));
 var _useRequestList3 = _interopRequireDefault(require("./hooks/useRequestList"));
 var _locale = _interopRequireDefault(require("../../../../locale"));
 var _utils = require("./utils");
-var _excluded = ["value", "onChange", "disabled", "labelInValue", "fieldNames", "readOnly", "addonAfter", "configOption", "title", "onFormat", "showCodeName", "optionRender", "customRender", "style", "className", "beforeOpen", "afterOpen", "isTooltip", "searchForm", "searchKey", "defaultOne", "otherProps"],
+var _excluded = ["value", "onChange", "disabled", "labelInValue", "fieldNames", "readOnly", "mode", "addonAfter", "configOption", "title", "onFormat", "showCodeName", "optionRender", "customRender", "style", "className", "beforeOpen", "afterOpen", "isTooltip", "tooltip", "searchForm", "searchKey", "defaultOne", "otherProps"],
   _excluded2 = ["onOk"],
   _excluded3 = ["rowKey", "columns", "rowSelection"];
 var ProModalSelect = function ProModalSelect(props, ref) {
@@ -56,6 +56,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     fieldNames = props.fieldNames,
     _props$readOnly = props.readOnly,
     readOnly = _props$readOnly === void 0 ? true : _props$readOnly,
+    _props$mode = props.mode,
+    mode = _props$mode === void 0 ? 'select' : _props$mode,
     addonAfter = props.addonAfter,
     configOption = props.configOption,
     title = props.title,
@@ -68,11 +70,22 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     beforeOpen = props.beforeOpen,
     afterOpen = props.afterOpen,
     isTooltip = props.isTooltip,
+    tooltip = props.tooltip,
     searchForm = props.searchForm,
     searchKey = props.searchKey,
     defaultOne = props.defaultOne,
     otherProps = props.otherProps,
     restProps = (0, _objectWithoutProperties2.default)(props, _excluded);
+  var _tooltip = tooltip !== null && tooltip !== void 0 ? tooltip : isTooltip;
+  var _readOnly = readOnly;
+  if (mode) {
+    if (String(mode) === 'input') {
+      _readOnly = false;
+    }
+    if (String(mode) === 'select') {
+      _readOnly = true;
+    }
+  }
   var contentForm = _form.default.useFormInstance();
   if (!configOption || Object.prototype.toString.call(configOption) !== '[object Object]') {
     throw new Error('error: 请检查枚举选择弹框的配置项【configOption】');
@@ -180,7 +193,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       transformResponse: transformResponse
     }, (0, _objectSpread5.default)({
       manual: true,
-      ready: (initParams || defaultOne) && !readOnly || visible
+      ready: (initParams || defaultOne) && !_readOnly || visible
     }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options)),
     data = _useRequestList2.data,
     loading = _useRequestList2.loading,
@@ -270,7 +283,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   var handleChangeValue = function handleChangeValue(e) {
     onChange(e.target.value);
     preValue.current = e.target.value;
-    if (!readOnly) {
+    if (!_readOnly) {
       setState({
         _value: e.target.value
       });
@@ -528,7 +541,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
                   selectedRows: list,
                   selectedRowKeys: nextSelectRowKeys
                 });
-              } else if (!readOnly) {
+              } else if (!_readOnly) {
                 // 当传入initParams且文本框非只读时，不调用接口获取初始化数据
                 setState({
                   _value: value,
@@ -671,12 +684,12 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     (0, _utils.hideTooltipIfOpen)(fieldRef.current, visible);
   }, [visible]);
   (0, _react.useEffect)(function () {
-    if (value && !visible && isInit && !readOnly) {
+    if (value && !visible && isInit && !_readOnly) {
       getInitValues();
     }
   }, [JSON.stringify(value), visible, isInit]);
   (0, _ahooks.useDebounceEffect)(function () {
-    if (value && !visible && readOnly && (!(0, _isEqual2.default)(value, preValue.current) || (options === null || options === void 0 ? void 0 : options.length) === 0)) {
+    if (value && !visible && _readOnly && (!(0, _isEqual2.default)(value, preValue.current) || (options === null || options === void 0 ? void 0 : options.length) === 0)) {
       var _options$some;
       preValue.current = value;
       var _data3 = labelInValue ? value[valueKey] : value;
@@ -743,7 +756,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
         });
       }
     }
-    if (!readOnly) {
+    if (!_readOnly) {
       if (labelInValue && _value && !(0, _isEqual2.default)(value, _value)) {
         setState({
           _value: value,
@@ -766,7 +779,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       width: '100%'
     },
     block: true,
-    children: [readOnly ? (0, _jsxRuntime.jsx)(_index.ProSelect, (0, _objectSpread5.default)({
+    children: [_readOnly ? (0, _jsxRuntime.jsx)(_index.ProSelect, (0, _objectSpread5.default)({
       value: value,
       onChange: handleSelectValue,
       disabled: disabled,
@@ -807,7 +820,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     });
   }
   (0, _ahooks.useDeepCompareEffect)(function () {
-    if (isTooltip && value) {
+    if (_tooltip && value) {
       var dom = document.getElementById(uuid);
       dom.addEventListener('mouseover', function (e) {
         if (value && e.target.tagName === 'INPUT') {
@@ -840,7 +853,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
         });
       };
     }
-  }, [value, isTooltip]);
+  }, [value, _tooltip]);
   (0, _ahooks.useDeepCompareEffect)(function () {
     setState({
       options: (tableProps === null || tableProps === void 0 ? void 0 : tableProps.dataSource) || []
@@ -878,7 +891,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       className: _className,
       style: style,
       ref: fieldRef,
-      children: isTooltip && viewText ? (0, _jsxRuntime.jsx)(_tooltip.default, {
+      children: _tooltip && viewText ? (0, _jsxRuntime.jsx)(_tooltip2.default, {
         placement: "topLeft",
         open: open,
         title: viewText,

package/lib/ProForm/components/combination/ProModalSelect/propsType.d.ts

@@ -80,14 +80,18 @@ interface ProModalPropsType {
     beforeOpen?: any;
     /** 打开弹框后的回调函数 */
     afterOpen?: any;
-    /** 是否启用tooltip提示 */
+    /** 废弃 是否启用tooltip提示 */
     isTooltip?: boolean;
+    /** 是否启用tooltip提示 */
+    tooltip?: boolean;
     /** 是否以"值-名称"形式展示 */
     showCodeName?: boolean;
     /** 查询表单实例，用于获取查询表单数据 */
     searchForm?: FormInstance;
     /** 模糊查询的字段名 */
     searchKey?: string;
+    /** 展示形式 */
+    mode?: 'input' | 'select';
 }
 /** 模态框选择器属性类型（结合Select和Input属性） */
 export declare type ProModalSelectPropsType = SelectProps & InputProps & ProModalPropsType;

package/lib/ProForm/components/combination/ProModalSelect/style/index.less

@@ -53,7 +53,7 @@
     }
   }
 
-  // 新加适用于 readonly false
+  // 新加适用于 _readOnly false
   .@{ant-prefix}-input-affix-wrapper {
     border-top-right-radius: 0;
     border-bottom-right-radius: 0;
@@ -100,7 +100,7 @@
   }
 
   .@{ant-prefix}-input-affix-wrapper-status-error{
-    
+
   }
 
 

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

@@ -20,7 +20,8 @@ var _index2 = require("../../../../index");
 var _utils = require("../../../../utils");
 var FoldMenu = function FoldMenu(props) {
   var style = props.style,
-    dataSource = props.dataSource;
+    dataSource = props.dataSource,
+    onMenuClick = props.onMenuClick;
   var menus = dataSource.menus,
     iconfontUrl = dataSource.iconfontUrl,
     notice = dataSource.notice,
@@ -89,7 +90,8 @@ var FoldMenu = function FoldMenu(props) {
           content: (0, _jsxRuntime.jsx)(_SideMenu.default, {
             dataSource: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, dataSource), {}, {
               menus: item
-            })
+            }),
+            onMenuClick: onMenuClick
           }),
           color: "#fff",
           overlayClassName: noticeCls,
@@ -98,12 +100,42 @@ var FoldMenu = function FoldMenu(props) {
             height: "calc(100vh - ".concat(headerHeight + (notice ? 32 : 0), "px)")
           },
           placement: "rightTop",
-          children: LiNode
+          children: (0, _jsxRuntime.jsx)("span", {
+            onClick: function onClick() {
+              // 查找完整的菜单项数据
+              var menuItem = (0, _utils.findMenuItemByKey)(menus, String(id));
+              var menuKeyPath = (menuItem === null || menuItem === void 0 ? void 0 : menuItem.keyIdPath) ? menuItem.keyIdPath.map(function (id) {
+                return String(id);
+              }) : [String(id)];
+              // 调用用户传入的onMenuClick回调
+              if (onMenuClick) {
+                onMenuClick({
+                  item: menuItem,
+                  key: String(id),
+                  keyPath: menuKeyPath
+                });
+              }
+            },
+            children: LiNode
+          })
         }, "".concat(id, "-").concat(name)) : !collapsed ? (0, _jsxRuntime.jsx)(_tooltip.default, {
           placement: "right",
           title: name,
           children: (0, _jsxRuntime.jsx)("span", {
             onClick: function onClick() {
+              // 查找完整的菜单项数据
+              var menuItem = (0, _utils.findMenuItemByKey)(menus, String(id));
+              var menuKeyPath = (menuItem === null || menuItem === void 0 ? void 0 : menuItem.keyIdPath) ? menuItem.keyIdPath.map(function (id) {
+                return String(id);
+              }) : [String(id)];
+              // 调用用户传入的onMenuClick回调
+              if (onMenuClick) {
+                onMenuClick({
+                  item: menuItem,
+                  key: String(id),
+                  keyPath: menuKeyPath
+                });
+              }
               onSelected({
                 selectedPath: toPath
               });
@@ -113,10 +145,27 @@ var FoldMenu = function FoldMenu(props) {
               children: LiNode
             }, toPath)
           })
-        }, toPath) : (0, _jsxRuntime.jsx)(_reactRouterDom.Link, {
-          to: toPath,
-          children: LiNode
-        }, toPath);
+        }, toPath) : (0, _jsxRuntime.jsx)("span", {
+          onClick: function onClick() {
+            // 查找完整的菜单项数据
+            var menuItem = (0, _utils.findMenuItemByKey)(menus, String(id));
+            var menuKeyPath = (menuItem === null || menuItem === void 0 ? void 0 : menuItem.keyIdPath) ? menuItem.keyIdPath.map(function (id) {
+              return String(id);
+            }) : [String(id)];
+            // 调用用户传入的onMenuClick回调
+            if (onMenuClick) {
+              onMenuClick({
+                item: menuItem,
+                key: String(id),
+                keyPath: menuKeyPath
+              });
+            }
+          },
+          children: (0, _jsxRuntime.jsx)(_reactRouterDom.Link, {
+            to: toPath,
+            children: LiNode
+          }, toPath)
+        });
       })
     })
   });

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

@@ -25,7 +25,8 @@ var OpenMenu = function OpenMenu(props) {
     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;
@@ -149,7 +150,26 @@ 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 = (0, _utils.findMenuItemByKey)(menus, key);
+        var menuKeyPath = (menuItem === null || menuItem === void 0 ? 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

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

@@ -11,7 +11,8 @@ var _classnames = _interopRequireDefault(require("classnames"));
 var _ahooks = require("ahooks");
 var _OpenMenu = _interopRequireDefault(require("../OpenMenu"));
 var SideMenu = function SideMenu(props) {
-  var dataSource = props.dataSource;
+  var dataSource = props.dataSource,
+    onMenuClick = props.onMenuClick;
   var ref = (0, _react.useRef)(null);
   var size = (0, _ahooks.useSize)(ref);
   var menus = dataSource.menus,
@@ -31,6 +32,7 @@ var SideMenu = function SideMenu(props) {
       children: (0, _jsxRuntime.jsx)(_OpenMenu.default, {
         className: "pro-layout-sider-menu-list",
         theme: "light",
+        onMenuClick: onMenuClick,
         dataSource: {
           menus: (menus === null || menus === void 0 ? void 0 : menus.children) || [],
           iconfontUrl: iconfontUrl,

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

@@ -21,7 +21,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 = (0, _classnames.default)({
     'pro-layout-menu': true,
@@ -47,6 +48,7 @@ var Menu = function Menu(props) {
         height: headerHeight + (notice ? 32 : 0) + 48
       },
       theme: theme,
+      onMenuClick: onMenuClick,
       style: {
         display: collapsed ? 'block' : 'none'
       }
@@ -59,6 +61,7 @@ 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)")

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

@@ -150,6 +150,9 @@
       .@{ant-prefix}-collapse-expand-icon {
         display: none;
       }
+      .pro-collapse-content{
+        padding: var(--zaui-space-size-sm, 8px) 0 !important;
+      }
     }
   }
 

package/lib/ProLayout/index.js

@@ -37,7 +37,8 @@ var ProLayout = function ProLayout(props) {
     pathPrefix = _props$pathPrefix === void 0 ? '' : _props$pathPrefix,
     theme = props.theme,
     target = props.target,
-    onCollapsedChange = props.onCollapsedChange;
+    onCollapsedChange = props.onCollapsedChange,
+    onMenuClick = props.onMenuClick;
   var _useSetState = (0, _ahooks.useSetState)({
       notice: headerNotice || noticeIn,
       menus: [],
@@ -102,6 +103,7 @@ var ProLayout = function ProLayout(props) {
         } : menus,
         notice: notice,
         collapsed: collapsed,
+        onMenuClick: onMenuClick,
         onToggle: function onToggle() {
           toggle();
           onCollapsedChange && onCollapsedChange(!collapsed);

package/lib/ProLayout/propTypes.d.ts

@@ -180,6 +180,15 @@ export interface ProLayoutType {
      * @default -
      */
     onCollapsedChange?: (collapsed: boolean) => void;
+    /**
+     * @description 菜单点击回调事件，返回命中的菜单项数据和完整路径
+     * @default -
+     */
+    onMenuClick?: (params: {
+        item: MenusType | null;
+        key: string;
+        keyPath: string[];
+    }) => void;
     /**
      * @description 规定在何处打开被链接文档
      * @default "_self"

package/lib/ProLayout/utils/index.d.ts

@@ -34,3 +34,10 @@ export declare const getPathNameKey: ({ menus, pathName, }: {
     menus: any[];
     pathName: string;
 }) => any;
+/**
+ * 根据key查找完整的菜单项数据
+ * @param menus 菜单数据数组
+ * @param key 要查找的菜单项key
+ * @returns 找到的菜单项数据或null
+ */
+export declare const findMenuItemByKey: (menus: any[], key: string) => any;

package/lib/ProLayout/utils/index.js

@@ -4,9 +4,10 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getPathNameKey = exports.getIdsByPathName = void 0;
+exports.getPathNameKey = exports.getIdsByPathName = exports.findMenuItemByKey = void 0;
 exports.getUrlParams = getUrlParams;
 exports.transformMenus = exports.transformMenu = void 0;
+var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/createForOfIteratorHelper"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _isPlainObject2 = _interopRequireDefault(require("lodash/isPlainObject"));
@@ -168,4 +169,32 @@ var getPathNameKey = exports.getPathNameKey = function getPathNameKey(_ref) {
   };
   _menuDeep3(menus);
   return result;
+};
+/**
+ * 根据key查找完整的菜单项数据
+ * @param menus 菜单数据数组
+ * @param key 要查找的菜单项key
+ * @returns 找到的菜单项数据或null
+ */
+var _findMenuItemByKey = exports.findMenuItemByKey = function findMenuItemByKey(menus, key) {
+  // eslint-disable-next-line no-restricted-syntax
+  var _iterator = (0, _createForOfIteratorHelper2.default)(menus),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var item = _step.value;
+      if (String(item.id) === key) {
+        return item;
+      }
+      if (Array.isArray(item.children) && item.children.length) {
+        var found = _findMenuItemByKey(item.children, key);
+        if (found) return found;
+      }
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  return null;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.13.18-beta.2",
+  "version": "3.13.18-beta.4",
   "license": "MIT",
   "main": "lib/index.js",
   "module": "es/index.js",