@zat-design/sisyphus-react 4.3.0-beta.6 → 4.3.0-beta.7

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/utils/index.d.ts

@@ -75,58 +75,58 @@ 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>;
-    children?: React.ReactNode | ((form: FormInstance<any>) => React.ReactNode);
-    trim?: boolean;
-    normalize?: (value: any, prevValue: any, allValues: import("@rc-component/form/lib/interface").Store) => any;
+    status?: "" | "success" | "warning" | "error" | "validating";
     className?: string;
-    style?: React.CSSProperties;
-    preserve?: boolean;
-    id?: string;
     hidden?: boolean;
+    id?: string;
+    style?: React.CSSProperties;
+    children?: React.ReactNode | ((form: FormInstance<any>) => React.ReactNode);
     onReset?: () => void;
     prefixCls?: string;
     rootClassName?: string;
-    layout?: import("antd/es/form/Form").FormItemLayout;
-    help?: React.ReactNode;
-    vertical?: boolean;
+    colon?: boolean;
     htmlFor?: string;
-    trigger?: string;
-    status?: "" | "warning" | "error" | "success" | "validating";
-    isView?: boolean;
-    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;
+    vertical?: boolean;
     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;
     hasFeedback?: boolean | {
         icons: import("antd/es/form/FormItem").FeedbackIcons;
     };
-    validateStatus?: "" | "warning" | "error" | "success" | "validating";
+    validateStatus?: "" | "success" | "warning" | "error" | "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;
         form: FormInstance<any>;
         index?: number;
     }) => string | React.ReactElement<any, any>;
+    desensitization?: [number, number] | ReactiveFunction<any, [number, number]>;
+    isView?: boolean;
+    switchValue?: [any, any];
     viewType?: import("../../../render/propsType").ViewType;
+    trim?: boolean;
     upperCase?: boolean;
     toISOString?: boolean;
     toCSTString?: boolean;
+    clearNotShow?: boolean;
     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" | "clearNotShow" | "valueType" | "switchValue" | "dependNames" | "toISOString" | "toCSTString" | "precision">;
+    componentProps: import("lodash").Omit<any, "valueType" | "precision" | "format" | "switchValue" | "dependNames" | "toISOString" | "toCSTString" | "clearNotShow">;
     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/hooks/useTabsState.js

@@ -4,7 +4,7 @@ import { arrayMove } from '@dnd-kit/sortable';
 import { DEFAULT_TABS_CONFIG } from "../propTypes";
 import { useTabsCache } from "./useTabsCache";
 import locale, { formatMessage } from "../../../../locale";
-import { createTabFromMenu, generateTabId, shouldOpenExternal, handleExternalOpen, checkTabLimit, getRightTabs, flattenMenuData, isLeafMenuItem } from "../utils";
+import { createTabFromMenu, generateTabId, shouldOpenExternal, handleExternalOpen, checkTabLimit, getRightTabs, flattenMenuData, canOpenAsTab, getMenuRoute } from "../utils";
 
 /**
  * 标签页状态管理Hook
@@ -107,8 +107,8 @@ export const useTabsState = options => {
       forceNew = false
     } = options || {};
 
-    // 只有最后一级菜单（叶子节点）才能添加标签页
-    if (!isLeafMenuItem(menuItem)) {
+    // 非叶子节点默认不入签，仅根节点特例可入签
+    if (!canOpenAsTab(menuItem)) {
       return false;
     }
 
@@ -119,7 +119,8 @@ export const useTabsState = options => {
 
     // 如果 forceNew = false（默认），检查是否已存在相同的标签页
     if (!forceNew) {
-      const existingTab = state.tabsList.find(tab => tab.menuItem?.code === menuItem.code || tab.url === menuItem.url);
+      const menuRoute = getMenuRoute(menuItem);
+      const existingTab = state.tabsList.find(tab => tab.menuItem?.code === menuItem.code || tab.url === menuRoute);
       if (existingTab) {
         // 如果已存在，可以添加（会切换到已存在的标签页）
         return true;
@@ -142,8 +143,8 @@ export const useTabsState = options => {
       forceNew = false
     } = options || {};
     setState(prevState => {
-      // 只有最后一级菜单（叶子节点）才能添加标签页
-      if (!isLeafMenuItem(menuItem)) {
+      // 非叶子节点默认不入签，仅根节点特例可入签
+      if (!canOpenAsTab(menuItem)) {
         return prevState;
       }
 
@@ -157,7 +158,8 @@ export const useTabsState = options => {
 
       // 如果 forceNew = false（默认），检查是否已存在相同的标签页
       if (!forceNew) {
-        const existingTab = prevState.tabsList.find(tab => tab.menuItem?.code === menuItem.code || tab.url === menuItem.url);
+        const menuRoute = getMenuRoute(menuItem);
+        const existingTab = prevState.tabsList.find(tab => tab.menuItem?.code === menuItem.code || tab.url === menuRoute);
         if (existingTab) {
           // 如果已存在，直接切换到该标签页
           const newState = {
@@ -375,15 +377,15 @@ export const useTabsState = options => {
 
     // 在菜单中查找当前 URL 对应的菜单项
     const flatMenus = flattenMenuData(dataSource.menus || []);
-    const targetMenu = flatMenus.find(item => item.url === currentPath);
+    const targetMenu = flatMenus.find(item => getMenuRoute(item) === currentPath);
     if (targetMenu) {
-      // 只有最后一级菜单（叶子节点）才能添加标签页
-      if (!isLeafMenuItem(targetMenu)) {
+      // 非叶子节点默认不入签，仅根节点特例可入签
+      if (!canOpenAsTab(targetMenu)) {
         return;
       }
 
       // 检查是否已在 Tabs 中
-      const existingTab = state.tabsList.find(tab => tab.menuItem?.code === targetMenu.code || tab.url === targetMenu.url);
+      const existingTab = state.tabsList.find(tab => tab.menuItem?.code === targetMenu.code || tab.url === getMenuRoute(targetMenu));
       if (existingTab) {
         // 如果已存在，切换到该 Tab
         if (state.activeKey !== existingTab.id) {

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

@@ -1,4 +1,9 @@
 import { TabItem, MenusType } from '../../../propTypes';
+/**
+ * 获取菜单实际用于路由/签页的路径
+ * 约定优先使用 redirectUrl，其次回退 url
+ */
+export declare const getMenuRoute: (menuItem: MenusType) => string;
 /**
  * 根据菜单项生成TabItem
  */
