From 0540e15e86656ffa9f253edece848b6020b2294a Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Mon, 21 Dec 2020 11:13:07 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B):=20?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=B7=BB=E5=8A=A0=E8=AF=84=E8=AE=BA=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/common/head/HeaderTopMenus.vue |   2 -
 .../track/case/components/TestCaseDetail.vue  | 295 +++++++++---------
 .../track/case/components/TestCaseList.vue    |   2 +-
 3 files changed, 154 insertions(+), 145 deletions(-)

diff --git a/frontend/src/business/components/common/head/HeaderTopMenus.vue b/frontend/src/business/components/common/head/HeaderTopMenus.vue
index a8fb2db8eb..8864d8df1e 100644
--- a/frontend/src/business/components/common/head/HeaderTopMenus.vue
+++ b/frontend/src/business/components/common/head/HeaderTopMenus.vue
@@ -47,9 +47,7 @@
     },
     methods: {
       handleSelect(index) {
-        console.log(index)
         this.activeIndex = index
-
       },
       active() {
         if (this.activeIndex === '/api') {
diff --git a/frontend/src/business/components/track/case/components/TestCaseDetail.vue b/frontend/src/business/components/track/case/components/TestCaseDetail.vue
index 3fad9f2c17..70f82ec70f 100644
--- a/frontend/src/business/components/track/case/components/TestCaseDetail.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseDetail.vue
@@ -1,163 +1,174 @@
 <template>
-  <el-form :model="form" ref="caseFrom" v-loading="result.loading">
+  <el-row :gutter="10">
+    <el-col :span="16">
+      <el-card>
+        <el-form :model="form" ref="caseFrom" v-loading="result.loading">
 
-    <el-row>
-      <el-col :span="10" :offset="1">
-        <el-form-item
-          :placeholder="$t('test_track.case.input_name')"
-          :label="$t('test_track.case.name')"
-          :label-width="formLabelWidth"
-          prop="name">
-          <el-input class="case-name" :disabled="readOnly" v-model="testCase.name"></el-input>
-        </el-form-item>
-      </el-col>
+          <el-row>
+            <el-col :span="10" :offset="1">
+              <el-form-item
+                :placeholder="$t('test_track.case.input_name')"
+                :label="$t('test_track.case.name')"
+                :label-width="formLabelWidth"
+                prop="name">
+                <el-input class="case-name" :disabled="readOnly" v-model="testCase.name"></el-input>
+              </el-form-item>
+            </el-col>
 
-      <el-col :span="12">
-        <el-form-item :label="$t('test_track.case.module')" :label-width="formLabelWidth" prop="module">
-          <el-input class="case-name" :disabled="readOnly" v-model="testCase.nodePath"></el-input>
-        </el-form-item>
-      </el-col>
-    </el-row>
+            <el-col :span="12">
+              <el-form-item :label="$t('test_track.case.module')" :label-width="formLabelWidth" prop="module">
+                <el-input class="case-name" :disabled="readOnly" v-model="testCase.nodePath"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
 
-    <el-row>
-      <el-col :span="10" :offset="1">
-        <el-form-item :label="$t('test_track.case.maintainer')" :label-width="formLabelWidth" prop="maintainer">
-          <el-select :disabled="readOnly" v-model="testCase.maintainer"
-                     :placeholder="$t('test_track.case.input_maintainer')" filterable>
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item :label="$t('test_track.case.priority')" :label-width="formLabelWidth" prop="priority">
-          <el-select :disabled="readOnly" v-model="testCase.priority" clearable
-                     :placeholder="$t('test_track.case.input_priority')">
-          </el-select>
-        </el-form-item>
-      </el-col>
-    </el-row>
+          <el-row>
+            <el-col :span="10" :offset="1">
+              <el-form-item :label="$t('test_track.case.maintainer')" :label-width="formLabelWidth" prop="maintainer">
+                <el-select :disabled="readOnly" v-model="testCase.maintainer"
+                           :placeholder="$t('test_track.case.input_maintainer')" filterable>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item :label="$t('test_track.case.priority')" :label-width="formLabelWidth" prop="priority">
+                <el-select :disabled="readOnly" v-model="testCase.priority" clearable
+                           :placeholder="$t('test_track.case.input_priority')">
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
 
-    <el-row>
-      <el-col :span="10" :offset="1">
-        <el-form-item :label="$t('test_track.case.type')" :label-width="formLabelWidth" prop="type">
-          <el-select :disabled="readOnly" v-model="testCase.type"
-                     :placeholder="$t('test_track.case.input_type')">
-            <el-option :label="$t('commons.functional')" value="functional"></el-option>
-            <el-option :label="$t('commons.performance')" value="performance"></el-option>
-            <el-option :label="$t('commons.api')" value="api"></el-option>
-          </el-select>
+          <el-row>
+            <el-col :span="10" :offset="1">
+              <el-form-item :label="$t('test_track.case.type')" :label-width="formLabelWidth" prop="type">
+                <el-select :disabled="readOnly" v-model="testCase.type"
+                           :placeholder="$t('test_track.case.input_type')">
+                  <el-option :label="$t('commons.functional')" value="functional"></el-option>
+                  <el-option :label="$t('commons.performance')" value="performance"></el-option>
+                  <el-option :label="$t('commons.api')" value="api"></el-option>
+                </el-select>
 
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item :label="$t('test_track.case.method')" :label-width="formLabelWidth" prop="method">
-          <el-select :disabled="readOnly" v-model="testCase.method" :placeholder="$t('test_track.case.input_method')">
-            <el-option :label="$t('test_track.case.auto')" value="auto"></el-option>
-            <el-option :label="$t('test_track.case.manual')" value="manual"></el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-    </el-row>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item :label="$t('test_track.case.method')" :label-width="formLabelWidth" prop="method">
+                <el-select :disabled="readOnly" v-model="testCase.method" :placeholder="$t('test_track.case.input_method')">
+                  <el-option :label="$t('test_track.case.auto')" value="auto"></el-option>
+                  <el-option :label="$t('test_track.case.manual')" value="manual"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
 
-    <el-row v-if="testCase.method && testCase.method == 'auto'">
-      <el-col :span="10" :offset="1">
-        <el-form-item :label="$t('test_track.case.relate_test')" :label-width="formLabelWidth" prop="testId">
-          <el-select filterable :disabled="readOnly" v-model="testCase.testId"
-                     :placeholder="$t('test_track.case.input_type')">
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12" v-if="testCase.testId=='other'">
-        <el-form-item :label="$t('test_track.case.test_name')" :label-width="formLabelWidth" prop="testId">
-          <el-input v-model="testCase.otherTestName" :placeholder="$t('test_track.case.input_test_case')"
-                    :disabled="readOnly"></el-input>
-        </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row style="margin-top: 15px;">
-      <el-col :offset="1">{{ $t('test_track.case.prerequisite') }}:</el-col>
-    </el-row>
-    <el-row type="flex" justify="center" style="margin-top: 10px;">
-      <el-col :span="22">
-        <el-form-item prop="prerequisite">
-          <el-input :disabled="readOnly" v-model="testCase.prerequisite"
-                    type="textarea"
-                    :autosize="{ minRows: 2, maxRows: 4}"
-                    :rows="2"
-                    :placeholder="$t('test_track.case.input_prerequisite')"></el-input>
-        </el-form-item>
-      </el-col>
-    </el-row>
+          <el-row v-if="testCase.method && testCase.method == 'auto'">
+            <el-col :span="10" :offset="1">
+              <el-form-item :label="$t('test_track.case.relate_test')" :label-width="formLabelWidth" prop="testId">
+                <el-select filterable :disabled="readOnly" v-model="testCase.testId"
+                           :placeholder="$t('test_track.case.input_type')">
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12" v-if="testCase.testId=='other'">
+              <el-form-item :label="$t('test_track.case.test_name')" :label-width="formLabelWidth" prop="testId">
+                <el-input v-model="testCase.otherTestName" :placeholder="$t('test_track.case.input_test_case')"
+                          :disabled="readOnly"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row style="margin-top: 15px;">
+            <el-col :offset="1">{{ $t('test_track.case.prerequisite') }}:</el-col>
+          </el-row>
+          <el-row type="flex" justify="center" style="margin-top: 10px;">
+            <el-col :span="22">
+              <el-form-item prop="prerequisite">
+                <el-input :disabled="readOnly" v-model="testCase.prerequisite"
+                          type="textarea"
+                          :autosize="{ minRows: 2, maxRows: 4}"
+                          :rows="2"
+                          :placeholder="$t('test_track.case.input_prerequisite')"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
 
-    <el-row v-if="testCase.method && testCase.method != 'auto'" style="margin-bottom: 10px">
-      <el-col :offset="1">{{ $t('test_track.case.steps') }}:</el-col>
-    </el-row>
+          <el-row v-if="testCase.method && testCase.method != 'auto'" style="margin-bottom: 10px">
+            <el-col :offset="1">{{ $t('test_track.case.steps') }}:</el-col>
+          </el-row>
 
-    <el-row v-if="testCase.method && testCase.method != 'auto'" type="flex" justify="center">
-      <el-col :span="22">
-        <el-table
-          v-if="isStepTableAlive"
-          :data="JSON.parse(testCase.steps)"
-          class="tb-edit"
-          border
-          size="mini"
-          :default-sort="{prop: 'num', order: 'ascending'}"
-          highlight-current-row>
-          <el-table-column :label="$t('test_track.case.number')" prop="num" min-width="15%"></el-table-column>
-          <el-table-column :label="$t('test_track.case.step_desc')" prop="desc" min-width="35%">
-            <template v-slot:default="scope">
-              <el-input
-                class="table-edit-input"
+          <el-row v-if="testCase.method && testCase.method != 'auto'" type="flex" justify="center">
+            <el-col :span="22">
+              <el-table
+                v-if="isStepTableAlive"
+                :data="JSON.parse(testCase.steps)"
+                class="tb-edit"
+                border
                 size="mini"
-                :disabled="readOnly"
-                type="textarea"
-                :autosize="{ minRows: 1, maxRows: 6}"
-                :rows="2"
-                v-model="scope.row.desc"
-                :placeholder="$t('commons.input_content')"
-                clearable/>
-            </template>
-          </el-table-column>
-          <el-table-column :label="$t('test_track.case.expected_results')" prop="result" min-width="35%">
-            <template v-slot:default="scope">
-              <el-input
-                class="table-edit-input"
-                size="mini"
-                :disabled="readOnly"
-                type="textarea"
-                :autosize="{ minRows: 1, maxRows: 6}"
-                :rows="2"
-                v-model="scope.row.result"
-                :placeholder="$t('commons.input_content')"
-                clearable/>
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-col>
-    </el-row>
+                :default-sort="{prop: 'num', order: 'ascending'}"
+                highlight-current-row>
+                <el-table-column :label="$t('test_track.case.number')" prop="num" min-width="15%"></el-table-column>
+                <el-table-column :label="$t('test_track.case.step_desc')" prop="desc" min-width="35%">
+                  <template v-slot:default="scope">
+                    <el-input
+                      class="table-edit-input"
+                      size="mini"
+                      :disabled="readOnly"
+                      type="textarea"
+                      :autosize="{ minRows: 1, maxRows: 6}"
+                      :rows="2"
+                      v-model="scope.row.desc"
+                      :placeholder="$t('commons.input_content')"
+                      clearable/>
+                  </template>
+                </el-table-column>
+                <el-table-column :label="$t('test_track.case.expected_results')" prop="result" min-width="35%">
+                  <template v-slot:default="scope">
+                    <el-input
+                      class="table-edit-input"
+                      size="mini"
+                      :disabled="readOnly"
+                      type="textarea"
+                      :autosize="{ minRows: 1, maxRows: 6}"
+                      :rows="2"
+                      v-model="scope.row.result"
+                      :placeholder="$t('commons.input_content')"
+                      clearable/>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-col>
+          </el-row>
 
-    <el-row style="margin-top: 15px;margin-bottom: 10px">
-      <el-col :offset="1">{{ $t('commons.remark') }}:</el-col>
-    </el-row>
-    <el-row type="flex" justify="center">
-      <el-col :span="22">
-        <el-form-item prop="remark">
-          <el-input v-model="testCase.remark"
-                    :autosize="{ minRows: 2, maxRows: 4}"
-                    type="textarea"
-                    :disabled="readOnly"
-                    :rows="2"
-                    :placeholder="$t('commons.input_content')"></el-input>
-        </el-form-item>
-      </el-col>
-    </el-row>
-  </el-form>
+          <el-row style="margin-top: 15px;margin-bottom: 10px">
+            <el-col :offset="1">{{ $t('commons.remark') }}:</el-col>
+          </el-row>
+          <el-row type="flex" justify="center">
+            <el-col :span="22">
+              <el-form-item prop="remark">
+                <el-input v-model="testCase.remark"
+                          :autosize="{ minRows: 2, maxRows: 4}"
+                          type="textarea"
+                          :disabled="readOnly"
+                          :rows="2"
+                          :placeholder="$t('commons.input_content')"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </el-card>
+    </el-col>
+    <el-col :span="8">
+      <case-comment :case-id="testCaseId"/>
+    </el-col>
+  </el-row>
 
 </template>
 
 <script>
 
+import CaseComment from "@/business/components/track/case/components/CaseComment";
 export default {
   name: "TestCaseDetail",
+  components: {CaseComment},
   data() {
     return {
       result: {},
diff --git a/frontend/src/business/components/track/case/components/TestCaseList.vue b/frontend/src/business/components/track/case/components/TestCaseList.vue
index 7042b87b9f..6f22ed013d 100644
--- a/frontend/src/business/components/track/case/components/TestCaseList.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseList.vue
@@ -62,7 +62,7 @@
             <el-popover
               placement="right-end"
               :title="$t('test_track.case.view_case')"
-              width="60%"
+              width="70%"
               trigger="hover"
             >
               <test-case-detail v-if="currentCaseId === scope.row.id" :test-case-id="currentCaseId"/>