From 967c79a6186e33064a5ec90df13f7dbb6cf0240c Mon Sep 17 00:00:00 2001
From: dengqichen <dengqichen@iscmtech.com>
Date: Fri, 10 Jan 2025 13:41:51 +0800
Subject: [PATCH] 1

---
 .../List/components/ApplicationModal.tsx      | 87 ++++++-------------
 1 file changed, 28 insertions(+), 59 deletions(-)

diff --git a/frontend/src/pages/Deploy/Application/List/components/ApplicationModal.tsx b/frontend/src/pages/Deploy/Application/List/components/ApplicationModal.tsx
index 221a69c6..a0d36023 100644
--- a/frontend/src/pages/Deploy/Application/List/components/ApplicationModal.tsx
+++ b/frontend/src/pages/Deploy/Application/List/components/ApplicationModal.tsx
@@ -279,66 +279,35 @@ const ApplicationModal: React.FC<ApplicationModalProps> = ({
                                     render={({field}) => (
                                         <FormItem>
                                             <FormLabel>代码仓库组</FormLabel>
-                                            <Popover>
-                                                <PopoverTrigger asChild>
-                                                    <FormControl>
-                                                        <Button
-                                                            variant="outline"
-                                                            role="combobox"
-                                                            disabled={!form.watch('gitInstanceId')}
-                                                            className={cn(
-                                                                "w-full justify-between",
-                                                                !field.value && "text-muted-foreground"
-                                                            )}
-                                                        >
-                                                            {field.value
-                                                                ? repositoryGroups.find(
-                                                                    (group) => group.id === field.value
-                                                                )?.name
-                                                                : "请选择代码仓库组"}
-                                                        </Button>
-                                                    </FormControl>
-                                                </PopoverTrigger>
-                                                <PopoverContent className="w-[--radix-popover-trigger-width] p-0" side="bottom" align="start">
-                                                    <Command className="w-full">
-                                                        <CommandInput 
-                                                            placeholder="搜索代码仓库组..." 
-                                                            className="h-9"
+                                            <Select
+                                                disabled={!form.watch('gitInstanceId')}
+                                                onValueChange={(value) => {
+                                                    form.setValue("repositoryGroupId", Number(value));
+                                                }}
+                                                value={field.value?.toString()}
+                                            >
+                                                <FormControl>
+                                                    <SelectTrigger>
+                                                        <SelectValue 
+                                                            placeholder={!form.watch('gitInstanceId') 
+                                                                ? "请先选择Git实例" 
+                                                                : "请选择代码仓库组"
+                                                            } 
                                                         />
-                                                        <CommandEmpty>未找到代码仓库组</CommandEmpty>
-                                                        <ScrollArea className="h-[200px] overflow-auto">
-                                                            <CommandGroup className="overflow-hidden">
-                                                                {repositoryGroups.map((group) => (
-                                                                    <CommandItem
-                                                                        key={group.id}
-                                                                        value={group.name}
-                                                                        onSelect={() => {
-                                                                            form.setValue("repositoryGroupId", group.id);
-                                                                            // 关闭 Popover
-                                                                            const popoverTrigger = document.querySelector('[role="combobox"]');
-                                                                            if (popoverTrigger) {
-                                                                                (popoverTrigger as HTMLElement).click();
-                                                                            }
-                                                                        }}
-                                                                        className="cursor-pointer"
-                                                                    >
-                                                                        <Check
-                                                                            className={cn(
-                                                                                "mr-2 h-4 w-4",
-                                                                                group.id === field.value
-                                                                                    ? "opacity-100"
-                                                                                    : "opacity-0"
-                                                                            )}
-                                                                        />
-                                                                        {group.name}
-                                                                    </CommandItem>
-                                                                ))}
-                                                            </CommandGroup>
-                                                        </ScrollArea>
-                                                    </Command>
-                                                </PopoverContent>
-                                            </Popover>
-                                            <FormMessage/>
+                                                    </SelectTrigger>
+                                                </FormControl>
+                                                <SelectContent>
+                                                    {repositoryGroups.map((group) => (
+                                                        <SelectItem 
+                                                            key={group.id} 
+                                                            value={group.id.toString()}
+                                                        >
+                                                            {group.name}
+                                                        </SelectItem>
+                                                    ))}
+                                                </SelectContent>
+                                            </Select>
+                                            <FormMessage />
                                         </FormItem>
                                     )}
                                 />