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

package/es/ProForm/components/render/Render.js

@@ -26,7 +26,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 var Render = function Render(props) {
-  var _ref2, _ref3, _ref4, _ref5, _otherProps$names2;
+  var _ref2, _ref3, _ref4, _ref5, _otherProps$names3;
   var component = props.component,
     originComponent = props.originComponent,
     _props$formItemProps = props.formItemProps,
@@ -47,7 +47,8 @@ var Render = function Render(props) {
     globalControl = props.globalControl,
     diffConfig = props.diffConfig,
     viewRender = props.viewRender,
-    desensitization = props.desensitization;
+    desensitization = props.desensitization,
+    shouldUpdateDebounce = props.shouldUpdateDebounce;
   var colProps = props.colProps;
 
   // 剔除一些不是FormItem的属性, 防止控制台报warning
@@ -76,7 +77,8 @@ var Render = function Render(props) {
       component: component,
       originComponent: originComponent,
       type: type,
-      desensitization: desensitization
+      desensitization: desensitization,
+      shouldUpdateDebounce: shouldUpdateDebounce
     }),
     shouldUpdate = _useShouldUpdate.shouldUpdate,
     _show = _useShouldUpdate.show,
@@ -467,9 +469,19 @@ var Render = function Render(props) {
       });
     }
     if (diffConfig !== null && diffConfig !== void 0 && diffConfig.originalValues) {
+      var _otherProps$namePath, _otherProps$names2;
+      var nextNames = otherProps.names;
+      // FormList中的names字段需要去除前缀
+      if (otherProps !== null && otherProps !== void 0 && (_otherProps$namePath = otherProps.namePath) !== null && _otherProps$namePath !== void 0 && _otherProps$namePath.length && (_otherProps$names2 = otherProps.names) !== null && _otherProps$names2 !== void 0 && _otherProps$names2.length) {
+        var _otherProps$namePath2;
+        var prefixLength = (otherProps === null || otherProps === void 0 || (_otherProps$namePath2 = otherProps.namePath) === null || _otherProps$namePath2 === void 0 ? void 0 : _otherProps$namePath2.length) - 1;
+        nextNames = otherProps.names.map(function (name) {
+          return name.slice(prefixLength);
+        });
+      }
       child = /*#__PURE__*/_jsx(ChangedWrapper, {
         name: formItemProps.name,
-        names: otherProps.names,
+        names: nextNames,
         namesStr: namesStr,
         diffConfig: diffConfig,
         form: form,
@@ -501,7 +513,7 @@ var Render = function Render(props) {
       children: function children() {
         return renderItem();
       }
-    }) : renderItem(), otherProps !== null && otherProps !== void 0 && (_otherProps$names2 = otherProps.names) !== null && _otherProps$names2 !== void 0 && _otherProps$names2.length ? otherProps.names.map(function (name) {
+    }) : renderItem(), otherProps !== null && otherProps !== void 0 && (_otherProps$names3 = otherProps.names) !== null && _otherProps$names3 !== void 0 && _otherProps$names3.length ? otherProps.names.map(function (name) {
       return /*#__PURE__*/_jsx(Form.Item, {
         hidden: true,
         name: name,

package/es/ProForm/components/render/RenderFields.d.ts

@@ -21,6 +21,7 @@ interface Props<T = any> {
     required?: boolean | boolean[] | (() => boolean | boolean[]);
     globalControl?: boolean;
     desensitizationKey?: string;
+    shouldUpdateDebounce?: number;
 }
 declare const RenderFields: React.FC<Props>;
 export default RenderFields;

package/es/ProForm/components/render/RenderFields.js

@@ -29,7 +29,8 @@ var RenderFields = function RenderFields(props) {
     required = props.required,
     diffConfig = props.diffConfig,
     globalControl = props.globalControl,
-    desensitizationKey = props.desensitizationKey;
+    desensitizationKey = props.desensitizationKey,
+    shouldUpdateDebounce = props.shouldUpdateDebounce;
 
   // 是否包含隐藏字段
   var hiddenData = columns.filter(function (item) {
@@ -240,7 +241,8 @@ var RenderFields = function RenderFields(props) {
         requiredOnView: requiredOnView,
         globalControl: globalControl,
         viewRender: viewRender,
-        desensitization: desensitization
+        desensitization: desensitization,
+        shouldUpdateDebounce: shouldUpdateDebounce
       })
     }, "".concat(_formItemProps.name || _formItemProps.label).concat(index));
   });

package/es/ProForm/components/render/propsType.d.ts

@@ -280,6 +280,7 @@ export interface RenderType<Values = any> {
     requiredOnView?: boolean;
     confirm?: ProFormColumnType['confirm'];
     globalControl?: boolean;
+    shouldUpdateDebounce?: number;
     [name: string]: any;
 }
 /**

package/es/ProForm/index.d.ts

@@ -1,11 +1,11 @@
 import { FormInstance } from 'antd';
-import React, { ForwardRefRenderFunction } from 'react';
+import React from 'react';
 import { FormProviderProps } from 'antd/es/form/context';
 import type { ProFormType } from './propsType';
 import { useForm } from './utils/useForm';
 import useWatch from './utils/useWatch';
 import { useForms } from '../FormsProvider';
-interface IProForm<T = any> extends ForwardRefRenderFunction<FormInstance<T>, ProFormType<T>> {
+interface IProForm<T = any> extends React.ForwardRefExoticComponent<ProFormType<T> & React.RefAttributes<FormInstance<T>>> {
     useForm: typeof useForm;
     useWatch: typeof useWatch;
     useFormInstances: typeof useForms;

package/es/ProForm/index.js

@@ -3,7 +3,7 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["mode", "span", "disabled", "isView", "columns", "footer", "onOk", "okText", "onCancel", "confirmLoading", "cancelText", "form", "children", "rowProps", "className", "expand", "expandOpen", "expandOpenChange", "viewEmpty", "labelAlign", "labelWidth", "onValuesChange", "onFinish", "diffConfig", "submitOnEnter", "clearNotShow", "initialValues", "requiredOnView", "formId", "required", "formKey", "globalControl", "scrollToError", "optimize", "desensitizationKey", "stopOnFirstError"];
+var _excluded = ["mode", "span", "disabled", "isView", "columns", "footer", "onOk", "okText", "onCancel", "confirmLoading", "cancelText", "form", "children", "rowProps", "className", "expand", "expandOpen", "expandOpenChange", "viewEmpty", "labelAlign", "labelWidth", "onValuesChange", "onFinish", "diffConfig", "submitOnEnter", "clearNotShow", "initialValues", "requiredOnView", "formId", "required", "formKey", "globalControl", "scrollToError", "optimize", "desensitizationKey", "stopOnFirstError", "shouldUpdateDebounce"];
 import { DoubleLeftOutlined } from '@ant-design/icons';
 import { Col, Form, Row, Space } from 'antd';
 import classnames from 'classnames';
@@ -69,6 +69,8 @@ var ProForm = function ProForm(props, ref) {
     desensitizationKey = _props$desensitizatio === void 0 ? 'zat-design-pro-component-desensitization' : _props$desensitizatio,
     _props$stopOnFirstErr = props.stopOnFirstError,
     stopOnFirstError = _props$stopOnFirstErr === void 0 ? false : _props$stopOnFirstErr,
+    _props$shouldUpdateDe = props.shouldUpdateDebounce,
+    shouldUpdateDebounce = _props$shouldUpdateDe === void 0 ? 500 : _props$shouldUpdateDe,
     otherProps = _objectWithoutProperties(props, _excluded);
   var config = useProConfig('ProForm');
   // source: 用于区分是哪个组件调用，用于错误提示
@@ -262,7 +264,8 @@ var ProForm = function ProForm(props, ref) {
         requiredOnView: requiredOnView,
         required: required,
         globalControl: globalControl,
-        desensitizationKey: desensitizationKey
+        desensitizationKey: desensitizationKey,
+        shouldUpdateDebounce: shouldUpdateDebounce
       }), footerRender()]
     })), children]
   }));

package/es/ProForm/propsType.d.ts

@@ -103,6 +103,8 @@ export interface ProFormType<Values = any> extends FormProps<Values> {
     desensitizationKey?: string;
     /** 是否在遇到第一个错误时停止验证 */
     stopOnFirstError?: boolean;
+    /** shouldUpdate防抖延迟时间，默认500ms，设置为0则不防抖 */
+    shouldUpdateDebounce?: number;
 }
 export interface TransformType<T = any> {
     normalize?: (value: StoreValue, prevValue: StoreValue, allValues: Store) => StoreValue;

package/es/ProForm/style/index.less

@@ -1,5 +1,3 @@
-/* @root-entry-name: 'default'; */
-/* @import (reference) '~antd/es/style/themes/index.less'; */
 @import '../components/base/SwitchCheckbox/style/index.less';
 @import '../components/base/TimePicker/style/index.less';
 @import '../components/base/TextArea/index.less';

package/es/ProForm/utils/diffOriginal.d.ts

@@ -3,6 +3,7 @@ export interface DiffOriginalParams {
     originalValue: any;
     value: any;
     form: FormInstance;
+    type?: string;
     onDiff?: (originalValue: any, currentValue: any) => DiffType | boolean | undefined;
 }
 export type DiffType = 'same' | 'add' | 'changed';

package/es/ProForm/utils/diffOriginal.js

@@ -1,5 +1,63 @@
 import { isEqual, isFunction, isObject } from 'lodash';
 import { isEmpty } from "../../utils";
+
+// 比较策略接口
+
+// 数字类型标准化函数
+var normalizeNumberValue = function normalizeNumberValue(value) {
+  if (value === null || value === undefined || value === '') return null;
+  var num = Number(value);
+  return Number.isNaN(num) ? null : num;
+};
+
+// InputNumber 比较策略
+var inputNumberStrategy = {
+  compare: function compare(val1, val2) {
+    var num1 = normalizeNumberValue(val1);
+    var num2 = normalizeNumberValue(val2);
+    return num1 === num2;
+  }
+};
+
+// ProNumberRange 比较策略
+var proNumberRangeStrategy = {
+  compare: function compare(val1, val2) {
+    if (!Array.isArray(val1) || !Array.isArray(val2)) return false;
+    if (val1.length !== val2.length) return false;
+    return val1.every(function (item, index) {
+      var num1 = normalizeNumberValue(item);
+      var num2 = normalizeNumberValue(val2[index]);
+      return num1 === num2;
+    });
+  }
+};
+
+// 数字类型处理函数
+var handleNumberTypeDiff = function handleNumberTypeDiff(params) {
+  var originalValue = params.originalValue,
+    value = params.value,
+    type = params.type;
+  var isEmptyVal = isEmpty(value);
+  var isEmptyOrg = isEmpty(originalValue);
+
+  // 都为空视为相等
+  if (isEmptyOrg && isEmptyVal) return 'same';
+
+  // 如果原始值为空 且当前有值的话 视为新增
+  if (isEmptyOrg && !isEmptyVal) return 'add';
+
+  // 根据类型选择对应的比较策略
+  var compareStrategy;
+  if (type === 'InputNumber') {
+    compareStrategy = inputNumberStrategy;
+  } else if (type === 'ProNumberRange') {
+    compareStrategy = proNumberRangeStrategy;
+  } else {
+    return 'changed'; // 未知类型视为已改变
+  }
+  return compareStrategy.compare(value, originalValue) ? 'same' : 'changed';
+};
+
 // 过滤对象中undefined字段
 // 防止{a: '1'} {a: '1', b: undefined | null}被认为不相等
 var filterObject = function filterObject(data) {
@@ -32,7 +90,9 @@ var filterObject = function filterObject(data) {
 export var diffOriginal = function diffOriginal(params) {
   var originalValue = params.originalValue,
     value = params.value,
-    onDiff = params.onDiff;
+    onDiff = params.onDiff,
+    type = params.type;
+
   // 支持传入自定义比较事件
   if (isFunction(onDiff)) {
     var diffRes = onDiff(originalValue, value);
@@ -44,6 +104,11 @@ export var diffOriginal = function diffOriginal(params) {
       return diffRes;
     }
   }
+  if (['InputNumber', 'ProNumberRange'].includes(type)) {
+    return handleNumberTypeDiff(params);
+  }
+
+  // 其他类型使用原有逻辑
   var _value = filterObject(value);
   var _originalValue = filterObject(originalValue);
   var isEmptyVal = isEmpty(_value);

package/es/ProForm/utils/index.js

@@ -149,7 +149,7 @@ export var filterInternalFields = function filterInternalFields(values, optimize
   if (isObject(nextValues)) {
     var result = {};
     Object.keys(nextValues).forEach(function (key) {
-      if (key.includes('-')) return;
+      if (key.includes('-') || key.startsWith('__')) return;
       result[key] = filterInternalFields(nextValues[key]);
     });
     return result;

package/es/ProForm/utils/useShouldUpdate.d.ts

@@ -19,6 +19,7 @@ interface UseShouldUpdateProps<Values> {
     rules?: ProRule[];
     required?: boolean;
     type: string;
+    shouldUpdateDebounce?: number;
     [key: string]: any;
 }
 type HookShouldUpdate<Values = any> = (props: UseShouldUpdateProps<Values>) => Result<Values>;

package/es/ProForm/utils/useShouldUpdate.js

@@ -1,6 +1,6 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import { useRef, useState } from 'react';
-import { isFunction, isEqualWith, get } from 'lodash';
+import { useRef, useState, useEffect } from 'react';
+import { isFunction, isEqualWith, get, debounce } from 'lodash';
 import { customEqualForFunction } from "../../utils";
 /** FormList中被删除的行也会再触发一次响应式函数 排除这种场景 */
 var isDeleteLine = function isDeleteLine(form, namePath) {
@@ -23,7 +23,9 @@ var useShouldUpdate = function useShouldUpdate(props) {
     component = props.component,
     originComponent = props.originComponent,
     type = props.type,
-    desensitization = props.desensitization;
+    desensitization = props.desensitization,
+    _props$shouldUpdateDe = props.shouldUpdateDebounce,
+    shouldUpdateDebounce = _props$shouldUpdateDe === void 0 ? 500 : _props$shouldUpdateDe;
   var _shouldUpdate = formItemProps.shouldUpdate,
     name = formItemProps.name,
     clearNotShow = formItemProps.clearNotShow,
@@ -32,6 +34,8 @@ var useShouldUpdate = function useShouldUpdate(props) {
     names = formItemProps.names,
     dependNames = formItemProps.dependNames;
   var timerRef = useRef(null); // 清值防抖
+  var debouncedShouldUpdateRef = useRef(null); // shouldUpdate防抖函数
+  var pendingValuesRef = useRef(null); // 待处理的表单值
 
   var needClear = useRef(false); // 是否需要执行清值操作
   var showRef = useRef(false);
@@ -48,6 +52,77 @@ var useShouldUpdate = function useShouldUpdate(props) {
     reRender = _useState2[1];
   var values = {};
 
+  // 处理表单值更新的函数
+  var processValuesUpdate = function processValuesUpdate(currentValues) {
+    var _currentValues;
+    if (namePath) {
+      _currentValues = form.getFieldValue(namePath) || {};
+    } else {
+      _currentValues = currentValues;
+    }
+    var _show = isFunction(show) ? Boolean(show(_currentValues, {
+      form: form,
+      index: index,
+      namePath: namePath
+    })) : show;
+    var _disabled = isFunction(disabled) ? disabled(_currentValues, {
+      form: form,
+      index: index,
+      namePath: namePath
+    }) : disabled;
+    var _required = isFunction(required) ? required(_currentValues, {
+      form: form,
+      index: index,
+      namePath: namePath
+    }) : required;
+    var _rules = isFunction(rules) ? rules(_currentValues, {
+      form: form,
+      index: index,
+      namePath: namePath
+    }) : rules;
+    var _fieldProps = isFunction(fieldProps) ? fieldProps(_currentValues, {
+      form: form,
+      index: index,
+      namePath: namePath
+    }) : fieldProps;
+    var _desensitization = isFunction(desensitization) ? desensitization(_currentValues, {
+      form: form,
+      index: index,
+      namePath: namePath
+    }) : desensitization;
+    var equalRes = isEqualWith(rulesRef.current, _rules, customEqualForFunction);
+    var proEqualRes = isEqualWith(fieldPropsRef.current, _fieldProps, customEqualForFunction);
+    var desensitizationRes = isEqualWith(desensitizationRef.current, _desensitization);
+    if (_show !== showRef.current || !isEqualWith(disabledRef.current, _disabled, customEqualForFunction) || _required !== requiredRef.current || !equalRes || !proEqualRes || !desensitizationRes || _fieldProps !== null && _fieldProps !== void 0 && _fieldProps.transformResponse) {
+      showRef.current = _show;
+      disabledRef.current = _disabled;
+      requiredRef.current = _required;
+      rulesRef.current = _rules;
+      fieldPropsRef.current = _fieldProps;
+      desensitizationRef.current = _desensitization;
+      reRender({});
+    }
+  };
+
+  // 创建防抖函数
+  useEffect(function () {
+    if (shouldUpdateDebounce > 0 && (dependNames !== null && dependNames !== void 0 && dependNames.length || isFunction(show) || isFunction(disabled) || isFunction(required) || isFunction(rules) || isFunction(fieldProps) || isFunction(originComponent) || isFunction(desensitization))) {
+      debouncedShouldUpdateRef.current = debounce(function () {
+        if (pendingValuesRef.current) {
+          var currentValues = pendingValuesRef.current;
+          pendingValuesRef.current = null;
+
+          // 使用最新的values重新计算状态
+          processValuesUpdate(currentValues);
+        }
+      }, shouldUpdateDebounce);
+    }
+    return function () {
+      var _debouncedShouldUpdat;
+      (_debouncedShouldUpdat = debouncedShouldUpdateRef.current) === null || _debouncedShouldUpdat === void 0 || _debouncedShouldUpdat.cancel();
+    };
+  }, [shouldUpdateDebounce, dependNames === null || dependNames === void 0 ? void 0 : dependNames.length, show, disabled, required, rules, fieldProps, originComponent, desensitization]);
+
   // 不是动态函数直接返回
   if (!(dependNames !== null && dependNames !== void 0 && dependNames.length) && !isFunction(show) && !isFunction(disabled) && !isFunction(required) && !isFunction(rules) && !isFunction(fieldProps) && !isFunction(originComponent) && !isFunction(desensitization)) {
     return {
@@ -159,6 +234,17 @@ var useShouldUpdate = function useShouldUpdate(props) {
         dependNamesRef.current = curDependNamesValue;
         if (!dependNamesChanged) return false;
       }
+
+      // 如果启用了防抖且存在防抖函数
+      if (shouldUpdateDebounce > 0 && debouncedShouldUpdateRef.current) {
+        // 缓存最新的表单值
+        pendingValuesRef.current = currentValues;
+        // 触发防抖函数
+        debouncedShouldUpdateRef.current();
+        return false; // 暂时不更新，由防抖函数控制
+      }
+
+      // 原有的非防抖逻辑
       var _currentValues;
       if (namePath) {
         // formList场景values取当前行数据

package/es/ProIcon/style/index.less

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

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

@@ -6,12 +6,13 @@ 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";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 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,
@@ -84,7 +85,8 @@ var FoldMenu = function FoldMenu(props) {
           content: /*#__PURE__*/_jsx(SideMenu, {
             dataSource: _objectSpread(_objectSpread({}, dataSource), {}, {
               menus: item
-            })
+            }),
+            onMenuClick: onMenuClick
           }),
           color: "#fff",
           classNames: {
@@ -97,12 +99,44 @@ var FoldMenu = function FoldMenu(props) {
             }
           },
           placement: "rightTop",
-          children: LiNode
+          children: /*#__PURE__*/_jsx("span", {
+            onClick: function onClick() {
+              // 查找完整的菜单项数据
+              var menuItem = findMenuItemByKey(menus, String(id));
+              var menuKeyPath = menuItem !== null && menuItem !== 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 ? /*#__PURE__*/_jsx(Tooltip, {
           placement: "right",
           title: name,
           children: /*#__PURE__*/_jsx("span", {
             onClick: function onClick() {
+              // 查找完整的菜单项数据
+              var menuItem = findMenuItemByKey(menus, String(id));
+              var menuKeyPath = menuItem !== null && menuItem !== 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
               });
@@ -112,10 +146,28 @@ var FoldMenu = function FoldMenu(props) {
               children: LiNode
             }, toPath)
           })
-        }, toPath) : /*#__PURE__*/_jsx(Link, {
-          to: toPath,
-          children: LiNode
-        }, toPath);
+        }, toPath) : /*#__PURE__*/_jsx("span", {
+          onClick: function onClick() {
+            // 查找完整的菜单项数据
+            var menuItem = findMenuItemByKey(menus, String(id));
+            var menuKeyPath = menuItem !== null && menuItem !== 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: /*#__PURE__*/_jsx(Link, {
+            to: toPath,
+            children: LiNode
+          }, toPath)
+        });
       })
     })
   });

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

@@ -8,7 +8,7 @@ import classnames from 'classnames';
 import { Link } from 'react-router-dom';
 import { cloneDeep } from 'lodash';
 import { LayoutContext } from "../../../../index";
-import { getIdsByPathName } from "../../../../utils";
+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";
@@ -19,7 +19,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;
@@ -146,7 +147,28 @@ 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 || (_item$props = item.props) === null || _item$props === void 0 ? void 0 : _item$props.router

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

@@ -5,7 +5,8 @@ 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,
@@ -25,6 +26,7 @@ var SideMenu = function SideMenu(props) {
       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

@@ -15,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,
@@ -41,6 +42,7 @@ var Menu = function Menu(props) {
         height: headerHeight + (notice ? 32 : 0) + 48
       },
       theme: theme,
+      onMenuClick: onMenuClick,
       style: {
         display: collapsed ? 'block' : 'none'
       }
@@ -53,6 +55,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/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/style/index.less

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