From 662e0a9bdff1fdc05fe72c02c74d233ed9b77160 Mon Sep 17 00:00:00 2001
From: q15971095971 <764419406@qq.com>
Date: Wed, 30 Oct 2024 11:55:54 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=85=8D=E7=BD=AE=E7=A4=BA=E4=BE=8B?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B9=EF=BC=88=E6=96=87=E4=BB=B6=E5=90=8D?=
 =?UTF-8?q?=EF=BC=89=E5=90=88=E5=B9=B6=E5=90=8E=E7=9A=84=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=E6=90=9C=E7=B4=A2=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98--bug=3D132751041=20(#19)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../example/components/config-selector.vue    | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/ui/src/views/space/client/example/components/config-selector.vue b/ui/src/views/space/client/example/components/config-selector.vue
index d565d5678..5ac7c5117 100644
--- a/ui/src/views/space/client/example/components/config-selector.vue
+++ b/ui/src/views/space/client/example/components/config-selector.vue
@@ -16,13 +16,18 @@
     <template #trigger>
       <div class="selector-trigger">
         <bk-overflow-title v-if="configName" class="config-name" type="tips">
-          {{ configName }}
+          {{ originalConfigName }}
         </bk-overflow-title>
         <span v-else class="empty">{{ $t('请选择') }}</span>
         <AngleUpFill class="arrow-icon arrow-fill" />
       </div>
     </template>
-    <bk-option v-for="item in configList" :key="item.id" :value="item.config" :label="item.config">
+    <!-- 非模板配置和套餐合并后的数据（configList），配置项名称（文件名）可能一样，这里添加/index做唯一区分，后续使用删除/index -->
+    <bk-option
+      v-for="(item, index) in configList"
+      :key="item.id + index"
+      :value="`${item.config}/${index}`"
+      :label="item.config">
       <div class="config-option-item">
         <div class="name-text">{{ item.config }}</div>
       </div>
@@ -31,7 +36,7 @@
 </template>
 
 <script lang="ts" setup>
-  import { ref, onMounted, inject, Ref } from 'vue';
+  import { ref, onMounted, inject, Ref, computed } from 'vue';
   import { useRoute } from 'vue-router';
   import { getConfigList, getBoundTemplates, getKvList } from '../../../../../api/config';
   import { AngleUpFill } from 'bkui-vue/lib/icon';
@@ -50,6 +55,9 @@
   const appId = ref(route.params.appId);
   const configList = ref<{ id: number; config: string }[]>([]);
 
+  // 选中的配置项（文件名）原始名称
+  const originalConfigName = computed(() => configName.value.replace(/\/[^\\/]*$/, ''));
+
   onMounted(async () => {
     await loadConfigList();
   });
@@ -107,9 +115,8 @@
   };
 
   // 下拉列表操作
-  const handleConfigChange = async (name: string) => {
-    configName.value = name;
-    emits('select-config', name);
+  const handleConfigChange = async () => {
+    emits('select-config', originalConfigName);
     validateConfig();
   };