opensource/mateclaw
2
0
Fork 0
mirror of https://gitee.com/mateos/mateclaw.git synced 2026-09-15 20:08:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(ui): resolve active model label from /enabled when providers is admin-only

Browse Source
This commit is contained in:
matevip 2026-05-15 10:19:10 +08:00
parent 26df2c94d0
commit 196ddb8588
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
mateclaw-ui/src/views/ChatConsole.vue
View File

@ -447,6 +447,11 @@ const providers = ref<ProviderInfo[]>([])
// base URLs, liveness) is admin-only, so viewers chat without it; the prompt // base URLs, liveness) is admin-only, so viewers chat without it; the prompt
// flags fall back to "trust the active model" in that branch. // flags fall back to "trust the active model" in that branch.
const providersUnavailable = ref(false) const providersUnavailable = ref(false)
// Mirror of /models/enabled (viewer-accessible). Used to resolve the display
// name of the active model when providers is empty for viewer-level users —
// otherwise the model selector trigger would show its 配置模型 fallback even
// though there IS an active model.
const enabledModels = ref<ModelConfig[]>([])
const activeModels = ref<ActiveModelsInfo | null>(null) const activeModels = ref<ActiveModelsInfo | null>(null)
const pendingAttachments = ref<ChatAttachment[]>([]) const pendingAttachments = ref<ChatAttachment[]>([])
const uploadingAttachment = ref(false) const uploadingAttachment = ref(false)
@ -851,7 +856,18 @@ const activeModelValue = computed(() => {
const activeModelLabel = computed(() => { const activeModelLabel = computed(() => {
if (!activeModelValue.value) return '' if (!activeModelValue.value) return ''
const match = eligibleModels.value.find(m => m.value === activeModelValue.value) const match = eligibleModels.value.find(m => m.value === activeModelValue.value)
return match?.label || '' if (match?.label) return match.label
// Viewer-level users have an empty providers list (admin-only endpoint), so
// eligibleModels is empty even when there IS an active model. Fall back to
// the viewer-readable /models/enabled list to resolve a display name —
// otherwise the trigger button would read "配置模型" forever.
const providerId = activeModels.value?.activeLlm?.providerId
const modelName = activeModels.value?.activeLlm?.model
if (!providerId || !modelName) return ''
const hit = enabledModels.value.find(m =>
m.provider === providerId && (m.modelName === modelName || m.name === modelName))
if (hit) return hit.name ? `${hit.name} (${hit.modelName})` : hit.modelName
return `${providerId} / ${modelName}`
}) })
const activeProvider = computed(() => { const activeProvider = computed(() => {
@ -1184,16 +1200,19 @@ async function loadAgents() {
} }
async function loadModelState() { async function loadModelState() {
// /default + /active are viewer-accessible and required to chat. /models // /default + /active + /enabled are viewer-accessible and required to chat.
// (provider list) is admin-only because it returns API keys + base URLs; // /models (provider list) is admin-only because it returns API keys + base
// viewers degrade to "trust the active model, skip the liveness banner". // URLs; viewers degrade to "trust the active model, skip the liveness
// banner" and resolve the label via /enabled instead.
try { try {
const [defaultRes, activeRes]: any = await Promise.all([ const [defaultRes, activeRes, enabledRes]: any = await Promise.all([
modelApi.getDefault(), modelApi.getDefault(),
modelApi.getActive(), modelApi.getActive(),
modelApi.listEnabled(),
]) ])
defaultModel.value = defaultRes.data || null defaultModel.value = defaultRes.data || null
activeModels.value = activeRes.data || null activeModels.value = activeRes.data || null
enabledModels.value = enabledRes.data || []
} catch (e) { } catch (e) {
ElMessage.error(t('chat.loadModelFailed')) ElMessage.error(t('chat.loadModelFailed'))
blockingPrompt.value = true blockingPrompt.value = true