From 29330b4e6bfce62de2915a40f8a5e38cfa30d1c9 Mon Sep 17 00:00:00 2001
From: metersphere-bot <78466014+metersphere-bot@users.noreply.github.com>
Date: Wed, 21 Apr 2021 22:29:43 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8E=BB=E6=8E=89=E5=A4=9A=E4=BD=99?=
 =?UTF-8?q?=E7=9A=84=E6=9B=B4=E5=A4=9A=E6=93=8D=E4=BD=9C=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=20(#2169)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: 页面样式

* fix: 去掉多余的更多操作按钮

Co-authored-by: chenjianxing <jianxing.chen@fit2cloud.com>
---
 .../components/api/automation/ApiAutomation.vue       |  1 +
 .../api/automation/scenario/ApiScenarioModule.vue     |  2 ++
 .../components/api/definition/ApiDefinition.vue       |  1 +
 .../api/definition/components/module/ApiModule.vue    |  2 ++
 .../definition/components/module/ApiModuleHeader.vue  |  4 +++-
 .../common/components/search/MsSearchBar.vue          |  3 ++-
 .../components/track/case/components/TestCaseEdit.vue |  8 --------
 .../track/case/components/TestCaseEditOtherInfo.vue   |  9 ++++++++-
 .../comonents/functional/FunctionalTestCaseEdit.vue   | 11 -----------
 9 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/frontend/src/business/components/api/automation/ApiAutomation.vue b/frontend/src/business/components/api/automation/ApiAutomation.vue
index 3b37ef8a6b..96762966d4 100644
--- a/frontend/src/business/components/api/automation/ApiAutomation.vue
+++ b/frontend/src/business/components/api/automation/ApiAutomation.vue
@@ -2,6 +2,7 @@
   <ms-container v-if="renderComponent" v-loading="loading">
     <ms-aside-container>
       <ms-api-scenario-module
+        :show-operator="true"
         @nodeSelectEvent="nodeChange"
         @refreshTable="refresh"
         @saveAsEdit="editScenario"
diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
index c93547beca..f59fb6763a 100644
--- a/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
+++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
@@ -17,6 +17,7 @@
 
       <template v-slot:header>
         <ms-search-bar
+          :show-operator="showOperator"
           :condition="condition"
           :commands="operators"/>
         <module-trash-button v-if="!isReadOnly" :condition="condition" :exe="enableTrash"/>
@@ -60,6 +61,7 @@
           return false
         }
       },
+      showOperator: Boolean,
       relevanceProjectId: String,
       planId: String
     },
diff --git a/frontend/src/business/components/api/definition/ApiDefinition.vue b/frontend/src/business/components/api/definition/ApiDefinition.vue
index 7e9313c116..22f75c44c5 100644
--- a/frontend/src/business/components/api/definition/ApiDefinition.vue
+++ b/frontend/src/business/components/api/definition/ApiDefinition.vue
@@ -3,6 +3,7 @@
     <ms-container v-if="renderComponent">
       <ms-aside-container>
         <ms-api-module
+          :show-operator="true"
           @nodeSelectEvent="nodeChange"
           @protocolChange="handleProtocolChange"
           @refreshTable="refresh"
diff --git a/frontend/src/business/components/api/definition/components/module/ApiModule.vue b/frontend/src/business/components/api/definition/components/module/ApiModule.vue
index 1d2e735ff6..1ad88fd128 100644
--- a/frontend/src/business/components/api/definition/components/module/ApiModule.vue
+++ b/frontend/src/business/components/api/definition/components/module/ApiModule.vue
@@ -17,6 +17,7 @@
 
       <template v-slot:header>
         <api-module-header
+          :show-operator="showOperator"
           :condition="condition"
           :current-module="currentModule"
           :is-read-only="isReadOnly"
@@ -71,6 +72,7 @@
           return false
         }
       },
+      showOperator: Boolean,
       planId: String,
       relevanceProjectId: String,
       reviewId: String
