From 0d0fc137c91b408ae89889539725349f79661bcb Mon Sep 17 00:00:00 2001 From: kicer Date: Wed, 2 Sep 2026 19:43:38 +0800 Subject: [PATCH] =?UTF-8?q?revert(chat):=20=E5=8E=BB=E6=8E=89=E6=89=93?= =?UTF-8?q?=E5=AD=97=E6=9C=BA=E6=95=88=E6=9E=9C,=E6=81=A2=E5=A4=8D?= =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E6=98=BE=E7=A4=BA=E6=B5=81=E5=BC=8F=E6=96=87?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 删除全部打字机逻辑(start/flush/stop/finishTypewriter、typingConfig、光标) - assistant_delta 改回 state.streamEl.textContent = state.streamText 直接显示 - 服务端每个 delta 推什么就显示什么,自然形成逐字效果 - 保留在底部跟随 + wheel/touchmove 暂停的滚动方案 - 移除打字机光标 CSS --- app/server/public/css/style.css | 8 ---- app/server/public/js/tasks.js | 78 +++++---------------------------- 2 files changed, 10 insertions(+), 76 deletions(-) diff --git a/app/server/public/css/style.css b/app/server/public/css/style.css index 5106576..50edd12 100644 --- a/app/server/public/css/style.css +++ b/app/server/public/css/style.css @@ -497,11 +497,3 @@ body { .scroll-bottom-btn .sb-spinner circle { stroke: #dde; stroke-width: 2.5; fill: none; } .scroll-bottom-btn .sb-spinner path { stroke: #3964FE; stroke-width: 2.5; stroke-linecap: round; fill: none; } @keyframes sb-spin { from { transform: rotate(0); } to { transform: rotate(360deg); } } - - /* 打字机光标:AI 流式输出中,气泡末尾闪烁竖条 */ - .msg-bubble.typing::after { - content: ''; display: inline-block; width: 2px; height: 1em; - background: #556; margin-left: 2px; vertical-align: text-bottom; - animation: tw-cursor 1s steps(1) infinite; - } - @keyframes tw-cursor { 0%, 50% { opacity: 1; } 50.01%, 100% { opacity: 0; } } diff --git a/app/server/public/js/tasks.js b/app/server/public/js/tasks.js index 22c29f7..83acf78 100644 --- a/app/server/public/js/tasks.js +++ b/app/server/public/js/tasks.js @@ -466,7 +466,7 @@ function scrollBottom() { } // 监听用户滚动意图:向上翻阅历史时立即暂停跟随,回到底部时恢复。 // 关键:用 wheel/touchmove 捕获「用户主动向上」的意图(程序滚动不会触发这二者), -// 避免被 16ms 一次的 flushTypewriter→scrollBottom 反复拉回底部而无法上翻。 +// 避免被自动跟随的 scrollBottom 反复拉回底部而无法上翻。 // scroll 事件只负责「回到底部时清除暂停」(程序 scrollBottom 到底部也会触发,清暂停无副作用)。 function bindScroll() { const box = $('messages'); @@ -533,60 +533,6 @@ function removePendingBubble() { if (state.pendingEl) { state.pendingEl.remove(); state.pendingEl = null; } } -// ---------- 打字机效果 ---------- -// AI 流式输出时,不直接把全量文本一次性写进气泡,而是逐字「吐」出, -// 视觉上接近打字机。累计文本存于 state.streamText,已显示长度存于 typewriterShown。 -// 每次固定推进 typingConfig.chunk 个字符(默认1=真逐字),不随堆积量加速。 -// chunk 与 interval 均可配置:localStorage 持久化 + window.typingConfig 控制台实时调。 -const typingConfig = { - chunk: 1, // 每次推进字符数 - interval: 16, // 每次推进间隔(ms) -}; -// 从 localStorage 读取用户自定义覆盖(便于调参) -try { - const saved = localStorage.getItem('typingConfig'); - if (saved) Object.assign(typingConfig, JSON.parse(saved)); -} catch (_) {} -// 暴露到 window,方便在控制台实时调整(改后下一帧生效) -window.typingConfig = typingConfig; -let typewriterShown = 0; -let typewriterTimer = null; -let typewriterBlinkCursor = null; // 光标闪烁 interval -function startTypewriter() { - typewriterShown = 0; - stopTypewriter(); - // 光标闪烁 - if (typewriterBlinkCursor) clearInterval(typewriterBlinkCursor); - typewriterBlinkCursor = setInterval(() => { - if (state.streamEl) state.streamEl.classList.toggle('typing'); - if (!state.streamEl && typewriterBlinkCursor) { clearInterval(typewriterBlinkCursor); typewriterBlinkCursor = null; } - }, 500); - // 递归 setTimeout:每次读取最新 interval,改 interval 实时生效 - typewriterTimer = setTimeout(flushTypewriter, typingConfig.interval); -} -function flushTypewriter() { - typewriterTimer = null; - if (!state.streamEl) return; - const total = state.streamText.length; - if (typewriterShown < total) { - // 固定步长,不随堆积量加速(避免一次输出一堆) - typewriterShown = Math.min(total, typewriterShown + typingConfig.chunk); - state.streamEl.textContent = state.streamText.slice(0, typewriterShown); - maybeAutoScroll(); - } - if (state.streamEl) { - typewriterTimer = setTimeout(flushTypewriter, typingConfig.interval); - } -} -function stopTypewriter() { - if (typewriterTimer) { clearTimeout(typewriterTimer); typewriterTimer = null; } -} -// 结束打字机:一次性补足剩余文本(以原始 markdown 渲染),关闭光标 -function finishTypewriter() { - stopTypewriter(); - if (typewriterBlinkCursor) { clearInterval(typewriterBlinkCursor); typewriterBlinkCursor = null; } - if (state.streamEl) state.streamEl.classList.remove('typing'); -} // ---------- SSE ---------- function connectStream() { @@ -607,20 +553,19 @@ function connectStream() { wrap.innerHTML = '
AI
' + '
'; state.streamEl = wrap.querySelector('.msg-bubble'); - state.streamText = ''; - $('messages').appendChild(wrap); - startTypewriter(); - } - state.streamText += d.text; - // 打字机推进在定时器里完成,这里仅设位状态、刷新按钮 - state.streaming = true; - updateScrollBottomBtn(); + state.streamText = ''; + $('messages').appendChild(wrap); + } + state.streamText += d.text; + state.streamEl.textContent = state.streamText; + state.streaming = true; + maybeAutoScroll(); + updateScrollBottomBtn(); }); es.addEventListener('assistant_message', ev => { const d = JSON.parse(ev.data); removePendingBubble(); if (state.streamEl) { - finishTypewriter(); const bubble = state.streamEl; bubble.innerHTML = md(d.content || ''); state.streamEl = null; @@ -663,7 +608,6 @@ function connectStream() { }); es.addEventListener('done', ev => { removePendingBubble(); // 本轮结束,占位兼终止(如模型报错无回复) - finishTypewriter(); state.streaming = false; updateScrollBottomBtn(); loadSessions(); @@ -853,9 +797,8 @@ const ui = { } catch (e) { toast('删除失败:' + e.message); } }, async openSession(id) { - // 切会话前收尾上一会话:关闭 SSE、清打字机/占位,避免跨会话残留 + // 切会话前收尾上一会话:关闭 SSE、清占位,避免跨会话残留 if (state.es) { state.es.close(); state.es = null; } - finishTypewriter(); removePendingBubble(); state.sessionId = id; // 待发送附件属于上一个会话的语境,切会话时清空展示(文件已落盘,可在文件面板查看) @@ -887,7 +830,6 @@ const ui = { }, backToList() { if (state.es) { state.es.close(); state.es = null; } - finishTypewriter(); removePendingBubble(); state.streaming = false; updateScrollBottomBtn();