@zat-design/sisyphus-react 4.2.0 → 4.3.0-beta.10

package/es/ProEditTable/components/RenderField/index.js

@@ -66,7 +66,6 @@ const RenderField = ({
   const {
     mode,
     cellName,
-    cellNamePath,
     _isEditing,
     form,
     setState,
@@ -89,11 +88,7 @@ const RenderField = ({
   let _disabled = false;
   let _desensitization = desensitization || [];
   let _component = component || editRender;
-  const isCell = mode === 'cell';
   const isSingleMode = mode === 'single';
-  if (isCell) {
-    record['is-view'] = !_isEqual(cellNamePath, cellName);
-  }
 
   // type类型 首字母转大写
   type = type?.replace?.(type[0], type[0].toUpperCase()) || 'Input';
@@ -512,12 +507,6 @@ const RenderField = ({
         }
       }
     }
-    if (isCell) {
-      await form.validateFields([cellName]);
-      setState({
-        cellNamePath: []
-      });
-    }
     // 单行编辑时需要 强制更新视图，仅对当前行打标记
     compatStartTransition(() => {
       setState({
@@ -526,7 +515,7 @@ const RenderField = ({
         }
       });
     });
-  }, [onBlur, formatArgs, namePath, index, form, TargetComponent, validateTrigger, debounceValidate, isCell, cellName, setState]);
+  }, [onBlur, formatArgs, namePath, index, form, TargetComponent, validateTrigger, debounceValidate, cellName, setState]);
 
   // 使用useMemo优化componentProps对象
   let componentProps = useMemo(() => ({
@@ -556,20 +545,9 @@ const RenderField = ({
     }
   }), [cellName, _fieldProps, TargetComponent?.props, namePath, index, _disabled, _onChange, _onblur, confirm, _desensitization, names, originalName, viewEmpty, _valueType, isView, otherProps?.desensitizationKey]);
   componentProps = _omit(componentProps, ['onFieldChange', 'namePath', 'index', ...OMIT_FORM_ITEM_AND_DOM_KEYS]);
-
-  // 单元格编辑时，设置各个单元格disabled属性
-  if (isCell) {
-    record[`${dataIndex}-Disabled`] = _disabled;
-  }
   if (['Switch', 'SwitchCheckbox'].includes(type)) {
     _formItemProps.valuePropName = 'checked';
   }
-  useEffect(() => {
-    if (isCell) {
-      const editingDom = document.getElementById(cellNamePath.join('_'));
-      editingDom?.focus?.();
-    }
-  }, [cellNamePath, isCell]);
 
   // 可编辑表格默认关闭scrollFollowParent
   if (['Select', 'ProSelect', 'ProEnum'].includes(type)) {

package/es/ProEditTable/index.js

@@ -81,8 +81,6 @@ const ProEditTable = ({
     return themeConfig?.data?.zauiFormAlign ?? configRequiredAlign ?? 'left';
   }, [themeConfig?.data?.zauiFormAlign, configRequiredAlign]);
   const [state, setState] = useSetState({
-    cellNamePath: [],
-    // hover模式下正在编辑的单元格路径
     forceUpdate: {},
     // 表格内部强制刷新开关
     editingKeys: [],
@@ -99,7 +97,6 @@ const ProEditTable = ({
     }
   });
   const {
-    cellNamePath,
     forceUpdate,
     editingKeys,
     virtualKey,
@@ -186,7 +183,6 @@ const ProEditTable = ({
     isView,
     viewEmpty,
     disabled,
-    cellNamePath,
     forceUpdate,
     insertType,
     emptyBtnText,
@@ -221,7 +217,7 @@ const ProEditTable = ({
     getIsNew,
     handlePageChange,
     ...resetProps
-  }), [actionDirection, actionProps, actionWidth, cellNamePath, deletePoConfirmMsg, disabled, diffConfig, editingKeys, emptyBtnText, form,
+  }), [actionDirection, actionProps, actionWidth, deletePoConfirmMsg, diffConfig, editingKeys, emptyBtnText, form,
   // forceUpdate 不应该作为依赖项，因为它是触发刷新的信号，而非用于比较的数据
   getIsNew, handlePageChange, insertType, isView, max, mode, mulDeletePoConfirmMsg, name, namePath, onlyOneLineMsg, originalValues, prefixCls, requiredAlign, resetProps, rowDisabled, selectedRowKeys, selectedRows, shouldUpdateDebounce, tableRef, toolbarProps, value?.length, viewEmpty, virtualKey, page]);
 
@@ -317,7 +313,7 @@ const ProEditTable = ({
   };
   const _columns = useMemo(() => {
     return transformColumns(columns, config);
-  }, [disabled, forceUpdate, columns, page, actionProps, editingKeys, cellNamePath, config]);
+  }, [disabled, forceUpdate, columns, page, actionProps, editingKeys, config]);
   const initDataSource = () => {
     // 检查每一项是否有 rowKey 或通过 rowKey 字段获取的 key
     const isAllHasKey = value?.every?.(item => item.rowKey || typeof rowKey === 'string' && item[rowKey]);

package/es/ProEditTable/propsType.d.ts

@@ -194,8 +194,6 @@ export type ProEditTableColumnsProps<K = any> = ProColumnsProps<K, 'ProEditTable
  * 状态接口
  */
 export interface StateProps {
-    /** 单元格名称路径 */
-    cellNamePath: NamePath[];
     /** 表格内部强制刷新开关 */
     forceUpdate: Record<string, any>;
     /** 正在编辑行的row-key集合 */
@@ -232,7 +230,7 @@ export type ProEditTableRefType = ProEditTableRefProps;
 /**
  * 可编辑表格模式类型
  */
-export type ProEditTableMode = 'single' | 'multiple' | 'cell';
+export type ProEditTableMode = 'single' | 'multiple';
 export type ProEditTableModeType = ProEditTableMode;
 /**
  * 表格插入类型

package/es/ProEditTable/style/index.less

@@ -76,20 +76,6 @@
     left: -9999px;
   }
 
-  .is-cell
-    .@{ant-prefix}-form-item
-    .@{ant-prefix}-form-item-row
-    .@{ant-prefix}-form-item-control
-    .@{ant-prefix}-form-item-control-input {
-    border: 1px solid transparent;
-
-    &:hover {
-      border: 1px solid #dee0e3;
-      border-radius: var(--zaui-border-radius, 8px);
-      text-indent: 5px;
-    }
-  }
-
   .pro-edit-table-drag-wrapper {
     display: flex;
     align-items: center;

package/es/ProEditTable/utils/index.js

@@ -185,7 +185,6 @@ export const transformColumns = (columns = [], config) => {
     form,
     name,
     disabled,
-    cellNamePath,
     editingKeys,
     virtualKey,
     requiredAlign,
@@ -193,7 +192,6 @@ export const transformColumns = (columns = [], config) => {
     setState,
     page
   } = config;
-  const isCell = mode === 'cell';
   let nextColumns = columns.map(item => cloneDeepFilterNode(item));
   const pageNum = tools.calc(page.pageNum, '-', 1);
   const firstIndex = tools.calc(pageNum, '*', page.pageSize);
@@ -304,25 +302,9 @@ export const transformColumns = (columns = [], config) => {
           isResponsiveWidth: true
         });
       }
-      let cellClassName;
-      const isCanEdit = isCell && !record[`${columnName}-Disabled`] && item.isEditable !== false;
-      // 单元格编辑场景下，需要将所有单元格设置为不可编辑状态，当鼠标hover时，展示输出框。点击可修改
-      if (isCanEdit) {
-        record['is-view'] = true;
-        // 样式处理
-        cellClassName = classnames({
-          'is-cell': !_isEqual(cellNamePath, cellName)
-        });
-      }
 
       // 单行多行交互有较大差异
       return /*#__PURE__*/_jsxs("div", {
-        className: cellClassName,
-        onClick: () => {
-          isCanEdit && setState({
-            cellNamePath: cellName
-          });
-        },
         children: [index === 0 && !item.width ? /*#__PURE__*/_jsx("div", {
           style: {
             visibility: 'hidden',

package/es/ProForm/components/combination/Group/component/AddonWrapper/index.js

@@ -9,11 +9,20 @@ const AddonWrapper = props => {
   } = props;
   return /*#__PURE__*/_jsxs("div", {
     className: "addon-wrapper",
+    style: {
+      display: 'flex',
+      alignItems: 'center',
+      gap: '8px'
+    },
     children: [before && /*#__PURE__*/_jsx("div", {
-      className: "before",
+      style: {
+        whiteSpace: 'nowrap'
+      },
       children: before
     }), children, after && /*#__PURE__*/_jsx("div", {
-      className: "after",
+      style: {
+        whiteSpace: 'nowrap'
+      },
       children: after
     })]
   });

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

@@ -1,4 +1,5 @@
 @import '../../../../../style/variables.less';
+@import '../component/AddonWrapper/index.less';
 
 .pro-group {
   display: flex;
@@ -115,7 +116,7 @@
 
         // 确保输入框完全贴合
         .@{ant-prefix}-input,
-        .@{ant-prefix}-select .@{ant-prefix}-select-selector,
+        .@{ant-prefix}-select .@{ant-prefix}-select-content,
         .@{ant-prefix}-input-number,
         .@{ant-prefix}-input-number-input {
           // 重置z-index确保正确的层级关系
@@ -127,7 +128,7 @@
         // 第一个表单项：左边保持圆角
         &:first-child {
           .@{ant-prefix}-input,
-          .@{ant-prefix}-select .@{ant-prefix}-select-selector,
+          .@{ant-prefix}-select .@{ant-prefix}-select-content,
           .@{ant-prefix}-input-number,
           .@{ant-prefix}-input-number-input {
             border-top-left-radius: 6px;
@@ -138,7 +139,7 @@
         // 最后一个表单项：右边保持圆角
         &:last-child {
           .@{ant-prefix}-input,
-          .@{ant-prefix}-select .@{ant-prefix}-select-selector,
+          .@{ant-prefix}-select .@{ant-prefix}-select-content,
           .@{ant-prefix}-input-number,
           .@{ant-prefix}-input-number-input {
             border-top-right-radius: 6px;
@@ -154,7 +155,7 @@
 
           // 聚焦时恢复左边框
           .@{ant-prefix}-input:focus,
-          .@{ant-prefix}-select:focus .@{ant-prefix}-select-selector,
+          .@{ant-prefix}-select:focus .@{ant-prefix}-select-content,
           .@{ant-prefix}-input-number:focus,
           .@{ant-prefix}-input-number:focus .@{ant-prefix}-input-number-input {
             margin-left: -1px;
@@ -165,7 +166,7 @@
         // 错误状态：确保边框变红（优先级要高于上面的 border-left-width: 0）
         &.@{ant-prefix}-form-item-has-error {
           .@{ant-prefix}-input,
-          .@{ant-prefix}-select .@{ant-prefix}-select-selector,
+          .@{ant-prefix}-select .@{ant-prefix}-select-content,
           .@{ant-prefix}-input-number,
           .@{ant-prefix}-input-number-input {
             border-color: #ff4d4f !important;
@@ -174,7 +175,7 @@
           // 错误状态下，中间元素也需要恢复左边框并设置为红色
           &:not(:first-child) {
             .@{ant-prefix}-input,
-            .@{ant-prefix}-select .@{ant-prefix}-select-selector,
+            .@{ant-prefix}-select .@{ant-prefix}-select-content,
             .@{ant-prefix}-input-number {
               border-left-color: #ff4d4f !important;
               border-left-width: 1px !important;
@@ -187,14 +188,14 @@
 
           // 聚焦时保持红色边框
           .@{ant-prefix}-input:focus,
-          .@{ant-prefix}-select:focus .@{ant-prefix}-select-selector,
+          .@{ant-prefix}-select:focus .@{ant-prefix}-select-content,
           .@{ant-prefix}-input-number:focus,
           .@{ant-prefix}-input-number:focus .@{ant-prefix}-input-number-input {
             border-color: #ff4d4f !important;
           }
 
           // Select 组件的错误状态处理
-          .@{ant-prefix}-select.@{ant-prefix}-select-status-error .@{ant-prefix}-select-selector {
+          .@{ant-prefix}-select.@{ant-prefix}-select-status-error .@{ant-prefix}-select-content {
             border-color: #ff4d4f !important;
           }
         }
@@ -317,37 +318,41 @@
         }
 
         // 确保输入框完全贴合
+        .@{ant-prefix}-input-affix-wrapper,
         .@{ant-prefix}-input,
-        .@{ant-prefix}-select .@{ant-prefix}-select-selector,
+        .@{ant-prefix}-select .@{ant-prefix}-select-content,
         .@{ant-prefix}-input-number,
         .@{ant-prefix}-input-number-input,
         .@{ant-prefix}-picker {
           // 重置z-index确保正确的层级关系
           position: relative;
-          // 重置圆角
-          border-radius: 0;
+          // 重置圆角（!important 确保覆盖 antd v6 CSS-in-JS 懒注入的 disabled 等状态样式）
+          border-radius: 0 !important;
         }
 
         // 第一个表单项：左边保持圆角
         &:first-child {
+          .@{ant-prefix}-input-affix-wrapper,
           .@{ant-prefix}-input,
-          .@{ant-prefix}-select .@{ant-prefix}-select-selector,
+          .@{ant-prefix}-select .@{ant-prefix}-select-content,
           .@{ant-prefix}-input-number,
-          .@{ant-prefix}-input-number-input {
-            border-top-left-radius: 6px;
-            border-bottom-left-radius: 6px;
+          .@{ant-prefix}-input-number-input,
+          .@{ant-prefix}-picker {
+            border-top-left-radius: 6px !important;
+            border-bottom-left-radius: 6px !important;
           }
         }
 
         // 最后一个表单项：右边保持圆角
         &:last-child {
+          .@{ant-prefix}-input-affix-wrapper,
           .@{ant-prefix}-input,
-          .@{ant-prefix}-select .@{ant-prefix}-select-selector,
+          .@{ant-prefix}-select .@{ant-prefix}-select-content,
           .@{ant-prefix}-input-number,
           .@{ant-prefix}-input-number-input,
           .@{ant-prefix}-picker {
-            border-top-right-radius: 6px;
-            border-bottom-right-radius: 6px;
+            border-top-right-radius: 6px !important;
+            border-bottom-right-radius: 6px !important;
           }
         }
 
@@ -355,7 +360,7 @@
         &:not(:first-child) {
           // 聚焦时恢复左边框
           .@{ant-prefix}-input:focus,
-          .@{ant-prefix}-select:focus .@{ant-prefix}-select-selector,
+          .@{ant-prefix}-select:focus .@{ant-prefix}-select-content,
           .@{ant-prefix}-input-number:focus,
           .@{ant-prefix}-input-number:focus .@{ant-prefix}-input-number-input {
             margin-left: -1px;
@@ -426,7 +431,7 @@
   &:not(.pro-group-flexible) {
     // 错误状态：确保边框变红（优先级要高于上面的 border-left-width: 0）
     .@{ant-prefix}-input,
-    .@{ant-prefix}-select .@{ant-prefix}-select-selector,
+    .@{ant-prefix}-select .@{ant-prefix}-select-content,
     .@{ant-prefix}-input-number,
     .@{ant-prefix}-input-number-input {
       border-color: #ff4d4f !important;
@@ -435,7 +440,7 @@
     // 错误状态下，中间元素也需要恢复左边框并设置为红色
     &:not(:first-child) {
       .@{ant-prefix}-input,
-      .@{ant-prefix}-select .@{ant-prefix}-select-selector,
+      .@{ant-prefix}-select .@{ant-prefix}-select-content,
       .@{ant-prefix}-input-number {
         border-left-color: #ff4d4f !important;
         border-left-width: 1px !important;
@@ -448,14 +453,14 @@
 
     // 聚焦时保持红色边框
     .@{ant-prefix}-input:focus,
-    .@{ant-prefix}-select:focus .@{ant-prefix}-select-selector,
+    .@{ant-prefix}-select:focus .@{ant-prefix}-select-content,
     .@{ant-prefix}-input-number:focus,
     .@{ant-prefix}-input-number:focus .@{ant-prefix}-input-number-input {
       border-color: #ff4d4f !important;
     }
 
     // Select 组件的错误状态处理
-    .@{ant-prefix}-select.@{ant-prefix}-select-status-error .@{ant-prefix}-select-selector {
+    .@{ant-prefix}-select.@{ant-prefix}-select-status-error .@{ant-prefix}-select-content {
       border-color: #ff4d4f !important;
     }
   }
@@ -464,8 +469,10 @@
 // compact模式容器, 修复antd6定制模式下，Group组件内嵌套Form.Item时，表单样式问题
 .pro-group-compact-container {
   .@{ant-prefix}-select {
-    border-radius: 0;
-    border-radius: 0;
+    border-radius: 0 !important;
+  }
+  .@{ant-prefix}-input-affix-wrapper {
+    border-radius: 0 !important;
   }
 
   > .pro-group-form-item:not(:first-child) {
@@ -492,9 +499,11 @@
   > .pro-group-form-item:first-child {
     .pro-select .@{ant-prefix}-select,
     .@{ant-prefix}-select,
-    .@{ant-prefix}-input-number {
-      border-top-left-radius: 6px;
-      border-bottom-left-radius: 6px;
+    .@{ant-prefix}-input-affix-wrapper,
+    .@{ant-prefix}-input-number,
+    .@{ant-prefix}-picker {
+      border-top-left-radius: 6px !important;
+      border-bottom-left-radius: 6px !important;
     }
   }
 
@@ -502,9 +511,11 @@
   > .pro-group-form-item:last-child {
     .pro-select .@{ant-prefix}-select,
     .@{ant-prefix}-select,
-    .@{ant-prefix}-input-number {
-      border-top-right-radius: 6px;
-      border-bottom-right-radius: 6px;
+    .@{ant-prefix}-input-affix-wrapper,
+    .@{ant-prefix}-input-number,
+    .@{ant-prefix}-picker {
+      border-top-right-radius: 6px !important;
+      border-bottom-right-radius: 6px !important;
     }
   }
 }

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

@@ -75,31 +75,36 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
     confirm?: boolean | import("antd").ModalFuncProps | import("../../../render/propsType").FunctionArgs<any, boolean | import("antd").ModalFuncProps>;
     show?: boolean | ReactiveFunction<any, boolean>;
     component?: React.ReactNode | ReactiveFunction<any, React.ReactNode>;
-    trim?: boolean;
-    normalize?: (value: any, prevValue: any, allValues: import("@rc-component/form/lib/interface").Store) => any;
-    children?: React.ReactNode | ((form: FormInstance<any>) => React.ReactNode);
+    id?: string;
     className?: string;
+    children?: React.ReactNode | ((form: FormInstance<any>) => React.ReactNode);
+    hidden?: boolean;
     style?: React.CSSProperties;
+    onReset?: () => void;
     prefixCls?: string;
-    trigger?: string;
-    id?: string;
-    isView?: boolean;
     rootClassName?: string;
-    hidden?: boolean;
-    onReset?: () => void;
-    status?: "" | "warning" | "error" | "success" | "validating";
+    layout?: import("antd/es/form/Form").FormItemLayout;
+    help?: React.ReactNode;
     vertical?: boolean;
-    validateTrigger?: string | false | string[];
     preserve?: boolean;
+    trim?: boolean;
+    normalize?: (value: any, prevValue: any, allValues: import("@rc-component/form/lib/interface").Store) => any;
     htmlFor?: string;
-    colon?: boolean;
+    trigger?: string;
+    isView?: boolean;
+    status?: "" | "warning" | "error" | "success" | "validating";
+    getValueProps?: ((value: any) => Record<string, unknown>) & ((value: any) => Record<string, unknown>);
+    desensitization?: [number, number] | ReactiveFunction<any, [number, number]>;
+    validateTrigger?: string | false | string[];
+    clearNotShow?: boolean;
     labelAlign?: import("antd/es/form/interface").FormLabelAlign;
+    colon?: boolean;
     labelCol?: import("antd").ColProps;
+    wrapperCol?: import("antd").ColProps;
     getValueFromEvent?: (...args: import("@rc-component/form/lib/interface").EventArgs) => any;
     shouldUpdate?: import("@rc-component/form/lib/Field").ShouldUpdate<any>;
     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;
@@ -110,9 +115,6 @@ 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];
@@ -125,8 +127,6 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
     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, "format" | "valueType" | "switchValue" | "dependNames" | "toISOString" | "toCSTString" | "clearNotShow" | "precision">;
+    componentProps: import("lodash").Omit<any, "format" | "clearNotShow" | "valueType" | "switchValue" | "dependNames" | "toISOString" | "toCSTString" | "precision">;
     formItemTransform: {
         getValueProps: any;
         normalize: any;

package/es/ProForm/utils/useForm.js

@@ -1,5 +1,5 @@
 import { Form } from 'antd';
-import { useContext, useLayoutEffect } from 'react';
+import { useContext } from 'react';
 import { filterInternalFields, getFormFieldPaths, mergeNames, isListForm } from "./index";
 import { handleScrollToError as handleScrollToErrorProEditTable } from "../../ProEditTable/utils/tools";
 import { FormsContext } from "../../FormsProvider";
@@ -19,15 +19,17 @@ export const useForm = function (originForm, options) {
 
   // formKey全局共享逻辑
   const forms = useContext(FormsContext);
-  const [form] = Form.useForm(forms[formKey] || _originForm);
-
-  // 使用 useLayoutEffect 在浏览器绘制前同步注册 form 实例，避免 React 19 StrictMode 警告
-  useLayoutEffect(() => {
-    if (formKey && forms[formKey] !== form) {
-      forms[formKey] = form;
-      form.formKey = formKey;
-    }
-  }, [formKey, form, forms]);
+  const [localForm] = Form.useForm(_originForm);
+  // 同步注册共享实例，确保同一渲染流程中相同 formKey 复用同一个实例
+  if (formKey && !forms[formKey]) {
+    forms[formKey] = localForm;
+    localForm.formKey = formKey;
+  }
+  const sharedForm = formKey ? forms[formKey] : undefined;
+  const form = sharedForm || localForm;
+  if (formKey && form.formKey !== formKey) {
+    form.formKey = formKey;
+  }
   const {
     getFieldsValue,
     validateFields,

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

@@ -109,7 +109,7 @@ const FoldMenu = props => {
           },
           placement: "rightTop",
           children: /*#__PURE__*/_jsx("span", {
-            onClick: () => {
+            onClick: e => {
               // 查找完整的菜单项数据
               const menuItem = findMenuItemByKey(menus, String(id));
               const menuKeyPath = menuItem?.keyIdPath ? menuItem.keyIdPath.map(id => String(id)) : [String(id)];
@@ -141,7 +141,7 @@ const FoldMenu = props => {
           placement: "right",
           title: name,
           children: /*#__PURE__*/_jsx("span", {
-            onClick: () => {
+            onClickCapture: e => {
               // 查找完整的菜单项数据
               const menuItem = findMenuItemByKey(menus, String(id));
               const menuKeyPath = menuItem?.keyIdPath ? menuItem.keyIdPath.map(id => String(id)) : [String(id)];
@@ -165,6 +165,10 @@ const FoldMenu = props => {
                 onSelected({
                   selectedPath: toPath
                 });
+              } else {
+                // Capture 阶段拦截，早于 Link 内部导航处理器
+                e.preventDefault();
+                e.stopPropagation();
               }
             },
             children: /*#__PURE__*/_jsx(Link, {
@@ -173,7 +177,7 @@ const FoldMenu = props => {
             })
           })
         }, `${id}-${name}`) : /*#__PURE__*/_jsx("span", {
-          onClick: () => {
+          onClickCapture: e => {
             // 查找完整的菜单项数据
             const menuItem = findMenuItemByKey(menus, String(id));
             const menuKeyPath = menuItem?.keyIdPath ? menuItem.keyIdPath.map(id => String(id)) : [String(id)];
@@ -197,6 +201,10 @@ const FoldMenu = props => {
               onSelected({
                 selectedPath: toPath
               });
+            } else {
+              // Capture 阶段拦截，早于 Link 内部导航处理器
+              e.preventDefault();
+              e.stopPropagation();
             }
           },
           children: /*#__PURE__*/_jsx(Link, {

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

@@ -7,7 +7,7 @@ import classnames from 'classnames';
 import { Link as RouterLink } from 'react-router-dom';
 import { LayoutContext } from "../../../../index";
 import { getIdsByPathName, findMenuItemByKey } from "../../../../utils";
-import { isLeafMenuItem } from "../../../TabsManager/utils";
+import { canOpenAsTab } from "../../../TabsManager/utils";
 import { Icon } from "../../index";
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 const Link = RouterLink;
@@ -163,9 +163,9 @@ const OpenMenu = props => {
           }
         }
 
-        // 只有最后一级菜单（叶子节点）才设置选中状态和路径
+        // 可入签节点（叶子 + 根节点特例）才设置选中状态和路径
         // 并且只有在 shouldActivate 为 true 时才设置
-        if (menuItem && isLeafMenuItem(menuItem) && shouldActivate) {
+        if (menuItem && canOpenAsTab(menuItem) && shouldActivate) {
           setState({
             selectedKeys: keyPath,
             router: item?.props?.router

package/es/ProLayout/components/TabsManager/components/TabsHeader.d.ts

@@ -4,9 +4,7 @@ export interface TabsHeaderProps {
     tabsItems: TabsProps['items'];
     onTabChange: (activeKey: string) => void;
     onTabEdit: (targetKey: string, action: 'add' | 'remove') => void;
+    draggable?: boolean;
+    onReorder?: (activeId: string, overId: string) => void;
 }
-/**
- * 标签页头部：监听 window 滚动（实际滚动在 window/documentElement，非 body），
- * 滚动时添加阴影类名；仅此组件随滚动重渲染，不带动父组件内容区。
- */
-export declare function TabsHeader({ activeKey, tabsItems, onTabChange, onTabEdit }: TabsHeaderProps): import("react/jsx-runtime").JSX.Element;
+export declare function TabsHeader({ activeKey, tabsItems, onTabChange, onTabEdit, draggable, onReorder, }: TabsHeaderProps): import("react/jsx-runtime").JSX.Element;