Merge branch 'next' into develop

This commit is contained in:
nocobase[bot] 2025-02-14 02:42:29 +00:00
commit 8025a7fac9

View File

@ -19,7 +19,7 @@ import React, { FC, memo, useCallback, useContext, useEffect, useMemo, useRef, u
import { ErrorBoundary } from 'react-error-boundary'; import { ErrorBoundary } from 'react-error-boundary';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import { NavigateFunction, Outlet, useOutletContext } from 'react-router-dom'; import { NavigateFunction, Outlet, useOutletContext } from 'react-router-dom';
import { FormDialog } from '..'; import { FormDialog, withSearchParams } from '..';
import { antTableCell } from '../../../acl/style'; import { antTableCell } from '../../../acl/style';
import { import {
CurrentTabUidContext, CurrentTabUidContext,
@ -445,9 +445,9 @@ export function navigateToTab({
} }
if (isTabPage(pathname)) { if (isTabPage(pathname)) {
navigate(`${pathname.replace(/\/tabs\/[^/]+$/, `/tabs/${activeKey}`)}`, { replace: true }); navigate(withSearchParams(`${pathname.replace(/\/tabs\/[^/]+$/, `/tabs/${activeKey}`)}`), { replace: true });
} else { } else {
navigate(`${pathname}/tabs/${activeKey}`, { replace: true }); navigate(withSearchParams(`${pathname}/tabs/${activeKey}`), { replace: true });
} }
} }