@zat-design/sisyphus-react 4.5.6-beta.1 → 4.5.6-beta.2

package/es/ProLayout/components/ProHeader/PropTypes.d.ts

@@ -172,7 +172,7 @@ export interface ProHeaderType {
      */
     fixedTop?: string | number;
     /**
-     * @description      是否显示返回按钮
+     * @description      是否显示返回按钮。显式传值优先；不传时若有 onBack 则显示，否则由 autoBack 按浏览器历史长度判断
      * @default           -
      */
     showBack?: boolean;
@@ -198,8 +198,8 @@ export interface ProHeaderType {
      */
     zIndex?: number;
     /**
-     * @description      返回
-     * @default           100
+     * @description      返回按钮点击回调；不传时默认执行 window.history.back()
+     * @default           -
      */
     onBack?: () => void;
     [key: string]: any;

package/es/ProLayout/components/ProHeader/components/Describe/index.d.ts

@@ -0,0 +1,26 @@
+import React from 'react';
+import type { DescribeColumnType } from '../../PropTypes';
+/** 描述项里的单条值（link / copyable / tag 组合），对应 items 数组元素 */
+type DescribeValueItem = Pick<DescribeColumnType, 'tag' | 'link' | 'value' | 'copyable'>;
+/**
+ * 标签渲染：数组 tag 逐个渲染，单值渲染一个，空则不渲染
+ */
+export declare const DescribeTag: ({ tag, parentKey, }: {
+    tag?: DescribeColumnType["tag"];
+    parentKey: string;
+}) => import("react/jsx-runtime").JSX.Element;
+/**
+ * 单行值渲染：link → <a>，copyable+字符串 → 复制按钮，末尾追加 tag
+ */
+export declare const DescribeValue: ({ value, link, copyable, tag, parentKey, }: DescribeValueItem & {
+    parentKey: string;
+}) => import("react/jsx-runtime").JSX.Element;
+/**
+ * 多值渲染：以「、」连接；超 3 个显示「共N个，」前缀；内容溢出时显示「...」并用 Tooltip 展示全部
+ */
+export declare const DescribeItems: ({ items, parentKey, containerRef, }: {
+    items: DescribeValueItem[];
+    parentKey: string;
+    containerRef: React.RefObject<HTMLDivElement>;
+}) => import("react/jsx-runtime").JSX.Element;
+export {};

package/es/ProLayout/components/ProHeader/components/Describe/index.js

@@ -0,0 +1,106 @@
+import _isString from "lodash/isString";
+import React from 'react';
+import { Space, Tooltip } from 'antd';
+import classnames from 'classnames';
+import Copy from "../Copy";
+import { checkDescribeItemsHidden, getTagKey, getDescribeValueKey } from "../../utils";
+
+/** 描述项里的单条值（link / copyable / tag 组合），对应 items 数组元素 */
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+/**
+ * 标签渲染：数组 tag 逐个渲染，单值渲染一个，空则不渲染
+ */
+export const DescribeTag = ({
+  tag,
+  parentKey
+}) => {
+  if (Array.isArray(tag) && tag.length) {
+    return /*#__PURE__*/_jsx(Space, {
+      size: 4,
+      children: tag.map((tagItem, tagIndex) => /*#__PURE__*/_jsx("div", {
+        className: "pro-header-tag",
+        children: tagItem
+      }, getTagKey(tagItem, parentKey, tagIndex)))
+    });
+  }
+  return tag ? /*#__PURE__*/_jsx("div", {
+    className: "pro-header-tag",
+    children: tag
+  }) : null;
+};
+
+/**
+ * 单行值渲染：link → <a>，copyable+字符串 → 复制按钮，末尾追加 tag
+ */
+export const DescribeValue = ({
+  value,
+  link,
+  copyable,
+  tag,
+  parentKey
+}) => {
+  return /*#__PURE__*/_jsxs(Space, {
+    size: 4,
+    align: tag ? 'baseline' : 'center',
+    children: [link ? /*#__PURE__*/_jsx("a", {
+      onClick: () => {
+        const newWindow = window.open(link);
+        newWindow.opener = null;
+      },
+      children: value
+    }) : value, copyable && _isString(value) ? /*#__PURE__*/_jsx(Copy, {
+      text: value
+    }) : null, /*#__PURE__*/_jsx(DescribeTag, {
+      tag: tag,
+      parentKey: parentKey
+    })]
+  });
+};
+
+/**
+ * 多值渲染：以「、」连接；超 3 个显示「共N个，」前缀；内容溢出时显示「...」并用 Tooltip 展示全部
+ */
+export const DescribeItems = ({
+  items,
+  parentKey,
+  containerRef
+}) => {
+  // items 配置是否超长，超长则展示 ... + tip 提示
+  const itemsHidden = checkDescribeItemsHidden(containerRef?.current);
+  const result = /*#__PURE__*/_jsxs("div", {
+    ref: containerRef,
+    className: classnames({
+      'pro-header-describe-items': true,
+      'pro-header-describe-items-more': items.length >= 2
+    }),
+    children: [items?.length > 3 ? `共${items?.length}个，` : null, items.map((item, itemIndex) => /*#__PURE__*/_jsxs("span", {
+      children: [/*#__PURE__*/_jsx(DescribeValue, {
+        ...item,
+        parentKey: parentKey
+      }), items?.length !== itemIndex + 1 ? ' 、' : null]
+    }, getDescribeValueKey(item, parentKey, itemIndex))), itemsHidden ? /*#__PURE__*/_jsx("span", {
+      className: "pro-header-describe-items-omit",
+      children: "..."
+    }) : null]
+  });
+  if (itemsHidden) {
+    const tipResult = /*#__PURE__*/_jsx(_Fragment, {
+      children: items.map((item, itemIndex) => /*#__PURE__*/_jsx("p", {
+        className: "pro-header-describe-items-tip-value",
+        children: /*#__PURE__*/_jsx(DescribeValue, {
+          ...item,
+          parentKey: parentKey
+        })
+      }, getDescribeValueKey(item, parentKey, itemIndex)))
+    });
+    return /*#__PURE__*/_jsx(Tooltip, {
+      placement: "bottomLeft",
+      classNames: {
+        root: 'pro-header-describe-items-tip'
+      },
+      title: tipResult,
+      children: result
+    });
+  }
+  return result;
+};

package/es/ProLayout/components/ProHeader/index.js

@@ -7,26 +7,18 @@ import React, { memo, useEffect, useState, useRef } from 'react';
 import { tools } from '@zat-design/utils';
 import classnames from 'classnames';
 import dayjs from 'dayjs';
-import { useToggle, useSize } from 'ahooks';
+import { useToggle } from 'ahooks';
 import { ReactSVG } from 'react-svg';
 import foldSvg from "../../../assets/arrow.svg";
 import { Copy, ProBackBtn } from "./components";
+import { DescribeItems, DescribeValue } from "./components/Describe";
 import getEnumLabel from "../../../ProEnum/utils/getEnumLabel";
 import locale from "../../../locale";
-import { checkDescribeItemsHidden } from "./utils";
+import { toKeyPart, getDescribeColumnKey, getTagKey, getSubDescribeKey } from "./utils";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 const {
   formatAmount
 } = tools;
-const toKeyPart = value => {
-  if (value == null || value === '') return undefined;
-  if (typeof value === 'string' || typeof value === 'number') return String(value);
-  return undefined;
-};
-const getDescribeColumnKey = (item, index) => toKeyPart(item.label) ?? toKeyPart(item.value) ?? `describe-${index}`;
-const getDescribeValueKey = (item, parentKey, index) => toKeyPart(item.link) ?? toKeyPart(item.value) ?? `${parentKey}-value-${index}`;
-const getTagKey = (tagItem, parentKey, index) => toKeyPart(tagItem) ?? `${parentKey}-tag-${index}`;
-const getSubDescribeKey = (item, index) => toKeyPart(item.label) ?? toKeyPart(item.code) ?? `sub-describe-${index}`;
 const ProHeader = props => {
   const {
     breadcrumbColumns,
@@ -37,7 +29,6 @@ const ProHeader = props => {
     className,
     bodyOverFlowHidden = false,
     fixedTop,
-    showBack = true,
     showShadow = false,
     zIndex = 98,
     title,
@@ -47,19 +38,32 @@ const ProHeader = props => {
     isConfirmBack = false,
     isConfirmBackModalProps = {}
   } = props;
-  const [backState, setBackState] = useState(showBack);
+
+  // 返回按钮是否显示。
+  // 显式意图优先于 autoBack 启发式：
+  // 1) 用户显式传了 showBack → 完全尊重该值；
+  // 2) 传了 onBack（返回不依赖浏览器历史，如 tab 内返回 / 自定义跳转）→ 显示；
+  // 3) 都没传（纯默认，返回兜底走 window.history.back）→ 由 autoBack 按历史长度智能判断：
+  //    新开页面(history.length <= autoBack)无处可返回，则隐藏。
+  const computeBackState = () => {
+    if (props.showBack !== undefined) return props.showBack;
+    if (onBack) return true;
+    return window.history.length > autoBack;
+  };
+  const [backState, setBackState] = useState(computeBackState);
   const [fold, {
     toggle
   }] = useToggle(collapsed);
   const ref = useRef(null);
-  const size = useSize(ref);
-  let _title = title;
+
+  // 最终用于渲染的标题（title + showBack 时会被转成面包屑，此处置空）
+  let finalTitle = title;
 
   // 面包屑配置数据源
-  const _breadcrumbColumns = breadcrumbColumns || [];
+  const finalBreadcrumbColumns = breadcrumbColumns || [];
 
   // 次级配置数据源
-  const _subDescribeColumns = subDescribeColumns || [];
+  const finalSubDescribeColumns = subDescribeColumns || [];
   useEffect(() => {
     if (bodyOverFlowHidden) {
       const bodyElement = document.querySelector('body');
@@ -70,13 +74,11 @@ const ProHeader = props => {
       bodyElement.style.overflow = '';
     };
   }, [bodyOverFlowHidden]);
+
+  // showBack / onBack / autoBack 变化时同步 backState（避免 props 更新后按钮显隐不同步）
   useEffect(() => {
-    const isNewPage = window.history.length;
-    // history的记录，默认2，代办新开页面
-    if (isNewPage <= autoBack) {
-      setBackState(false);
-    }
-  }, []);
+    setBackState(computeBackState());
+  }, [props.showBack, onBack, autoBack]);
 
   /**
    * 主级描述数据渲染
@@ -108,82 +110,6 @@ const ProHeader = props => {
           return null;
         }
         const onlyTag = tag && !label && !value;
-        const tagRender = params => {
-          if (Array.isArray(params?.tag) && params?.tag.length) {
-            return /*#__PURE__*/_jsx(Space, {
-              size: 4,
-              children: params.tag.map((tagItem, tagIndex) => {
-                return /*#__PURE__*/_jsx("div", {
-                  className: "pro-header-tag",
-                  children: tagItem
-                }, getTagKey(tagItem, describeItemKey, tagIndex));
-              })
-            });
-          }
-          return params?.tag ? /*#__PURE__*/_jsx("div", {
-            className: "pro-header-tag",
-            children: params?.tag
-          }) : null;
-        };
-
-        /** 单行渲染 */
-        const valueRender = params => {
-          return /*#__PURE__*/_jsxs(Space, {
-            size: 4,
-            align: params?.tag ? 'baseline' : 'center',
-            children: [params?.link ? /*#__PURE__*/_jsx("a", {
-              onClick: () => {
-                const newWindow = window.open(params.link);
-                newWindow.opener = null;
-              },
-              children: params?.value
-            }) : params?.value, params?.copyable && _isString(params?.value) ? /*#__PURE__*/_jsx(Copy, {
-              text: params.value
-            }) : null, tagRender({
-              tag: params?.tag
-            })]
-          });
-        };
-
-        /** 多行渲染 */
-        const itemsRender = () => {
-          // items配置是否超长，超长配置... + tip 提示
-          const itemsHidden = checkDescribeItemsHidden(ref?.current);
-          const result = /*#__PURE__*/_jsxs("div", {
-            ref: ref,
-            className: classnames({
-              'pro-header-describe-items': true,
-              'pro-header-describe-items-more': items.length >= 2
-            }),
-            children: [items?.length > 3 ? `共${items?.length}个，` : null, items.map((item, itemIndex) => {
-              return /*#__PURE__*/_jsxs("span", {
-                children: [valueRender(item), items?.length !== itemIndex + 1 ? ' 、' : null]
-              }, getDescribeValueKey(item, describeItemKey, itemIndex));
-            }), itemsHidden ? /*#__PURE__*/_jsx("span", {
-              className: "pro-header-describe-items-omit",
-              children: "..."
-            }) : null]
-          });
-          if (itemsHidden) {
-            const tipResult = /*#__PURE__*/_jsx(_Fragment, {
-              children: items.map((item, itemIndex) => {
-                return /*#__PURE__*/_jsx("p", {
-                  className: "pro-header-describe-items-tip-value",
-                  children: valueRender(item)
-                }, getDescribeValueKey(item, describeItemKey, itemIndex));
-              })
-            });
-            return /*#__PURE__*/_jsx(Tooltip, {
-              placement: "bottomLeft",
-              classNames: {
-                root: 'pro-header-describe-items-tip'
-              },
-              title: tipResult,
-              children: result
-            });
-          }
-          return result;
-        };
         const tagCls = classnames({
           'pro-header-only-tag': onlyTag,
           'pro-header-describe-items-calc': _isString(width) ? width.includes('calc') : false
@@ -200,12 +126,17 @@ const ProHeader = props => {
               children: label
             }) : null, /*#__PURE__*/_jsx("span", {
               className: "pro-header-describe-value",
-              children: items?.length ? itemsRender() : /*#__PURE__*/_jsx("span", {
-                children: valueRender({
-                  value,
-                  copyable,
-                  tag,
-                  link
+              children: items?.length ? /*#__PURE__*/_jsx(DescribeItems, {
+                items: items,
+                parentKey: describeItemKey,
+                containerRef: ref
+              }) : /*#__PURE__*/_jsx("span", {
+                children: /*#__PURE__*/_jsx(DescribeValue, {
+                  value: value,
+                  copyable: copyable,
+                  tag: tag,
+                  link: link,
+                  parentKey: describeItemKey
                 })
               })
             })]
@@ -302,10 +233,10 @@ const ProHeader = props => {
    * 总结信息面板渲染
    */
   const breadcrumbRender = () => {
-    if (Array.isArray(_breadcrumbColumns) && !_breadcrumbColumns.length) {
+    if (Array.isArray(finalBreadcrumbColumns) && !finalBreadcrumbColumns.length) {
       return [];
     }
-    const list = _breadcrumbColumns?.filter(item => {
+    const list = finalBreadcrumbColumns?.filter(item => {
       return item.type === 'breadcrumb';
     });
     return list.map((item, index) => {
@@ -355,10 +286,10 @@ const ProHeader = props => {
    * 头部左侧导航栏后业务信息
    */
   const infoRender = () => {
-    if (!Array.isArray(_breadcrumbColumns)) {
+    if (!Array.isArray(finalBreadcrumbColumns)) {
       return '';
     }
-    const list = _breadcrumbColumns?.filter(item => {
+    const list = finalBreadcrumbColumns?.filter(item => {
       return item.type !== 'breadcrumb';
     });
     if (!list.length) {
@@ -436,24 +367,29 @@ const ProHeader = props => {
       })
     });
   };
+
+  // 说明：以下两个 class 的判断沿用原有等价逻辑（去掉了原表达式里对 describeColumns 的重复判断）。
+  // has = 有次级描述 或 有主级描述；no = 无主级描述。二者非严格互斥（原实现即如此，未改动其行为）。
+  const noDescribe = _isEmpty(describeColumns);
+  const hasDescribe = !_isEmpty(finalSubDescribeColumns) || !noDescribe;
   const cls = classnames({
     'pro-header': true,
     'pro-header-fixed': fixedTop,
     'pro-header-shadow': showShadow,
     // 内部窗口滚动自带阴影场景
     'pro-header-no-back': !backState,
-    'pro-header-has-describe': !_isEmpty(_subDescribeColumns) || !_isEmpty(describeColumns) || !_isEmpty(describeColumns),
-    'pro-header-no-describe': _isEmpty(_subDescribeColumns) && _isEmpty(describeColumns) || _isEmpty(describeColumns),
+    'pro-header-has-describe': hasDescribe,
+    'pro-header-no-describe': noDescribe,
     [`${className}`]: className
   });
-  if (title && !_isEmpty(_breadcrumbColumns)) {
+  if (title && !_isEmpty(finalBreadcrumbColumns)) {
     console.error('warning: The title and the breadcrumbList cannot be used together');
   }
 
   // title默认不显示返回按钮，只有showBack设置为true时才显示
   if (title && props.showBack) {
-    _title = null;
-    _breadcrumbColumns.push({
+    finalTitle = null;
+    finalBreadcrumbColumns.push({
       type: 'breadcrumb',
       value: title
     });
@@ -492,9 +428,9 @@ const ProHeader = props => {
       top: fixedTop,
       zIndex
     },
-    children: _title ? /*#__PURE__*/_jsx("div", {
+    children: finalTitle ? /*#__PURE__*/_jsx("div", {
       className: "pro-header-title",
-      children: _title
+      children: finalTitle
     }) : /*#__PURE__*/_jsxs(_Fragment, {
       children: [/*#__PURE__*/_jsxs("div", {
         className: "pro-header-top",
@@ -516,14 +452,14 @@ const ProHeader = props => {
           className: "pro-header-right",
           children: actionsRender()
         })]
-      }), describeRender(describeColumns), !_isEmpty(_subDescribeColumns) ? /*#__PURE__*/_jsxs("div", {
+      }), describeRender(describeColumns), !_isEmpty(finalSubDescribeColumns) ? /*#__PURE__*/_jsxs("div", {
         className: classnames({
           'pro-header-nav': true,
           'pro-header-nav-open': fold,
           'pro-header-nav-hidden': !fold
         }),
         children: [/*#__PURE__*/_jsx("ul", {
-          children: _subDescribeColumns.map((item, index) => {
+          children: finalSubDescribeColumns.map((item, index) => {
             return /*#__PURE__*/_jsx("li", {
               children: subDescribeRender(item)
             }, getSubDescribeKey(item, index));

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

@@ -1,5 +1,20 @@
+import type React from 'react';
+import type { DescribeColumnType, SubDescribeColumnType } from '../PropTypes';
 /**
  * 检查描述dom是否部分隐藏
  * @param ele  dom节点
  */
 export declare const checkDescribeItemsHidden: (ele?: any) => boolean;
+/**
+ * 将值转为可用于 React key 的字符串片段
+ * 仅 string / number 有效，其余（含 ReactNode、对象、数组、boolean）返回 undefined
+ */
+export declare const toKeyPart: (value: unknown) => string | undefined;
+/** 主级描述项 key：label → value → describe-${index} */
+export declare const getDescribeColumnKey: (item: DescribeColumnType, index: number) => string;
+/** 描述值 key：link → value → ${parentKey}-value-${index} */
+export declare const getDescribeValueKey: (item: Pick<DescribeColumnType, "tag" | "link" | "value" | "copyable">, parentKey: string, index: number) => string;
+/** 标签 key：tagItem → ${parentKey}-tag-${index} */
+export declare const getTagKey: (tagItem: string | React.ReactNode, parentKey: string, index: number) => string;
+/** 次级描述项 key：label → code → sub-describe-${index} */
+export declare const getSubDescribeKey: (item: SubDescribeColumnType, index: number) => string;

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

@@ -11,4 +11,26 @@ export const checkDescribeItemsHidden = ele => {
   const itemsScrollWidth = element.scrollWidth;
   const itemsClientWidth = element.clientWidth;
   return itemsScrollWidth > itemsClientWidth;
-};
+};
+
+/**
+ * 将值转为可用于 React key 的字符串片段
+ * 仅 string / number 有效，其余（含 ReactNode、对象、数组、boolean）返回 undefined
+ */
+export const toKeyPart = value => {
+  if (value == null || value === '') return undefined;
+  if (typeof value === 'string' || typeof value === 'number') return String(value);
+  return undefined;
+};
+
+/** 主级描述项 key：label → value → describe-${index} */
+export const getDescribeColumnKey = (item, index) => toKeyPart(item.label) ?? toKeyPart(item.value) ?? `describe-${index}`;
+
+/** 描述值 key：link → value → ${parentKey}-value-${index} */
+export const getDescribeValueKey = (item, parentKey, index) => toKeyPart(item.link) ?? toKeyPart(item.value) ?? `${parentKey}-value-${index}`;
+
+/** 标签 key：tagItem → ${parentKey}-tag-${index} */
+export const getTagKey = (tagItem, parentKey, index) => toKeyPart(tagItem) ?? `${parentKey}-tag-${index}`;
+
+/** 次级描述项 key：label → code → sub-describe-${index} */
+export const getSubDescribeKey = (item, index) => toKeyPart(item.label) ?? toKeyPart(item.code) ?? `sub-describe-${index}`;

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

@@ -85,6 +85,68 @@ const TabsManager = /*#__PURE__*/forwardRef(({
     }
   }, [state.activeKey]);
 
+  // tab 内子视图栈：按 tabId 隔离。栈底→栈顶顺序，入口页不在其中。
+  // 只活在内存、不进缓存（详情/工作流是运行态 ReactNode，无法 JSON 序列化）。
+  const [viewStacks, setViewStacks] = useState({});
+
+  // 用 ref 持有 activeKey，供稳定的 pushView/back 读取当前激活 tab，避免因 activeKey 变化重建实例
+  const activeKeyRef = useRef(state.activeKey);
+  activeKeyRef.current = state.activeKey;
+
+  // 同步持有最新 viewStacks，使 getViewStack 成为稳定引用且读取不受渲染时序影响
+  const viewStacksRef = useRef(viewStacks);
+  viewStacksRef.current = viewStacks;
+
+  // 在当前激活 tab 内压入一层子视图（入口页/下层随之隐藏但不卸载）
+  const pushView = useCallback(node => {
+    const tabId = activeKeyRef.current;
+    if (!tabId) return;
+    setViewStacks(prev => ({
+      ...prev,
+      [tabId]: [...(prev[tabId] || []), node]
+    }));
+  }, []);
+
+  // 返回：销毁当前激活 tab 的栈顶子视图（栈空时 no-op）
+  const back = useCallback(() => {
+    const tabId = activeKeyRef.current;
+    if (!tabId) return;
+    setViewStacks(prev => {
+      const stack = prev[tabId];
+      if (!stack || stack.length === 0) return prev;
+      const nextStack = stack.slice(0, -1);
+      const next = {
+        ...prev
+      };
+      if (nextStack.length === 0) {
+        delete next[tabId];
+      } else {
+        next[tabId] = nextStack;
+      }
+      return next;
+    });
+  }, []);
+
+  // 获取当前激活 tab 的子视图栈（从 ref 读最新值，稳定引用）
+  const getViewStack = useCallback(() => viewStacksRef.current[activeKeyRef.current] || [], []);
+
+  // 子视图栈与 tabsList 对账：任何关闭路径（removeTab / closeOthers / closeRight /
+  // closeAll）导致某 tab 消失后，清除其残留子视图栈，避免关闭后 node 仍驻留内存。
+  useEffect(() => {
+    setViewStacks(prev => {
+      const keys = Object.keys(prev);
+      if (keys.length === 0) return prev;
+      const aliveIds = new Set(state.tabsList.map(tab => tab.id));
+      const staleKeys = keys.filter(id => !aliveIds.has(id));
+      if (staleKeys.length === 0) return prev;
+      const next = {
+        ...prev
+      };
+      staleKeys.forEach(id => delete next[id]);
+      return next;
+    });
+  }, [state.tabsList]);
+
   // 通知父级（ProLayout）当前是否有 Tab
   useEffect(() => {
     onTabsChange?.(state.tabsList.length > 0);
@@ -169,8 +231,11 @@ const TabsManager = /*#__PURE__*/forwardRef(({
       tabsList: state.tabsList,
       activeTabInfo: state.tabsList.find(tab => tab.id === state.activeKey),
       activeComponent: state.activeComponent
-    })
-  }), [addTab, removeTab, updateTab, state.tabsList, state.activeKey, state.activeComponent, dataSource]);
+    }),
+    pushView,
+    back,
+    getViewStack
+  }), [addTab, removeTab, updateTab, state.tabsList, state.activeKey, state.activeComponent, dataSource, pushView, back, getViewStack]);
   const handleTabChange = useCallback(activeKey => {
     switchTab(activeKey);
   }, [switchTab]);
@@ -227,11 +292,30 @@ const TabsManager = /*#__PURE__*/forwardRef(({
             });
           }
         }
+
+        // 该 tab 的子视图栈：栈底→栈顶。只有「当前激活 tab 的栈顶层」可见，
+        // 入口页与下层子视图 display:none 但保持挂载 → 返回秒回、状态不丢。
+        const stack = viewStacks[tab.id] || [];
+        // 入口页可见条件：该 tab 激活 且 无子视图
+        const entryVisible = isActive && stack.length === 0;
         return /*#__PURE__*/_jsx("div", {
-          className: `tab-pane ${isActive ? '' : 'hidden'}`,
+          className: `tab-pane ${entryVisible ? '' : 'hidden'}`,
           "data-testid": `tab-pane-${tab.id}`,
           children: content
         }, tab.id);
+      }), state.tabsList.map(tab => {
+        const isActive = tab.id === state.activeKey;
+        const stack = viewStacks[tab.id] || [];
+        if (stack.length === 0) return null;
+        const topIndex = stack.length - 1;
+        return stack.map((node, index) => {
+          const layerVisible = isActive && index === topIndex;
+          return /*#__PURE__*/_jsx("div", {
+            className: `tab-pane ${layerVisible ? '' : 'hidden'}`,
+            "data-testid": `tab-subview-${tab.id}-${index}`,
+            children: node
+          }, `${tab.id}-subview-${index}`);
+        });
       }), state.tabsList.length === 0 && /*#__PURE__*/_jsx("div", {
         className: "tab-pane",
         "data-testid": "default-content",

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

@@ -84,10 +84,13 @@
       margin: 0;
       padding: 0;
       border-bottom: none;
+    }
 
-      &::before {
-        display: none; // 隐藏底部边框
-      }
+    // 横线右端缩短，空出圆角半径，让横线在圆弧起点处结束
+    // 用属性选择器提升权重，确保覆盖 antd :where() 规则
+    .@{ant-prefix}-tabs-nav[class]::before {
+      right: var(--zaui-border-radius, 8px) !important;
+      left: 0 !important;
     }
 
     // 覆盖 nav-list 样式，使其匹配 pro-layout-tab-list