From 65f9018f73e99d6ff82e643c7f201074178735c3 Mon Sep 17 00:00:00 2001 From: wizardchen Date: Mon, 1 Jun 2026 14:29:20 +0800 Subject: [PATCH] refactor(settings): enhance card interactions and accessibility across components Updated the McpSettings, ModelSettings, VectorStoreSettings, and WebSearchSettings components to improve user interactions with service, model, store, and provider cards. Implemented click and keyboard event handling for better accessibility, allowing cards to be clickable based on user roles. Enhanced UI elements with appropriate roles and tabindex attributes, ensuring a consistent and user-friendly experience. Adjusted styles to reflect clickable states and improved focus visibility for better usability. --- frontend/src/views/settings/McpSettings.vue | 79 +++- frontend/src/views/settings/ModelSettings.vue | 406 ++++++------------ .../views/settings/VectorStoreSettings.vue | 83 +++- .../src/views/settings/WebSearchSettings.vue | 67 ++- 4 files changed, 314 insertions(+), 321 deletions(-) diff --git a/frontend/src/views/settings/McpSettings.vue b/frontend/src/views/settings/McpSettings.vue index d328d386..53ce920f 100644 --- a/frontend/src/views/settings/McpSettings.vue +++ b/frontend/src/views/settings/McpSettings.vue @@ -42,8 +42,15 @@ class="service-card" :class="[ `service-card--${service.transport_type || 'unknown'}`, - { 'service-card--builtin': service.is_builtin } + { + 'service-card--builtin': service.is_builtin, + 'service-card--clickable': isServiceCardClickable(), + }, ]" + :role="isServiceCardClickable() ? 'button' : undefined" + :tabindex="isServiceCardClickable() ? 0 : undefined" + @click="onServiceCardClick($event, service)" + @keydown.enter="onServiceCardClick($event, service)" >
@@ -66,17 +73,23 @@ {{ service.enabled ? $t('common.on') : $t('common.off') }} - - - - - + + + + + +
{{ getTransportTypeLabel(service.transport_type) }} @@ -162,6 +175,20 @@ const handleAdd = () => { dialogVisible.value = true } +const isServiceCardClickable = () => authStore.hasRole('admin') + +const onServiceCardClick = (event: Event, service: MCPService) => { + if (!isServiceCardClickable()) return + if (event.type === 'keydown') { + const ke = event as KeyboardEvent + if (ke.key !== 'Enter' && ke.key !== ' ') return + ke.preventDefault() + } + const target = event.target as HTMLElement | null + if (target?.closest('.service-card__actions')) return + handleEdit(service) +} + // Handle edit button click const handleEdit = (service: MCPService) => { currentService.value = { ...service } @@ -384,19 +411,32 @@ onMounted(() => { transition: border-color 0.18s ease, box-shadow 0.18s ease; min-width: 0; - &:hover { - border-color: var(--td-brand-color-3, var(--td-brand-color)); - box-shadow: 0 4px 14px rgba(15, 23, 42, 0.06); - } - &--builtin { background: var(--td-bg-color-secondarycontainer); + } + + &--clickable { + cursor: pointer; &:hover { - box-shadow: none; - border-color: var(--td-component-stroke); + border-color: var(--td-brand-color-3, var(--td-brand-color)); + box-shadow: 0 4px 14px rgba(15, 23, 42, 0.06); + } + + &:focus-visible { + outline: 2px solid var(--td-brand-color); + outline-offset: 2px; } } + + &--builtin:not(.service-card--clickable):hover { + box-shadow: none; + border-color: var(--td-component-stroke); + } +} + +.service-card__actions { + flex-shrink: 0; } .service-card__badge { @@ -521,7 +561,8 @@ onMounted(() => { // switch 始终显示(它是状态锚点);三点按钮只在 hover/focus 时出现。 .service-card:hover .service-card__more, -.service-card:focus-within .service-card__more { +.service-card:focus-within .service-card__more, +.service-card__actions:focus-within .service-card__more { opacity: 1; } diff --git a/frontend/src/views/settings/ModelSettings.vue b/frontend/src/views/settings/ModelSettings.vue index 299c048c..7a9d6024 100644 --- a/frontend/src/views/settings/ModelSettings.vue +++ b/frontend/src/views/settings/ModelSettings.vue @@ -40,120 +40,88 @@ -
- -
-
- -
-
- -
-

{{ modelDisplayName(model) }}

- - - - - - - - + +
+
+
+
- - -
- - {{ identityText(model) }} -
- - -
- - {{ typeLabel(model._modelType) }} - - - {{ vendorLabel(model) }} - - - {{ model.dimension }} dim - - - - +
+
+

{{ modelDisplayName(model) }}

+ + + +
+ + + + + +
+
+

