From f811e29f13c9229d431715f5d7baaddfd7b46627 Mon Sep 17 00:00:00 2001
From: AAEE86 <ppk0227@hotmail.com>
Date: Tue, 29 Sep 2026 14:29:56 +0800
Subject: [PATCH] =?UTF-8?q?feat(providers):=20=E6=89=B9=E9=87=8F=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=A8=A1=E5=9E=8B=E6=94=AF=E6=8C=81=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=A8=A1=E5=9E=8B=E5=B9=B6=E5=88=B7=E6=96=B0?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- BatchAssignModelsDialog: 在"按密钥匹配"按钮旁新增"创建模型"按钮，
  复用 GlobalModelFormDialog 打开"创建统一模型"界面
- 创建成功后重新加载全局模型列表，新模型可直接勾选并保存关联
- GlobalModelFormDialog: 新增可选 zIndex 属性，用于嵌套弹窗层级
- 补充组件测试：打开创建弹窗、创建成功后列表刷新
---
 .../components/GlobalModelFormDialog.vue      |  3 +
 .../components/BatchAssignModelsDialog.vue    | 35 +++++++-
 .../BatchAssignModelsDialog.loading.spec.ts   | 87 +++++++++++++++++++
 3 files changed, 124 insertions(+), 1 deletion(-)

diff --git a/frontend/src/features/models/components/GlobalModelFormDialog.vue b/frontend/src/features/models/components/GlobalModelFormDialog.vue
index d21283888..20ec570e2 100644
--- a/frontend/src/features/models/components/GlobalModelFormDialog.vue
+++ b/frontend/src/features/models/components/GlobalModelFormDialog.vue
@@ -5,6 +5,7 @@
     :description="isEditMode ? '修改模型配置和价格信息' : ''"
     :icon="isEditMode ? SquarePen : Layers"
     :size="isEditMode ? '4xl' : '3xl'"
+    :z-index="zIndex"
     @update:model-value="handleDialogUpdate"
   >
     <div