@@ -39,3 +44,12 @@ export declare const flattenMenuData: (menus?: MenusType[]) => MenusType[];
  * 只有当菜单项没有子菜单或子菜单为空时，才认为是叶子节点
  */
 export declare const isLeafMenuItem: (menuItem: MenusType) => boolean;
+/**
+ * 判断菜单项是否为根节点
+ */
+export declare const isRootMenuItem: (menuItem: MenusType) => boolean;
+/**
+ * 判断菜单项是否可以在 Tabs 模式下打开
+ * 规则：叶子节点可打开；有 children 时仅根节点可打开
+ */
+export declare const canOpenAsTab: (menuItem: MenusType) => boolean;

package/es/ProLayout/components/TabsManager/utils/index.js

@@ -1,14 +1,23 @@
+/**
+ * 获取菜单实际用于路由/签页的路径
+ * 约定优先使用 redirectUrl，其次回退 url
+ */
+export const getMenuRoute = menuItem => {
+  return menuItem.redirectUrl || menuItem.url || '';
+};
+
 /**
  * 根据菜单项生成TabItem
  */
 export const createTabFromMenu = (menuItem, index = 0) => {
+  const route = getMenuRoute(menuItem);
   return {
     id: String(menuItem.id || menuItem.code || menuItem.url || index),
     code: menuItem.code,
     name: menuItem.name,
     title: menuItem.name,
-    url: menuItem.url,
-    closable: true,
+    url: route,
+    closable: menuItem.closable !== false,
     menuItem,
     icon: menuItem.icon || menuItem.imgUrl
   };
@@ -34,16 +43,17 @@ export const generateTabId = (menuItem, existingIds) => {
  * 检查菜单项是否应该外部跳转
  */
 export const shouldOpenExternal = (menuItem, target) => {
-  return target === '_blank' || menuItem.redirectUrl && menuItem.redirectUrl !== menuItem.url || menuItem.type === 'EXTERNAL';
+  const menuTarget = menuItem?.target || target;
+  return menuTarget === '_blank' || menuItem.type === 'EXTERNAL';
 };
 
 /**
  * 处理外部跳转
  */
 export const handleExternalOpen = menuItem => {
-  const url = menuItem.redirectUrl || menuItem.url;
+  const url = getMenuRoute(menuItem);
   if (url) {
-    window.open(url, '_blank');
+    window.open(url, menuItem.target || '_blank');
   }
 };
 
@@ -109,4 +119,28 @@ export const isLeafMenuItem = menuItem => {
   } = menuItem || {};
   // 如果 children 不存在、为 null、为 undefined，或者为空数组，则认为是叶子节点
   return !children || Array.isArray(children) && children.length === 0;
+};
+
+/**
+ * 判断菜单项是否为根节点
+ */
+export const isRootMenuItem = menuItem => {
+  if (!menuItem) return false;
+  if (menuItem.parentId === null || menuItem.parentId === undefined) {
+    return true;
+  }
+  return Array.isArray(menuItem.keyIdPath) && menuItem.keyIdPath.length === 1;
+};
+
+/**
+ * 判断菜单项是否可以在 Tabs 模式下打开
+ * 规则：叶子节点可打开；有 children 时仅根节点可打开
+ */
+export const canOpenAsTab = menuItem => {
+  if (!menuItem) return false;
+  if (!(menuItem.url || menuItem.redirectUrl)) return false;
+  if (isLeafMenuItem(menuItem)) {
+    return true;
+  }
+  return isRootMenuItem(menuItem);
 };

package/es/ProLayout/index.js

@@ -11,7 +11,7 @@ import { isTabsMode, validateTabsProps } from "./propTypes";
 import { useProLayoutTabs } from "./components/TabsManager/hooks/useProLayoutTabs";
 import { useActiveTab } from "./components/TabsManager/hooks/useActiveTab";
 import { transformMenus } from "./utils";
-import { isLeafMenuItem } from "./components/TabsManager/utils";
+import { canOpenAsTab } from "./components/TabsManager/utils";
 import headerBg from "../assets/header_bg.png";
 
 // 全局上下文
@@ -99,7 +99,7 @@ const ProLayout = props => {
           });
           return;
         }
