From dd4df8f54322f26a19612088adbcaa3da7fb076e Mon Sep 17 00:00:00 2001
From: q15971095971 <764419406@qq.com>
Date: Tue, 29 Oct 2024 16:41:11 +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=E6=96=87=E4=BB=B6=E5=90=8D=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BC=BA=E5=B0=91=E5=A5=97=E9=A4=90=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E4=BF=A1=E6=81=AF=E9=97=AE=E9=A2=98--bug=3D132751041?=
 =?UTF-8?q?=20(#18)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../example/components/config-selector.vue    | 48 ++++++++++++-------
 1 file changed, 32 insertions(+), 16 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 b3143cc94..d565d5678 100644
--- a/ui/src/views/space/client/example/components/config-selector.vue
+++ b/ui/src/views/space/client/example/components/config-selector.vue
@@ -33,9 +33,9 @@
 <script lang="ts" setup>
   import { ref, onMounted, inject, Ref } from 'vue';
   import { useRoute } from 'vue-router';
-  import { getConfigList, getKvList } from '../../../../../api/config';
+  import { getConfigList, getBoundTemplates, getKvList } from '../../../../../api/config';
   import { AngleUpFill } from 'bkui-vue/lib/icon';
-  import { IConfigItem, IConfigKvType } from '../../../../../../types/config';
+  import { IConfigItem, IBoundTemplateGroup, IConfigKvType } from '../../../../../../types/config';
 
   const emits = defineEmits(['select-config']);
 
@@ -62,27 +62,43 @@
         start: 0,
         all: true,
       };
-      let res;
       if (basicInfo?.serviceType.value === 'file') {
         // 文件型配置项
-        res = await getConfigList(bizId.value, Number(appId.value), query);
-      } else {
-        // 键值型配置项
-        res = await getKvList(bizId.value, Number(appId.value), query);
-      }
-      configList.value = res.details.map((item: IConfigItem | IConfigKvType) => {
-        if ('path' in item.spec) {
+        const [configRes, boundTempRes] = await Promise.all([
+          getConfigList(bizId.value, Number(appId.value), query), // 非模板配置
+          getBoundTemplates(bizId.value, Number(appId.value), query), // 套餐
+        ]);
+        // 提取非模板配置的信息
+        const configResult = configRes.details.map((item: IConfigItem) => {
           const { path, name } = item.spec;
           return {
             id: item.id,
             config: path.endsWith('/') ? `${path}${name}` : `${path}/${name}`,
           };
-        }
-        return {
-          id: item.id,
-          config: item.spec.key,
-        };
-      });
+        });
+        // 提取套餐配置信息
+        const boundTempResult = boundTempRes.details.map((group: IBoundTemplateGroup) => {
+          // 遍历套餐
+          return group.template_revisions.map((item) => {
+            const { template_id, path, name } = item;
+            return {
+              id: template_id,
+              config: path.endsWith('/') ? `${path}${name}` : `${path}/${name}`,
+            };
+          });
+        });
+        // 合并配置信息
+        configList.value = [...configResult, ...boundTempResult].flat();
+      } else {
+        // 键值型配置项
+        const res = await getKvList(bizId.value, Number(appId.value), query);
+        configList.value = res.details.map((item: IConfigKvType) => {
+          return {
+            id: item.id,
+            config: item.spec.key,
+          };
+        });
+      }
     } catch (e) {
       console.error(e);
     } finally {