@zat-design/sisyphus-react 4.0.13 → 4.0.14

package/lib/ProEditLabel/index.js

@@ -74,6 +74,11 @@ var ProEditLabel = _ref => {
     _Form$useForm4 = _slicedToArray(_Form$useForm3, 1),
     viewForm = _Form$useForm4[0];
   var inputRef = (0, _react.useRef)(null);
+
+  // 类型断言：antd FormInstance 确实有这些方法（setFieldsValue, validateFields等）
+  // 使用类型断言解决 TypeScript 类型检查问题
+  var formInstance = form;
+  var viewFormInstance = viewForm;
   var onPress = e => {
     var element = e.target;
     if (e.key === 'Enter') {
@@ -89,9 +94,16 @@ var ProEditLabel = _ref => {
     if (mode === 'popup') {
       // 兼容老写法
       if (!popupProps.columns) {
-        form.setFieldValue((popupProps === null || popupProps === void 0 ? void 0 : popupProps.type) || 'Input', confirmValue);
+        if (!(popupProps !== null && popupProps !== void 0 && popupProps.type)) {
+          console.warn('ProEditLabel: popupProps.type is required when using old API (without columns)');
+          return;
+        }
+        formInstance.setFieldsValue({
+          [popupProps.type]: confirmValue
+        });
       } else {
-        form.setFieldsValue(confirmValue || {});
+        var matchedValue = (0, _utils.matchFormValue)(confirmValue, popupProps.columns);
+        formInstance.setFieldsValue(matchedValue || {});
       }
       // 弹窗同步最新value数据，解决Popconfirm空白处关闭数据不同步问题
       setState({
@@ -119,13 +131,21 @@ var ProEditLabel = _ref => {
     if (mode === 'popup' && props.value) {
       // 兼容老写法
       if (!popupProps.columns) {
-        form.setFieldValue((popupProps === null || popupProps === void 0 ? void 0 : popupProps.type) || 'Input', props.value);
+        if (!(popupProps !== null && popupProps !== void 0 && popupProps.type)) {
+          console.warn('ProEditLabel: popupProps.type is required when using old API (without columns)');
+          return;
+        }
+        formInstance.setFieldsValue({
+          [popupProps.type]: props.value
+        });
         // 文本模式初始化赋值
-        viewForm.setFieldValue((popupProps === null || popupProps === void 0 ? void 0 : popupProps.type) || 'Input', props.value);
+        viewFormInstance.setFieldsValue({
+          [popupProps.type]: props.value
+        });
       } else {
-        form.setFieldsValue((0, _utils.matchFormValue)(props.value, popupProps.columns) || {});
+        formInstance.setFieldsValue((0, _utils.matchFormValue)(props.value, popupProps.columns) || {});
         // 文本模式初始化赋值
-        viewForm.setFieldsValue((0, _utils.matchFormValue)(props.value, popupProps.columns) || {});
+        viewFormInstance.setFieldsValue((0, _utils.matchFormValue)(props.value, popupProps.columns) || {});
       }
     }
   }, [props.value, mode]);
@@ -136,9 +156,15 @@ var ProEditLabel = _ref => {
     if (mode === 'popup' && confirmValue !== props.value) {
       // 兼容老写法
       if (!popupProps.columns) {
-        viewForm.setFieldValue((popupProps === null || popupProps === void 0 ? void 0 : popupProps.type) || 'Input', confirmValue);
+        if (!(popupProps !== null && popupProps !== void 0 && popupProps.type)) {
+          console.warn('ProEditLabel: popupProps.type is required when using old API (without columns)');
+          return;
+        }
+        viewFormInstance.setFieldsValue({
+          [popupProps.type]: confirmValue
+        });
       } else {
-        viewForm.setFieldsValue((0, _utils.matchFormValue)(confirmValue, popupProps.columns) || {});
+        viewFormInstance.setFieldsValue((0, _utils.matchFormValue)(confirmValue, popupProps.columns) || {});
       }
     }
   }, [confirmValue, mode]);
@@ -157,53 +183,71 @@ var ProEditLabel = _ref => {
    */
   var onConfirmHandle = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var res, value;
+      var res, value, fieldName;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             _context.next = 2;
-            return form.validateFields();
+            return formInstance.validateFields();
           case 2:
             res = _context.sent;
-            // 兼容老写法
-            if (!popupProps.columns) {
-              value = res[(popupProps === null || popupProps === void 0 ? void 0 : popupProps.type) || 'Input'];
+            if (popupProps.columns) {
+              _context.next = 10;
+              break;
+            }
+            if (popupProps !== null && popupProps !== void 0 && popupProps.type) {
+              _context.next = 7;
+              break;
             }
-            value = res;
-            _context.prev = 5;
+            console.warn('ProEditLabel: popupProps.type is required when using old API (without columns)');
+            return _context.abrupt("return", Promise.reject(new Error('popupProps.type is required')));
+          case 7:
+            value = res[popupProps.type];
+            _context.next = 11;
+            break;
+          case 10:
+            // 新写法：如果只有一个字段，提取单个值；否则使用整个对象
+            if (popupProps.columns.length === 1) {
+              fieldName = popupProps.columns[0].name || popupProps.columns[0].type;
+              value = res[fieldName];
+            } else {
+              value = res;
+            }
+          case 11:
+            _context.prev = 11;
             _context.t0 = onFinish;
             if (!_context.t0) {
-              _context.next = 10;
+              _context.next = 16;
               break;
             }
-            _context.next = 10;
+            _context.next = 16;
             return onFinish(value);
-          case 10:
+          case 16:
             _context.t1 = onConfirm;
             if (!_context.t1) {
-              _context.next = 14;
+              _context.next = 20;
               break;
             }
-            _context.next = 14;
+            _context.next = 20;
             return onConfirm(value);
-          case 14:
-            _context.next = 16;
+          case 20:
+            _context.next = 22;
             return setState({
               confirmValue: value,
               popValue: value
             });
-          case 16:
-            _context.next = 21;
+          case 22:
+            _context.next = 27;
             break;
-          case 18:
-            _context.prev = 18;
-            _context.t2 = _context["catch"](5);
+          case 24:
+            _context.prev = 24;
+            _context.t2 = _context["catch"](11);
             return _context.abrupt("return", Promise.reject());
-          case 21:
+          case 27:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[5, 18]]);
+      }, _callee, null, [[11, 24]]);
     }));
     return function onConfirmHandle() {
       return _ref2.apply(this, arguments);
@@ -216,9 +260,15 @@ var ProEditLabel = _ref => {
   var onCancelHandle = () => {
     // 兼容老写法
     if (!popupProps.columns) {
-      form.setFieldValue((popupProps === null || popupProps === void 0 ? void 0 : popupProps.type) || 'Input', props.value);
+      if (!(popupProps !== null && popupProps !== void 0 && popupProps.type)) {
+        console.warn('ProEditLabel: popupProps.type is required when using old API (without columns)');
+        return;
+      }
+      formInstance.setFieldsValue({
+        [popupProps.type]: props.value
+      });
     } else {
-      form.setFieldsValue((0, _utils.matchFormValue)(props.value, popupProps.columns) || {});
+      formInstance.setFieldsValue((0, _utils.matchFormValue)(props.value, popupProps.columns) || {});
     }
     setState({
       popValue: props.value

package/lib/ProEditLabel/propsType.d.ts

@@ -2,7 +2,7 @@ import { InputProps } from 'antd/es/input';
 import { PopconfirmProps } from 'antd/es/popconfirm';
 import { FormInstance } from 'antd/es/form';
 import React from 'react';
-import type { ProFormColumnType } from '../index';
+import type { ProFormColumnType } from '../ProForm/propsType';
 export interface ContainerType {
     /**
      * @description 触发方式
@@ -77,13 +77,13 @@ export interface PopupType {
      * @description 列配置
      * @default -
      */
-    columns?: ProFormColumnType;
+    columns?: ProFormColumnType[];
     /**
      * @description 允许扩展字段
      */
     [key: string]: any;
 }
-export interface LabelType extends InputProps {
+export interface LabelType extends Omit<InputProps, 'onChange'> {
     /**
      * @description 是否打开
      * @default false
@@ -98,7 +98,7 @@ export interface LabelType extends InputProps {
      * @description 值变化回调
      * @default -
      */
-    onChange?: (value: React.ChangeEvent<HTMLInputElement>) => void;
+    onChange?: (value: any) => void;
     /**
      * @description 是否可编辑
      * @default false

package/lib/ProForm/components/combination/Group/utils/index.d.ts

@@ -76,34 +76,35 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
     show?: boolean | ReactiveFunction<any, boolean>;
     component?: React.ReactNode | ReactiveFunction<any, React.ReactNode>;
     children?: React.ReactNode | ((form: FormInstance<any>) => React.ReactNode);
-    isView?: boolean;
-    id?: string;
-    prefixCls?: string;
-    className?: string;
     style?: React.CSSProperties;
+    className?: string;
     rootClassName?: string;
+    trim?: boolean;
+    normalize?: (value: any, prevValue: any, allValues: import("@rc-component/form/lib/interface").Store) => any;
     hidden?: boolean;
+    layout?: import("antd/es/form/Form").FormItemLayout;
+    help?: React.ReactNode;
+    vertical?: boolean;
+    preserve?: boolean;
+    id?: string;
     onReset?: () => void;
+    prefixCls?: string;
+    htmlFor?: string;
+    trigger?: string;
     status?: "" | "warning" | "error" | "success" | "validating";
-    vertical?: boolean;
-    validateTrigger?: string | false | string[];
-    getValueProps?: ((value: any) => Record<string, unknown>) & ((value: any) => Record<string, unknown>);
-    desensitization?: [number, number] | ReactiveFunction<any, [number, number]>;
-    valueType?: import("../../../render/propsType").ProFormValueType;
+    isView?: boolean;
     colon?: boolean;
-    htmlFor?: string;
     labelAlign?: import("antd/es/form/interface").FormLabelAlign;
     labelCol?: import("antd").ColProps;
     getValueFromEvent?: (...args: import("@rc-component/form/lib/interface").EventArgs) => any;
-    normalize?: (value: any, prevValue: any, allValues: import("@rc-component/form/lib/interface").Store) => any;
     shouldUpdate?: import("@rc-component/form/lib/Field").ShouldUpdate<any>;
-    trigger?: string;
+    validateTrigger?: string | false | string[];
     validateDebounce?: number;
     valuePropName?: string;
+    getValueProps?: ((value: any) => Record<string, unknown>) & ((value: any) => Record<string, unknown>);
     messageVariables?: Record<string, string>;
     initialValue?: any;
     onMetaChange?: (meta: import("@rc-component/form/lib/Field").MetaEvent) => void;
-    preserve?: boolean;
     isListField?: boolean;
     isList?: boolean;
     noStyle?: boolean;
@@ -111,10 +112,9 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
         icons: import("antd/es/form/FormItem").FeedbackIcons;
     };
     validateStatus?: "" | "warning" | "error" | "success" | "validating";
-    layout?: import("antd/es/form/Form").FormItemLayout;
     wrapperCol?: import("antd").ColProps;
-    help?: React.ReactNode;
     fieldId?: string;
+    valueType?: import("../../../render/propsType").ProFormValueType;
     switchValue?: [any, any];
     viewRender?: (value: any, record: any, { form, index, namePath, }: {
         [key: string]: any;
@@ -122,11 +122,11 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
         index?: number;
     }) => string | React.ReactElement<any, any>;
     viewType?: import("../../../render/propsType").ViewType;
-    trim?: boolean;
     upperCase?: boolean;
     toISOString?: boolean;
     toCSTString?: boolean;
     clearNotShow?: boolean;
+    desensitization?: [number, number] | ReactiveFunction<any, [number, number]>;
     name: any;
     dependencies: any[];
     tooltip: string | {
@@ -141,7 +141,7 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
  * 创建组件属性
  */
 export declare const createComponentProps: (column: FlexibleGroupColumnType, formItemProps: any) => {
-    componentProps: import("lodash").Omit<any, "precision" | "format" | "valueType" | "switchValue" | "dependNames" | "toISOString" | "toCSTString" | "clearNotShow">;
+    componentProps: import("lodash").Omit<any, "format" | "valueType" | "switchValue" | "dependNames" | "toISOString" | "toCSTString" | "clearNotShow" | "precision">;
     formItemTransform: {
         getValueProps: any;
         normalize: any;

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

@@ -114,13 +114,25 @@ var FoldMenu = props => {
               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回调
+              // 调用用户传入的onMenuClick回调，获取返回值（是否应该激活菜单）
+              var shouldActivate = true;
               if (onMenuClick) {
-                onMenuClick({
+                var result = onMenuClick({
                   item: menuItem,
                   key: String(id),
                   keyPath: menuKeyPath
                 });
+                // 如果返回 false，表示不应该激活菜单
+                if (result === false) {
+                  shouldActivate = false;
+                }
+              }
+
+              // 只有在 shouldActivate 为 true 时才设置选中状态
+              if (shouldActivate) {
+                onSelected({
+                  selectedPath: toPath
+                });
               }
             },
             children: LiNode
@@ -134,17 +146,26 @@ var FoldMenu = props => {
               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回调
+              // 调用用户传入的onMenuClick回调，获取返回值（是否应该激活菜单）
+              var shouldActivate = true;
               if (onMenuClick) {
-                onMenuClick({
+                var result = onMenuClick({
                   item: menuItem,
                   key: String(id),
                   keyPath: menuKeyPath
                 });
+                // 如果返回 false，表示不应该激活菜单
+                if (result === false) {
+                  shouldActivate = false;
+                }
+              }
+
+              // 只有在 shouldActivate 为 true 时才设置选中状态
+              if (shouldActivate) {
+                onSelected({
+                  selectedPath: toPath
+                });
               }
-              onSelected({
-                selectedPath: toPath
-              });
             },
             children: /*#__PURE__*/(0, _jsxRuntime.jsx)(Link, {
               to: toPath,
@@ -157,13 +178,25 @@ var FoldMenu = props => {
             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回调
+            // 调用用户传入的onMenuClick回调，获取返回值（是否应该激活菜单）
+            var shouldActivate = true;
             if (onMenuClick) {
-              onMenuClick({
+              var result = onMenuClick({
                 item: menuItem,
                 key: String(id),
                 keyPath: menuKeyPath
               });
+              // 如果返回 false，表示不应该激活菜单
+              if (result === false) {
+                shouldActivate = false;
+              }
+            }
+
+            // 只有在 shouldActivate 为 true 时才设置选中状态
+            if (shouldActivate) {
+              onSelected({
+                selectedPath: toPath
+              });
             }
           },
           children: /*#__PURE__*/(0, _jsxRuntime.jsx)(Link, {

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

@@ -161,26 +161,27 @@ var OpenMenu = props => {
           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回调
+        // 调用用户传入的onMenuClick回调，获取返回值（是否应该激活菜单）
+        var shouldActivate = true;
         if (onMenuClick) {
-          onMenuClick({
+          var result = onMenuClick({
             item: menuItem,
             key,
             keyPath: menuKeyPath
           });
+          // 如果返回 false，表示不应该激活菜单
+          if (result === false) {
+            shouldActivate = false;
+          }
         }
 
         // 只有最后一级菜单（叶子节点）才设置选中状态和路径
-        if (menuItem && (0, _utils2.isLeafMenuItem)(menuItem)) {
+        // 并且只有在 shouldActivate 为 true 时才设置
+        if (menuItem && (0, _utils2.isLeafMenuItem)(menuItem) && shouldActivate) {
           var _item$props, _item$props2;
           setState({
             selectedKeys: keyPath,

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

@@ -28,6 +28,14 @@ var TabItemComponent = _ref => {
     e.stopPropagation();
     _onClose();
   };
+
+  // 作为 antd Tabs label 使用时，不需要阻止事件冒泡
+  // antd Tabs 会通过 onChange 处理切换，我们的 onClick 作为备用
+  var handleLabelClick = e => {
+    // 不阻止冒泡，让 antd Tabs 处理切换
+    // 但我们也调用 onClick 以确保状态同步
+    onClick();
+  };
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_TabContextMenu.TabContextMenu, {
     tabId: tab.id,
     closable: tab.closable,
@@ -41,7 +49,7 @@ var TabItemComponent = _ref => {
     tabMenuClick: tabMenuClick,
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: `pro-layout-tab-item ${active ? 'active' : ''} ${tab.closable ? 'closable' : ''}`,
-      onClick: onClick,
+      onClick: handleLabelClick,
       "data-testid": `tab-${tab.id}`,
       children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
         className: "pro-layout-tab-content",

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

@@ -5,9 +5,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.useTabsState = void 0;
 var _react = require("react");
+var _antd = require("antd");
 var _propTypes = require("../propTypes");
 var _useTabsCache2 = require("./useTabsCache");
+var _locale = _interopRequireWildcard(require("../../../../locale"));
 var _utils = require("../utils");
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -111,12 +115,50 @@ var useTabsState = options => {
   }, [state, saveToCache, finalConfig, isInitialized]);
 
   /**
-   * 添加标签页
+   * 检查是否可以添加标签页（用于在菜单点击时判断是否应该激活菜单）
    */
-  var addTab = (0, _react.useCallback)((menuItem, options) => {
+  var canAddTab = (0, _react.useCallback)((menuItem, options) => {
     var _ref = options || {},
       _ref$forceNew = _ref.forceNew,
       forceNew = _ref$forceNew === void 0 ? false : _ref$forceNew;
+
+    // 只有最后一级菜单（叶子节点）才能添加标签页
+    if (!(0, _utils.isLeafMenuItem)(menuItem)) {
+      return false;
+    }
+
+    // 检查是否需要外部跳转
+    if ((0, _utils.shouldOpenExternal)(menuItem)) {
+      return false;
+    }
+
+    // 如果 forceNew = false（默认），检查是否已存在相同的标签页
+    if (!forceNew) {
+      var existingTab = state.tabsList.find(tab => {
+        var _tab$menuItem;
+        return ((_tab$menuItem = tab.menuItem) === null || _tab$menuItem === void 0 ? void 0 : _tab$menuItem.code) === menuItem.code || tab.url === menuItem.url;
+      });
+      if (existingTab) {
+        // 如果已存在，可以添加（会切换到已存在的标签页）
+        return true;
+      }
+    }
+
+    // 检查是否超出限制（只有在需要创建新标签页时才检查）
+    if ((0, _utils.checkTabLimit)(state.tabsList, finalConfig.max)) {
+      // 达到最大值时，不能添加新标签页
+      return false;
+    }
+    return true;
+  }, [state.tabsList, finalConfig]);
+
+  /**
+   * 添加标签页
+   */
+  var addTab = (0, _react.useCallback)((menuItem, options) => {
+    var _ref2 = options || {},
+      _ref2$forceNew = _ref2.forceNew,
+      forceNew = _ref2$forceNew === void 0 ? false : _ref2$forceNew;
     setState(prevState => {
       // 只有最后一级菜单（叶子节点）才能添加标签页
       if (!(0, _utils.isLeafMenuItem)(menuItem)) {
@@ -134,8 +176,8 @@ var useTabsState = options => {
       // 如果 forceNew = false（默认），检查是否已存在相同的标签页
       if (!forceNew) {
         var existingTab = prevState.tabsList.find(tab => {
-          var _tab$menuItem;
-          return ((_tab$menuItem = tab.menuItem) === null || _tab$menuItem === void 0 ? void 0 : _tab$menuItem.code) === menuItem.code || tab.url === menuItem.url;
+          var _tab$menuItem2;
+          return ((_tab$menuItem2 = tab.menuItem) === null || _tab$menuItem2 === void 0 ? void 0 : _tab$menuItem2.code) === menuItem.code || tab.url === menuItem.url;
         });
         if (existingTab) {
           var _existingTab$menuItem;
@@ -151,7 +193,11 @@ var useTabsState = options => {
 
       // 检查是否超出限制
       if ((0, _utils.checkTabLimit)(prevState.tabsList, finalConfig.max)) {
-        // 达到最大值时，不添加新标签页，直接返回
+        // 达到最大值时，不添加新标签页，显示提示信息
+        var messageText = (0, _locale.formatMessage)(_locale.default.ProLayout.tabMaxLimitMessage, {
+          max: finalConfig.max
+        });
+        _antd.message.info(messageText);
         return prevState;
       }
 
@@ -342,8 +388,8 @@ var useTabsState = options => {
 
       // 检查是否已在 Tabs 中
       var existingTab = state.tabsList.find(tab => {
-        var _tab$menuItem2;
-        return ((_tab$menuItem2 = tab.menuItem) === null || _tab$menuItem2 === void 0 ? void 0 : _tab$menuItem2.code) === targetMenu.code || tab.url === targetMenu.url;
+        var _tab$menuItem3;
+        return ((_tab$menuItem3 = tab.menuItem) === null || _tab$menuItem3 === void 0 ? void 0 : _tab$menuItem3.code) === targetMenu.code || tab.url === targetMenu.url;
       });
       if (existingTab) {
         // 如果已存在，切换到该 Tab
@@ -359,6 +405,7 @@ var useTabsState = options => {
   return {
     state,
     addTab,
+    canAddTab,
     removeTab,
     switchTab,
     closeOtherTabs,

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

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _react = require("react");
+var _antd = require("antd");
 var _useTabsState2 = require("./hooks/useTabsState");
 var _TabItem = require("./components/TabItem");
 var _TabsContext = require("./components/TabsContext");
@@ -34,6 +35,7 @@ var TabsManager = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
     }),
     state = _useTabsState.state,
     _addTab = _useTabsState.addTab,
+    canAddTab = _useTabsState.canAddTab,
     removeTab = _useTabsState.removeTab,
     switchTab = _useTabsState.switchTab,
     closeOtherTabs = _useTabsState.closeOtherTabs,
@@ -99,25 +101,58 @@ var TabsManager = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
     })
   }), [_addTab, removeTab, state.tabsList, state.activeKey, state.activeComponent]);
 
+  // 处理标签切换
+  var handleTabChange = (0, _react.useCallback)(activeKey => {
+    switchTab(activeKey);
+  }, [switchTab]);
+
+  // 处理标签关闭
+  var handleTabEdit = (0, _react.useCallback)((targetKey, action) => {
+    if (action === 'remove') {
+      removeTab(targetKey);
+    }
+  }, [removeTab]);
+
+  // 构建 Tabs items
+  var tabsItems = (0, _react.useMemo)(() => {
+    if (state.tabsList.length === 0) return [];
+    return state.tabsList.map(tab => ({
+      key: tab.id,
+      label: /*#__PURE__*/(0, _jsxRuntime.jsx)(_TabItem.TabItemComponent, {
+        tab: tab,
+        active: tab.id === state.activeKey,
+        onClick: () => switchTab(tab.id),
+        onClose: () => removeTab(tab.id),
+        onCloseOthers: () => closeOtherTabs(tab.id),
+        onCloseRight: () => closeRightTabs(tab.id),
+        onCloseAll: closeAllTabs,
+        tabsList: state.tabsList,
+        menuItems: config === null || config === void 0 ? void 0 : config.menuItems,
+        tabMenuClick: config === null || config === void 0 ? void 0 : config.tabMenuClick
+      }),
+      closable: tab.closable,
+      children: null // 内容在 renderContent() 中渲染
+    }));
+  }, [state.tabsList, state.activeKey, config === null || config === void 0 ? void 0 : config.menuItems, config === null || config === void 0 ? void 0 : config.tabMenuClick, switchTab, removeTab, closeOtherTabs, closeRightTabs, closeAllTabs]);
+
   // 渲染标签页列表
   var renderTabList = () => {
     if (state.tabsList.length === 0) return null;
     return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: "pro-layout-tabs-header",
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-        className: "pro-layout-tab-list",
-        children: state.tabsList.map(tab => /*#__PURE__*/(0, _jsxRuntime.jsx)(_TabItem.TabItemComponent, {
-          tab: tab,
-          active: tab.id === state.activeKey,
-          onClick: () => switchTab(tab.id),
-          onClose: () => removeTab(tab.id),
-          onCloseOthers: () => closeOtherTabs(tab.id),
-          onCloseRight: () => closeRightTabs(tab.id),
-          onCloseAll: closeAllTabs,
-          tabsList: state.tabsList,
-          menuItems: config === null || config === void 0 ? void 0 : config.menuItems,
-          tabMenuClick: config === null || config === void 0 ? void 0 : config.tabMenuClick
-        }, tab.id))
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Tabs, {
+        activeKey: state.activeKey || undefined,
+        onChange: handleTabChange,
+        onEdit: handleTabEdit,
+        type: "editable-card",
+        hideAdd: true,
+        items: tabsItems,
+        className: "pro-layout-tabs-antd",
+        classNames: {
+          popup: {
+            root: 'pro-layout-tabs-dropdown-menu'
+          }
+        }
       })
     });
   };
@@ -167,8 +202,9 @@ var TabsManager = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
 
   // 暴露方法给父组件
   (0, _react.useImperativeHandle)(ref, () => ({
-    handleMenuClick
-  }), [handleMenuClick]);
+    handleMenuClick,
+    canAddTab
+  }), [handleMenuClick, canAddTab]);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_TabsContext.TabsContext.Provider, {
     value: tabsInstance,
     children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {