From 3810c015592719ed30f9b003296a8106c65f05be Mon Sep 17 00:00:00 2001
From: RubyLiu <liulubingjava@163.com>
Date: Wed, 15 Nov 2023 18:42:10 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA);=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA=E9=87=8C?=
 =?UTF-8?q?=E7=9A=84=E5=BC=B9=E7=AA=97=E5=B7=A6=E4=BE=A7=E6=A0=91=E5=AE=BD?=
 =?UTF-8?q?=E5=BA=A6=E6=8B=96=E6=8B=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../automation/scenario/EditApiScenario.vue    |  2 +-
 .../automation/scenario/api/ApiRelevance.vue   |  1 +
 .../scenario/api/ScenarioRelevance.vue         |  1 +
 .../common/function/ApiFuncRelevance.vue       |  1 +
 .../src/business/commons/RelevanceDialog.vue   | 18 ++++++++----------
 .../business/commons/TestCaseRelevanceBase.vue |  5 ++++-
 .../components/EditCompleteContainer.vue       |  4 ++--
 .../complete/ApiRelationshipRelevance.vue      |  1 +
 .../src/components/MsAsideContainer.vue        |  6 +++++-
 .../view/comonents/base/RelevanceDialog.vue    | 18 +++++++++---------
 .../comonents/base/TestCaseRelevanceBase.vue   |  7 +++++++
 .../comonents/base/TestPlanCommonComponent.vue | 13 +++++--------
 12 files changed, 45 insertions(+), 32 deletions(-)

diff --git a/api-test/frontend/src/business/automation/scenario/EditApiScenario.vue b/api-test/frontend/src/business/automation/scenario/EditApiScenario.vue
index 2fa8ab752e..7604cce8d1 100644
--- a/api-test/frontend/src/business/automation/scenario/EditApiScenario.vue
+++ b/api-test/frontend/src/business/automation/scenario/EditApiScenario.vue
@@ -1,6 +1,6 @@
 <template>
   <ms-container>
-    <ms-aside-container :height="'calc(100vh - 20px)'">
+    <ms-aside-container pageKey="EDIT_API_SCENARIO" :height="'calc(100vh - 20px)'">
       <div @click="showAll" style="overflow-x: hidden">
         <div class="tip">{{ $t('test_track.plan_view.base_info') }}</div>
         <el-form
diff --git a/api-test/frontend/src/business/automation/scenario/api/ApiRelevance.vue b/api-test/frontend/src/business/automation/scenario/api/ApiRelevance.vue
index 90b4e2d306..ad0132790e 100644
--- a/api-test/frontend/src/business/automation/scenario/api/ApiRelevance.vue
+++ b/api-test/frontend/src/business/automation/scenario/api/ApiRelevance.vue
@@ -1,5 +1,6 @@
 <template>
   <test-case-relevance-base
+    pageKey="API_RELEVANCE_DIALOG"
     :is-across-space="isAcrossSpace"
     @setProject="setProject"
     :dialog-title="$t('api_test.definition.api_import')"
diff --git a/api-test/frontend/src/business/automation/scenario/api/ScenarioRelevance.vue b/api-test/frontend/src/business/automation/scenario/api/ScenarioRelevance.vue
index 7528619946..acd9a68cd1 100644
--- a/api-test/frontend/src/business/automation/scenario/api/ScenarioRelevance.vue
+++ b/api-test/frontend/src/business/automation/scenario/api/ScenarioRelevance.vue
@@ -1,5 +1,6 @@
 <template>
   <test-case-relevance-base
+    pageKey="SCENARIO_RELEVANCE_DIALOG"
     :is-across-space="isAcrossSpace"
     :dialog-title="$t('api_test.automation.scenario_import')"
     @setProject="setProject"
diff --git a/api-test/frontend/src/business/automation/scenario/common/function/ApiFuncRelevance.vue b/api-test/frontend/src/business/automation/scenario/common/function/ApiFuncRelevance.vue
index 3f421d6979..644fe8fa46 100644
--- a/api-test/frontend/src/business/automation/scenario/common/function/ApiFuncRelevance.vue
+++ b/api-test/frontend/src/business/automation/scenario/common/function/ApiFuncRelevance.vue
@@ -1,5 +1,6 @@
 <template>
   <test-case-relevance-base
+      pageKey="API_FUNC_RELEVANCE_DIALOG"
       @setProject="setProject"
       @save="save"
       :plan-id="planId"
diff --git a/api-test/frontend/src/business/commons/RelevanceDialog.vue b/api-test/frontend/src/business/commons/RelevanceDialog.vue
index aa51920d58..f5937e447c 100644
--- a/api-test/frontend/src/business/commons/RelevanceDialog.vue
+++ b/api-test/frontend/src/business/commons/RelevanceDialog.vue
@@ -19,16 +19,9 @@
     </el-header>
 
     <el-container class="main-content">