diff --git a/frontend/src/business/components/api/definition/components/module/ApiModuleHeader.vue b/frontend/src/business/components/api/definition/components/module/ApiModuleHeader.vue
index 9a84c82952..920e348db2 100644
--- a/frontend/src/business/components/api/definition/components/module/ApiModuleHeader.vue
+++ b/frontend/src/business/components/api/definition/components/module/ApiModuleHeader.vue
@@ -14,6 +14,7 @@
       </el-col>
       <el-col :span="15">
         <ms-search-bar
+          :show-operator="showOperator"
           :condition="condition"
           :commands="operators"/>
       </el-col>
@@ -39,7 +40,7 @@
   import TemplateComponent from "../../../../track/plan/view/comonents/report/TemplateComponent/TemplateComponent";
   import MsSearchBar from "@/business/components/common/components/search/MsSearchBar";
   export default {
-    name: "ApiModuleHeader",
+      name: "ApiModuleHeader",
     components: {MsSearchBar, TemplateComponent, ModuleTrashButton, ApiImport, MsAddBasisApi},
     data() {
       return {
@@ -92,6 +93,7 @@
           return {}
         }
       },
+      showOperator: Boolean,
       moduleOptions: Array,
       currentModule: {
         type: Object,
diff --git a/frontend/src/business/components/common/components/search/MsSearchBar.vue b/frontend/src/business/components/common/components/search/MsSearchBar.vue
index 43188da64f..14a5fe265d 100644
--- a/frontend/src/business/components/common/components/search/MsSearchBar.vue
+++ b/frontend/src/business/components/common/components/search/MsSearchBar.vue
@@ -1,6 +1,6 @@
 <template>
     <el-input class="ms-search-bar" :placeholder="$t('test_track.module.search')" v-model="condition.filterText" size="small">
-      <template v-slot:append>
+      <template v-if="showOperator" v-slot:append>
         <el-dropdown>
           <el-button type="primary">
             <span class="tip-font">{{ $t('commons.more_operator') }}</span>
@@ -44,6 +44,7 @@ export default {
         return {}
       }
     },
+    showOperator: Boolean,
     commands: {
       type: Array,
       default() {
diff --git a/frontend/src/business/components/track/case/components/TestCaseEdit.vue b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
index f24f692c61..e9ea68f589 100644
--- a/frontend/src/business/components/track/case/components/TestCaseEdit.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
@@ -753,14 +753,6 @@ export default {
   width: 56px;
 }
 
-.el-tabs >>> .el-tabs__content {
-  padding: 20px 0px;
-}
-
-.el-tabs {
-  padding: 30px 60px
-}
-
 .step-info {
   padding: 30px;
 }
diff --git a/frontend/src/business/components/track/case/components/TestCaseEditOtherInfo.vue b/frontend/src/business/components/track/case/components/TestCaseEditOtherInfo.vue
index fffe8bace8..8ccd008fbf 100644
--- a/frontend/src/business/components/track/case/components/TestCaseEditOtherInfo.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseEditOtherInfo.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-tabs v-loading="result.loading" v-model="tabActiveName">
+  <el-tabs class="other-info-tabs" v-loading="result.loading" v-model="tabActiveName">
     <el-tab-pane :label="$t('commons.remark')" name="remark">
       <el-row >
         <ms-rich-text :disabled="readOnly" :content="form.remark" @updateRichText="updateRemark"/>
@@ -300,4 +300,11 @@ export default {
 
 <style scoped>
 
+.other-info-tabs >>> .el-tabs__content {
+  padding: 20px 0px;
+}
+
+.other-info-tabs {
+  padding: 30px 60px;
+}
 </style>
diff --git a/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseEdit.vue b/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseEdit.vue
index 9797b006e6..d8fb26b319 100644
--- a/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseEdit.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseEdit.vue
@@ -492,15 +492,4 @@ p {
   height: 550px;
   overflow: auto;
 }
-
-
-.el-tabs >>> .el-tabs__content {
-  padding: 20px 0px;
-}
-
-.el-tabs {
-  padding: 30px 60px
-}
-
-
 </style>