Skip to content

Commit 824f441

Browse files
authored
Update hooks.ts
1 parent 73fc90d commit 824f441

1 file changed

Lines changed: 25 additions & 1 deletion

File tree

app/utils/hooks.ts

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,45 @@
11
import { useMemo } from "react";
22
import { useAccessStore, useAppConfig } from "../store";
33
import { collectModelsWithDefaultModel } from "./model";
4+
import { getServerSideConfig } from "../config/server";
45

56
export function useAllModels() {
67
const accessStore = useAccessStore();
78
const configStore = useAppConfig();
9+
10+
// 安全获取服务器配置(避免客户端报错)
11+
const serverConfig = typeof window === 'undefined' ?
12+
getServerSideConfig() :
13+
{ customModels: '', defaultModel: '' };
14+
15+
816
const models = useMemo(() => {
17+
18+
const combinedCustomModels = [
19+
serverConfig.customModels, // 服务器配置优先
20+
configStore.customModels,
21+
accessStore.customModels
22+
]
23+
.filter(Boolean) // 移除空值
24+
.join(",");
25+
26+
927
return collectModelsWithDefaultModel(
1028
configStore.models,
11-
[configStore.customModels, accessStore.customModels].join(","),
29+
//[configStore.customModels, accessStore.customModels].join(","),
30+
// 直接使用服务器配置的customModels
31+
32+
combinedCustomModels,
1233
accessStore.defaultModel,
1334
);
1435
}, [
1536
accessStore.customModels,
37+
serverConfig.customModels, // 依赖项改为serverConfig.customModels
1638
accessStore.defaultModel,
1739
configStore.customModels,
1840
configStore.models,
41+
serverConfig.customModels, // 依赖项
42+
serverConfig.defaultModel
1943
]);
2044

2145
return models;

0 commit comments

Comments
 (0)