tt/ttstd-infinite-canvas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(canvas): 模型选择 - 按系统渠道聚合模型一级菜单

Browse Source 
Co-authored-by: lmj15657306288-ui <lmj15657306288-ui@users.noreply.github.com>

Co-authored-by: ZW-Hao <ZW-Hao@users.noreply.github.com>
This commit is contained in:
ddCat
2026-09-19 07:18:01 +08:00
parent 359c537f30
commit f549486fa2
5 changed files with 43 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web/src/components/model-picker.tsx
View File

@@ -245,7 +245,7 @@ export function ModelPicker({
theme={theme}
creationVariant
showConfiguredModelName={showConfiguredModelName}
label={group.kind === "product" ? modelGroup.label : undefined}
label={group.kind === "product" || group.kind === "system-channel" ? modelGroup.label : undefined}
requirements={requirements}
showPrice={showOptionPrices && creditsEnabled}
disabledReason={disabledReason}

37
web/src/lib/model-picker-groups.ts
View File

@@ -6,7 +6,7 @@ export type ModelPickerGroup = {
label: string;
icon: string;
scope: string;
kind: "product" | "channel";
kind: "product" | "channel" | "system-channel";
models: DisplayModelGroup[];
};
@@ -23,21 +23,26 @@ export function modelChannelLabel(config: AiConfig, value: string) {
return cost?.channelLabel?.trim() || channel.publicAlias?.trim() || channel.name || "未命名渠道";
}
// 只构建展示树。每个产品下的叶子仍是独立的渠道选择，不能交给模型族自动路由。
// 系统模型按渠道聚合展示，但每个模型仍保留独立的 channelId::modelKey 选择值。
export function groupModelsForPicker(config: AiConfig, options: string[]): ModelPickerGroup[] {
const groups = new Map<string, ModelPickerGroup>();
for (const channel of config.channels) {
const models = options.filter((value) => resolveModelChannel(config, value).id === channel.id);
for (const value of models) {
if (!isDirectSystemModel(config, value)) continue;
const cost = channel.modelCosts?.find((item) => item.model === modelOptionName(value));
const key = JSON.stringify(["product", cost?.capability, modelOptionName(value)]);
let group = groups.get(key);
if (!group) {
group = { key, label: "", icon: "", scope: "平台服务", kind: "product", models: [] };
groups.set(key, group);
}
group.models.push({ key: value, label: modelChannelLabel(config, value), models: [value] });
const directModels = models.filter((value) => isDirectSystemModel(config, value));
if (directModels.length) {
const key = JSON.stringify(["system-channel", channel.id]);
groups.set(key, {
key,
label: channel.name || "未命名渠道",
icon: modelIcon(config, directModels[0]),
scope: "平台服务",
kind: "system-channel",
models: directModels.map((value) => ({
key: value,
label: configuredModelDisplayName(config, value),
models: [value],
})),
});
}
const otherModels = models.filter((value) => !isDirectSystemModel(config, value));
if (otherModels.length) {
@@ -52,13 +57,5 @@ export function groupModelsForPicker(config: AiConfig, options: string[]): Model
});
}
}
for (const group of groups.values()) {
if (group.kind !== "product") continue;
// 元数据按稳定身份取值，不随当前选中项或渠道排序变化；叶子顺序仍遵循后台排序。
const members = group.models.map((item) => item.models[0]).sort();
const named = members.find((value) => configuredModelDisplayName(config, value) !== modelOptionName(value));
group.label = configuredModelDisplayName(config, named || members[0]);
group.icon = members.map((value) => modelIcon(config, value)).find(Boolean) || "";
}
return Array.from(groups.values());
}