From 7e74af93a01482046b826bf83a37242ece0ed5ce Mon Sep 17 00:00:00 2001
From: MoeSnowyFox <SnowyFox_@outlook.com>
Date: Tue, 23 Sep 2025 23:32:07 +0800
Subject: [PATCH] =?UTF-8?q?refactor(plan):=20=E7=BB=9F=E4=B8=80=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=20MaaPlanConfig=20=E4=BD=9C=E4=B8=BA=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E8=AE=A1=E5=88=92=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/composables/usePlanApi.ts              | 11 ++++++-----
 frontend/src/views/plan/components/PlanHeader.vue   | 11 ++++++-----
 frontend/src/views/plan/components/PlanSelector.vue | 11 ++---------
 frontend/src/views/plan/index.vue                   |  5 ++---
 4 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/frontend/src/composables/usePlanApi.ts b/frontend/src/composables/usePlanApi.ts
index 59aa7e1..f67a406 100644
--- a/frontend/src/composables/usePlanApi.ts
+++ b/frontend/src/composables/usePlanApi.ts
@@ -1,7 +1,7 @@
 import { ref } from 'vue'
 import { message } from 'ant-design-vue'
+import type { PlanCreateIn, PlanDeleteIn, PlanGetIn, PlanReorderIn, PlanUpdateIn } from '../api'
 import { Service } from '../api'
-import type { PlanCreateIn, PlanGetIn, PlanUpdateIn, PlanDeleteIn, PlanReorderIn } from '../api'
 
 export function usePlanApi() {
   const loading = ref(false)
@@ -26,10 +26,12 @@ export function usePlanApi() {
   const createPlan = async (type: string) => {
     loading.value = true
     try {
+      if (type === 'MaaPlanConfig') {
+        type = 'MaaPlan'
+      }
       const params: PlanCreateIn = { type }
-      const response = await Service.addPlanApiPlanAddPost(params)
       // message.success('创建计划成功')
-      return response
+      return await Service.addPlanApiPlanAddPost(params)
     } catch (error) {
       console.error('创建计划失败:', error)
       message.error('创建计划失败')
@@ -44,9 +46,8 @@ export function usePlanApi() {
     loading.value = true
     try {
       const params: PlanUpdateIn = { planId, data }
-      const response = await Service.updatePlanApiPlanUpdatePost(params)
       // message.success('更新计划成功')
-      return response
+      return await Service.updatePlanApiPlanUpdatePost(params)
     } catch (error) {
       console.error('更新计划失败:', error)
       message.error('更新计划失败')
diff --git a/frontend/src/views/plan/components/PlanHeader.vue b/frontend/src/views/plan/components/PlanHeader.vue
index dbce777..f45a4e5 100644
--- a/frontend/src/views/plan/components/PlanHeader.vue
+++ b/frontend/src/views/plan/components/PlanHeader.vue
@@ -9,7 +9,7 @@
         <a-dropdown>
           <template #overlay>
             <a-menu @click="handleMenuClick">
-              <a-menu-item key="MaaPlan">
+              <a-menu-item key="MaaPlanConfig">
                 <PlusOutlined />
                 新建 MAA 计划
               </a-menu-item>
@@ -54,7 +54,7 @@
 
 <script setup lang="ts">
 import { DeleteOutlined, DownOutlined, PlusOutlined } from '@ant-design/icons-vue'
-import { ref, computed } from 'vue'
+import { computed, ref } from 'vue'
 
 interface Plan {
   id: string
@@ -69,6 +69,7 @@ interface Props {
 
 interface Emits {
   (e: 'add-plan', planType: string): void
+
   (e: 'remove-plan', planId: string): void
 }
 
@@ -76,12 +77,12 @@ defineProps<Props>()
 const emit = defineEmits<Emits>()
 
 // 默认计划类型
-const selectedPlanType = ref('MaaPlan')
+const selectedPlanType = ref('MaaPlanConfig')
 
 // 根据选择的计划类型获取按钮文本
 const getPlanButtonText = computed(() => {
   switch (selectedPlanType.value) {
-    case 'MaaPlan':
+    case 'MaaPlanConfig':
       return '新建 MAA 计划'
     case 'GeneralPlan':
       return '新建通用计划'
@@ -153,4 +154,4 @@ const handleAddPlan = () => {
     justify-content: center;
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/frontend/src/views/plan/components/PlanSelector.vue b/frontend/src/views/plan/components/PlanSelector.vue
index b610633..744046e 100644
--- a/frontend/src/views/plan/components/PlanSelector.vue
+++ b/frontend/src/views/plan/components/PlanSelector.vue
@@ -83,18 +83,11 @@ const shouldShowPlanTypeTag = (plan: Plan) => {
   const allSameType = props.planList.every(p => p.type === firstType)
 
   // 如果所有计划类型相同，则不显示任何标签
-  if (allSameType) {
-    return false
-  }
-
-  // 如果存在不同类型的计划，则只显示非默认类型（MaaPlanConfig）的标签
-  const normalizedPlanType = plan.type === 'MaaPlan' ? 'MaaPlanConfig' : plan.type
-  return normalizedPlanType !== 'MaaPlanConfig'
+  return !allSameType
 }
 
 const getPlanTypeLabel = (planType: string) => {
-  // 统一使用 MaaPlanConfig 作为默认类型
-  const normalizedPlanType = planType === 'MaaPlan' ? 'MaaPlanConfig' : planType
+  const normalizedPlanType = planType
   const labelMap: Record<string, string> = {
     MaaPlanConfig: 'MAA',
     GeneralPlan: '通用',
diff --git a/frontend/src/views/plan/index.vue b/frontend/src/views/plan/index.vue
index ac8fdd9..e7bccaa 100644
--- a/frontend/src/views/plan/index.vue
+++ b/frontend/src/views/plan/index.vue
@@ -107,8 +107,7 @@ const tableData = ref<Record<string, any>>({})
 const currentTableComponent = computed(() => {
   const currentPlan = planList.value.find(plan => plan.id === activePlanId.value)
   // 统一使用 MaaPlanConfig 作为默认类型
-  const planType =
-    currentPlan?.type === 'MaaPlan' ? 'MaaPlanConfig' : currentPlan?.type || 'MaaPlanConfig'
+  const planType = currentPlan?.type
   switch (planType) {
     case 'MaaPlanConfig':
       return MaaPlanTable
@@ -292,7 +291,7 @@ const initPlans = async () => {
       planList.value = response.index.map((item: any) => {
         const planId = item.uid
         const planData = response.data[planId]
-        const planType = item.type === 'MaaPlan' ? 'MaaPlanConfig' : item.type || 'MaaPlanConfig'
+        const planType = item.type
         const planName = planData?.Info?.Name || getDefaultPlanName(planType)
         return { id: planId, name: planName, type: planType }
       })