From 1f0e880d11392221e48ae23a59a88923fcb302df Mon Sep 17 00:00:00 2001
From: yaojn <everast@aliyun.com>
Date: Mon, 18 Dec 2023 18:41:22 +0800
Subject: [PATCH] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B9=E6=A8=A1=E5=9E=8B=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=E9=AB=98=E5=BA=A6=E8=8E=B7=E5=8F=96=E4=B8=8D=E5=AF=B9=EF=BC=8C?=
 =?UTF-8?q?=E6=9C=89=E5=8F=8C=E9=87=8D=E6=BB=9A=E5=8A=A8=E6=9D=A1=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/pages/cmdb/components/ci/ci-type-list.vue | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/views/pages/cmdb/components/ci/ci-type-list.vue b/src/views/pages/cmdb/components/ci/ci-type-list.vue
index d7361ea0..8b684d3b 100644
--- a/src/views/pages/cmdb/components/ci/ci-type-list.vue
+++ b/src/views/pages/cmdb/components/ci/ci-type-list.vue
@@ -19,7 +19,7 @@
         <Radio label="ciLevel">{{ $t('term.cmdb.cilevel') }}</Radio>
       </RadioGroup>
     </div>
-    <div style="height:calc(100vh - 205px);overflow-y:auto">
+    <div id="treeheight" style="overflow-y:auto;" :style="{height: catalogHeight}">
       <template v-if="ciName == 'ciCatalog'">
         <NoData v-if="$utils.isEmpty(treeList)"></NoData>
         <TsZtree
@@ -77,7 +77,8 @@ export default {
       keyword: '',
       treeList: [],
       ciName: 'ciCatalog',
-      treeId: ''
+      treeId: '',
+      catalogHeight: '200px'
     };
   },
   beforeCreate() {},
@@ -102,6 +103,11 @@ export default {
         this.$utils.jumpTo('#ci-' + this.ciId);
       });
     }
+    let element = document.getElementById('treeheight');
+    let rect = element?.getBoundingClientRect();
+    if (rect && rect.top) {
+      this.catalogHeight = `calc(100vh - ${rect.top.toFixed(0)}px - 16px)`; // 减去底部的16
+    }
   },
   beforeUpdate() {},
   updated() {},
@@ -117,7 +123,7 @@ export default {
         if (item && item.type === 'ci') {
           return item.id;
         } else if (item.children && item.children.length > 0) {
-          const ciId = findFirstCiId(item.children);
+          const ciId = this.findFirstCiId(item.children);
           if (ciId) {
             return ciId;
           }
-- 
Gitee