Merge remote-tracking branch 'origin/v1.1' into v1.1

backend/src/main/java/io/metersphere/track/service/TestCaseService.java

@@ -366,7 +366,7 @@ public class TestCaseService {
                 data.setStepResult("");
                 data.setRemark(t.getPerformName());
             }
-            data.setMaintainer(user.getId());
+            data.setMaintainer(t.getMaintainer());
             list.add(data);
 
         });

frontend/src/business/components/settings/system/EmailSetting.vue

@@ -72,12 +72,7 @@
     data() {
       return {
         formInline: {
-          /*host: 'smtp.163.com',
-          port: '465',
-          account: 'xjj0608@163.com',
-          password: '2345678',*/
         },
-
         input: '',
         visible: true,
         result: {},
@@ -113,7 +108,7 @@
       }
     },
 
-    activated() {
+    created() {
       this.query()
     },
     methods: {
@@ -129,6 +124,9 @@
           this.$set(this.formInline, "SSL", JSON.parse(response.data[4].paramValue));
           this.$set(this.formInline, "TLS", JSON.parse(response.data[5].paramValue));
           this.$set(this.formInline, "SMTP", JSON.parse(response.data[6].paramValue));
+          this.$nextTick(() => {
+            this.$refs.formInline.clearValidate();
+          })
         })
       },
       change() {

frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseEdit.vue

@@ -88,6 +88,10 @@
                 <span class="cast_label">{{$t('test_track.case.module')}}：</span>
                 <span class="cast_item">{{testCase.nodePath}}</span>
               </el-col>
+              <el-col :span="4" :offset="1">
+                <span class="cast_label">{{$t('test_track.case.prerequisite')}}：</span>
+                <span class="cast_item">{{testCase.prerequisite}}</span>
+              </el-col>
             </el-row>
 
             <el-row v-if="testCase.method == 'auto' && testCase.testId">
@@ -121,17 +125,18 @@
                   :default-sort="{prop: 'num', order: 'ascending'}"
                   highlight-current-row>
                   <el-table-column :label="$t('test_track.case.number')" prop="num" min-width="5%"></el-table-column>
-                  <el-table-column :label="$t('test_track.case.step_desc')" prop="desc" min-width="29%">
+
+                  <el-table-column :label="$t('test_track.case.step_desc')" prop="desc" min-width="21%">
                     <template v-slot:default="scope">
                       <span>{{scope.row.desc}}</span>
                     </template>
                   </el-table-column>
-                  <el-table-column :label="$t('test_track.case.expected_results')" prop="result" min-width="28%">
+                  <el-table-column :label="$t('test_track.case.expected_results')" prop="result" min-width="21%">
                     <template v-slot:default="scope">
                       <span>{{scope.row.result}}</span>
                     </template>
                   </el-table-column>
-                  <el-table-column :label="$t('test_track.plan_view.actual_result')" min-width="29%">
+                  <el-table-column :label="$t('test_track.plan_view.actual_result')" min-width="21%">
                     <template v-slot:default="scope">
                       <el-input
                         size="mini"
@@ -145,7 +150,7 @@
                       <span>{{scope.row.actualResult}}</span>
                     </template>
                   </el-table-column>
-                  <el-table-column :label="$t('test_track.plan_view.step_result')" min-width="9%">
+                  <el-table-column :label="$t('test_track.plan_view.step_result')" min-width="12%">
                     <template v-slot:default="scope">
                       <el-select
                         :disabled="isReadOnly"
@@ -297,15 +302,6 @@
               + this.$t('test_track.length_less_than') + '300');
             return;
           }
-          if (this.testCase.method != 'auto') {
-            if (!result.executeResult) {
-              this.$warning(this.testCase.steptResults[i].desc + this.$t('test_track.execution_result')
-              );
-              return;
-            }
-          }
-
-
           param.results.push(result);
         }
 

frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseList.vue

@@ -206,7 +206,8 @@
           priorityFilters: [
             {text: 'P0', value: 'P0'},
             {text: 'P1', value: 'P1'},
-            {text: 'P2', value: 'P2'}
+            {text: 'P2', value: 'P2'},
+            {text: 'P3', value: 'P3'}
           ],
           methodFilters: [
             {text: this.$t('test_track.case.manual'), value: 'manual'},