From bccc1e3b1c8a34d28cb232a21b69926430ab7bb1 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Fri, 24 Apr 2020 09:42:48 +0800
Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=B5=8B=E8=AF=95=E7=94=A8?=
 =?UTF-8?q?=E4=BE=8B=E5=B1=95=E7=A4=BA=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/track/case/TestCase.vue        | 15 ++++++++---
 .../track/case/components/TestCaseEdit.vue    | 25 +++++++++++++------
 .../track/case/components/TestCaseList.vue    | 19 +++++++-------
 3 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/frontend/src/business/components/track/case/TestCase.vue b/frontend/src/business/components/track/case/TestCase.vue
index d6c42790e7..e63ec65808 100644
--- a/frontend/src/business/components/track/case/TestCase.vue
+++ b/frontend/src/business/components/track/case/TestCase.vue
@@ -22,8 +22,8 @@
               :current-project="currentProject"
               :selectNodeIds="selectNodeIds"
               :selectNodeNames="selectNodeNames"
-              @openTestCaseEditDialog="openTestCaseEditDialog"
-              @testCaseEdit="openTestCaseEditDialog"
+              @testCaseEdit="editTestCase"
+              @testCaseDetail="showTestCaseDetail"
               @refresh="refresh"
               ref="testCaseList">
             </test-case-list>
@@ -32,6 +32,7 @@
 
         <test-case-edit
           @refresh="refresh"
+          :read-only="testCaseReadOnly"
           :tree-nodes="treeNodes"
           ref="testCaseEditDialog">
         </test-case-edit>
@@ -60,7 +61,8 @@
         currentProject: null,
         treeNodes: [],
         selectNodeIds: [],
