From d35b0cca4ca99017cf0042c3d4ed4b6a6f7d09c6 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Wed, 17 Nov 2021 20:23:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BE=A7=E8=BE=B9=E6=A0=8F=E7=BA=B5?=
 =?UTF-8?q?=E8=BD=B4=E6=BB=9A=E5=8A=A8=E6=9D=A1=E6=B2=A1=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/components/MsAsideContainer.vue         | 14 ++++++++++++--
 .../detail/component/ApiCaseFailureResult.vue      |  3 ---
 .../detail/component/ApiScenarioFailureResult.vue  |  4 ----
 .../report/detail/component/LoadAllResult.vue      |  3 ---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/frontend/src/business/components/common/components/MsAsideContainer.vue b/frontend/src/business/components/common/components/MsAsideContainer.vue
index 6ea94a2898..2ae24cb1b9 100644
--- a/frontend/src/business/components/common/components/MsAsideContainer.vue
+++ b/frontend/src/business/components/common/components/MsAsideContainer.vue
@@ -4,13 +4,15 @@
             :style="{
               'margin-left': !asideHidden ? 0 : '-' + width,
               'min-width': minWidth + 'px',
-              'height': height ? (height + 'px') : (enableAutoHeight ? null : 'calc(100vh - 80px)'),
+              'height': calHeight,
              }">
     <div v-if="enableAsideHidden" class="hiddenBottom" :style="{'top': hiddenBottomTop ? hiddenBottomTop : 0}" @click="asideHidden = !asideHidden">
       <i v-if="!asideHidden" class="el-icon-arrow-left"/>
       <i v-if="asideHidden" class="el-icon-arrow-right"/>
     </div>
-    <slot></slot>
+    <div style="overflow: scroll" :style="{'height': containerCalHeight }">
+      <slot></slot>
+    </div>
     <ms-horizontal-drag-bar/>
   </el-aside>
 </template>
@@ -52,6 +54,14 @@
           this.$emit('setAsideHidden', this.asideHidden) ;
         }
       },
+      computed: {
+        calHeight() {
+          return this.height ? (this.height + 'px') : (this.enableAutoHeight ? null : 'calc(100vh - 80px)')
+        },
+        containerCalHeight() {
+          return this.height ? (this.height - 30 + 'px') : (this.enableAutoHeight ? null : 'calc(100vh - 100px)')
+        },
+      },
       created() {
         this.id = getUUID();
       },
diff --git a/frontend/src/business/components/track/plan/view/comonents/report/detail/component/ApiCaseFailureResult.vue b/frontend/src/business/components/track/plan/view/comonents/report/detail/component/ApiCaseFailureResult.vue
index 228f4c1422..5700f416b0 100644
--- a/frontend/src/business/components/track/plan/view/comonents/report/detail/component/ApiCaseFailureResult.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/report/detail/component/ApiCaseFailureResult.vue
@@ -180,9 +180,6 @@ export default {
   height: 550px !important;
 }
 
-/deep/ .drag-bar {
-  width: 0px;
-}
 .ms-aside-container {
   border: 0px;
   padding: 10px 0px 0px 10px;
diff --git a/frontend/src/business/components/track/plan/view/comonents/report/detail/component/ApiScenarioFailureResult.vue b/frontend/src/business/components/track/plan/view/comonents/report/detail/component/ApiScenarioFailureResult.vue
index 65c987243a..84e5c8c3d5 100644
--- a/frontend/src/business/components/track/plan/view/comonents/report/detail/component/ApiScenarioFailureResult.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/report/detail/component/ApiScenarioFailureResult.vue
@@ -170,10 +170,6 @@ export default {
   height: 620px !important;
 }
 
-/deep/ .drag-bar {
-  width: 0px;
-}
-
 .ms-aside-container {
   border: 0px;
   padding: 10px 0px 0px 10px;
diff --git a/frontend/src/business/components/track/plan/view/comonents/report/detail/component/LoadAllResult.vue b/frontend/src/business/components/track/plan/view/comonents/report/detail/component/LoadAllResult.vue
index 3772ea137c..a04b2f0c39 100644
--- a/frontend/src/business/components/track/plan/view/comonents/report/detail/component/LoadAllResult.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/report/detail/component/LoadAllResult.vue
@@ -95,9 +95,6 @@ export default {
   height: 600px !important;
 }
 
-/deep/ .drag-bar {
-  width: 0px;
-}
 .ms-aside-container {
   border: 0px;
   padding: 10px 0px 0px 10px;