-        const targetPath = activeTab?.url || activeTab?.menuItem?.router || activeTab?.menuItem?.url || activeTab?.menuItem?.redirectUrl;
+        const targetPath = activeTab?.url || activeTab?.menuItem?.router || activeTab?.menuItem?.redirectUrl || activeTab?.menuItem?.url;
         if (targetPath && targetPath !== selectedPath) {
           setState({
             selectedPath: targetPath
@@ -134,13 +134,16 @@ const ProLayout = props => {
 
     // tabs 模式：调用 TabsManager 的 handleMenuClick 来添加标签页
     tabsManagerRef.current?.handleMenuClick?.(params);
+    if (!params.item) {
+      return true;
+    }
 
-    // 非叶子节点，直接允许激活
-    if (!params.item || !isLeafMenuItem(params.item)) {
+    // 根节点可入签；中间层级（有 children）不激活；叶子入签
+    if (!canOpenAsTab(params.item)) {
       return true;
     }
 
-    // 叶子节点：检查是否可以添加标签页（检查 max 限制）
+    // 可入签节点：检查是否可以添加标签页（检查 max 限制、_blank 等）
     const canAdd = tabsManagerRef.current?.canAddTab?.(params.item);
     if (!canAdd) {
       // 超过限制，返回 false 阻止菜单激活
@@ -148,13 +151,14 @@ const ProLayout = props => {
     }
 
     // 可以添加标签页，设置选中路径（激活菜单）
-    const targetPath = params.item?.url || params.item?.redirectUrl || params.item?.router;
+    const targetPath = params.item?.redirectUrl || params.item?.url || params.item?.router;
     if (targetPath && targetPath !== selectedPath) {
       setState({
         selectedPath: targetPath
       });
     }
-    return true;
+    // tabs 模式下由 Tab 管理内容，阻止菜单默认 Link 跳转
+    return false;
   }, [isTabsLayout, onMenuClick, selectedPath]);
 
   /**

package/es/ProLayout/propTypes.d.ts

@@ -124,6 +124,11 @@ export interface MenusType {
      * @default -
      */
     type?: string;
+    /**
+     * @description 当前菜单点击后的打开方式
+     * @default "_self"
+     */
+    target?: '_blank' | '_parent' | '_self' | '_top';
     /**
      * @description 允许扩展字段
      */

package/es/assets/edit.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1775025459029" class="icon" viewBox="0 0 1025 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7119" xmlns:xlink="http://www.w3.org/1999/xlink" width="200.1953125" height="200"><path d="M181.10185262 930.4882664c-18.69801175 0-33.42977859-15.29837325-33.42977858-33.42977858 0-18.69801175 15.29837325-33.42977859 33.42977858-33.4297786h691.25982844c18.69801175 0 33.42977859 15.29837325 33.42977859 33.4297786 0 18.69801175-15.29837325 33.42977859-33.42977859 33.42977858h-691.25982844z m671.42860384-747.92047012L752.80772713 82.84506694c-12.46534117-12.46534117-32.86317217-12.46534117-45.32851335 0l-100.85594218 100.85594218 145.05124269 145.05124269 100.85594217-100.85594218c12.46534117-12.46534117 12.46534117-32.29656575 0-45.32851335z m-275.93732495 31.16335293L240.59552637 549.72875434c-9.06570266 9.06570266-16.9981925 28.89692726-16.9981925 28.89692726l-52.12779033 165.44907369c-3.96624492 12.46534117 7.93248983 23.7974695 20.397831 20.397831l164.31586085-52.12779034s19.83122459-7.36588342 29.46353368-17.56479891L721.6443742 358.7823919 576.59313151 213.73114921z" fill="#2C2C2C" p-id="7120"></path></svg>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "4.3.0-beta.6",
+  "version": "4.3.0-beta.7",
   "license": "MIT",
   "files": [
     "es",