修复模型选择继承的小bug

This commit is contained in:
sijinhui
2024-07-12 11:28:32 +08:00
parent 90bbcc06d6
commit 37392d068c
5 changed files with 27 additions and 8 deletions

View File

@@ -472,9 +472,11 @@ export function ChatActions(props: {
// switch model
const currentModel = chatStore.currentSession().mask.modelConfig.model;
// 这里获取的不准确看起来没有什么地方可以更新这个providerName
const currentProviderName =
chatStore.currentSession().mask.modelConfig?.providerName ||
ServiceProvider.OpenAI;
console.log("222222222", currentModel, currentProviderName);
const allModels = useAllModels();
const models = useMemo(() => {
const filteredModels = allModels.filter((m) => m.available);
@@ -609,7 +611,7 @@ export function ChatActions(props: {
<ChatAction
onClick={() => setShowModelSelector(true)}
text={currentModel}
text={currentModelName}
icon={<RobotIcon />}
/>
@@ -627,7 +629,7 @@ export function ChatActions(props: {
{/*/>*/}
{showModelSelector && (
<Selector
<ModalSelector
defaultSelectedValue={`${currentModel}@${currentProviderName}`}
items={models.map((m) => ({
title: `${m.displayName}${

View File

@@ -23,6 +23,7 @@ import {
NARROW_SIDEBAR_WIDTH,
Path,
REPO_URL,
ServiceProvider,
} from "../constant";
import { Link, useNavigate } from "react-router-dom";
@@ -131,6 +132,10 @@ export function SideBar(props: { className?: string }) {
const chatStore = useChatStore();
const currentModel = chatStore.currentSession().mask.modelConfig.model;
const currentProviderName =
chatStore.currentSession().mask.modelConfig?.providerName ||
ServiceProvider.OpenAI;
// drag side bar
const { onDragStart, shouldNarrow } = useDragSideBar();
const navigate = useNavigate();
@@ -249,7 +254,11 @@ export function SideBar(props: { className?: string }) {
text={shouldNarrow ? undefined : Locale.Home.NewChat}
onClick={() => {
if (config.dontShowMaskSplashScreen) {
chatStore.newSession(undefined, currentModel);
chatStore.newSession(
undefined,
currentModel,
currentProviderName,
);
navigate(Path.Chat);
} else {
navigate(Path.NewChat);

View File

@@ -514,7 +514,7 @@ export function ModalSelector<T extends CheckGroupValueType>(props: {
onClose?: () => void;
multiple?: boolean;
}) {
// console.log("-----", props);
console.log("-----", props);
const getCheckCardAvatar = (value: string): React.ReactNode => {
if (value.startsWith("gpt")) {