+ {{ vendorLabel(model) }} + + +

-
-
- - - - - {{ $t('modelSettings.actions.addModel') }} - - - -
+
+ + + + + {{ $t('modelSettings.actions.addModel') }} + + + +
+
{ return providerLabel(model) || sourceLabel(model._modelType) } -// Hover tooltip for the whole card — shows the long-form details we -// removed from the visible card body so they're still one mouseover -// away. baseUrl is the most useful for debugging "why is this model -// failing" scenarios. -const cardTooltip = (model: any): string => { - const lines: string[] = [] - if (model.displayName && model.displayName !== model.name) { - lines.push(`${t('modelSettings.rawModelName')}: ${model.name}`) - } - if (model.baseUrl) { - lines.push(model.baseUrl) - } else if (model.source === 'local') { - lines.push('Ollama (localhost)') - } - return lines.join('\n') -} - -// Whether the raw model identifier is worth showing on the card. We hide -// it when the user did NOT set a display name, because then the title is -// already the raw name and printing it again is just noise. -const rawNameVisible = (model: any): boolean => { - const displayName = typeof model.displayName === 'string' ? model.displayName.trim() : '' - return Boolean(displayName) && displayName !== model.name -} - -// What goes in the URL slot of the identity row. Local models intentionally -// return '' here — "ollama://localhost" is just noise on Ollama-only built-in -// cards. Only remote models with an explicit base URL get this row. -const urlText = (model: any): string => { - return model.baseUrl || '' -} - -// Single-line text shown in the identity row. Picks the more useful of -// the two (URL > raw name) — never crams both into one ellipsizing line -// because that produces double-end truncation that nobody can read. -const identityText = (model: any): string => { - return urlText(model) || (rawNameVisible(model) ? model.name : '') -} - -// Whether the identity row should render at all. -const identityVisible = (model: any): boolean => identityText(model).length > 0 - -// Identity-row tooltip — exposes BOTH name and URL when the user hovers, -// so the diagnostic info we hid from the visible row is still one mouse -// move away. -const identityTooltip = (model: any): string => { - const parts: string[] = [] - if (rawNameVisible(model)) parts.push(model.name) - if (urlText(model)) parts.push(urlText(model)) - return parts.join('\n') -} - const modelDisplayName = (model: any) => { const displayName = typeof model.displayName === 'string' ? model.displayName.trim() : '' return displayName || model.name @@ -394,12 +310,31 @@ const openAddDialog = (type: ModelType) => { showDialog.value = true } +// 可点击打开编辑抽屉:管理员 + 非内置模型 +const isModelCardClickable = (model: any) => + authStore.hasRole('admin') && !model.isBuiltin + +const onModelCardClick = (event: Event, type: ModelType, model: any) => { + if (!isModelCardClickable(model)) return + if (event.type === 'keydown') { + const ke = event as KeyboardEvent + if (ke.key !== 'Enter' && ke.key !== ' ') return + ke.preventDefault() + } + const target = event.target as HTMLElement | null + if (target?.closest('.model-card__actions')) return + editModel(type, model) +} + // 编辑模型 const editModel = (type: ModelType, model: any) => { if (model.isBuiltin) { MessagePlugin.warning(t('modelSettings.toasts.builtinCannotEdit')) return } + if (!authStore.hasRole('admin')) { + return + } currentModelType.value = type editingModel.value = { ...model } showDialog.value = true @@ -700,6 +635,10 @@ onMounted(() => { } } +.model-list-loading { + min-height: 120px; +} + .model-type-tabs { margin-bottom: 16px; @@ -736,13 +675,13 @@ onMounted(() => { gap: 12px; } -// 模型卡片 —— 左侧类型徽章 + 标题 / identity / 元 chip 行(固定三行) +// 模型卡片 —— 可选类型徽章(仅「全部」Tab)+ 标题 + 一行副标题 .model-card { position: relative; display: flex; align-items: flex-start; gap: 12px; - padding: 12px 14px; + padding: 14px 16px; border: 1px solid var(--td-component-stroke); border-radius: 10px; background: var(--td-bg-color-container); @@ -762,6 +701,20 @@ onMounted(() => { border-color: var(--td-component-stroke); } } + + &--clickable { + cursor: pointer; + + &:hover { + border-color: var(--td-brand-color-3, var(--td-brand-color)); + box-shadow: 0 4px 14px rgba(15, 23, 42, 0.06); + } + + &:focus-visible { + outline: 2px solid var(--td-brand-color); + outline-offset: 2px; + } + } } .model-card__badge { @@ -810,7 +763,7 @@ onMounted(() => { display: flex; flex-direction: column; justify-content: center; - gap: 4px; + gap: 2px; } .model-card__header { @@ -833,32 +786,6 @@ onMounted(() => { white-space: nowrap; } -/* - Generic chip used for: built-in tag, type chip, source chip, dimension, - vision flag. Same shape across all so the row reads as one consistent - rhythm of pills. Variants tweak color only. -*/ -.model-card__chip { - flex-shrink: 0; - display: inline-flex; - align-items: center; - gap: 3px; - padding: 1px 7px 1px 6px; - height: 20px; - font-size: 11px; - font-weight: 500; - line-height: 18px; - color: var(--td-text-color-secondary); - background: var(--td-bg-color-component); - border-radius: 4px; - white-space: nowrap; - - .t-icon { - font-size: 12px; - flex-shrink: 0; - } -} - /* Built-in lock indicator. Most cards in a typical install ARE built-in, so loud styling everywhere becomes noise — instead the lock is muted @@ -887,51 +814,29 @@ onMounted(() => { color: var(--td-text-color-secondary); } -/* - Icon-only chip variant. Drops horizontal padding to a tight square so the - chip reads as a status badge (vision flag) rather than a text pill that - happens to start with an icon. -*/ -.model-card__chip--icon-only { - padding: 0; - width: 20px; - justify-content: center; - - .t-icon { - font-size: 12px; - } +.model-card__subtitle { + margin: 2px 0 0; + font-size: 12px; + line-height: 1.5; + color: var(--td-text-color-secondary); + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } -/* Type chip in the meta row — slightly emphasized, picks up the type's - accent color so it links to the left badge. */ -.model-card__chip--type { - color: var(--td-text-color-primary); - font-weight: 500; +.model-card__sep { + margin: 0 4px; + color: var(--td-text-color-placeholder); } -.model-card--chat .model-card__chip--type { - color: #0052D9; - background: rgba(0, 82, 217, 0.08); +.model-card__vision { + display: inline-flex; + align-items: center; + gap: 3px; } -.model-card--embedding .model-card__chip--type { - color: #6235BB; - background: rgba(98, 53, 187, 0.08); -} - -.model-card--rerank .model-card__chip--type { - color: #B85C00; - background: rgba(184, 92, 0, 0.08); -} - -.model-card--vllm .model-card__chip--type { - color: #C93E3E; - background: rgba(201, 62, 62, 0.08); -} - -.model-card--asr .model-card__chip--type { - color: #118053; - background: rgba(17, 128, 83, 0.08); +.model-card__actions { + flex-shrink: 0; } .model-card__more { @@ -948,48 +853,13 @@ onMounted(() => { } } -// Hover / 键盘焦点 / 菜单已展开 时显示,避免静态卡片上有"杂物"。 +// Hover / 键盘焦点 时显示更多菜单,避免静态卡片上有"杂物"。 .model-card:hover .model-card__more, -.model-card:focus-within .model-card__more { +.model-card:focus-within .model-card__more, +.model-card__actions:focus-within .model-card__more { opacity: 1; } -.model-card__meta { - display: flex; - align-items: center; - flex-wrap: nowrap; - gap: 4px; - min-width: 0; - // Truncate at the row level rather than within each chip — chips clip - // off-screen if the card narrows below the chip set's natural width - // (rare at 320px+ minmax but possible if grid recomputes). - overflow: hidden; -} - -/* - Compact identity row: monospace one-liner showing whichever of - baseUrl / raw name is more useful (URL preferred). Conditionally - rendered — empty cards (most built-in ones) skip this row entirely - and grid auto-sizing handles the height. -*/ -.model-card__identity { - display: flex; - align-items: center; - min-width: 0; - font-family: ui-monospace, SFMono-Regular, "SF Mono", Menlo, Consolas, monospace; - font-size: 11px; - line-height: 1.4; - color: var(--td-text-color-placeholder); -} - -.model-card__identity-text { - flex: 1; - min-width: 0; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; -} - .empty-state { padding: 64px 0; text-align: center; diff --git a/frontend/src/views/settings/VectorStoreSettings.vue b/frontend/src/views/settings/VectorStoreSettings.vue index 64e27096..3868ec36 100644 --- a/frontend/src/views/settings/VectorStoreSettings.vue +++ b/frontend/src/views/settings/VectorStoreSettings.vue @@ -30,8 +30,15 @@ class="store-card" :class="[ `store-card--${store.engine_type}`, - { 'store-card--env': store.source === 'env' } + { + 'store-card--env': store.source === 'env', + 'store-card--clickable': isStoreCardClickable(store), + }, ]" + :role="isStoreCardClickable(store) ? 'button' : undefined" + :tabindex="isStoreCardClickable(store) ? 0 : undefined" + @click="onStoreCardClick($event, store)" + @keydown.enter="onStoreCardClick($event, store)" >
- - - - - + + + + + +
{{ store.engine_type }} @@ -600,7 +612,26 @@ const openAddDialog = () => { showDialog.value = true } +// env 来源由 .env 注入,与列表菜单一致:不可点击编辑 +const isStoreCardClickable = (store: VectorStoreEntity) => + authStore.hasRole('admin') && store.source !== 'env' + +const onStoreCardClick = (event: Event, store: VectorStoreEntity) => { + if (!isStoreCardClickable(store)) return + if (event.type === 'keydown') { + const ke = event as KeyboardEvent + if (ke.key !== 'Enter' && ke.key !== ' ') return + ke.preventDefault() + } + const target = event.target as HTMLElement | null + if (target?.closest('.store-card__actions')) return + editStore(store) +} + const editStore = (store: VectorStoreEntity) => { + if (store.source === 'env') { + return + } editingStore.value = store showAdvanced.value = false form.value = { @@ -786,19 +817,32 @@ onMounted(async () => { transition: border-color 0.18s ease, box-shadow 0.18s ease; min-width: 0; - &:hover { - border-color: var(--td-brand-color-3, var(--td-brand-color)); - box-shadow: 0 4px 14px rgba(15, 23, 42, 0.06); - } - &--env { background: var(--td-bg-color-secondarycontainer); + } + + &--clickable { + cursor: pointer; &:hover { - border-color: var(--td-component-stroke); - box-shadow: none; + border-color: var(--td-brand-color-3, var(--td-brand-color)); + box-shadow: 0 4px 14px rgba(15, 23, 42, 0.06); + } + + &:focus-visible { + outline: 2px solid var(--td-brand-color); + outline-offset: 2px; } } + + &--env:not(.store-card--clickable):hover { + border-color: var(--td-component-stroke); + box-shadow: none; + } +} + +.store-card__actions { + flex-shrink: 0; } .store-card__main { @@ -952,7 +996,8 @@ onMounted(async () => { } .store-card:hover .store-card__more, -.store-card:focus-within .store-card__more { +.store-card:focus-within .store-card__more, +.store-card__actions:focus-within .store-card__more { opacity: 1; } diff --git a/frontend/src/views/settings/WebSearchSettings.vue b/frontend/src/views/settings/WebSearchSettings.vue index 1a11f20b..e45794ae 100644 --- a/frontend/src/views/settings/WebSearchSettings.vue +++ b/frontend/src/views/settings/WebSearchSettings.vue @@ -21,7 +21,11 @@ v-for="entity in providerEntities" :key="entity.id" class="provider-card" - :class="`provider-card--${entity.provider}`" + :class="[`provider-card--${entity.provider}`, { 'provider-card--clickable': isProviderCardClickable() }]" + :role="isProviderCardClickable() ? 'button' : undefined" + :tabindex="isProviderCardClickable() ? 0 : undefined" + @click="onProviderCardClick($event, entity)" + @keydown.enter="onProviderCardClick($event, entity)" >

