From 68f06dcd7f6ce4ba3f3bb2c95f7880ba4c24fb09 Mon Sep 17 00:00:00 2001
From: "nathan.liu" <yao.liu@fit2cloud.com>
Date: Thu, 16 Feb 2023 17:39:50 +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=E5=8A=9F=E8=83=BD=E7=94=A8=E4=BE=8B=E5=9F=BA?=
 =?UTF-8?q?=E7=A1=80=E4=BF=A1=E6=81=AF=E6=A0=B7=E5=BC=8F=E5=8F=8A=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1023153 --user=刘瑶
【测试跟踪】功能用例-用例编辑/创建页面-自定义富文本类型字段名称较长-显示重叠
https://www.tapd.cn/55049933/s/1336724
--bug=1023144 --user=刘瑶
【测试跟踪】功能用例-创建用例-只输入用例名称-敲2下回车-页面刷新-名称清空
https://www.tapd.cn/55049933/s/1336725
--bug=1022810 --user=刘瑶 【测试跟踪】新建用例，必填提示不对
https://www.tapd.cn/55049933/s/1336726
---
 .../business/case/components/TestCaseEdit.vue |  2 -
 .../case/components/case/CaseBaseInfo.vue     | 46 +++++++++++--------
 .../case/CaseCustomFiledFormRow.vue           |  6 +--
 .../components/case/CaseDetailComponent.vue   |  2 +-
 .../components/case/CaseEditInfoComponent.vue |  2 -
 .../components/case/diff/CaseDiffViewer.vue   |  2 -
 test-track/frontend/src/i18n/lang/en-US.js    |  1 +
 test-track/frontend/src/i18n/lang/zh-CN.js    |  1 +
 test-track/frontend/src/i18n/lang/zh-TW.js    |  1 +
 9 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/test-track/frontend/src/business/case/components/TestCaseEdit.vue b/test-track/frontend/src/business/case/components/TestCaseEdit.vue
index 8309c68e2c..e2751db7be 100644
--- a/test-track/frontend/src/business/case/components/TestCaseEdit.vue
+++ b/test-track/frontend/src/business/case/components/TestCaseEdit.vue
@@ -2035,12 +2035,10 @@ export default {
           margin-top: px2rem(24);
           margin-bottom: px2rem(8);
           .title-wrap {
-            height: 22px;
             font-family: "PingFang SC";
             font-style: normal;
             font-weight: 500;
             font-size: 14px;
-            line-height: 22px;
             color: #1f2329;
           }
         }
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 1fd7279705..26e38842fa 100644
--- a/test-track/frontend/src/business/case/components/case/CaseBaseInfo.vue
+++ b/test-track/frontend/src/business/case/components/case/CaseBaseInfo.vue
@@ -1,6 +1,6 @@
 <template>
   <div v-loading="isloading" class="case-base-info-form">
-    <el-form ref="caseFrom" :rules="rules" :model="form">
+    <el-form ref="caseFrom" :rules="headerRules" :model="form" class="case-padding">
       <div class="module-row case-wrap" v-if="!publicEnable">
         <div class="case-title-wrap">
           <div class="name title-wrap">
@@ -21,7 +21,7 @@
             :readonlyHoverEvent="!readOnly"
             :content-click-event="!readOnly"
             :model="form"
-            :rules="rules"
+            :rules="headerRules"
             ref="moduleRef"
           >
             <template v-slot:content="{ onClick, hoverEditable }">
@@ -65,7 +65,7 @@
             :readonlyHoverEvent="!readOnly"
             :content-click-event="!readOnly"
             :model="form"
-            :rules="rules"
+            :rules="headerRules"
           >
             <template v-slot:content="{ onClick, hoverEditable }">
               <div :class="hoverEditable ? 'selectHover' : ''">
@@ -100,7 +100,7 @@
       label-position="right"
       label-width="100px"
       size="small"
-      class="case-form"
+      class="case-form case-padding"
     >
       <custom-filed-form-row
         :form="customFieldForm"
