Skip to content

fix: optimize ModelScope MCP sync UI layout for consistent window height #741

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zerob13 merged 1 commit into from
Aug 15, 2025
Merged

fix: optimize ModelScope MCP sync UI layout for consistent window height #741

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
143 changes: 63 additions & 80 deletions src/renderer/src/components/settings/ModelScopeMcpSync.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,95 +1,78 @@
<template>
<div
class="p-3 md:p-4 border rounded-lg bg-card/70 backdrop-blur supports-[backdrop-filter]:bg-card/60 shadow-sm"
class="p-2 border rounded-lg bg-card/70 backdrop-blur supports-[backdrop-filter]:bg-card/60 shadow-sm"
>
<h3 class="text-sm md:text-base font-semibold mb-2 flex items-center gap-2 tracking-tight">
<Icon icon="lucide:cloud-download" class="h-5 w-5 text-primary" />
<span>{{ t('settings.provider.modelscope.mcpSync.title') }}</span>
</h3>

<div class="space-y-3">
<p
class="text-[12px] md:text-[13px] text-muted-foreground leading-relaxed truncate"
:title="t('settings.provider.modelscope.mcpSync.description')"
>
<!-- 标题行 -->
<div class="flex items-center justify-between mb-2">
<div class="flex items-center gap-2">
<Icon icon="lucide:cloud-download" class="h-4 w-4 text-primary" />
<span class="text-sm font-semibold">{{
t('settings.provider.modelscope.mcpSync.title')
}}</span>
</div>
</div>

<!-- 描述和控件行 -->
<div class="space-y-2">
<p class="text-xs text-muted-foreground">
{{ t('settings.provider.modelscope.mcpSync.description') }}
</p>

<!-- 紧凑工具栏布局：控件与按钮同行（小屏自动换行） -->
<div
class="grid items-end gap-2 md:gap-3 grid-cols-1 sm:grid-cols-2 lg:[grid-template-columns:theme(spacing.40)_theme(spacing.40)_1fr_auto]"
>
<!-- Page Size -->
<div class="space-y-1">
<label class="sr-only">
{{ t('settings.provider.modelscope.mcpSync.pageSize') }}
</label>
<select
v-model="syncOptions.page_size"
class="w-full h-8 text-xs px-2 border rounded-md bg-background/60 border-border focus:outline-none focus:ring-2 focus:ring-primary/30 focus:border-primary transition-colors"
:aria-label="t('settings.provider.modelscope.mcpSync.pageSize')"
>
<option value="10">10</option>
<option value="25">25</option>
<option value="50">50</option>
<option value="100">100</option>
</select>
</div>

<!-- Page Number -->
<div class="space-y-1">
<label class="sr-only">
{{ t('settings.provider.modelscope.mcpSync.pageNumber') }}
</label>
<input
v-model.number="syncOptions.page_number"
type="number"
min="1"
class="w-full h-8 text-xs px-2 border rounded-md bg-background/60 border-border focus:outline-none focus:ring-2 focus:ring-primary/30 focus:border-primary transition-colors"
:placeholder="t('settings.provider.modelscope.mcpSync.pageNumberPlaceholder')"
:aria-label="t('settings.provider.modelscope.mcpSync.pageNumber')"
/>
</div>

<!-- Spacer for alignment on large screens -->
<div class="hidden lg:block"></div>

