Compare commits

..

No commits in common. "af9c3c7c28a05277eb0a377d0ecf0a35b6eec001" and "65653525a0d2f9177ce8aeca32f69d4793206de1" have entirely different histories.

4 changed files with 13 additions and 20 deletions

View File

@ -78,6 +78,8 @@ const sendMessage = () => {
// //
if (!inputMessage.value.trim()) return; if (!inputMessage.value.trim()) return;
emit('send', inputMessage.value) emit('send', inputMessage.value)
inputMessage.value = ''
emit('update:inputMessage', inputMessage.value)
// //
if (props.holdKeyboard && textareaRef.value) { if (props.holdKeyboard && textareaRef.value) {

View File

@ -235,6 +235,9 @@
if (!inputText.trim()) return; if (!inputText.trim()) return;
handleNoHideKeyboard() handleNoHideKeyboard()
sendMessage(inputText) sendMessage(inputText)
if(!isSessionActive.value) {
inputMessage.value = ''
}
// //
if (holdKeyboard.value && inputAreaRef.value) { if (holdKeyboard.value && inputAreaRef.value) {
setTimeout(() => { setTimeout(() => {
@ -340,7 +343,6 @@
} }
} }
chatMsgList.value.push(newMsg) chatMsgList.value.push(newMsg)
inputMessage.value = '';
sendChat(message, isInstruct) sendChat(message, isInstruct)
console.log("发送的新消息:",JSON.stringify(newMsg)) console.log("发送的新消息:",JSON.stringify(newMsg))
} }
@ -464,7 +466,7 @@
console.log('请求完成'); console.log('请求完成');
}).catch(err => { }).catch(err => {
isSessionActive.value = false; // isSessionActive.value = false; //
console.log('error:', err); console.log('error:', err)
}); });
// //
@ -488,9 +490,6 @@
// //
const stopRequest = () => { const stopRequest = () => {
if (requestTaskRef.value && requestTaskRef.value.abort) { if (requestTaskRef.value && requestTaskRef.value.abort) {
//
requestTaskRef.value.isAborted = true;
//
requestTaskRef.value.abort(); requestTaskRef.value.abort();
// //
isSessionActive.value = false; isSessionActive.value = false;
@ -508,8 +507,6 @@
typeWriterTimer = null; typeWriterTimer = null;
} }
setTimeoutScrollToBottom() setTimeoutScrollToBottom()
//
requestTaskRef.value = null;
} }
} }

View File

@ -59,8 +59,7 @@ function agentChatStream(params, onChunk) {
}); });
requestTask.onChunkReceived(res => { requestTask.onChunkReceived(res => {
// 检查请求是否已被中止 if (hasError) return;
if (hasError || requestTask.isAborted) return;
const base64 = uni.arrayBufferToBase64(res.data); const base64 = uni.arrayBufferToBase64(res.data);
let data = ''; let data = '';
try { try {

View File

@ -1,5 +1,4 @@
import { BASE_URL } from "../../constant/base"; import { BASE_URL } from "../../constant/base";
import { goLogin } from "@/hooks/useGoLogin";
const defaultConfig = { const defaultConfig = {
header: { header: {
@ -15,7 +14,7 @@ function request(url, args = {}, method = 'POST', customConfig = {}) {
} }
// 动态获取 token // 动态获取 token
const token = uni.getStorageSync('token'); const token = uni.getStorageSync('token');
let header = { let header = {
...defaultConfig.header, ...defaultConfig.header,
...customConfig.header ...customConfig.header
@ -27,16 +26,16 @@ function request(url, args = {}, method = 'POST', customConfig = {}) {
if (token) { if (token) {
header.Authorization = `Bearer ${token}`; header.Authorization = `Bearer ${token}`;
} }
} }
console.log("请求头customConfig:" + JSON.stringify(customConfig)) console.log("请求头customConfig:" + JSON.stringify(customConfig))
const config = { const config = {
...defaultConfig, ...defaultConfig,
...customConfig, ...customConfig,
header header
}; };
console.log("请求接口:" + url) console.log("请求接口:" + url)
console.log("请求头:" + JSON.stringify(config)) console.log("请求头:" + JSON.stringify(config))
console.log("请求参数:" + JSON.stringify(args)) console.log("请求参数:" + JSON.stringify(args))
@ -50,10 +49,6 @@ function request(url, args = {}, method = 'POST', customConfig = {}) {
success: (res) => { success: (res) => {
console.log("请求响应:" + JSON.stringify(res)) console.log("请求响应:" + JSON.stringify(res))
resolve(res.data) resolve(res.data)
if(res.statusCode && res.statusCode === 424) {
uni.setStorageSync('token', '')
goLogin();
}
}, },
fail: (err) => { fail: (err) => {
console.error("请求失败:", err); console.error("请求失败:", err);
@ -74,4 +69,4 @@ request.get = function(url, args = {}, config = {}) {
}; };
export default request; export default request;