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

---
 .../src/components/head/DrawerHeader.vue      |  7 +-----
 .../components/new-ui/MsCaseDescTextItem.vue  |  2 +-
 .../src/components/new-ui/MsTable.vue         |  2 +-
 .../new-ui/MsTableBatchOperatorGroup.vue      | 15 +++++++++---
 .../new-ui/MsTableHeaderSelectPopover.vue     |  2 +-
 .../frontend/src/i18n/lang/track/en-US.js     |  4 ++--
 .../frontend/src/business/TestTrack.vue       |  7 ++++++
 .../business/case/components/RelateDemand.vue |  4 ++--
 .../case/components/TestCasePreview.vue       | 23 ++++++++++++++++---
 .../export/TestCaseExportToExcel.vue          |  4 ++++
 .../import/TestCaseCommonImportNew.vue        |  4 ++++
 .../components/pagination/HomePagination.vue  |  1 -
 12 files changed, 55 insertions(+), 20 deletions(-)

diff --git a/framework/sdk-parent/frontend/src/components/head/DrawerHeader.vue b/framework/sdk-parent/frontend/src/components/head/DrawerHeader.vue
index a7d9c9fd53..816abc5bca 100644
--- a/framework/sdk-parent/frontend/src/components/head/DrawerHeader.vue
+++ b/framework/sdk-parent/frontend/src/components/head/DrawerHeader.vue
@@ -91,7 +91,7 @@ button.el-button.el-button--default.el-button--mini {
 }
 
 :deep(.el-icon-close:before) {
-  font-size: 19px;
+  font-size: 20px;
 }
 
 span.el-dropdown-link.el-dropdown-selfdefine {
@@ -143,11 +143,6 @@ i.delimiter {
   width: 100%;
 }
 
-:deep(.el-icon-close:before) {
-  position: relative;
-  top: 2px;
-}
-
 .close-btn {
   background-color: transparent!important;
 }
diff --git a/framework/sdk-parent/frontend/src/components/new-ui/MsCaseDescTextItem.vue b/framework/sdk-parent/frontend/src/components/new-ui/MsCaseDescTextItem.vue
index aaa31f6998..5bd758c403 100644
--- a/framework/sdk-parent/frontend/src/components/new-ui/MsCaseDescTextItem.vue
+++ b/framework/sdk-parent/frontend/src/components/new-ui/MsCaseDescTextItem.vue
@@ -6,7 +6,7 @@
   <el-table v-else
     :data="data.steps" header-cell-class-name="case-desc-table-header-cell"
     style="width: 100%" class="case-desc-table">
-    <el-table-column type="index" :label="$t('test_track.home.serial_number')" />
+    <el-table-column type="index" width="60px" :label="$t('test_track.home.serial_number')" />
     <el-table-column prop="desc" :label="$t('test_track.case.step_desc')"/>
     <el-table-column prop="result" :label="$t('test_track.case.expected_results')"/>
   </el-table>
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 c7ca800f3b..7de68eb474 100644
--- a/framework/sdk-parent/frontend/src/components/new-ui/MsTable.vue
+++ b/framework/sdk-parent/frontend/src/components/new-ui/MsTable.vue
@@ -94,7 +94,7 @@
 
       <template #empty>
         <div style="width: 100%;height: 300px;display: flex;flex-direction: column;justify-content: start;align-items: center">
-          <img :src="refreshBySearch ? '/assets/module/figma/icon_search_none.svg' : '/assets/module/figma/icon_none.svg'" style="height: 100px;width: 100px;margin-bottom: 8px"/>
+          <img :src="refreshBySearch ? '/assets/module/figma/icon_search_none.svg' : '/assets/module/figma/icon_none.svg'" style="height: 100px;width: 100px;margin-bottom: 0.6rem; margin-top: 3rem"/>
           <span class="addition-info-title">{{ refreshBySearch ? $t("home.dashboard.public.no_search_data") : $t("home.dashboard.public.no_data") }}</span>
         </div>
       </template>
diff --git a/framework/sdk-parent/frontend/src/components/new-ui/MsTableBatchOperatorGroup.vue b/framework/sdk-parent/frontend/src/components/new-ui/MsTableBatchOperatorGroup.vue
index f37ad25014..e9f714cbe2 100644
--- a/framework/sdk-parent/frontend/src/components/new-ui/MsTableBatchOperatorGroup.vue
+++ b/framework/sdk-parent/frontend/src/components/new-ui/MsTableBatchOperatorGroup.vue
@@ -120,7 +120,6 @@ export default {
 
 :deep(.showBtnGroup button.el-button.el-button--default.el-button--small) {
   box-sizing: border-box;
-  width: 80px;
   height: 32px;
   left: 0px;
   top: 0px;
@@ -158,7 +157,7 @@ export default {
   align-self: center;
   flex-grow: 0;
   position: relative;
-  top: -6px;
+  top: -5.5px;
   left: 11px;
   padding: 0px;
 }
@@ -220,10 +219,11 @@ export default {
 
 .more-operate-menu {
   width: 164px!important;
+  margin-left: 10px;
 }
 
 .more-operate-menu-children {
-  margin-left: 40px;
+  margin-left: 16px;
   margin-bottom: -12px;
   width: 135px!important;
 }
@@ -278,6 +278,15 @@ export default {
 .is-delete:hover {
   background: rgba(245, 74, 69, 0.2)!important;
 }
+
+:deep(.el-icon-arrow-right) {
+  margin-left: 30px;
+}
+
+:deep(.el-icon-arrow-right:before) {
+  font-size: 15px;
+  color: #8F959E;
+}
 </style>
 
 <style>
diff --git a/framework/sdk-parent/frontend/src/components/new-ui/MsTableHeaderSelectPopover.vue b/framework/sdk-parent/frontend/src/components/new-ui/MsTableHeaderSelectPopover.vue
index a85c2eb746..f806d0095c 100644
--- a/framework/sdk-parent/frontend/src/components/new-ui/MsTableHeaderSelectPopover.vue
+++ b/framework/sdk-parent/frontend/src/components/new-ui/MsTableHeaderSelectPopover.vue
@@ -1,6 +1,6 @@
 <template>
   <el-table-column v-if="isShow" width="1" :resizable="false" fixed="left" align="center">
-    <el-popover slot="header" placement="bottom" trigger="hover" style="margin-right: 0px;" popper-class="select-popover">
+    <el-popover slot="header" placement="bottom" trigger="hover" style="margin-right: 0px;" popper-class="select-popover" :open-delay="0" :close-delay="0">
       <el-button type="text" @click.native.stop="click('selectPageAll')">
           <span>
             {{ $t('api_test.batch_menus.select_current_page') }}
diff --git a/framework/sdk-parent/frontend/src/i18n/lang/track/en-US.js b/framework/sdk-parent/frontend/src/i18n/lang/track/en-US.js
index 7b0e273d84..d4f5202ffb 100644
--- a/framework/sdk-parent/frontend/src/i18n/lang/track/en-US.js
+++ b/framework/sdk-parent/frontend/src/i18n/lang/track/en-US.js
@@ -168,8 +168,8 @@ export default {
     match_rule: "Test Case Match Rule",
     import: {
       import: "Import test case",
-      case_import: "Import test case",
-      case_export: "Export test case",
+      case_import: "Import case",
+      case_export: "Export case",
       download_template: "Download template",
       click_upload: "Upload",
       upload_limit: "Only XLS/XLSX/XMIND files can be uploaded, and no more than 100M",
diff --git a/test-track/frontend/src/business/TestTrack.vue b/test-track/frontend/src/business/TestTrack.vue
index 89977b98c9..41d61f5048 100644
--- a/test-track/frontend/src/business/TestTrack.vue
+++ b/test-track/frontend/src/business/TestTrack.vue
@@ -192,6 +192,9 @@ button.el-button.el-button--default.el-button--small.el-button--danger {
   width: 100%;
 }
 
+.el-message-box__headerbtn .el-message-box__close {
+  font-size: 20px!important;
+}
 /**
  * el-button
  */
@@ -249,6 +252,10 @@ button.el-button.el-button--default.el-button--small.el-button--danger {
   padding: 0px;
 }
 
+i.el-dialog__close.el-icon.el-icon-close:before {
+  font-size: 20px!important;
+}
+
 /**
  * el-icon
  */
diff --git a/test-track/frontend/src/business/case/components/RelateDemand.vue b/test-track/frontend/src/business/case/components/RelateDemand.vue
index 7ddc92b840..e89dd7bdeb 100644
--- a/test-track/frontend/src/business/case/components/RelateDemand.vue
+++ b/test-track/frontend/src/business/case/components/RelateDemand.vue
@@ -206,14 +206,14 @@ export default {
   flex-grow: 0;
 }
 
-.el-form-item__label {
+:deep(.el-form-item__label) {
   line-height: 36px;
   font-family: 'PingFang SC';
   font-style: normal;
   font-weight: 400;
   font-size: 14px;
   line-height: 22px;
-  color: #1F2329;
+  color: #1F2329!important;
   flex: none;
   order: 0;
   flex-grow: 0;
diff --git a/test-track/frontend/src/business/case/components/TestCasePreview.vue b/test-track/frontend/src/business/case/components/TestCasePreview.vue
index 1b3d22c8f2..06751e909e 100644
--- a/test-track/frontend/src/business/case/components/TestCasePreview.vue
+++ b/test-track/frontend/src/business/case/components/TestCasePreview.vue
@@ -2,7 +2,7 @@
   <el-drawer
     :visible.sync="visible"
     append-to-body
-    size="70%"
+    :size="calcWidth"
     :close-on-click-modal="false"
     class="case-desc-drawer-layout"
   >
@@ -15,7 +15,7 @@
           <h3>{{$t('test_track.case.prerequisite')}}</h3>
           <span>{{data.prerequisite}}</span>
         </div>
-        <step-change-item :label-width="formLabelWidth" :form="data"/>
+        <step-change-item :label-width="stepForLabelWidth" :form="data"/>
         <ms-case-desc-text-item v-if="data.stepModel === 'TEXT'" :title="$t('test_track.case.step_desc')" :data="data" :content="data.stepDescription"/>
         <ms-case-desc-text-item v-if="data.stepModel === 'TEXT'" :title="$t('test_track.case.expected_results')" :data="data" :content="data.expectedResult"/>
         <ms-case-desc-text-item v-if="data.stepModel === 'STEP' || !data.stepModel" :data="data"/>
@@ -38,11 +38,28 @@ export default {
     StepChangeItem,
     TestCaseStepItem,
   },
-  props: ['loading'],
+  props: {
+    width: {
+      type: Number,
+      default: 1280,
+    },
+  },
+  computed: {
+    calcWidth() {
+      if (!isNaN(this.width)) {
+        //计算rem
+        let remW = (this.width / 1440) * 100;
+        let standW = (1280 / 1440) * 100;
+        return remW > standW ? standW : remW + "%";
+      }
+      return this.width;
+    },
+  },
   data() {
     return {
       result: {},
       formLabelWidth: "100px",
+      stepForLabelWidth: "150px",
       visible: false,
       data: {}
     }
diff --git a/test-track/frontend/src/business/case/components/export/TestCaseExportToExcel.vue b/test-track/frontend/src/business/case/components/export/TestCaseExportToExcel.vue
index 3456ab7e1b..166e77bf72 100644
--- a/test-track/frontend/src/business/case/components/export/TestCaseExportToExcel.vue
+++ b/test-track/frontend/src/business/case/components/export/TestCaseExportToExcel.vue
@@ -118,4 +118,8 @@ export default {
   height: 32px;
   border-radius: 4px;
 }
+
+:deep(.el-icon-close:before) {
+  font-size: 20px;
+}
 </style>
diff --git a/test-track/frontend/src/business/case/components/import/TestCaseCommonImportNew.vue b/test-track/frontend/src/business/case/components/import/TestCaseCommonImportNew.vue
index 37934999de..7090edebe9 100644
--- a/test-track/frontend/src/business/case/components/import/TestCaseCommonImportNew.vue
+++ b/test-track/frontend/src/business/case/components/import/TestCaseCommonImportNew.vue
@@ -377,6 +377,10 @@ export default {
 .case-upload-progress :deep(.el-progress-bar__inner){
   background-color: #AA4FBF;;
 }
+
+:deep(.el-icon-close:before) {
+  font-size: 20px;
+}
 </style>
 
 <style>
diff --git a/test-track/frontend/src/business/home/components/pagination/HomePagination.vue b/test-track/frontend/src/business/home/components/pagination/HomePagination.vue
index 8cdd0b3d2d..eb4773c7b0 100644
--- a/test-track/frontend/src/business/home/components/pagination/HomePagination.vue
+++ b/test-track/frontend/src/business/home/components/pagination/HomePagination.vue
@@ -74,7 +74,6 @@ export default {
   background-color: #FFFFFF;
   color: #1F2329;
   border: 1px solid #BBBFC4;
-  width: 28px;
   height: 28px;
   box-sizing: border-box;
   border-radius: 4px;