-        selectNodeNames: []
+        selectNodeNames: [],
+        testCaseReadOnly: true
       }
     },
     mounted() {
@@ -136,7 +138,12 @@
       refreshTable() {
         this.$refs.testCaseList.initTableData();
       },
-      openTestCaseEditDialog(testCase) {
+      editTestCase(testCase) {
+        this.testCaseReadOnly = false;
+        this.$refs.testCaseEditDialog.open(testCase);
+      },
+      showTestCaseDetail(testCase) {
+        this.testCaseReadOnly = true;
         this.$refs.testCaseEditDialog.open(testCase);
       },
       getProjectByCaseId(caseId) {
diff --git a/frontend/src/business/components/track/case/components/TestCaseEdit.vue b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
index acc373d1c6..d9600ec2fe 100644
--- a/frontend/src/business/components/track/case/components/TestCaseEdit.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
@@ -13,7 +13,7 @@
               :label="$t('test_track.case.name')"
               :label-width="formLabelWidth"
               prop="name">
-              <el-input v-model="form.name"></el-input>
+              <el-input :disabled="readOnly" v-model="form.name"></el-input>
             </el-form-item>
           </el-col>
 
@@ -21,6 +21,7 @@
             <el-form-item :label="$t('test_track.case.module')" :label-width="formLabelWidth" prop="module">
               <el-select
                 v-model="form.module"
+                :disabled="readOnly"
                 :placeholder="$t('test_track.case.input_module')"
                 filterable>
                 <el-option
@@ -37,7 +38,7 @@
         <el-row>
           <el-col :span="10" :offset="1">
             <el-form-item :label="$t('test_track.case.maintainer')" :label-width="formLabelWidth" prop="maintainer">
-              <el-select v-model="form.maintainer" :placeholder="$t('test_track.case.input_maintainer')" filterable>
+              <el-select :disabled="readOnly" v-model="form.maintainer" :placeholder="$t('test_track.case.input_maintainer')" filterable>
                 <el-option
                   v-for="item in maintainerOptions"
                   :key="item.id"
@@ -49,7 +50,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('test_track.case.priority')" :label-width="formLabelWidth" prop="priority">
-              <el-select v-model="form.priority" clearable :placeholder="$t('test_track.case.input_priority')">
+              <el-select :disabled="readOnly" v-model="form.priority" clearable :placeholder="$t('test_track.case.input_priority')">
                 <el-option label="P0" value="P0"></el-option>
                 <el-option label="P1" value="P1"></el-option>
                 <el-option label="P2" value="P2"></el-option>
@@ -62,7 +63,7 @@
         <el-row>
           <el-col :span="10" :offset="1">
             <el-form-item :label="$t('test_track.case.type')" :label-width="formLabelWidth" prop="type">
-              <el-select v-model="form.type" :placeholder="$t('test_track.case.input_type')">
+              <el-select :disabled="readOnly" v-model="form.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>
@@ -71,7 +72,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('test_track.case.method')" :label-width="formLabelWidth" prop="method">
-              <el-select v-model="form.method" :placeholder="$t('test_track.case.input_method')">
+              <el-select :disabled="readOnly" v-model="form.method" :placeholder="$t('test_track.case.input_method')">
                 <el-option :label="$t('test_track.case.manual')" value="manual"></el-option>
                 <el-option :label="$t('test_track.case.auto')" value="auto"></el-option>
               </el-select>
@@ -85,7 +86,7 @@
         <el-row type="flex" justify="center" style="margin-top: 10px;">
           <el-col :span="20">
             <el-form-item>
-              <el-input v-model="form.prerequisite"
+              <el-input :disabled="readOnly" v-model="form.prerequisite"
                         type="textarea"
                         :autosize="{ minRows: 2, maxRows: 4}"
                         :rows="2"
@@ -111,6 +112,7 @@
                 <template v-slot:default="scope">
                   <el-input
                     size="mini"
+                    v-if="!readOnly"
                     type="textarea"
                     :rows="2"
                     v-model="scope.row.desc"
@@ -123,6 +125,7 @@
                 <template v-slot:default="scope">
                   <el-input
                     size="mini"
+                    v-if="!readOnly"
                     type="textarea"
                     :rows="2"
                     v-model="scope.row.result"
@@ -135,6 +138,7 @@
                 <template v-slot:default="scope">
                   <el-button
                     type="primary"
+                    :disabled="readOnly"
                     icon="el-icon-plus"
                     circle size="mini"
                     @click="handleAddStep(scope.$index, scope.row)"></el-button>
@@ -143,7 +147,7 @@
                     icon="el-icon-delete"
                     circle size="mini"
                     @click="handleDeleteStep(scope.$index, scope.row)"
-                    :disabled="scope.$index == 0 ? true : false"></el-button>
+                    :disabled="readOnly || scope.$index == 0 ? true : false"></el-button>
                 </template>
               </el-table-column>
             </el-table>
@@ -159,6 +163,7 @@
               <el-input v-model="form.remark"
                         :autosize="{ minRows: 2, maxRows: 4}"
                         type="textarea"
+                        :disabled="readOnly"
                         :rows="2"
                         :placeholder="$t('commons.input_content')"></el-input>
             </el-form-item>
@@ -167,7 +172,7 @@
       </el-form>
 
       <template v-slot:footer>
-        <ms-dialog-footer
+        <ms-dialog-footer v-if="!readOnly"
           @cancel="dialogFormVisible = false"
           @confirm="saveCase"/>
       </template>
@@ -227,6 +232,10 @@
     props: {
       treeNodes: {
         type: Array
+      },
+      readOnly: {
+        type: Boolean,
+        default: true
       }
     },
     methods: {
diff --git a/frontend/src/business/components/track/case/components/TestCaseList.vue b/frontend/src/business/components/track/case/components/TestCaseList.vue
index dd9fd93de5..dbab186688 100644
--- a/frontend/src/business/components/track/case/components/TestCaseList.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseList.vue
@@ -19,6 +19,7 @@
 
       <el-table
         :data="tableData"
+        @row-click="showDetail"
         class="test-content">
         <el-table-column
           prop="name"
@@ -60,14 +61,7 @@
           :label="$t('test_track.case.module')"
           show-overflow-tooltip>
         </el-table-column>
-        <el-table-column
-          prop="createTime"
-          sortable
-          :label="$t('commons.create_time')">
-          <template v-slot:default="scope">
-            <span>{{ scope.row.createTime | timestampFormatDate }}</span>
-          </template>
-        </el-table-column>
+
         <el-table-column
           prop="updateTime"
           sortable
@@ -178,7 +172,7 @@
           return path + "/" + this.currentPage + "/" + this.pageSize;
         },
         testCaseCreate() {
-          this.$emit('openTestCaseEditDialog');
+          this.$emit('testCaseEdit');
         },
         handleEdit(testCase) {
           this.$emit('testCaseEdit', testCase);
@@ -210,6 +204,9 @@
         filter(value, row, column) {
           const property = column['property'];
           return row[property] === value;
+        },
+        showDetail(row, event, column) {
+          this.$emit('testCaseDetail', row);
         }
       }
     }
@@ -237,4 +234,8 @@
     width: 240px;
   }
 
+  .el-table {
+    cursor:pointer;
+  }
+
 </style>