@@ -111,7 +111,7 @@
         :editable="editable"
       />
     </el-form>
-    <el-form ref="baseCaseFrom" :rules="rules" :model="form">
+    <el-form ref="baseCaseFrom" :rules="rules" :model="form" class="case-padding">
       <div class="version-row case-wrap" v-if="versionEnable">
         <div class="case-title-wrap">
           <div class="name title-wrap">{{ $t("commons.version") }}</div>
@@ -381,10 +381,10 @@ export default {
             trigger: "blur",
           },
         ],
-        module: [
-          {
+        versionId:[
+        {
             required: true,
-            message: this.$t("test_track.case.input_module"),
+            message: this.$t("case.version_id_cannot_be_empty"),
             trigger: "change",
           },
         ],
@@ -425,6 +425,15 @@ export default {
           },
         ],
       },
+      headerRules: {
+        module: [
+          {
+            required: true,
+            message: this.$t("test_track.case.input_module"),
+            trigger: "change",
+          },
+        ],
+      },
       moduleObj: {
         id: "id",
         label: "name",
@@ -555,11 +564,11 @@ export default {
     },
     validateForm() {
       let isValidate = true;
-      this.$refs["caseFrom"].validate((valid) => {
-        if (!valid) {
-          isValidate = false;
-        }
-      });
+      // this.$refs["caseFrom"].validate((valid) => {
+      //   if (!valid) {
+      //     isValidate = false;
+      //   }
+      // });
       this.$refs["baseCaseFrom"].validate((valid) => {
         if (!valid) {
           isValidate = false;
@@ -657,7 +666,10 @@ export default {
 
 <style scoped lang="scss">
 @import "@/business/style/index.scss";
-
+.case-padding{
+  margin-left: px2rem(24);
+  margin-right: px2rem(24);
+}
 /* 关联需求下拉框 */
 .story-box {
   display: flex;
@@ -773,12 +785,10 @@ export default {
           margin-top: px2rem(24);
           margin-bottom: px2rem(8);
           .title-wrap {
-            height: 22px;
             font-family: "PingFang SC";
             font-style: normal;
             font-weight: 500;
             font-size: 14px;
-            line-height: 22px;
             color: #1f2329;
           }
         }
@@ -871,9 +881,9 @@ export default {
         min-height: px2rem(864);
         border-left: 1px solid rgba(31, 35, 41, 0.15);
         .case-wrap {
-          margin-left: px2rem(24);
+          /* margin-left: px2rem(24); */
           margin-top: px2rem(24);
-          margin-right: px2rem(24);
+          /* margin-right: px2rem(24); */
         }
         .case-title-wrap {
           display: flex;
diff --git a/test-track/frontend/src/business/case/components/case/CaseCustomFiledFormRow.vue b/test-track/frontend/src/business/case/components/case/CaseCustomFiledFormRow.vue
index addbf3a7a6..3630a2848b 100644
--- a/test-track/frontend/src/business/case/components/case/CaseCustomFiledFormRow.vue
+++ b/test-track/frontend/src/business/case/components/case/CaseCustomFiledFormRow.vue
@@ -142,26 +142,22 @@ export default {
     margin-top: px2rem(24);
     margin-bottom: px2rem(8);
     .title-wrap {
-      height: 22px;
       font-family: "PingFang SC";
       font-style: normal;
       font-weight: 500;
       font-size: 14px;
-      line-height: 22px;
       color: #1f2329;
     }
   }
   .case-wrap {
-    margin-left: px2rem(24);
+    /* margin-left: px2rem(24); */
     margin-top: px2rem(24);
   }
   .case-title-wrap {
     display: flex;
     .title-wrap {
       font-weight: 500;
-      height: 22px;
       font-size: 14px;
-      line-height: 22px;
       color: #1f2329;
     }
     margin-bottom: px2rem(8);
diff --git a/test-track/frontend/src/business/case/components/case/CaseDetailComponent.vue b/test-track/frontend/src/business/case/components/case/CaseDetailComponent.vue
index 7acceee1ad..45d5974551 100644
--- a/test-track/frontend/src/business/case/components/case/CaseDetailComponent.vue
+++ b/test-track/frontend/src/business/case/components/case/CaseDetailComponent.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div v-on:keydown.enter.prevent>
     <!-- 基于form组件进行表单验证 -->
     <el-form ref="caseDetailForm" :rules="rules" :model="form">
       <!-- case name -->
diff --git a/test-track/frontend/src/business/case/components/case/CaseEditInfoComponent.vue b/test-track/frontend/src/business/case/components/case/CaseEditInfoComponent.vue
index a8843c9e5b..ead1a26da3 100644
--- a/test-track/frontend/src/business/case/components/case/CaseEditInfoComponent.vue
+++ b/test-track/frontend/src/business/case/components/case/CaseEditInfoComponent.vue
@@ -587,12 +587,10 @@ export default {
           margin-top: px2rem(24);
           margin-bottom: px2rem(8);
           .title-wrap {
-            height: 22px;
             font-family: "PingFang SC";
             font-style: normal;
             font-weight: 500;
             font-size: 14px;
-            line-height: 22px;
             color: #1f2329;
           }
         }
diff --git a/test-track/frontend/src/business/case/components/case/diff/CaseDiffViewer.vue b/test-track/frontend/src/business/case/components/case/diff/CaseDiffViewer.vue
index 17a0dd4afc..5c7a131331 100644
--- a/test-track/frontend/src/business/case/components/case/diff/CaseDiffViewer.vue
+++ b/test-track/frontend/src/business/case/components/case/diff/CaseDiffViewer.vue
@@ -941,9 +941,7 @@ export default {
   display: flex;
   .title-wrap {
     font-weight: 500;
-    height: 22px;
     font-size: 14px;
-    line-height: 22px;
     color: #1f2329;
   }
   margin-bottom: px2rem(8);
diff --git a/test-track/frontend/src/i18n/lang/en-US.js b/test-track/frontend/src/i18n/lang/en-US.js
index 3e43ad4f43..bcb96fd52e 100644
--- a/test-track/frontend/src/i18n/lang/en-US.js
+++ b/test-track/frontend/src/i18n/lang/en-US.js
@@ -142,6 +142,7 @@ const message = {
     current_display_history_version: "Current display history version",
     compare_with_the_latest_version: "Compare with the latest version",
     view_the_latest_version: "View the latest version",
+    version_id_cannot_be_empty: "Version id cannot be empty",
   },
   attachment: {
     preview: "Preview",
diff --git a/test-track/frontend/src/i18n/lang/zh-CN.js b/test-track/frontend/src/i18n/lang/zh-CN.js
index 4d77335f35..bc8b04388f 100644
--- a/test-track/frontend/src/i18n/lang/zh-CN.js
+++ b/test-track/frontend/src/i18n/lang/zh-CN.js
@@ -142,6 +142,7 @@ const message = {
     current_display_history_version: "当前展示历史版本",
     compare_with_the_latest_version: "与最新版本比较",
     view_the_latest_version: "查看最新版本",
+    version_id_cannot_be_empty: "版本号不能为空",
   },
   attachment: {
     preview: "预览",
diff --git a/test-track/frontend/src/i18n/lang/zh-TW.js b/test-track/frontend/src/i18n/lang/zh-TW.js
index 69c69a4ea9..389c199521 100644
--- a/test-track/frontend/src/i18n/lang/zh-TW.js
+++ b/test-track/frontend/src/i18n/lang/zh-TW.js
@@ -142,6 +142,7 @@ const message = {
     current_display_history_version: "當前展示歷史版本",
     compare_with_the_latest_version: "與最新版本比較",
     view_the_latest_version: "查看最新版本",
+    version_id_cannot_be_empty: "版本號不能為空",
   },
   attachment: {
     preview: "預覽",