From 3f8e5c58d318303434889b1f81cb666a6eef0cd4 Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Mon, 12 Oct 2020 18:06:17 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=E6=B7=BB=E5=8A=A0=E9=A2=84=E8=A7=88?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../track/case/components/TestCaseDetail.vue  | 201 ++++++++++++++++++
 .../track/case/components/TestCaseList.vue    |  18 +-
 2 files changed, 215 insertions(+), 4 deletions(-)
 create mode 100644 frontend/src/business/components/track/case/components/TestCaseDetail.vue

diff --git a/frontend/src/business/components/track/case/components/TestCaseDetail.vue b/frontend/src/business/components/track/case/components/TestCaseDetail.vue
new file mode 100644
index 0000000000..94aadc184f
--- /dev/null
+++ b/frontend/src/business/components/track/case/components/TestCaseDetail.vue
@@ -0,0 +1,201 @@
+<template>
+  <el-form :model="form" ref="caseFrom" v-loading="result.loading">
+
+    <el-row>
+      <el-col :span="8" :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="11" :offset="2">
+        <el-form-item :label="$t('test_track.case.module')" :label-width="formLabelWidth" prop="module">
+          <el-select
+            v-model="testCase.module"
+            :disabled="readOnly"
+            :placeholder="$t('test_track.case.input_module')"
+            filterable>
+          </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-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-select>
+        </el-form-item>
+      </el-col>
+    </el-row>
+
+    <el-row v-if="testCase.method && testCase.method == 'auto'">
+      <el-col :span="9" :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="9" :offset="1" 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')"></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row style="margin-top: 15px;">
+      <el-col :offset="2">{{ $t('test_track.case.prerequisite') }}:</el-col>
+    </el-row>
+    <el-row type="flex" justify="center" style="margin-top: 10px;">
+      <el-col :span="20">
+        <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="2">{{ $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="20">
+        <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"
+                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="2">{{ $t('commons.remark') }}:</el-col>
+    </el-row>
+    <el-row type="flex" justify="center">
+      <el-col :span="20">
+        <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>
+
+</template>
+
+<script>
+
+export default {
+  name: "TestCaseDetail",
+  data() {
+    return {
+      result: {},
+      dialogFormVisible: false,
+      readOnly: true,
+      form: {
+        name: '',
+        module: '',
+        maintainer: '',
+        priority: '',
+        type: '',
+        method: '',
+        prerequisite: '',
+        testId: '',
+        otherTestName: '',
+        steps: [{
+          num: 1,
+          desc: '',
+          result: ''
+        }],
+        remark: '',
+      },
+      workspaceId: '',
+      formLabelWidth: "120px",
+
+      isStepTableAlive: true,
+      methodOptions: [
+        {value: 'auto', label: this.$t('test_track.case.auto')},
+        {value: 'manual', label: this.$t('test_track.case.manual')}
+      ]
+    };
+  },
+  props: {
+    testCase: {
+      type: Object
+    }
+  },
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/frontend/src/business/components/track/case/components/TestCaseList.vue b/frontend/src/business/components/track/case/components/TestCaseList.vue
index 94b9b5c67e..8b9fb910ec 100644
--- a/frontend/src/business/components/track/case/components/TestCaseList.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseList.vue
@@ -56,9 +56,18 @@
           show-overflow-tooltip
         >
           <template v-slot:default="scope">
-            <div @mouseover="showDetail(scope.row)">
+            <!--<div @mouseover="showDetail(scope.row)">
               <p>{{ scope.row.name }}</p>
-            </div>
+            </div>-->
+            <el-popover
+              placement="right-end"
+              :title="$t('test_track.case.view_case')"
+              width="60%"
+              trigger="hover"
+            >
+              <test-case-detail :test-case="scope.row"/>
+              <p slot="reference">{{ scope.row.name }}</p>
+            </el-popover>
           </template>
         </el-table-column>
         <el-table-column
@@ -164,7 +173,7 @@
   import {WORKSPACE_ID} from "../../../../../common/js/constants";
   import {LIST_CHANGE, TrackEvent} from "@/business/components/common/head/ListEvent";
   import StatusTableItem from "@/business/components/track/common/tableItems/planview/StatusTableItem";
-
+  import TestCaseDetail from "./TestCaseDetail";
   export default {
     name: "TestCaseList",
     components: {
@@ -182,7 +191,8 @@
       MsTableHeader,
       ShowMoreBtn,
       BatchEdit,
-      StatusTableItem
+      StatusTableItem,
+      TestCaseDetail
     },
     data() {
       return {

From 55c06e0ff00144e57321733929ece38f4ddbb9fa Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Mon, 12 Oct 2020 18:42:33 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E9=A2=84=E8=A7=88?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../track/case/components/TestCaseDetail.vue     | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/frontend/src/business/components/track/case/components/TestCaseDetail.vue b/frontend/src/business/components/track/case/components/TestCaseDetail.vue
index 94aadc184f..49fcf7263e 100644
--- a/frontend/src/business/components/track/case/components/TestCaseDetail.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseDetail.vue
@@ -14,12 +14,7 @@
 
       <el-col :span="11" :offset="2">
         <el-form-item :label="$t('test_track.case.module')" :label-width="formLabelWidth" prop="module">
-          <el-select
-            v-model="testCase.module"
-            :disabled="readOnly"
-            :placeholder="$t('test_track.case.input_module')"
-            filterable>
-          </el-select>
+          <el-input class="case-name" :disabled="readOnly" v-model="testCase.nodePath"></el-input>
         </el-form-item>
       </el-col>
     </el-row>
@@ -46,12 +41,18 @@
         <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>
@@ -67,7 +68,8 @@
       </el-col>
       <el-col :span="9" :offset="1" 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')"></el-input>
+          <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>