-      <el-aside class="ms-aside-container"
-                :style="{
-        'min-width': '300px',
-        'max-width': '600px',
-        'height': calHeight,
-        'max-height': calHeight,
-        }">
+      <ms-aside-container :min-height="calHeight" :enableAsideHidden="false" :height="calHeight" min-width="300px" max-width="600px" :pageKey="pageKey">
         <slot name="aside"></slot>
-        <ms-horizontal-drag-bar v-if="draggable"/>
-      </el-aside>
+      </ms-aside-container>
 
 
       <el-container>
@@ -48,13 +41,15 @@
 import MsHorizontalDragBar from "metersphere-frontend/src/components/dragbar/MsLeft2RightDragBar"
 import MsDialogFooter from 'metersphere-frontend/src/components/MsDialogFooter';
 import SelectMenu from '@/business/commons/SelectMenu';
+import MsAsideContainer from 'metersphere-frontend/src/components/MsAsideContainer';
 
 export default {
   name: 'RelevanceDialog',
   components: {
     SelectMenu,
     MsDialogFooter,
-    MsHorizontalDragBar
+    MsHorizontalDragBar,
+    MsAsideContainer
   },
   data() {
     return {
@@ -75,6 +70,9 @@ export default {
     draggable: {
       type: Boolean,
       default: true
+    },
+    pageKey: {
+      type: String
     }
   },
   computed: {
diff --git a/api-test/frontend/src/business/commons/TestCaseRelevanceBase.vue b/api-test/frontend/src/business/commons/TestCaseRelevanceBase.vue
index e3556f1528..b9a31107cc 100644
--- a/api-test/frontend/src/business/commons/TestCaseRelevanceBase.vue
+++ b/api-test/frontend/src/business/commons/TestCaseRelevanceBase.vue
@@ -1,5 +1,5 @@
 <template>
-  <relevance-dialog :width="width" :title="dialogTitle" ref="relevanceDialog" :full-screen="isFullScreen">
+  <relevance-dialog :width="width" :page-key="pageKey" :title="dialogTitle" ref="relevanceDialog" :full-screen="isFullScreen">
     <!-- todo -->
     <template slot="headerBtn" v-if="$slots.headerBtn">
       <div>
@@ -119,6 +119,9 @@ export default {
       type: Boolean,
       default: true,
     },
+    pageKey: {
+      type: String,
+    },
   },
   methods: {
     refreshNode() {
diff --git a/api-test/frontend/src/business/definition/components/EditCompleteContainer.vue b/api-test/frontend/src/business/definition/components/EditCompleteContainer.vue
index 70f7a45f81..3d3fdc3556 100644
--- a/api-test/frontend/src/business/definition/components/EditCompleteContainer.vue
+++ b/api-test/frontend/src/business/definition/components/EditCompleteContainer.vue
@@ -1,6 +1,6 @@
 <template>
   <ms-container v-if="isShow && !loading">
-    <ms-aside-container >
+    <ms-aside-container pageKey="API_EDIT_BASE_INFO" >
       <api-base-info
         ref="apiBaseInfo"
         :api-template="apiTemplate"
@@ -158,7 +158,7 @@ export default {
     MsApiCaseList,
     ApiBaseInfo,
     MsMainContainer: () => import('metersphere-frontend/src/components/MsMainContainer'),
-    MsAsideContainer: () => import('./CustomAsideContainer.vue'),
+    MsAsideContainer: () => import('metersphere-frontend/src/components/MsAsideContainer'),
     MsContainer: () => import('metersphere-frontend/src/components/MsContainer'),
   },
   data() {
diff --git a/api-test/frontend/src/business/definition/components/complete/ApiRelationshipRelevance.vue b/api-test/frontend/src/business/definition/components/complete/ApiRelationshipRelevance.vue
index 2268212fa1..45f3b09d83 100644
--- a/api-test/frontend/src/business/definition/components/complete/ApiRelationshipRelevance.vue
+++ b/api-test/frontend/src/business/definition/components/complete/ApiRelationshipRelevance.vue
@@ -1,5 +1,6 @@
 <template>
   <test-case-relevance-base
+    pageKey="API_CASE_RELEVANCE_DIALOG"
     @setProject="setProject"
     @save="saveCaseRelevance"
     :multiple-project="false"
diff --git a/framework/sdk-parent/frontend/src/components/MsAsideContainer.vue b/framework/sdk-parent/frontend/src/components/MsAsideContainer.vue
index 252b9d0264..3572ed5fb4 100644
--- a/framework/sdk-parent/frontend/src/components/MsAsideContainer.vue
+++ b/framework/sdk-parent/frontend/src/components/MsAsideContainer.vue
@@ -3,7 +3,7 @@
     :width="asideHidden ? '0' : defaultWidth"
     class="ms-aside-container"
     :id="id"
-    :style="{ 'min-width': minWidth, 'max-width': maxWidth }"
+    :style="{ 'min-width': minWidth, 'max-width': maxWidth, 'min-height': minHeight }"
   >
     <div
       v-if="enableAsideHidden"
@@ -53,6 +53,10 @@ export default {
       type: String,
       default: null,
     },
+    minHeight: {
+      type: String,
+      default: null,
+    },
     enableAutoHeight: {
       type: Boolean,
       default: false,
diff --git a/test-track/frontend/src/business/plan/view/comonents/base/RelevanceDialog.vue b/test-track/frontend/src/business/plan/view/comonents/base/RelevanceDialog.vue
index 683d5cd8a8..e62883ea63 100644
--- a/test-track/frontend/src/business/plan/view/comonents/base/RelevanceDialog.vue
+++ b/test-track/frontend/src/business/plan/view/comonents/base/RelevanceDialog.vue
@@ -17,16 +17,10 @@
     </el-header>
 
     <el-container v-if="dialogVisible" class="main-content">
-      <el-aside class="ms-aside-container"
-        :style="{
-        'min-width': '300px',
-        'max-width': '600px',
-        'height': calHeight,
-        'max-height': calHeight,
-        }">
+      
+      <ms-aside-container :min-height="calHeight" :enableAsideHidden="false" :height="calHeight" min-width="300px" max-width="600px" :pageKey="pageKey">
         <slot name="aside"></slot>
-        <ms-horizontal-drag-bar v-if="draggable"/>
-      </el-aside>
+      </ms-aside-container>
 
       <el-container>
         <el-main class="case-content">
@@ -47,6 +41,7 @@
 import MsHorizontalDragBar from "metersphere-frontend/src/components/dragbar/MsLeft2RightDragBar"
 import MsDialogFooter from 'metersphere-frontend/src/components/MsDialogFooter'
 import SelectMenu from "@/business/common/SelectMenu";
+import MsAsideContainer from 'metersphere-frontend/src/components/MsAsideContainer';
 
 export default {
   name: "RelevanceDialog",
@@ -54,6 +49,7 @@ export default {
     MsHorizontalDragBar,
     SelectMenu,
     MsDialogFooter,
+    MsAsideContainer,
   },
   data() {
     return {
@@ -74,6 +70,10 @@ export default {
     draggable: {
       type: Boolean,
       default: true
+    },
+    pageKey: {
+      type: String,
+      default: null
     }
   },
   computed: {
diff --git a/test-track/frontend/src/business/plan/view/comonents/base/TestCaseRelevanceBase.vue b/test-track/frontend/src/business/plan/view/comonents/base/TestCaseRelevanceBase.vue
index 2ce8d511ee..9d0b6bba05 100644
--- a/test-track/frontend/src/business/plan/view/comonents/base/TestCaseRelevanceBase.vue
+++ b/test-track/frontend/src/business/plan/view/comonents/base/TestCaseRelevanceBase.vue
@@ -5,6 +5,7 @@
     ref="relevanceDialog"
     @close="handleCloseEven"
     :full-screen="isFullScreen"
+    :pageKey="pageKey"
   >
     <!-- todo -->
     <template slot="headerBtn" v-if="$slots.headerBtn">
@@ -143,6 +144,12 @@ export default {
         return true;
       },
     },
+    pageKey: {
+      type: String,
+      default() {
+        return "TEST_TRACK_TEST_CASE_RELEVANCE_BASE";
+      },
+    },
   },
   methods: {
     refreshNode() {
diff --git a/test-track/frontend/src/business/plan/view/comonents/base/TestPlanCommonComponent.vue b/test-track/frontend/src/business/plan/view/comonents/base/TestPlanCommonComponent.vue
index b542d6bdd6..458aa4756e 100644
--- a/test-track/frontend/src/business/plan/view/comonents/base/TestPlanCommonComponent.vue
+++ b/test-track/frontend/src/business/plan/view/comonents/base/TestPlanCommonComponent.vue
@@ -1,7 +1,6 @@
 <template>
   <ms-container>
-
-    <ms-aside-container v-if="showAside">
+    <ms-aside-container v-if="showAside" pageKey="TEST_PLAN_COMMON_COMP">
       <slot name="aside"></slot>
     </ms-aside-container>
 
@@ -10,7 +9,6 @@
     </ms-main-container>
 
     <slot></slot>
-
   </ms-container>
 </template>
 
@@ -21,18 +19,17 @@ import MsContainer from "metersphere-frontend/src/components/MsContainer";
 
 export default {
   name: "MsTestPlanCommonComponent",
-  components: {MsContainer, MsAsideContainer, MsMainContainer},
+  components: { MsContainer, MsAsideContainer, MsMainContainer },
   props: {
     showAside: {
       type: Boolean,
-      default: true
-    }
-  }
+      default: true,
+    },
+  },
 };
 </script>
 
 <style scoped>
-
 .ms-main-container {
   height: calc(100vh - 132px) !important;
 }