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

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

@@ -15,6 +15,7 @@ import {
   getMenuRoute,
   hasRelationKey,
   findExistingTab,
+  getComparableTabUrl,
   normalizeTabUrl,
   isSafeExternalUrl,
   isSafeHttpUrl,
@@ -30,6 +31,7 @@ const useTabsState = (options) => {
   const finalConfig = { ...DEFAULT_TABS_CONFIG, ...config };
   const urlSyncEnabled = finalConfig.urlSync === true || typeof finalConfig.urlSync === "object" && finalConfig.urlSync !== null;
   const urlSyncIdentity = typeof finalConfig.urlSync === "object" && finalConfig.urlSync !== null ? finalConfig.urlSync.identity || "url" : "url";
+  const urlSyncBasename = typeof finalConfig.urlSync === "object" && finalConfig.urlSync !== null ? finalConfig.urlSync.basename : void 0;
   const [state, setState] = useState(() => ({
     tabsList: [],
     activeKey: "",
@@ -71,8 +73,11 @@ const useTabsState = (options) => {
           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:${normalizedUrl}`;
+          const identity = urlSyncIdentity === "relationKey" && hasRelationKey(relationKey) ? `relationKey:${typeof relationKey}:${String(relationKey)}` : `url:${comparableUrl}`;
           const retainedTab = retainedTabByIdentity.get(identity);
           if (retainedTab) {
             retainedTabByIdentity.set(identity, { ...retainedTab, url: normalizedUrl });
@@ -93,7 +98,7 @@ const useTabsState = (options) => {
       setState(restoredState);
     }
     setIsInitialized(true);
-  }, [restoreFromCache, urlSyncEnabled, urlSyncIdentity]);
+  }, [restoreFromCache, urlSyncEnabled, urlSyncIdentity, urlSyncBasename]);
   const lastActiveKeyRef = useRef("");
   const shouldSkipSaveRef = useRef(false);
   const initialTabsAppliedRef = useRef(false);
@@ -132,7 +137,8 @@ const useTabsState = (options) => {
       if (urlSyncEnabled || !forceNew) {
         const existingTab = findExistingTab(state.tabsList, menuItem, {
           urlSync: urlSyncEnabled,
-          identity: urlSyncIdentity
+          identity: urlSyncIdentity,
+          basename: urlSyncBasename
         });
         if (existingTab) {
           return true;
@@ -143,7 +149,7 @@ const useTabsState = (options) => {
       }
       return true;
     },
-    [state.tabsList, finalConfig, urlSyncEnabled, urlSyncIdentity]
+    [state.tabsList, finalConfig, urlSyncEnabled, urlSyncIdentity, urlSyncBasename]
   );
   const addTab = useCallback(
     (menuItem, options2) => {
@@ -170,11 +176,12 @@ const useTabsState = (options) => {
         const resolvedMenuItem = normalizedUrl ? { ...menuItem, url: normalizedUrl, redirectUrl: void 0 } : menuItem;
         const existingTab = urlSyncEnabled || !forceNew ? findExistingTab(prevState.tabsList, resolvedMenuItem, {
           urlSync: urlSyncEnabled,
-          identity: urlSyncIdentity
+          identity: urlSyncIdentity,
+          basename: urlSyncBasename
         }) : void 0;
         if (existingTab) {
           const shouldFixClosable = resolvedMenuItem.closable === false && existingTab.closable !== false;
-          const shouldUpdateUrl = urlSyncIdentity === "relationKey" && normalizedUrl !== void 0 && existingTab.url !== normalizedUrl;
+          const shouldUpdateUrl = urlSyncIdentity === "relationKey" && normalizedUrl !== void 0 && getComparableTabUrl(existingTab.url, urlSyncBasename) !== getComparableTabUrl(normalizedUrl, urlSyncBasename);
           const correctedTab = shouldFixClosable || shouldUpdateUrl ? {
             ...existingTab,
             ...shouldFixClosable ? { closable: false } : {},
@@ -216,7 +223,7 @@ const useTabsState = (options) => {
         };
       });
     },
-    [finalConfig, urlSyncEnabled, urlSyncIdentity]
+    [finalConfig, urlSyncEnabled, urlSyncIdentity, urlSyncBasename]
   );
   useEffect(() => {
     const initialTabs = finalConfig.initialTabs;

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

@@ -3,6 +3,8 @@ import * as ReactRouterDom from "react-router-dom";
 import {
   canOpenAsTab,
   flattenMenuData,
+  getBrowserTabUrl,
+  getComparableTabUrl,
   getCurrentTabUrl,
   getMenuRoute,
   getTabUrlPathname,
@@ -92,6 +94,7 @@ const useTabsUrlSync = ({
   const navigator = navigationContext == null ? void 0 : navigationContext.navigator;
   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 bootstrappedRef = useRef(false);
   const writingUrlRef = useRef(false);
   const preserveUrlInteractionRef = useRef(null);
@@ -156,11 +159,14 @@ const useTabsUrlSync = ({
     if (!enabled || !isInitialized || typeof window === "undefined")
       return;
     const currentUrl = normalizeTabUrl(locationChange.url);
-    if (!currentUrl)
+    const comparableCurrentUrl = getComparableTabUrl(currentUrl, basename);
+    if (!currentUrl || !comparableCurrentUrl)
       return;
     if (handledLocationSequenceRef.current === locationChange.sequence)
       return;
-    const exactTab = state.tabsList.find((tab) => normalizeTabUrl(tab.url) === currentUrl);
+    const exactTab = state.tabsList.find(
+      (tab) => getComparableTabUrl(tab.url, basename) === comparableCurrentUrl
+    );
     if (exactTab) {
       handledLocationSequenceRef.current = locationChange.sequence;
       bootstrappedRef.current = true;
@@ -170,16 +176,16 @@ const useTabsUrlSync = ({
       }
       return;
     }
-    const currentPathname = getTabUrlPathname(currentUrl);
+    const currentPathname = getTabUrlPathname(comparableCurrentUrl);
     const sourceMenus = getSourceMenus(dataSource);
     const activeTab = state.tabsList.find((tab) => tab.id === state.activeKey);
     const activeCode = ((_a = activeTab == null ? void 0 : activeTab.menuItem) == null ? void 0 : _a.code) || (activeTab == null ? void 0 : activeTab.code);
     const activeSourceMenu = activeCode ? sourceMenus.find((item) => item.code === activeCode) : void 0;
     const activeMenuItem = activeSourceMenu || (activeTab == null ? void 0 : activeTab.menuItem);
-    const activeBasePathname = activeMenuItem ? getTabUrlPathname(getMenuRoute(activeMenuItem)) : getTabUrlPathname(activeTab == null ? void 0 : activeTab.url);
+    const activeBasePathname = activeMenuItem ? getTabUrlPathname(getComparableTabUrl(getMenuRoute(activeMenuItem), basename)) : getTabUrlPathname(getComparableTabUrl(activeTab == null ? void 0 : activeTab.url, basename));
     const targetMenu = (_b = sourceMenus.map((item) => ({
       item,
-      pathname: getTabUrlPathname(getMenuRoute(item))
+      pathname: getTabUrlPathname(getComparableTabUrl(getMenuRoute(item), basename))
     })).filter(
       (entry) => !!entry.pathname && isSameOrNestedPath(entry.pathname, currentPathname)
     ).sort((left, right) => right.pathname.length - left.pathname.length)[0]) == null ? void 0 : _b.item;
@@ -223,7 +229,8 @@ const useTabsUrlSync = ({
     addTab,
     switchTab,
     updateTabUrl,
-    interactionSequence
+    interactionSequence,
+    basename
   ]);
   useEffect(() => {
     if (!enabled || !isInitialized || !bootstrappedRef.current || typeof window === "undefined") {
@@ -231,13 +238,14 @@ const useTabsUrlSync = ({
     }
     const activeTab = state.tabsList.find((tab) => tab.id === state.activeKey);
     const targetUrl = normalizeTabUrl(activeTab == null ? void 0 : activeTab.url);
+    const browserTargetUrl = getBrowserTabUrl(targetUrl, basename);
     const commitActiveTab = () => {
       committedActiveKeyRef.current = state.activeKey;
       committedTabIdsRef.current = new Set(state.tabsList.map((tab) => tab.id));
     };
     if (preserveUrlInteractionRef.current !== null) {
       if (preserveUrlInteractionRef.current === interactionSequence) {
-        if (targetUrl === getCurrentTabUrl()) {
+        if (browserTargetUrl === getCurrentTabUrl()) {
           preserveUrlInteractionRef.current = null;
         }
         commitActiveTab();
@@ -245,7 +253,7 @@ const useTabsUrlSync = ({
       }
       preserveUrlInteractionRef.current = null;
     }
-    if (!targetUrl || targetUrl === getCurrentTabUrl()) {
+    if (!targetUrl || !browserTargetUrl || browserTargetUrl === getCurrentTabUrl()) {
       const pendingNavigation = pendingDataNavigationRef.current;
       navigationAttemptRef.current += 1;
       pendingDataNavigationRef.current = false;
@@ -286,30 +294,34 @@ const useTabsUrlSync = ({
           pendingDataNavigationRef.current = false;
           pendingDataNavigationUrlRef.current = null;
           const currentUrl = getCurrentTabUrl();
-          if (targetUrl === currentUrl || committedDataNavigationUrl === currentUrl) {
+          if (browserTargetUrl === currentUrl || committedDataNavigationUrl === currentUrl) {
             commitActiveTab();
             return;
           }
           rollbackTabActivation(previousActiveKey, attemptedActiveKey, removeAttemptedTab);
         };
         pendingDataNavigationRef.current = true;
-        pendingDataNavigationUrlRef.current = targetUrl;
-        void dataRouterContext.router.navigate(getDataRouterUrl(targetUrl, dataRouterContext.basename), {
+        pendingDataNavigationUrlRef.current = browserTargetUrl;
+        void dataRouterContext.router.navigate(getDataRouterUrl(browserTargetUrl, dataRouterContext.basename), {
           replace: historyMode === "replace",
           state: routerState
         }).then(settleNavigation);
       } else if (navigator) {
         if (historyMode === "push") {
-          navigator.push(targetUrl, routerState);
+          navigator.push(browserTargetUrl, routerState);
         } else {
-          navigator.replace(targetUrl, routerState);
+          navigator.replace(browserTargetUrl, routerState);
         }
         commitActiveTab();
       } else if (historyMode === "push") {
-        window.history.pushState(createPushHistoryState(window.history.state), "", targetUrl);
+        window.history.pushState(
+          createPushHistoryState(window.history.state),
+          "",
+          browserTargetUrl
+        );
         commitActiveTab();
       } else {
-        window.history.replaceState(window.history.state, "", targetUrl);
+        window.history.replaceState(window.history.state, "", browserTargetUrl);
         commitActiveTab();
       }
     } finally {
@@ -324,7 +336,8 @@ const useTabsUrlSync = ({
     interactionSequence,
     navigator,
     dataRouterContext,
-    rollbackTabActivation
+    rollbackTabActivation,
+    basename
   ]);
 };
 export {

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

@@ -14,10 +14,15 @@ export declare const normalizeTabUrl: (value?: string) => string | undefined;
 export declare const isSafeExternalUrl: (value?: string) => boolean;
 export declare const isSafeHttpUrl: (value?: string) => boolean;
 export declare const getCurrentTabUrl: () => string;
+/** 将浏览器地址和 Tab 内部地址转为同一身份，仅按完整路径段移除 basename。 */
+export declare const getComparableTabUrl: (value?: string, basename?: string) => string | undefined;
+/** 将 Tab 内部地址转为浏览器地址，已带 basename 时不重复添加。 */
+export declare const getBrowserTabUrl: (value?: string, basename?: string) => string | undefined;
 export declare const getTabUrlPathname: (value?: string) => string | undefined;
 export interface FindExistingTabOptions {
     urlSync?: boolean;
     identity?: TabsUrlSyncConfig['identity'];
+    basename?: TabsUrlSyncConfig['basename'];
 }
 export declare const findExistingTab: (tabsList: TabItem[], menuItem: MenusType, options?: FindExistingTabOptions) => TabItem | undefined;
 /**

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

@@ -29,6 +29,49 @@ const isSafeExternalUrl = (value) => {
 };
 const isSafeHttpUrl = (value) => !!resolveHttpUrl(value);
 const getCurrentTabUrl = () => `${window.location.pathname}${window.location.search}${window.location.hash}`;
+const normalizeTabsBasename = (basename) => {
+  const normalized = String(basename ?? "").trim();
+  if (!normalized || normalized === "/")
+    return "";
+  return `/${normalized.replace(/^\/+|\/+$/g, "")}`;
+};
+const splitNormalizedTabUrl = (url) => {
+  const pathnameEnd = [url.indexOf("?"), url.indexOf("#")].filter((index) => index >= 0).reduce((current, index) => Math.min(current, index), url.length);
+  return {
+    pathname: url.slice(0, pathnameEnd),
+    suffix: url.slice(pathnameEnd)
+  };
+};
+const hasPathBasename = (pathname, basename) => {
+  const lowerPathname = pathname.toLowerCase();
+  const lowerBasename = basename.toLowerCase();
+  return lowerPathname === lowerBasename || lowerPathname.startsWith(`${lowerBasename}/`);
+};
+const getComparableTabUrl = (value, basename) => {
+  const normalizedUrl = normalizeTabUrl(value);
+  if (!normalizedUrl)
+    return void 0;
+  const normalizedBasename = normalizeTabsBasename(basename);
+  if (!normalizedBasename)
+    return normalizedUrl;
+  const { pathname, suffix } = splitNormalizedTabUrl(normalizedUrl);
+  if (!hasPathBasename(pathname, normalizedBasename))
+    return normalizedUrl;
+  const barePathname = pathname.slice(normalizedBasename.length) || "/";
+  return `${barePathname}${suffix}`;
+};
+const getBrowserTabUrl = (value, basename) => {
+  const normalizedUrl = normalizeTabUrl(value);
+  if (!normalizedUrl)
+    return void 0;
+  const normalizedBasename = normalizeTabsBasename(basename);
+  if (!normalizedBasename)
+    return normalizedUrl;
+  const { pathname, suffix } = splitNormalizedTabUrl(normalizedUrl);
+  if (hasPathBasename(pathname, normalizedBasename))
+    return normalizedUrl;
+  return `${normalizedBasename}${pathname}${suffix}`;
+};
 const getTabUrlPathname = (value) => {
   const normalized = normalizeTabUrl(value);
   if (!normalized || typeof window === "undefined")
@@ -45,10 +88,10 @@ const findExistingTab = (tabsList, menuItem, options = {}) => {
         }
       );
     }
-    const targetUrl = normalizeTabUrl(getMenuRoute(menuItem));
+    const targetUrl = getComparableTabUrl(getMenuRoute(menuItem), options.basename);
     if (!targetUrl)
       return void 0;
-    return tabsList.find((tab) => normalizeTabUrl(tab.url) === targetUrl);
+    return tabsList.find((tab) => getComparableTabUrl(tab.url, options.basename) === targetUrl);
   }
   if (hasRelationKey(menuItem.relationKey)) {
     return tabsList.find(
@@ -232,6 +275,8 @@ export {
   findExistingTab,
   flattenMenuData,
   generateTabId,
+  getBrowserTabUrl,
+  getComparableTabUrl,
   getCurrentTabUrl,
   getMenuRoute,
   getPinnedBoundary,

package/es/ProLayout/propTypes.d.ts

@@ -373,6 +373,11 @@ export interface TabsUrlSyncConfig {
      * @default 'url'
      */
     identity?: 'url' | 'relationKey';
+    /**
+     * @description 浏览器地址中的显式基础路径；Tab 内部 URL 可以不带该前缀
+     * @example '/wjs'
+     */
+    basename?: string;
 }
 /**
  * @description 添加标签页的业务参数

package/package.json

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