页面嵌套修改
This commit is contained in:
1 parent
213dd841b5
commit
4450f342d8
38 files changed
+2020
-309
No files matched your search
@@ -10,6 +10,7 @@ import { setStoredAuth, setStoredUserName } from '@/core/auth';
|
||||
import {
|
||||
getRouteKeyLoginPassword,
|
||||
resolveRouteKey,
|
||||
resolveRouteKeyMapping,
|
||||
ROUTE_KEY_PARAM,
|
||||
} from '@/core/auth/route-key-login';
|
||||
import {
|
||||
@@ -25,6 +26,7 @@ import {
|
||||
} from '@/core/auth/task-deeplink';
|
||||
import { resolveUsernameByOnlineTicket } from '@/core/auth/wujie-ticket-login';
|
||||
import { isWujieEnv, useWujieProps } from '@/core/embed/wujie';
|
||||
import { isEmbeddedHost } from '@/core/embed/frame-context';
|
||||
import { readEmbedParam } from '@/core/embed/embed-session';
|
||||
import {
|
||||
GENERAL_QA_ROUTE,
|
||||
@@ -33,9 +35,14 @@ import {
|
||||
persistToolsToken,
|
||||
} from '@/core/auth/yuser-login';
|
||||
import {
|
||||
buildStandardChatRedirectPath,
|
||||
buildEmbeddedIframeRedirectPath,
|
||||
buildChatsIframeRedirectPath,
|
||||
hasIframePresentationOverride,
|
||||
isChatsIframeLogin,
|
||||
resolveChatsIframeEntryRedirect,
|
||||
resolvePostLoginRedirectPath,
|
||||
shouldUseChatsIframeProtocol,
|
||||
} from '@/core/page-layout/chats-iframe-route';
|
||||
import {
|
||||
isSidebarEnabledFromSearch,
|
||||
@@ -101,22 +108,42 @@ export default function LoginPage() {
|
||||
);
|
||||
const requestedChatMode =
|
||||
searchParams.get('chatMode')?.trim().toLowerCase() ?? '';
|
||||
const brainyIframeRequested = requestedChatMode === IFRAME_CHAT_MODE;
|
||||
// Wujie is an application container, not the Brainy iframe protocol. It
|
||||
// must therefore land on the regular full ChatPage. Plugin links with
|
||||
// `from=iframe` are normalized into the explicit iframe protocol mode.
|
||||
const iframePresentationOverride = useMemo(
|
||||
() => hasIframePresentationOverride(searchParams.toString()),
|
||||
[searchParams],
|
||||
);
|
||||
const embeddedHost = useMemo(() => isEmbeddedHost(), []);
|
||||
// `from=iframe` is the established entry contract for the dedicated iframe
|
||||
// page. A standard presentation flag is the one intentional exception: it
|
||||
// uses the normal full chat workspace so Header/PageSidebar visibility is
|
||||
// controlled by hideHeader/hideChrome/embed instead.
|
||||
const brainyIframeRequested = shouldUseChatsIframeProtocol(
|
||||
searchParams.toString(),
|
||||
embeddedHost,
|
||||
);
|
||||
// An explicit full-chat request and all standard presentation flags retain
|
||||
// the regular workspace. Otherwise native iframe/Wujie hosts use the
|
||||
// legacy dedicated AgentSelector entry, matching the established bare
|
||||
// iframe login integration.
|
||||
const fullChatRequested = useMemo(
|
||||
() =>
|
||||
!brainyIframeRequested &&
|
||||
(isWujieEnv() ||
|
||||
requestedChatMode === FULL_CHAT_MODE),
|
||||
[brainyIframeRequested, requestedChatMode, searchParams],
|
||||
requestedChatMode === FULL_CHAT_MODE ||
|
||||
// hideHeader/hideChrome/embed are explicit presentation contracts.
|
||||
// They must retain their query parameters and enter the standard
|
||||
// workspace even when a native iframe has no legacy `from` marker.
|
||||
iframePresentationOverride),
|
||||
[
|
||||
brainyIframeRequested,
|
||||
iframePresentationOverride,
|
||||
requestedChatMode,
|
||||
searchParams,
|
||||
],
|
||||
);
|
||||
const isIframeLogin = useMemo(
|
||||
() =>
|
||||
brainyIframeRequested ||
|
||||
(!fullChatRequested && isChatsIframeLogin(searchParams.toString())),
|
||||
[brainyIframeRequested, fullChatRequested, searchParams],
|
||||
() => brainyIframeRequested,
|
||||
[brainyIframeRequested],
|
||||
);
|
||||
const resolvedUsername = useMemo(() => {
|
||||
const raw = username?.trim();
|
||||
@@ -127,22 +154,37 @@ export default function LoginPage() {
|
||||
const yUserId = searchParams.get('yUserId')?.trim() ?? '';
|
||||
const redirectPath = useMemo(
|
||||
() => {
|
||||
if (yUserId) return GENERAL_QA_ROUTE;
|
||||
// Keep the mode on the destination URL so PageRoutes can retain the
|
||||
// full chat workspace sidebar while hideChrome hides only the global
|
||||
// application chrome.
|
||||
if (brainyIframeRequested) {
|
||||
return buildChatsIframeRedirectPath(searchParams.toString());
|
||||
return !isChatsIframeLogin(searchParams.toString()) &&
|
||||
requestedChatMode !== IFRAME_CHAT_MODE
|
||||
? buildEmbeddedIframeRedirectPath(searchParams.toString())
|
||||
: buildChatsIframeRedirectPath(searchParams.toString());
|
||||
}
|
||||
if (fullChatRequested) {
|
||||
return `${DEFAULT_REDIRECT_PATH}?chatMode=${FULL_CHAT_MODE}`;
|
||||
return buildStandardChatRedirectPath(
|
||||
searchParams.toString(),
|
||||
DEFAULT_REDIRECT_PATH,
|
||||
);
|
||||
}
|
||||
// External iframe callers frequently also provide yUserId for login.
|
||||
// That identity parameter must not steal a deliberate iframe entry and
|
||||
// send it to the generic full-chat home before the route split above.
|
||||
if (yUserId) return GENERAL_QA_ROUTE;
|
||||
return resolvePostLoginRedirectPath(
|
||||
searchParams.toString(),
|
||||
DEFAULT_REDIRECT_PATH,
|
||||
);
|
||||
},
|
||||
[brainyIframeRequested, fullChatRequested, searchParams, yUserId],
|
||||
[
|
||||
brainyIframeRequested,
|
||||
fullChatRequested,
|
||||
requestedChatMode,
|
||||
searchParams,
|
||||
yUserId,
|
||||
],
|
||||
);
|
||||
const toolToken = searchParams.get('token')?.trim() ?? '';
|
||||
// 内网登录透传的访问令牌:存入 userInfo.accessToken,供 XK/PG 中任务 iframe 拼参
|
||||
@@ -152,6 +194,10 @@ export default function LoginPage() {
|
||||
// token 换登录:?authToken= 传上游 token(与 tools_token 的 ?token= 区分开)
|
||||
const authToken = searchParams.get('authToken')?.trim() ?? '';
|
||||
const routeKey = searchParams.get(ROUTE_KEY_PARAM)?.trim() ?? '';
|
||||
const routeKeyMapping = useMemo(
|
||||
() => resolveRouteKeyMapping(routeKey),
|
||||
[routeKey],
|
||||
);
|
||||
const routeKeyTarget = useMemo(() => resolveRouteKey(routeKey), [routeKey]);
|
||||
const configuredRouteLoginPassword = useMemo(
|
||||
() => (routeKeyTarget ? getRouteKeyLoginPassword() : ''),
|
||||
@@ -183,6 +229,14 @@ export default function LoginPage() {
|
||||
const normalized = raw.startsWith('/') ? raw : `/${raw}`;
|
||||
const [pathOnly, ownQuery = ''] = normalized.split('?');
|
||||
const target = new URLSearchParams(ownQuery);
|
||||
const iframeEntryTarget = resolveChatsIframeEntryRedirect(
|
||||
pathOnly,
|
||||
searchParams.toString(),
|
||||
embeddedHost,
|
||||
);
|
||||
if (iframeEntryTarget) {
|
||||
return iframeEntryTarget;
|
||||
}
|
||||
// Keep the Wujie/full-chat decision on the target URL. The destination
|
||||
// route uses it to retain the full agent/history workspace sidebar.
|
||||
if (
|
||||
@@ -204,7 +258,7 @@ export default function LoginPage() {
|
||||
});
|
||||
const qs = target.toString();
|
||||
return qs ? `${pathOnly}?${qs}` : pathOnly;
|
||||
}, [fullChatRequested, routeKeyTarget, searchParams]);
|
||||
}, [embeddedHost, fullChatRequested, routeKeyTarget, searchParams]);
|
||||
const externalParams = useMemo(
|
||||
() => ({
|
||||
theme: searchParams.get('theme') ?? '',
|
||||
@@ -243,10 +297,20 @@ export default function LoginPage() {
|
||||
// 跨标签污染正常系统页;iframe 主题改由 forcedTheme(按标签页、不持久化)接管。
|
||||
useEffect(() => {
|
||||
if (isEmbed || isIframeLogin) return;
|
||||
const themeValue = wujieProps.theme || externalParams.theme;
|
||||
// routeKey 中显式配置的主题优先于调用方 URL,确保短链无需额外拼
|
||||
// `theme=dark-blue` 也能在登录完成前切换到指定主题。
|
||||
const themeValue =
|
||||
routeKeyMapping?.theme || wujieProps.theme || externalParams.theme;
|
||||
if (!themeValue) return;
|
||||
setTheme(resolveThemeFromQuery(themeValue));
|
||||
}, [isEmbed, isIframeLogin, wujieProps.theme, externalParams.theme, setTheme]);
|
||||
}, [
|
||||
isEmbed,
|
||||
isIframeLogin,
|
||||
routeKeyMapping?.theme,
|
||||
wujieProps.theme,
|
||||
externalParams.theme,
|
||||
setTheme,
|
||||
]);
|
||||
|
||||
// ticket / userId / env 持久化(与 login 请求并行做,互不阻塞)
|
||||
useEffect(() => {
|
||||
|
||||
Reference in new issue
Block a user