mirror of
https://gitee.com/nocobase/nocobase.git
synced 2025-05-07 22:49:26 +08:00
Merge branch 'main' into next
This commit is contained in:
commit
a8c511b625
@ -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 });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user