From c56dd9479e4c44af4b58c5a14c6f0f3f3cc20d85 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 05 三月 2025 15:37:20 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/views/mkai/index.jsx | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/views/mkai/index.jsx b/src/views/mkai/index.jsx
index 91102ed..05fddfb 100644
--- a/src/views/mkai/index.jsx
+++ b/src/views/mkai/index.jsx
@@ -129,7 +129,7 @@
if (status) {
return (
<div className="item-title edit">
- <Input value={val} onChange={chanVal} onBlur={submit} onPressEnter={submit}/>
+ <Input value={val} autoFocus onChange={chanVal} onBlur={submit} onPressEnter={submit}/>
</div>
)
}
@@ -233,7 +233,7 @@
UserID: '',
LoginUID: '',
textInput: '',
- type: 'deepseek-chat', // deepseek-chat deepseek-reasoner
+ type: 'deepseek-reasoner', // deepseek-chat deepseek-reasoner
currentChat: {id: '', list: [], title: ''},
chats: []
}
@@ -429,7 +429,7 @@
if (!item.loading) {
list.push({
role: item.role,
- content: item.content
+ content: item.oriText || item.content
})
}
})
@@ -449,12 +449,15 @@
delete _chat.loading
_chat.list.pop()
- let _val = ''
- let _html = '鏈嶅姟鍣ㄧ箒蹇欙紝璇风◢鍚庡啀璇曘��'
+ let _val = '鏈嶅姟鍣ㄧ箒蹇欙紝璇风◢鍚庡啀璇曘��'
+ let _html = _val
let tokens_count = 0
if (res.success && res.choices && res.choices[0]) {
_val = res.choices[0].message.content
_html = this.getAssistVal(_val)
+ } else if (!res.success && res.rawStatusCode === 400 && res.message && /This\s*model's\s*maximum\s*context\s*length/.test(res.message)) {
+ _html = `褰撳墠瀵硅瘽宸茶秴鍑�${type === 'deepseek-reasoner' ? '娣卞害鎬濊�冪殑' : ''}鏈�澶ч暱搴﹂檺鍒讹紝寮�鍚竴涓柊瀵硅瘽缁х画鎬濊�冨惂~`
+ _val = _html
}
if (res.usage && res.usage.total_tokens) {
--
Gitblit v1.8.0