Compare commits

..

No commits in common. "35abfea922ab52dbb6ebe9b69a833088281e79a6" and "cf2a3ba19a0d6c36921293fccc76175160d9d419" have entirely different histories.

3 changed files with 39 additions and 66 deletions

View File

@ -256,9 +256,8 @@ const handleScrollToLower = () => {};
// - // -
const scrollToBottom = () => { const scrollToBottom = () => {
nextTick(() => { nextTick(() => {
// 使
scrollTop.value = 99999; scrollTop.value = 99999;
// DOM //
setTimeout(() => { setTimeout(() => {
scrollTop.value = scrollTop.value + Math.random(); scrollTop.value = scrollTop.value + Math.random();
}, 10); }, 10);
@ -539,6 +538,7 @@ const initTypewriterManager = () => {
typewriterManager.setCallbacks({ typewriterManager.setCallbacks({
// //
onCharacterTyped: (displayedContent) => { onCharacterTyped: (displayedContent) => {
//
scrollToBottom(); scrollToBottom();
}, },
// //
@ -671,37 +671,29 @@ const stopRequest = () => {
// (messageType=2) // (messageType=2)
sendWebSocketMessage(2, "stop_request", { silent: true }); sendWebSocketMessage(2, "stop_request", { silent: true });
// //
if (typewriterManager) { if (typewriterManager) {
// typewriterManager.stopTypewriter();
const currentStatus = typewriterManager.getStatus();
const currentDisplayedContent = currentStatus.displayedContent;
// 使
typewriterManager.stopAndKeepCurrent();
// AI
const aiMsgIndex = chatMsgList.value.length - 1;
if (
chatMsgList.value[aiMsgIndex] &&
chatMsgList.value[aiMsgIndex].msgType === MessageRole.AI
) {
chatMsgList.value[aiMsgIndex].isLoading = false;
// 使
if (
currentDisplayedContent &&
currentDisplayedContent.trim() &&
!currentDisplayedContent.startsWith("加载中")
) {
chatMsgList.value[aiMsgIndex].msg = currentDisplayedContent;
} else {
chatMsgList.value[aiMsgIndex].msg = "请求已停止";
}
}
} }
// //
isSessionActive.value = false; isSessionActive.value = false;
resetMessageState();
// AI
const aiMsgIndex = chatMsgList.value.length - 1;
if (
chatMsgList.value[aiMsgIndex] &&
chatMsgList.value[aiMsgIndex].msgType === MessageRole.AI
) {
chatMsgList.value[aiMsgIndex].isLoading = false;
if (
!chatMsgList.value[aiMsgIndex].msg ||
chatMsgList.value[aiMsgIndex].msg.startsWith("加载中")
) {
chatMsgList.value[aiMsgIndex].msg = "请求已停止";
}
}
console.log("请求已停止,状态已重置"); console.log("请求已停止,状态已重置");

View File

@ -60,7 +60,7 @@ const initData = () => {
icon: "/static/quick/quick_icon_call.png", icon: "/static/quick/quick_icon_call.png",
title: "反馈意见", title: "反馈意见",
content: "有意见告诉朵朵", content: "有意见告诉朵朵",
type: "Command.feedbackCard", type: "Command.createWorkOrder",
}, },
]; ];
}; };

View File

@ -7,8 +7,8 @@ class TypewriterManager {
// 配置选项 // 配置选项
this.options = { this.options = {
typingSpeed: 50, // 打字速度(毫秒) typingSpeed: 50, // 打字速度(毫秒)
cursorText: "", // 光标样式 cursorText: '', // 光标样式
...options, ...options
}; };
// 状态变量 // 状态变量
@ -41,7 +41,7 @@ class TypewriterManager {
* @param {string} content - 要添加的内容 * @param {string} content - 要添加的内容
*/ */
addContent(content) { addContent(content) {
if (typeof content !== "string") { if (typeof content !== 'string') {
content = String(content); content = String(content);
} }
this.currentMessageContent += content; this.currentMessageContent += content;
@ -70,13 +70,9 @@ class TypewriterManager {
_typeNextChar() { _typeNextChar() {
// 如果已显示内容长度小于完整内容长度,继续打字 // 如果已显示内容长度小于完整内容长度,继续打字
if (this.displayedContent.length < this.currentMessageContent.length) { if (this.displayedContent.length < this.currentMessageContent.length) {
const nextLength = Math.min(
this.displayedContent.length + 1,
this.currentMessageContent.length
);
this.displayedContent = this.currentMessageContent.substring( this.displayedContent = this.currentMessageContent.substring(
0, 0,
nextLength this.displayedContent.length + 1
); );
const displayContent = this.displayedContent; const displayContent = this.displayedContent;
@ -96,6 +92,7 @@ class TypewriterManager {
this.typewriterTimer = setTimeout(() => { this.typewriterTimer = setTimeout(() => {
this._typeNextChar(); this._typeNextChar();
}, delay); }, delay);
} else { } else {
// 打字完成,移除光标 // 打字完成,移除光标
if (this.onContentUpdate) { if (this.onContentUpdate) {
@ -122,21 +119,6 @@ class TypewriterManager {
this.isTyping = false; this.isTyping = false;
} }
/**
* 停止打字机效果并保留当前显示的内容
* 与stopTypewriter不同这个方法会将当前显示的内容设为最终内容
*/
stopAndKeepCurrent() {
this.stopTypewriter();
// 将当前显示的内容设为完整内容,避免后续添加更多内容
this.currentMessageContent = this.displayedContent;
// 调用完成回调
if (this.onTypingComplete) {
this.onTypingComplete(this.displayedContent);
}
}
/** /**
* 重置打字机状态 * 重置打字机状态
*/ */
@ -155,10 +137,9 @@ class TypewriterManager {
isTyping: this.isTyping, isTyping: this.isTyping,
currentContent: this.currentMessageContent, currentContent: this.currentMessageContent,
displayedContent: this.displayedContent, displayedContent: this.displayedContent,
progress: progress: this.currentMessageContent.length > 0
this.currentMessageContent.length > 0 ? this.displayedContent.length / this.currentMessageContent.length
? this.displayedContent.length / this.currentMessageContent.length : 0
: 0,
}; };
} }