@zat-design/sisyphus-react 4.6.0-beta.3 → 4.6.0

package/es/ProEditTable/utils/tools.d.ts

@@ -32,7 +32,7 @@ export declare const difference: <T extends Record<string, any>, U extends Recor
  * @param rowName 行名称路径
  * @returns 校验结果Promise
  */
-export declare const customValidate: (validateKeys: string[], form: FormInstance, rowName: NamePath) => Promise<any>;
+export declare const customValidate: (validateKeys: NamePath[], form: FormInstance, rowName: NamePath) => Promise<any>;
 /**
  * 拆解数组names
  * @param names 名称数组

package/es/ProEditTable/utils/tools.js

@@ -47,10 +47,11 @@ const difference = (object, base) => {
   return changes(object, base);
 };
 const customValidate = (validateKeys, form, rowName) => {
-  const array = [];
-  validateKeys.forEach((key) => {
-    array.push([...Array.isArray(rowName) ? rowName : [rowName], key]);
-  });
+  const rowNamePath = Array.isArray(rowName) ? rowName : [rowName];
+  const array = validateKeys.map((key) => [
+    ...rowNamePath,
+    ...Array.isArray(key) ? key : [key]
+  ]);
   return form.validateFields(array);
 };
 const splitNames = (names) => {

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

@@ -13,8 +13,8 @@ import {
   flattenMenuData,
   canOpenAsTab,
   getMenuRoute,
-  hasRelationKey,
   findExistingTab,
+  getUrlSyncTabIdentity,
   getComparableTabUrl,
   normalizeTabUrl,
   isSafeExternalUrl,
@@ -69,18 +69,20 @@ const useTabsState = (options) => {
         const retainedTabByIdentity = /* @__PURE__ */ new Map();
         const retainedIdByOriginalId = /* @__PURE__ */ new Map();
         restoredState.tabsList.forEach((tab) => {
-          var _a2;
           const normalizedUrl = normalizeTabUrl(tab.url);
           if (!normalizedUrl)
             return;
           const comparableUrl = getComparableTabUrl(normalizedUrl, urlSyncBasename);
           if (!comparableUrl)
             return;
-          const relationKey = tab.relationKey ?? ((_a2 = tab.menuItem) == null ? void 0 : _a2.relationKey);
-          const identity = urlSyncIdentity === "relationKey" && hasRelationKey(relationKey) ? `relationKey:${typeof relationKey}:${String(relationKey)}` : `url:${comparableUrl}`;
+          const identity = getUrlSyncTabIdentity(
+            { ...tab, url: normalizedUrl },
+            { identity: urlSyncIdentity, basename: urlSyncBasename }
+          );
+          if (!identity)
+            return;
           const retainedTab = retainedTabByIdentity.get(identity);
           if (retainedTab) {
-            retainedTabByIdentity.set(identity, { ...retainedTab, url: normalizedUrl });
             retainedIdByOriginalId.set(tab.id, retainedTab.id);
             return;
           }
@@ -181,12 +183,7 @@ const useTabsState = (options) => {
         }) : void 0;
         if (existingTab) {
           const shouldFixClosable = resolvedMenuItem.closable === false && existingTab.closable !== false;
-          const shouldUpdateUrl = urlSyncIdentity === "relationKey" && normalizedUrl !== void 0 && getComparableTabUrl(existingTab.url, urlSyncBasename) !== getComparableTabUrl(normalizedUrl, urlSyncBasename);
-          const correctedTab = shouldFixClosable || shouldUpdateUrl ? {
-            ...existingTab,
-            ...shouldFixClosable ? { closable: false } : {},
-            ...shouldUpdateUrl ? { url: normalizedUrl } : {}
-          } : existingTab;
+          const correctedTab = shouldFixClosable ? { ...existingTab, closable: false } : existingTab;
           const updatedTabsList = correctedTab !== existingTab ? prevState.tabsList.map((t) => t.id === existingTab.id ? correctedTab : t) : prevState.tabsList;
           return {
             ...prevState,
@@ -257,7 +254,10 @@ const useTabsState = (options) => {
         ...updates.icon !== void 0 && { icon: updates.icon },
         ...updates.extra !== void 0 && { extra: updates.extra },
         ...updates.closable !== void 0 && { closable: updates.closable },
-        ...updates.pinned !== void 0 && { pinned: updates.pinned }
+        ...updates.pinned !== void 0 && { pinned: updates.pinned },
+        ...updates.menuCodeSource !== void 0 && {
+          menuCodeSource: updates.menuCodeSource
+        }
       } : target.menuItem;
       const nextTab = {
         ...target,
@@ -265,6 +265,9 @@ const useTabsState = (options) => {
         ...updates.icon !== void 0 && { icon: updates.icon },
         ...updates.closable !== void 0 && { closable: updates.closable },
         ...updates.pinned !== void 0 && { pinned: updates.pinned },
+        ...updates.menuCodeSource !== void 0 && {
+          menuCodeSource: updates.menuCodeSource
+        },
         menuItem: nextMenuItem
       };
       const newTabsList = [...prevState.tabsList];

package/es/ProLayout/components/TabsManager/hooks/useTabsUrlSync.js

@@ -3,6 +3,7 @@ import * as ReactRouterDom from "react-router-dom";
 import {
   canOpenAsTab,
   flattenMenuData,
+  findExistingTab,
   getBrowserTabUrl,
   getComparableTabUrl,
   getCurrentTabUrl,
@@ -95,6 +96,7 @@ const useTabsUrlSync = ({
   const enabled = config.urlSync === true || typeof config.urlSync === "object" && config.urlSync !== null;
   const historyMode = typeof config.urlSync === "object" ? config.urlSync.history || "replace" : "replace";
   const basename = typeof config.urlSync === "object" ? config.urlSync.basename : void 0;
+  const identity = typeof config.urlSync === "object" ? config.urlSync.identity : void 0;
   const bootstrappedRef = useRef(false);
   const writingUrlRef = useRef(false);
   const preserveUrlInteractionRef = useRef(null);
@@ -201,7 +203,21 @@ const useTabsUrlSync = ({
       handledLocationSequenceRef.current = locationChange.sequence;
       bootstrappedRef.current = true;
       preserveUrlInteractionRef.current = interactionSequence;
-      addTab({ ...targetMenu, url: currentUrl, redirectUrl: void 0 });
+      const resolvedTargetMenu = { ...targetMenu, url: currentUrl, redirectUrl: void 0 };
+      const existingTargetTab = findExistingTab(state.tabsList, resolvedTargetMenu, {
+        urlSync: true,
+        identity,
+        basename
+      });
+      if (existingTargetTab) {
+        if (getComparableTabUrl(existingTargetTab.url, basename) !== comparableCurrentUrl) {
+          updateTabUrl(existingTargetTab.id, currentUrl);
+        }
+        if (state.activeKey !== existingTargetTab.id)
+          switchTab(existingTargetTab.id);
+        return;
+      }
+      addTab(resolvedTargetMenu);
       return;
     }
     if (!bootstrappedRef.current) {
@@ -230,7 +246,8 @@ const useTabsUrlSync = ({
     switchTab,
     updateTabUrl,
     interactionSequence,
-    basename
+    basename,
+    identity
   ]);
   useEffect(() => {
     if (!enabled || !isInitialized || !bootstrappedRef.current || typeof window === "undefined") {

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

@@ -86,13 +86,6 @@
       border-bottom: 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
     .@{ant-prefix}-tabs-nav-list {
       display: flex;
@@ -167,6 +160,13 @@
 
 .pro-layout-tabs-antd {
   &.@{ant-prefix}-tabs {
+    // TabsHeader 通过 Portal 渲染到 ProLayout 挂载点，需要在全局作用域截断横线。
+    // 右侧空出一个圆角半径，与内容区圆弧的顶部边线无缝连接。
+    .@{ant-prefix}-tabs-nav[class]::before {
+      right: var(--zaui-border-radius, 8px) !important;
+      left: 0 !important;
+    }
+
     .@{ant-prefix}-tabs-tab {
       padding: 4px 0 5px !important;
       margin-right: 8px !important;

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

@@ -24,6 +24,8 @@ export interface FindExistingTabOptions {
     identity?: TabsUrlSyncConfig['identity'];
     basename?: TabsUrlSyncConfig['basename'];
 }
+/** URL 同步模式的唯一身份；relationKey 模式兼容无关联键的旧菜单 code。 */
+export declare const getUrlSyncTabIdentity: (item: MenusType | TabItem, options?: Pick<FindExistingTabOptions, 'identity' | 'basename'>) => string | undefined;
 export declare const findExistingTab: (tabsList: TabItem[], menuItem: MenusType, options?: FindExistingTabOptions) => TabItem | undefined;
 /**
  * 根据菜单项生成TabItem

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

@@ -78,20 +78,59 @@ const getTabUrlPathname = (value) => {
     return void 0;
   return new URL(normalized, window.location.origin).pathname;
 };
+const getIdentityRelationKey = (item) => {
+  var _a;
+  return item.relationKey ?? ("menuItem" in item ? (_a = item.menuItem) == null ? void 0 : _a.relationKey : void 0);
+};
+const getIdentityCode = (item) => {
+  var _a;
+  return item.code ?? ("menuItem" in item ? (_a = item.menuItem) == null ? void 0 : _a.code : void 0);
+};
+const getTypedIdentity = (prefix, value) => `${prefix}:${typeof value}:${String(value)}`;
+const isTabItem = (item) => typeof item.id === "string";
+const getUrlSyncTabIdentity = (item, options = {}) => {
+  if (options.identity === "relationKey") {
+    const relationKey = getIdentityRelationKey(item);
+    if (hasRelationKey(relationKey))
+      return getTypedIdentity("relationKey", relationKey);
+    const code = getIdentityCode(item);
+    if (code !== void 0 && code !== null && code !== "") {
+      return getTypedIdentity("code", code);
+    }
+  }
+  const route = isTabItem(item) ? item.url : getMenuRoute(item);
+  const comparableUrl = getComparableTabUrl(route, options.basename);
+  return comparableUrl ? `url:${comparableUrl}` : void 0;
+};
 const findExistingTab = (tabsList, menuItem, options = {}) => {
   if (options.urlSync) {
-    if (options.identity === "relationKey" && hasRelationKey(menuItem.relationKey)) {
-      return tabsList.find(
-        (tab) => {
-          var _a;
-          return tab.relationKey === menuItem.relationKey || ((_a = tab.menuItem) == null ? void 0 : _a.relationKey) === menuItem.relationKey;
+    if (options.identity === "relationKey") {
+      const relationKey = getIdentityRelationKey(menuItem);
+      if (hasRelationKey(relationKey)) {
+        const relatedTab = tabsList.find(
+          (tab) => getIdentityRelationKey(tab) === relationKey
+        );
+        if (relatedTab)
+          return relatedTab;
+        const legacyCode = getIdentityCode(menuItem);
+        if (legacyCode !== void 0 && legacyCode !== null && legacyCode !== "") {
+          return tabsList.find(
+            (tab) => !hasRelationKey(getIdentityRelationKey(tab)) && getIdentityCode(tab) === legacyCode
+          );
         }
-      );
+        return void 0;
+      }
+      const code = getIdentityCode(menuItem);
+      if (code !== void 0 && code !== null && code !== "") {
+        return tabsList.find((tab) => getIdentityCode(tab) === code);
+      }
     }
     const targetUrl = getComparableTabUrl(getMenuRoute(menuItem), options.basename);
     if (!targetUrl)
       return void 0;
-    return tabsList.find((tab) => getComparableTabUrl(tab.url, options.basename) === targetUrl);
+    return tabsList.find(
+      (tab) => getComparableTabUrl(tab.url, options.basename) === targetUrl
+    );
   }
   if (hasRelationKey(menuItem.relationKey)) {
     return tabsList.find(
@@ -282,6 +321,7 @@ export {
   getPinnedBoundary,
   getRightTabs,
   getTabUrlPathname,
+  getUrlSyncTabIdentity,
   handleExternalOpen,
   hasRelationKey,
   isLeafMenuItem,

package/es/ProLayout/propTypes.d.ts

@@ -369,7 +369,7 @@ export interface TabsUrlSyncConfig {
      */
     history?: 'replace' | 'push';
     /**
-     * @description 页签复用身份。url 保持既有完整 URL 唯一语义；relationKey 在显式传入时优先按业务关联键复用
+     * @description 页签复用身份。url 保持完整 URL 唯一语义；relationKey 按关联键、无关联键的菜单 code、完整 URL 依次匹配
      * @default 'url'
      */
     identity?: 'url' | 'relationKey';
@@ -425,7 +425,7 @@ export interface AddTabOptions {
     silent?: boolean;
 }
 /**
- * @description 更新标签页的字段（仅允许更新展示与扩展数据）
+ * @description 更新标签页的展示、扩展数据与来源菜单身份
  */
 export interface UpdateTabParams {
     /**
@@ -448,6 +448,10 @@ export interface UpdateTabParams {
      * @description 是否固定标签（本质状态，driven closable）
      */
     pinned?: boolean;
+    /**
+     * @description 最初打开当前业务标签链路的左侧菜单 code；用于兼容性迁移已缓存的来源身份
+     */
+    menuCodeSource?: string;
 }
 /**
  * @description 获取标签页信息返回值

package/es/ProLayout/style/index.less

@@ -327,24 +327,6 @@
       overflow: hidden;
       min-height: 0;
     }
-
-    // 稳定遮住 ant-tabs-nav::before 横线的右端，使其在内容区圆弧起点处截止
-    &.tabs-visible::before {
-      content: '';
-      position: absolute;
-      bottom: 0;
-      right: 0;
-      width: var(--zaui-border-radius, 8px);
-      height: 2px;
-      background-color: #f7f9fd;
-      background-image: var(--header-bg-image);
-      background-repeat: no-repeat;
-      background-position: top center;
-      background-size: 100% auto;
-      background-attachment: fixed;
-      z-index: 1;
-      pointer-events: none;
-    }
   }
 
   /** 内容区 */
@@ -370,17 +352,19 @@
       border-top-color: transparent;
       border-radius: 0;
       padding-top: var(--zaui-space-size-md, 16px);
-      border-top-right-radius: var(--zaui-border-radius, 8px);
 
       // 圆弧由内容区独立绘制并随内容滚动；sticky Tab 栏始终保持在其上方。
-      // ::before 在子内容之前绘制，ProStep / ProHeader 仍可完整覆盖圆弧。
+      // 与内容区外边框对齐，同时遮住底层直角，避免缩放时出现断线或双重圆弧。
       &::before {
         content: '';
         position: absolute;
-        top: 0;
-        right: 0;
+        box-sizing: border-box;
+        top: -1px;
+        right: -1px;
         width: var(--zaui-border-radius, 8px);
         height: var(--zaui-border-radius, 8px);
+        background: #ffffff;
+        border-top: 1px solid rgb(235 236 238);
         border-right: 1px solid rgb(235 236 238);
         border-top-right-radius: var(--zaui-border-radius, 8px);
         pointer-events: none;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "4.6.0-beta.3",
+  "version": "4.6.0",
   "license": "MIT",
   "publishConfig": {
     "access": "public",