<!-- Action Button -->
<div class="flex lg:justify-end">
<Button
@click="handleSync"
:disabled="isSyncing"
class="h-8 px-2.5 inline-flex items-center gap-2"
>
<Icon v-if="isSyncing" icon="lucide:loader-2" class="h-4 w-4 animate-spin" />
<Icon v-else icon="lucide:download" class="h-4 w-4" />
<span class="text-xs md:text-sm">
{{
isSyncing
? t('settings.provider.modelscope.mcpSync.syncing')
: t('settings.provider.modelscope.mcpSync.sync')
}}
</span>
</Button>
</div>
<!-- 内联控件行 -->
<div class="flex items-center gap-2 text-xs">
<span class="text-muted-foreground whitespace-nowrap">每页</span>
<select
v-model="syncOptions.page_size"
class="w-16 h-6 text-xs px-1 border rounded bg-background border-border focus:outline-none focus:ring-1 focus:ring-primary/50"
>
<option value="10">10</option>
<option value="25">25</option>
<option value="50">50</option>
<option value="100">100</option>
</select>
<span class="text-muted-foreground whitespace-nowrap">条，第</span>
<input
v-model.number="syncOptions.page_number"
type="number"
min="1"
class="w-16 h-6 text-xs px-1 border rounded bg-background border-border focus:outline-none focus:ring-1 focus:ring-primary/50"
/>
<span class="text-muted-foreground whitespace-nowrap">页</span>
<Button
@click="handleSync"
:disabled="isSyncing"
size="sm"
class="h-6 px-2 text-xs ml-auto"
>
<Icon v-if="isSyncing" icon="lucide:loader-2" class="h-3 w-3 animate-spin mr-1" />
<Icon v-else icon="lucide:download" class="h-3 w-3 mr-1" />
{{
isSyncing
? t('settings.provider.modelscope.mcpSync.syncing')
: t('settings.provider.modelscope.mcpSync.sync')
}}
</Button>
</div>

<!-- 同步状态与结果（更紧凑） -->
<div v-if="syncResult" class="flex flex-wrap items-center gap-1.5 md:gap-2 text-xs">
<Badge variant="outline" class="border-green-500/30 text-green-600 bg-green-500/10">
<!-- 同步状态与结果 -->
<div v-if="syncResult" class="flex items-center gap-1 text-xs">
<Badge
variant="outline"
class="text-xs h-5 border-green-500/30 text-green-600 bg-green-500/10"
>
{{ t('settings.provider.modelscope.mcpSync.imported', { count: syncResult.imported }) }}
</Badge>
<Badge
v-if="syncResult.skipped > 0"
variant="outline"
class="border-amber-500/30 text-amber-600 bg-amber-500/10"
class="text-xs h-5 border-amber-500/30 text-amber-600 bg-amber-500/10"
>
{{ t('settings.provider.modelscope.mcpSync.skipped', { count: syncResult.skipped }) }}
</Badge>
<Badge
v-if="syncResult.errors.length > 0"
variant="outline"
class="border-red-500/30 text-red-600 bg-red-500/10"
class="text-xs h-5 border-red-500/30 text-red-600 bg-red-500/10"
>
{{
t('settings.provider.modelscope.mcpSync.errors', { count: syncResult.errors.length })
Expand All @@ -100,21 +83,21 @@
<!-- 错误信息显示 -->
<div
v-if="errorMessage"
class="p-2.5 md:p-3 bg-destructive/10 border border-destructive/20 rounded-md"
class="p-2 bg-destructive/10 border border-destructive/20 rounded text-xs text-destructive"
>
<p class="text-[12px] md:text-[13px] text-destructive">{{ errorMessage }}</p>
{{ errorMessage }}
</div>

<!-- 同步结果详情 -->
<div v-if="syncResult && syncResult.errors.length > 0" class="space-y-1.5">
<h4 class="text-xs md:text-sm font-medium text-destructive">
<div v-if="syncResult && syncResult.errors.length > 0" class="space-y-1">
<div class="text-xs font-medium text-destructive">
{{ t('settings.provider.modelscope.mcpSync.errorDetails') }}
</h4>
<div class="max-h-28 overflow-y-auto p-2 bg-muted/40 rounded-md border border-border/60">
</div>
<div class="max-h-20 overflow-y-auto p-1 bg-muted/40 rounded text-xs">
<div
v-for="(error, index) in syncResult.errors"
:key="index"
class="text-[12px] text-muted-foreground py-1 first:pt-0 last:pb-0 border-b border-border/40 last:border-0"
class="text-muted-foreground py-0.5 border-b border-border/40 last:border-0"
>
{{ error }}
</div>
Expand Down