From 9298b02eb7d2ddeedeb822fe86721b3337d4dcd7 Mon Sep 17 00:00:00 2001
From: KDZhu <carlchu0113@gmail.com>
Date: Thu, 24 Oct 2024 10:57:13 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat(doc-detail):=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=96=87=E6=A1=A3=E8=AF=A6=E6=83=85=E9=A1=B5API=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E5=B1=95=E7=A4=BA=20#=20Reviewed,=20transaction=20id:?=
 =?UTF-8?q?=2021868?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/apiDocs/doc-detail.vue          | 180 ++++++++++++++++--
 .../src/views/apiDocs/types.d.ts              |   2 +-
 2 files changed, 166 insertions(+), 16 deletions(-)

diff --git a/src/dashboard-front/src/views/apiDocs/doc-detail.vue b/src/dashboard-front/src/views/apiDocs/doc-detail.vue
index ee9eb1309..15b3421c1 100644
--- a/src/dashboard-front/src/views/apiDocs/doc-detail.vue
+++ b/src/dashboard-front/src/views/apiDocs/doc-detail.vue
@@ -105,19 +105,33 @@
                   <!--  API 列表  -->
                   <main class="resource-list custom-scroll-bar">
                     <template v-if="filteredApiList.length">
-                      <article
-                        class="resource-item"
-                        v-for="api in filteredApiList"
-                        :key="api.id"
-                        :class="{ active: api.id === curApi?.id }"
-                        @click="handleApiClick(api.id)"
-                      >
-                        <!-- eslint-disable-next-line vue/no-v-html -->
-                        <header class="res-item-name" v-dompurify-html="getHighlightedHtml(api.name)" v-bk-overflow-tips
-                        ></header>
-                        <!-- eslint-disable-next-line vue/no-v-html -->
-                        <main class="res-item-desc" v-dompurify-html="getHighlightedHtml(api.description)"></main>
-                      </article>
+                      <bk-collapse class="api-group-collapse" v-model="activeGroupPanelNames">
+                        <bk-collapse-panel v-for="group of apiGroupList" :key="group.id" :name="group.name">
+                          <template #header>
+                            <div class="api-group-collapse-header">
+                              <angle-up-fill
+                                class="menu-header-icon"
+                                :class="{ fold: !activeGroupPanelNames.includes(group.name) }"
+                              />
+                              <div class="api-group-collapse-title">{{ group.name }}</div>
+                            </div>
+                          </template>
+                          <template #content>
+                            <article
+                              class="resource-item"
+                              v-for="api in group.apiList"
+                              :key="api.id"
+                              :class="{ active: api.id === curApi?.id }"
+                              @click="handleApiClick(api.id)"
+                            >
+                              <header
+                                class="res-item-name" v-dompurify-html="getHighlightedHtml(api.name)" v-bk-overflow-tips
+                              ></header>
+                              <main class="res-item-desc" v-dompurify-html="getHighlightedHtml(api.description)"></main>
+                            </article>
+                          </template>
+                        </bk-collapse-panel>
+                      </bk-collapse>
                     </template>
                     <template v-else-if="keyword">
                       <TableEmpty