@@ -869,6 +870,8 @@ import {
 const props = defineProps<{
   open: boolean
   model?: GlobalModelResponse | null
+  // 嵌套在其他弹窗内部时使用更高的层级，避免被父弹窗遮挡
+  zIndex?: number
 }>()
 
 const emit = defineEmits<{
diff --git a/frontend/src/features/providers/components/BatchAssignModelsDialog.vue b/frontend/src/features/providers/components/BatchAssignModelsDialog.vue
index 2c38f7cbf..4b52285d2 100644
--- a/frontend/src/features/providers/components/BatchAssignModelsDialog.vue
+++ b/frontend/src/features/providers/components/BatchAssignModelsDialog.vue
@@ -62,6 +62,16 @@
               </DropdownMenuItem>
             </DropdownMenuContent>
           </DropdownMenu>
+          <Button
+            variant="outline"
+            size="sm"
+            class="shrink-0 gap-1.5"
+            data-testid="batch-assign-create-model"
+            @click="openCreateModelDialog"
+          >
+            <Plus class="w-4 h-4" />
+            创建模型
+          </Button>
         </div>
 
         <!-- 模型列表 -->
@@ -139,6 +149,15 @@
           </div>
         </div>
       </div>
+
+      <!-- 创建统一模型对话框（嵌套，创建成功后刷新下方模型列表）
+           注意：不使用 v-if 挂载，GlobalModelFormDialog 依赖 open 变化来加载模型目录 -->
+      <GlobalModelFormDialog
+        :open="createModelDialogOpen"
+        :z-index="70"
+        @update:open="createModelDialogOpen = $event"
+        @success="handleGlobalModelCreated"
+      />
     </template>
     <template #footer>
       <div class="flex items-center justify-between w-full">
@@ -170,10 +189,11 @@
 
 <script setup lang="ts">
 import { ref, computed, watch } from 'vue'
-import { Layers, Loader2, Search, Check, ListChecks } from 'lucide-vue-next'
+import { Layers, Loader2, Search, Check, ListChecks, Plus } from 'lucide-vue-next'
 import Dialog from '@/components/ui/dialog/Dialog.vue'
 import Button from '@/components/ui/button.vue'
 import Input from '@/components/ui/input.vue'
+import GlobalModelFormDialog from '@/features/models/components/GlobalModelFormDialog.vue'
 import {
   DropdownMenu,
   DropdownMenuTrigger,
@@ -227,6 +247,8 @@ const loadingGlobalModels = ref(false)
 const loadingProviderKeys = ref(false)
 const saving = ref(false)
 const fetchingAutoMatchedModels = ref(false)
+// 创建统一模型对话框是否打开（嵌套在本弹窗内）
+const createModelDialogOpen = ref(false)
 
 // 数据
 const allGlobalModels = ref<GlobalModelResponse[]>([])
@@ -422,6 +444,16 @@ async function applyAutoMatchFromKey(key: AutoMatchKey) {
   }
 }
 
+// 打开"创建统一模型"对话框
+function openCreateModelDialog() {
+  createModelDialogOpen.value = true
+}
+
+// 统一模型创建成功：刷新下方全局模型列表，便于直接勾选新模型
+async function handleGlobalModelCreated() {
+  await loadGlobalModels()
+}
+
 // 处理关闭
 async function handleClose() {
   if (hasChanges.value) {
@@ -517,6 +549,7 @@ watch(
       initialGlobalModelIds.value = new Set()
       providerKeys.value = []
       fetchingAutoMatchedModels.value = false
+      createModelDialogOpen.value = false
     }
   },
   { immediate: true },
diff --git a/frontend/src/features/providers/components/__tests__/BatchAssignModelsDialog.loading.spec.ts b/frontend/src/features/providers/components/__tests__/BatchAssignModelsDialog.loading.spec.ts
index 63d4663bc..1ea0f29de 100644
--- a/frontend/src/features/providers/components/__tests__/BatchAssignModelsDialog.loading.spec.ts
+++ b/frontend/src/features/providers/components/__tests__/BatchAssignModelsDialog.loading.spec.ts
@@ -33,6 +33,32 @@ vi.mock('@/features/providers/composables/useUpstreamModelsCache', () => ({
     fetchModels: vi.fn(),
   }),
 }))
+vi.mock('@/features/models/components/GlobalModelFormDialog.vue', async () => {
+  const { defineComponent, h } = await import('vue')
+  return {
+    default: defineComponent({
+      name: 'GlobalModelFormDialogStub',
+      props: {
+        open: { type: Boolean, default: false },
+        model: { type: Object, default: null },
+        zIndex: { type: Number, default: undefined },
+      },
+      emits: ['update:open', 'success'],
+      setup(props, { emit }) {
+        return () => {
+          if (!props.open) return null
+          return h('div', { 'data-testid': 'global-model-form-dialog-stub' }, [
+            h('button', {
+              type: 'button',
+              'data-testid': 'global-model-form-dialog-stub-success',
+              onClick: () => emit('success'),
+            }, 'submit'),
+          ])
+        }
+      },
+    }),
+  }
+})
 vi.mock('@/components/ui/dialog/Dialog.vue', async () => {
   const { defineComponent, h } = await import('vue')
   return {
@@ -203,3 +229,64 @@ describe('BatchAssignModelsDialog loading', () => {
     expect(visibleModelIds(root)).toEqual(['gm-beta', 'gm-alpha'])
   })
 })
+
+describe('BatchAssignModelsDialog create model entry', () => {
+  async function mountDialog() {
+    const root = document.createElement('div')
+    document.body.appendChild(root)
+    const app = createApp(defineComponent({
+      setup() {
+        return () => h(BatchAssignModelsDialog, {
+          open: true,
+          providerId: 'provider-1',
+        })
+      },
+    }))
+    app.mount(root)
+    mountedApps.push({ app, root })
+    await settle()
+    return root
+  }
+
+  it('opens the unified model dialog from the create button', async () => {
+    const root = await mountDialog()
+    expect(root.querySelector('[data-testid="global-model-form-dialog-stub"]')).toBeNull()
+
+    const createButton = root.querySelector('[data-testid="batch-assign-create-model"]') as HTMLButtonElement
+    expect(createButton).toBeTruthy()
+    createButton.click()
+    await settle()
+
+    expect(root.querySelector('[data-testid="global-model-form-dialog-stub"]')).not.toBeNull()
+  })
+
+  it('refreshes the global model list after a model is created', async () => {
+    globalModelMocks.getGlobalModels
+      .mockResolvedValueOnce({
+        models: [createGlobalModel('gm-old', 'old-model', 'Old Model')],
+        total: 1,
+      })
+      .mockResolvedValueOnce({
+        models: [
+          createGlobalModel('gm-old', 'old-model', 'Old Model'),
+          createGlobalModel('gm-new', 'new-model', 'New Model'),
+        ],
+        total: 2,
+      })
+
+    const root = await mountDialog()
+    expect(visibleModelIds(root)).toEqual(['gm-old'])
+
+    const createButton = root.querySelector('[data-testid="batch-assign-create-model"]') as HTMLButtonElement
+    createButton.click()
+    await settle()
+
+    const successButton = root.querySelector('[data-testid="global-model-form-dialog-stub-success"]') as HTMLButtonElement
+    expect(successButton).toBeTruthy()
+    successButton.click()
+    await settle()
+
+    expect(globalModelMocks.getGlobalModels).toHaveBeenCalledTimes(2)
+    expect(visibleModelIds(root)).toEqual(['gm-new', 'gm-old'])
+  })
+})