0.3.2.1 UI修复3
This commit is contained in:
@@ -279,8 +279,10 @@ export default function OnlyOfficePage() {
|
||||
const fileType = (params.get("fileType") ?? "docx").toLowerCase();
|
||||
const mode = (params.get("mode") ?? "edit") as EditorMode;
|
||||
const assetId = params.get("assetId") ?? "";
|
||||
const initialUserId = params.get("userId") ?? "";
|
||||
const channel = (params.get("channel") ?? "").trim().toLowerCase();
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
const [authedUserId, setAuthedUserId] = useState<string>(initialUserId);
|
||||
const runtimeConfig = useMemo(() => getMnoteRuntimeConfig(), []);
|
||||
const baseUrlCandidates = useMemo(() => {
|
||||
const uniq: string[] = [];
|
||||
@@ -330,6 +332,31 @@ export default function OnlyOfficePage() {
|
||||
const proxyOrigin = runtimeConfig.onlyofficeProxyOrigin;
|
||||
const callbackOrigin = runtimeConfig.onlyofficeCallbackOrigin;
|
||||
|
||||
useEffect(() => {
|
||||
// 说明:ONLYOFFICE 回调由文档服务器触发,不携带用户 Cookie。
|
||||
// 为了让 /api/onlyoffice/callback 能以真实用户身份写回存储,
|
||||
// 这里尽量从当前会话获取 userId,并透传到 callbackUrl。
|
||||
if (authedUserId) return undefined;
|
||||
let canceled = false;
|
||||
fetch("/api/auth/whoami", { method: "GET" })
|
||||
.then(async (r) => {
|
||||
if (!r.ok) return null;
|
||||
return (await r.json().catch(() => null)) as { userId?: string } | null;
|
||||
})
|
||||
.then((payload) => {
|
||||
const uid = String(payload?.userId || "").trim();
|
||||
if (!uid) return;
|
||||
if (canceled) return;
|
||||
setAuthedUserId(uid);
|
||||
})
|
||||
.catch(() => {
|
||||
// ignore
|
||||
});
|
||||
return () => {
|
||||
canceled = true;
|
||||
};
|
||||
}, [authedUserId]);
|
||||
|
||||
useEffect(() => {
|
||||
// 说明:在部分 ONLYOFFICE 版本/环境下,编辑器内部会触发 DOMException(NotFoundError: removeChild),
|
||||
// 该异常会被 Next.js 捕获并显示“客户端异常”大红屏,但实际文档仍可继续使用。
|
||||
@@ -540,7 +567,7 @@ export default function OnlyOfficePage() {
|
||||
} catch {
|
||||
// ignore
|
||||
}
|
||||
}, [assetId, baseUrl, callbackOrigin, fileName, fileType, fileUrl, mode, proxyOrigin, resolvedFileUrl]);
|
||||
}, [assetId, authedUserId, baseUrl, callbackOrigin, fileName, fileType, fileUrl, mode, proxyOrigin, resolvedFileUrl]);
|
||||
|
||||
useEffect(() => {
|
||||
if (!baseUrl) {
|
||||
@@ -623,6 +650,7 @@ export default function OnlyOfficePage() {
|
||||
const base = callbackOrigin || proxyOrigin || window.location.origin;
|
||||
const cb = new URL("/api/onlyoffice/callback", base);
|
||||
if (assetId) cb.searchParams.set("assetId", assetId);
|
||||
if (authedUserId) cb.searchParams.set("userId", authedUserId);
|
||||
return cb.toString();
|
||||
})(),
|
||||
customization: {
|
||||
|
||||
Reference in New Issue
Block a user