From 8bf8c456a1f62c366766a0c23d9cf83dc493e935 Mon Sep 17 00:00:00 2001
From: song-cc-rock <changchang.song@fit2cloud.com>
Date: Thu, 23 Feb 2023 16:23:43 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?=
 =?UTF-8?q?=E7=94=A8=E4=BE=8B=E8=87=AA=E5=AE=9A=E4=B9=89ID=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../frontend/src/components/head/DrawerHeader.vue     |  5 +++--
 .../frontend/src/components/new-ui/MsTable.vue        | 11 ++++++++++-
 .../src/business/case/components/TestCaseFile.vue     |  3 ---
 .../business/case/components/case/CaseBaseInfo.vue    | 10 +++++-----
 4 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/framework/sdk-parent/frontend/src/components/head/DrawerHeader.vue b/framework/sdk-parent/frontend/src/components/head/DrawerHeader.vue
index 0dd1c76358..a7d9c9fd53 100644
--- a/framework/sdk-parent/frontend/src/components/head/DrawerHeader.vue
+++ b/framework/sdk-parent/frontend/src/components/head/DrawerHeader.vue
@@ -13,7 +13,7 @@
       </el-col>
       <el-col :span="4">
         <div class="ms-export">
-          <el-dropdown style="padding-left: 30px">
+          <el-dropdown style="padding-left: 3rem">
             <span class="el-dropdown-link">
               <i class="el-icon-download"/>
               {{ $t('commons.export') }}
@@ -24,7 +24,7 @@
             </el-dropdown-menu>
           </el-dropdown>
           <i class="delimiter">|</i>
-          <el-button size="mini" icon="el-icon-close" @click="close" class="close-btn" style="margin: 0 24px 0 20px"></el-button>
+          <el-button size="mini" icon="el-icon-close" @click="close" class="close-btn" style="float: right; margin: 0.3rem 1.2rem 0 0"></el-button>
         </div>
       </el-col>
     </el-row>
@@ -140,6 +140,7 @@ i.delimiter {
 
 .ms-export {
   float: right;
+  width: 100%;
 }
 
 :deep(.el-icon-close:before) {
diff --git a/framework/sdk-parent/frontend/src/components/new-ui/MsTable.vue b/framework/sdk-parent/frontend/src/components/new-ui/MsTable.vue
index de6796ebea..c7ca800f3b 100644
--- a/framework/sdk-parent/frontend/src/components/new-ui/MsTable.vue
+++ b/framework/sdk-parent/frontend/src/components/new-ui/MsTable.vue
@@ -609,6 +609,11 @@ export default {
   cursor: pointer!important;
 }
 
+/* focus行背景色 */
+.ms-table :deep(.el-table__body) tr.current-row > td {
+  background-color: #FFFFFF!important;
+}
+
 /* 选中某行时的背景色*/
 .ms-table :deep(.el-table__body tr.hignlight-row > td) {
   background-color: rgba(120, 56, 135, 0.1)!important;
@@ -620,7 +625,7 @@ export default {
 }
 
 .disable-hover :deep(tr:hover>td) {
-  background-color: #ffffff !important;
+  background-color: #FFFFFF!important;
 }
 
 .row-click {
@@ -666,6 +671,7 @@ export default {
   display: inline-block;
   width: 50px;
   border-top: 1px solid rgba(31, 35, 41, 0.15);
+  border-bottom: 1px solid rgba(31, 35, 41, 0.15);
 }
 
 :deep(.ms-select-all-fixed th.el-table-column--selection.is-leaf.ms-table-header-cell.el-table__cell .el-checkbox) {
@@ -681,6 +687,9 @@ export default {
   width: 35px;
 }
 
+:deep(.el-table th.is-leaf) {
+  border-bottom: 1px solid rgba(31, 35, 41, 0.15);
+}
 
 :deep(.ms-select-all-fixed th:nth-child(2) .table-select-icon) {
   position: absolute;
diff --git a/test-track/frontend/src/business/case/components/TestCaseFile.vue b/test-track/frontend/src/business/case/components/TestCaseFile.vue
index 2ed2469c16..c1f250d3ee 100644
--- a/test-track/frontend/src/business/case/components/TestCaseFile.vue
+++ b/test-track/frontend/src/business/case/components/TestCaseFile.vue
@@ -35,9 +35,6 @@ export default {
       this.dialogVisible = true;
       this.url = generateModuleUrl('/attachment/preview/' + this.file.id + '/' + this.file.isLocal);
     },
-    setModulePrefix(url) {
-      return generateModuleUrl(url);
-    },
     close() {
       this.file = {
         id: '',
diff --git a/test-track/frontend/src/business/case/components/case/CaseBaseInfo.vue b/test-track/frontend/src/business/case/components/case/CaseBaseInfo.vue
index 6f48676020..807032ae13 100644
--- a/test-track/frontend/src/business/case/components/case/CaseBaseInfo.vue
+++ b/test-track/frontend/src/business/case/components/case/CaseBaseInfo.vue
@@ -159,7 +159,7 @@
           </base-edit-item-component>
         </div>
       </div>
-      <div class="id-row case-wrap">
+      <div class="id-row case-wrap" v-if="!editable || isCustomNum">
         <div class="case-title-wrap">
           <div class="name title-wrap">ID</div>
           <div class="required required-item"></div>
@@ -167,14 +167,14 @@
         <div class="side-content">
           <base-edit-item-component
             :editable="editable"
-            :auto-save="editable"
+            :auto-save="isCustomNum"
             trigger="hover"
             :contentObject="{
-              content: form.customNum,
+              content: isCustomNum ? form.customNum : form.num,
               contentType: 'INPUT',
             }"
-            :readonlyHoverEvent="editable"
-            :content-click-event="editable"
+            :readonlyHoverEvent="isCustomNum"
+            :content-click-event="isCustomNum"
             :model="form"
             :rules="rules"
           >