mirror of
https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web.git
synced 2025-10-02 16:16:39 +08:00
暂存merge
This commit is contained in:
parent
e3b0d909fe
commit
c42a9554a5
@ -494,15 +494,15 @@ export function ChatActions(props: {
|
|||||||
|
|
||||||
// if current model is not available
|
// if current model is not available
|
||||||
// switch to first available model
|
// switch to first available model
|
||||||
const isUnavaliableModel = !models.some((m) => m.name === currentModel);
|
const isUnavailableModel = !models.some((m) => m.name === currentModel);
|
||||||
if (isUnavaliableModel && models.length > 0) {
|
if (isUnavailableModel && models.length > 0) {
|
||||||
const nextModel = models[0].name as ModelType;
|
const nextModel = models[0].name as ModelType;
|
||||||
chatStore.updateCurrentSession(
|
chatStore.updateCurrentSession(
|
||||||
(session) => (session.mask.modelConfig.model = nextModel),
|
(session) => (session.mask.modelConfig.model = nextModel),
|
||||||
);
|
);
|
||||||
showToast(nextModel);
|
showToast(nextModel);
|
||||||
}
|
}
|
||||||
}, [chatStore, currentModel, models]);
|
}, [chatStore, currentModel, models, props]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className={styles["chat-input-actions"]}>
|
<div className={styles["chat-input-actions"]}>
|
||||||
@ -1552,7 +1552,7 @@ function _Chat() {
|
|||||||
defaultShow={i >= messages.length - 6}
|
defaultShow={i >= messages.length - 6}
|
||||||
/>
|
/>
|
||||||
{getMessageImages(message).length == 1 && (
|
{getMessageImages(message).length == 1 && (
|
||||||
<img
|
<Image
|
||||||
className={styles["chat-message-item-image"]}
|
className={styles["chat-message-item-image"]}
|
||||||
src={getMessageImages(message)[0]}
|
src={getMessageImages(message)[0]}
|
||||||
alt=""
|
alt=""
|
||||||
@ -1569,7 +1569,7 @@ function _Chat() {
|
|||||||
>
|
>
|
||||||
{getMessageImages(message).map((image, index) => {
|
{getMessageImages(message).map((image, index) => {
|
||||||
return (
|
return (
|
||||||
<img
|
<Image
|
||||||
className={styles["chat-message-item-image-multi"]}
|
className={styles["chat-message-item-image-multi"]}
|
||||||
key={index}
|
key={index}
|
||||||
src={image}
|
src={image}
|
||||||
|
@ -102,7 +102,6 @@ const cn = {
|
|||||||
Prompt: "快捷指令",
|
Prompt: "快捷指令",
|
||||||
Masks: "所有面具",
|
Masks: "所有面具",
|
||||||
Clear: "清除聊天",
|
Clear: "清除聊天",
|
||||||
UploadImage: "上传图片",
|
|
||||||
Settings: "对话设置",
|
Settings: "对话设置",
|
||||||
UploadImage: "上传图片",
|
UploadImage: "上传图片",
|
||||||
},
|
},
|
||||||
|
@ -104,7 +104,6 @@ const en: LocaleType = {
|
|||||||
Prompt: "Prompts",
|
Prompt: "Prompts",
|
||||||
Masks: "Masks",
|
Masks: "Masks",
|
||||||
Clear: "Clear Context",
|
Clear: "Clear Context",
|
||||||
UploadImage: "Upload Image",
|
|
||||||
Settings: "Settings",
|
Settings: "Settings",
|
||||||
UploadImage: "Upload Images",
|
UploadImage: "Upload Images",
|
||||||
},
|
},
|
||||||
|
Loading…
Reference in New Issue
Block a user