{{ entity.name }}

- - - - - + + + + + +
{{ providerTypeLabel(entity.provider) }} @@ -598,6 +607,20 @@ const testConnection = async () => { } } +const isProviderCardClickable = () => authStore.hasRole('admin') + +const onProviderCardClick = (event: Event, entity: WebSearchProviderEntity) => { + if (!isProviderCardClickable()) return + if (event.type === 'keydown') { + const ke = event as KeyboardEvent + if (ke.key !== 'Enter' && ke.key !== ' ') return + ke.preventDefault() + } + const target = event.target as HTMLElement | null + if (target?.closest('.provider-card__actions')) return + editProvider(entity) +} + const getProviderOptions = (_entity: WebSearchProviderEntity) => { // Web search providers carry external API credentials; the backend // gates every mutation/test behind Admin+ (RegisterWebSearchProviderRoutes). @@ -687,12 +710,25 @@ onMounted(async () => { transition: border-color 0.18s ease, box-shadow 0.18s ease; min-width: 0; - &:hover { - border-color: var(--td-brand-color-3, var(--td-brand-color)); - box-shadow: 0 4px 14px rgba(15, 23, 42, 0.06); + &--clickable { + cursor: pointer; + + &:hover { + border-color: var(--td-brand-color-3, var(--td-brand-color)); + box-shadow: 0 4px 14px rgba(15, 23, 42, 0.06); + } + + &:focus-visible { + outline: 2px solid var(--td-brand-color); + outline-offset: 2px; + } } } +.provider-card__actions { + flex-shrink: 0; +} + .provider-card__badge { flex-shrink: 0; width: 36px; @@ -814,7 +850,8 @@ onMounted(async () => { } .provider-card:hover .provider-card__more, -.provider-card:focus-within .provider-card__more { +.provider-card:focus-within .provider-card__more, +.provider-card__actions:focus-within .provider-card__more { opacity: 1; }