Merge branch 'v1.0'

backend/src/main/java/io/metersphere/service/SystemParameterService.java

@@ -75,8 +75,6 @@ public class SystemParameterService {
         javaMailSender.setUsername(hashMap.get(ParamConstants.MAIL.ACCOUNT.getKey()));
         javaMailSender.setPassword(hashMap.get(ParamConstants.MAIL.PASSWORD.getKey()));
         Properties props = new Properties();
-        props.put("mail.smtp.timeout", "5000");
-        props.put("mail.smtp.connectiontimeout", "5000");
         props.put("mail.smtp.auth", "true");
         if (BooleanUtils.toBoolean(hashMap.get(ParamConstants.MAIL.SSL.getKey()))) {
             props.put("mail.smtp.socketFactory.class", "javax.net.ssl.SSLSocketFactory");
@@ -84,6 +82,8 @@ public class SystemParameterService {
         if (BooleanUtils.toBoolean(hashMap.get(ParamConstants.MAIL.TLS.getKey()))) {
             props.put("mail.smtp.starttls.enable", "true");
         }
+        props.put("mail.smtp.timeout", "30000");
+        props.put("mail.smtp.connectiontimeout", "5000");
         javaMailSender.setJavaMailProperties(props);
         try {
             javaMailSender.testConnection();

frontend/src/business/components/settings/personal/PersonSetting.vue

@@ -57,7 +57,8 @@
     </el-dialog>
 
     <!--Change personal password-->
-    <el-dialog :title="$t('member.edit_password')" :visible.sync="editPasswordVisible" width="35%" :before-close='closeDialog' left  >
+    <el-dialog :title="$t('member.edit_password')" :visible.sync="editPasswordVisible" width="35%"
+               :destroy-on-close="true" @close="handleClose" left>
       <el-form :model="ruleForm" :rules="rules" ref="editPasswordForm" label-width="120px" class="demo-ruleForm">
         <el-form-item :label="$t('member.old_password')" prop="password" style="margin-bottom: 29px">
           <el-input v-model="ruleForm.password" autocomplete="off" show-password/>
@@ -68,7 +69,7 @@
       </el-form>
       <span slot="footer" class="dialog-footer">
            <ms-dialog-footer
-             @cancel="cancel()"
+             @cancel="editPasswordVisible = false"
              @confirm="updatePassword('editPasswordForm')"/>
         </span>
     </el-dialog>

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

@@ -267,7 +267,8 @@
       </template>
     </el-dialog>
     <!--Changing user password in system settings-->
-    <el-dialog :title="$t('member.edit_password')" :visible.sync="editPasswordVisible" width="30%" left>
+    <el-dialog :title="$t('member.edit_password')" :visible.sync="editPasswordVisible" width="30%"
+               :destroy-on-close="true" @close="handleClose" left>
       <el-form :model="ruleForm" label-position="right" label-width="120px" size="small" :rules="rule"
                ref="editPasswordForm" class="demo-ruleForm">
         <el-form-item :label="$t('member.new_password')" prop="newpassword">

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

@@ -282,6 +282,18 @@
               + this.$t('test_track.length_less_than') + '300');
             return;
           }
+          if (!result.actualResult) {
+            this.$warning(this.testCase.steptResults[i].desc + this.$t('test_track.actual_result')
+            );
+            return;
+          }
+          if (!result.executeResult) {
+            this.$warning(this.testCase.steptResults[i].desc + this.$t('test_track.execution_result')
+            );
+            return;
+          }
+
+
           param.results.push(result);
         }
 

frontend/src/i18n/en-US.js

@@ -461,6 +461,8 @@ export default {
     recent_plan: "Recent plan",
     recent_case: "Recent case",
     pass_rate: "Pass rate",
+    execution_result: ": Please select the execution result",
+    actual_result: ": The actual result is empty",
     case: {
       test_case: "Case",
       move: "Move case",

frontend/src/i18n/zh-CN.js

@@ -460,6 +460,9 @@ export default {
     recent_plan: "最近的计划",
     recent_case: "最近的用例",
     pass_rate: "通过率",
+    execution_result: ": 请选择执行结果",
+    actual_result: ": 实际结果为空",
+
     case: {
       test_case: "测试用例",
       move: "移动用例",

frontend/src/i18n/zh-TW.js

@@ -460,6 +460,8 @@ export default {
     recent_plan: "最近的計劃",
     recent_case: "最近的用例",
     pass_rate: "通過率",
+    execution_result: ": 請選擇執行結果",
+    actual_result: ": 實際結果為空",
     case: {
       test_case: "測試用例",
       move: "移動用例",