Skip to content

fix(web): 修复「选择同步渠道」打开弹窗时页面卡死 #6651

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

Open
Rain-kl wants to merge 1 commit into
base: main
Choose a base branch
from
+22 −37
Open

fix(web): 修复「选择同步渠道」打开弹窗时页面卡死 #6651

Show file tree
Hide file tree
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
37 changes: 10 additions & 27 deletions web/src/features/system-settings/models/channel-selector-dialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,6 @@ import { StatusBadge } from '@/components/status-badge'
import { Button } from '@/components/ui/button'
import { Checkbox } from '@/components/ui/checkbox'
import { Input } from '@/components/ui/input'
import {
Select,
SelectContent,
SelectGroup,
SelectItem,
SelectTrigger,
SelectValue,
} from '@/components/ui/select'

import type { UpstreamChannel } from '../types'
import {
Expand Down Expand Up @@ -235,27 +227,18 @@ export function ChannelSelectorDialog({

return (
<div className='flex min-w-0 items-center gap-2'>
<Select
items={ENDPOINT_OPTIONS.map((option) => ({
value: option.value,
label: option.label,
}))}
<select
className='border-input bg-background h-8 w-32 shrink-0 rounded-md border px-2 text-sm'
value={endpointType}
onValueChange={(v) => v !== null && handleTypeChange(v)}
onChange={(e) => handleTypeChange(e.target.value)}
aria-label={t('Sync Endpoint')}
>
<SelectTrigger className='h-8 w-32'>
<SelectValue />
</SelectTrigger>
<SelectContent alignItemWithTrigger={false}>
<SelectGroup>
{ENDPOINT_OPTIONS.map((option) => (
<SelectItem key={option.value} value={option.value}>
{option.label}
</SelectItem>
))}
</SelectGroup>
</SelectContent>
</Select>
{ENDPOINT_OPTIONS.map((option) => (
<option key={option.value} value={option.value}>
{option.label}
</option>
))}
</select>
{endpointType === 'custom' && (
<Input
value={currentEndpoint}
Expand Down
22 changes: 12 additions & 10 deletions web/src/features/system-settings/models/upstream-ratio-sync.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,16 +509,18 @@ export function UpstreamRatioSync({ modelRatios }: UpstreamRatioSyncProps) {
/>
</div>

<ChannelSelectorDialog
open={channelDialogOpen}
onOpenChange={setChannelDialogOpen}
channels={channels}
selectedChannelIds={selectedChannelIds}
onSelectedChannelIdsChange={setSelectedChannelIds}
channelEndpoints={channelEndpoints}
onChannelEndpointsChange={setChannelEndpoints}
onConfirm={handleConfirmChannelSelection}
/>
{channelDialogOpen ? (
<ChannelSelectorDialog
open
onOpenChange={setChannelDialogOpen}
channels={channels}
selectedChannelIds={selectedChannelIds}
onSelectedChannelIdsChange={setSelectedChannelIds}
channelEndpoints={channelEndpoints}
onChannelEndpointsChange={setChannelEndpoints}
onConfirm={handleConfirmChannelSelection}
/>
) : null}

<ConflictConfirmDialog
open={conflictDialogOpen}
Expand Down