From d237fd7ebefb1dd52919e9ec94d005fb58e5876e Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Mon, 6 Sep 2021 14:32:33 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=AD=A5=E9=AA=A4=E6=8F=8F?=
 =?UTF-8?q?=E8=BF=B0=E6=A0=BC=E5=BC=8F=E4=BC=98=E5=8C=96=20-bug=3D1005182?=
 =?UTF-8?q?=20--user=3D=E9=99=88=E5=BB=BA=E6=98=9F=20=E3=80=90=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E8=AE=A1=E5=88=92=E3=80=91-=E6=AD=A5=E9=AA=A4?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E6=A0=BC=E5=BC=8F=E4=BC=98=E5=8C=96=20https:?=
 =?UTF-8?q?//www.tapd.cn/55049933/s/1043894?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../functional/FunctionalTestCaseEdit.vue     | 12 ------
 .../TestPlanCaseStepResultsItem.vue           | 41 +++++++++++++++++--
 frontend/src/common/js/utils.js               |  9 ++++
 3 files changed, 46 insertions(+), 16 deletions(-)

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 88d1c3dfe1..45b921c4f0 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
@@ -545,18 +545,6 @@ p {
 .head-bar {
   z-index: 999;
 }
-
-/*/deep/ .el-textarea.is-disabled .el-textarea__inner {
-  background-color: #FBFBFB !important;
-  color: #606266 !important;
-  height: 48px !important;
-}*/
-
-/*/deep/ .table-edit-input .el-textarea__inner, .table-edit-input .el-input__inner {
-  border-style: solid;
-  height: 30px !important;
-  min-height: 30px !important;
-}*/
 </style>
 
 <style>
diff --git a/frontend/src/business/components/track/plan/view/comonents/functional/TestPlanCaseStepResultsItem.vue b/frontend/src/business/components/track/plan/view/comonents/functional/TestPlanCaseStepResultsItem.vue
index 1d4dda3404..e62e9e5e45 100644
--- a/frontend/src/business/components/track/plan/view/comonents/functional/TestPlanCaseStepResultsItem.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/functional/TestPlanCaseStepResultsItem.vue
@@ -1,6 +1,7 @@
 <template>
   <el-form-item class="result-item" :label-width="labelWidth">
     <el-table
+      v-if="visible"
       :data="testCase.steptResults"
       class="tb-edit"
       size="mini"
@@ -15,7 +16,7 @@
             size="mini"
             class="border-hidden"
             type="textarea"
-            :autosize="{ minRows: 1, maxRows: 4}"
+            :autosize="{ minRows: scope.row.minRows, maxRows: 4}"
             :disabled="true"
             v-model="scope.row.desc"/>
         </template>
@@ -26,7 +27,7 @@
             size="mini"
             class="border-hidden"
             type="textarea"
-            :autosize="{ minRows: 1, maxRows: 4}"
+            :autosize="{ minRows: scope.row.minRows, maxRows: 4}"
             :disabled="true"
             v-model="scope.row.result"/>
         </template>
@@ -37,9 +38,9 @@
             class="table-edit-input"
             size="mini"
             type="textarea"
-            :autosize="{ minRows: 1, maxRows: 4}"
-            :rows="2"
+            :autosize="{ minRows: scope.row.minRows, maxRows: 4}"
             :disabled="isReadOnly"
+            @blur="actualResultChange(scope.row)"
             v-model="scope.row.actualResult"
             :placeholder="$t('commons.input_content')"
             clearable/>
@@ -69,10 +70,42 @@
 </template>
 
 <script>
+import {getCharCountInStr} from "@/common/js/utils";
+
 export default {
   name: "TestPlanCaseStepResultsItem",
   props: ['testCase', 'isReadOnly', 'labelWidth'],
+  data() {
+    return {
+      visible: true
+    }
+  },
+  mounted() {
+    let step = this.testCase.steptResults;
+    if (step) {
+      step.forEach(item => {
+        let maxCount = Math.max(
+          getCharCountInStr(item.desc, '\n'),
+          getCharCountInStr(item.result, '\n'),
+          getCharCountInStr(item.actualResult, '\n')
+        );
+        let minRows = maxCount + 1;
+        minRows = minRows > 4 ? 4 : minRows;
+        this.$set(item, 'minRows', minRows);
+      });
+    }
+  },
   methods: {
+    actualResultChange(item) {
+      let minRows = getCharCountInStr(item.actualResult, '\n') + 1;
+      if (minRows > item.minRows) {
+        this.$set(item, 'minRows', Math.min(minRows, 4));
+        this.visible = false;
+        this.$nextTick(() => {
+          this.visible = true;
+        });
+      }
+    },
     stepResultChange() {
       if (this.testCase.method === 'manual' || !this.testCase.method) {
         this.isFailure = this.testCase.steptResults.filter(s => {
diff --git a/frontend/src/common/js/utils.js b/frontend/src/common/js/utils.js
index 7612ca30f3..f8c85019a0 100644
--- a/frontend/src/common/js/utils.js
+++ b/frontend/src/common/js/utils.js
@@ -260,6 +260,15 @@ export function lineToHump(name) {
   });
 }
 
+// 查找字符出现的次数
+export function getCharCountInStr(str, char){
+  if (!str) return 0;
+  let regex = new RegExp(char, 'g'); // 使用g表示整个字符串都要匹配
+  let result = str.match(regex);
+  let count = !result ? 0 : result.length;
+  return count;
+}
+
 export function downloadFile(name, content) {
   const blob = new Blob([content]);
   if ("download" in document.createElement("a")) {