@@ -170,6 +184,7 @@ import {
   onBeforeMount,
   provide,
   ref,
+  watch,
 } from 'vue';
 import { useI18n } from 'vue-i18n';
 import {
@@ -208,6 +223,7 @@ import DocDetailMainContent from '@/views/apiDocs/components/doc-detail-main-con
 import DocDetailSideContent from '@/views/apiDocs/components/doc-detail-side-content.vue';
 import SdkInstructionSlider from '@/views/apiDocs/components/sdk-instruction-slider.vue';
 import TableEmpty from '@/components/table-empty.vue';
+import { AngleUpFill } from 'bkui-vue/lib/icon';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -238,6 +254,7 @@ const outerResizeLayoutRef = ref<InstanceType<typeof ResizeLayout> | null>(null)
 const isAsideVisible = ref(true);
 const isLoading = ref(false);
 const keyword = ref('');  // 筛选器输入框的搜索关键字
+const activeGroupPanelNames = ref<string[]>([]);  // API分类 collapse 展开的 panel
 
 const searchPlaceholder = computed(() => {
   return t(
@@ -250,7 +267,32 @@ const searchPlaceholder = computed(() => {
 });
 
 const filteredApiList = computed(() => {
-  return apiList.value.filter(res => res.name.includes(keyword.value) || res.description.includes(keyword.value));
+  const regex = new RegExp(keyword.value, 'i');
+  return apiList.value.filter(api => regex.test(api.name) || regex.test(api.description));
+});
+
+// API 分类列表
+const apiGroupList = computed(() => {
+  return filteredApiList.value.reduce((groupList, api) => {
+    const { id, name } = api.labels[0];
+    const group = groupList.find(item => item.id === id);
+
+    if (group) {
+      group.apiList.push(api);
+    } else {
+      groupList.push({
+        id,
+        name,
+        apiList: [api],
+      });
+    }
+    return groupList;
+  }, [] as { id: number, name: string, apiList: typeof apiList.value }[]);
+});
+
+// 分类列表变化时更新 collapse 展开状态
+watch(apiGroupList, () => {
+  activeGroupPanelNames.value = apiGroupList.value.map(item => item.name);
 });
 
 const allSystemList = computed(() => {
@@ -323,6 +365,13 @@ const fetchApiList = async () => {
       res = await getSystemAPIList(board.value, curTargetName.value) as (IResource & IComponent)[];
     }
     apiList.value = res ?? [];
+    // 为 api 添加默认分类
+    apiList.value.forEach((api) => {
+      if (!api.labels?.length) {
+        api.labels = [{ id: -1, name: t('默认分类') }];
+      }
+    });
+
     if (curComponentApiName.value) {
       curApi.value = apiList.value.find(api => api.name === curComponentApiName.value) ?? null;
     } else {
@@ -395,7 +444,7 @@ const handleStageChange = async () => {
 
 const getHighlightedHtml = (value: string) => {
   if (keyword.value) {
-    return value.replace(new RegExp(`(${keyword.value})`), '<em class="ag-keyword">$1</em>');
+    return value.replace(new RegExp(`(${keyword.value})`, 'i'), '<em class="ag-keyword">$1</em>');
   }
   return value;
 };
@@ -588,6 +637,107 @@ onBeforeMount(() => {
       height: calc(100vh - 282px);
       overflow-y: scroll;
 
+      .api-group-collapse {
+        max-height: 100%;
+        overflow: auto;
+
+        :deep(.bk-collapse-item) {
+          margin-bottom: 12px;
+        }
+
+        :deep(.icon-angle-right) {
+          display: none;
+        }
+
+        &::-webkit-scrollbar {
+          width: 4px;
+          background-color: lighten(#c4c6cc, 80%);
+        }
+
+        &::-webkit-scrollbar-thumb {
+          height: 5px;
+          border-radius: 2px;
+          background-color: #c4c6cc;
+        }
+
+        .custom-icon {
+          margin: -3px 6px 0 0;
+          font-size: 13px;
+          vertical-align: middle;
+          display: inline-block;
+        }
+
+        .api-group-collapse-header {
+          padding: 4px 6px;
+          display: flex;
+          align-items: center;
+          cursor: pointer;
+
+          .api-group-collapse-title {
+            color: #63656e;
+            margin-left: 4px;
+            font-weight: bold;
+          }
+
+          .menu-header-icon {
+            transition: all .2s;
+            color: #979ba5;
+            font-size: 14px;
+
+            &.fold {
+              transform: rotate(-90deg);
+            }
+          }
+        }
+
+        :deep(.bk-collapse-content) {
+          padding: 2px 0;
+        }
+
+        .component-list {
+          list-style: none;
+          margin: 0;
+          padding: 0;
+
+          > li {
+            font-size: 12px;
+            position: relative;
+            padding: 6px 36px 6px 56px;
+            cursor: pointer;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+
+            &:hover,
+            &.active {
+              background: #f0f5ff;
+
+              .name,
+              .label {
+                color: #3a84ff;
+              }
+            }
+          }
+
+          .name {
+            color: #63656e;
+            font-weight: 700;
+          }
+
+          .label {
+            color: #979ba5;
+          }
+
+          .name,
+          .label {
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+            line-height: 20px;
+          }
+        }
+      }
+
       .resource-item {
         padding-left: 24px;
         height: 52px;
diff --git a/src/dashboard-front/src/views/apiDocs/types.d.ts b/src/dashboard-front/src/views/apiDocs/types.d.ts
index 285313b53..5b1de091f 100644
--- a/src/dashboard-front/src/views/apiDocs/types.d.ts
+++ b/src/dashboard-front/src/views/apiDocs/types.d.ts
@@ -48,7 +48,7 @@ interface IResource {
   verified_app_required: boolean;
   resource_perm_required: boolean;
   allow_apply_permission: boolean;
-  labels: string[];
+  labels: { id: number, name: string }[];
 }
 
 interface IStage {

From 649ddbf9cd2aa012e2bc60573223c11847d7a18e Mon Sep 17 00:00:00 2001
From: KDZhu <carlchu0113@gmail.com>
Date: Fri, 25 Oct 2024 17:28:50 +0800
Subject: [PATCH 2/2] Merge branch 'master' into feat-doc-detail-resource

# Conflicts:
#	src/dashboard-front/src/views/apiDocs/doc-detail.vue
# Reviewed, transaction id: 21935