Merge branch 'dev' of https://github.com/metersphere/server into dev

frontend/src/business/components/api/test/components/assertion/ApiAssertionRegex.vue

@@ -51,11 +51,16 @@
 
     methods: {
       add: function () {
-        this.list.push(new Regex(this.regex));
+        this.list.push(this.getRegex());
         this.callback();
       },
       remove: function () {
         this.list.splice(this.index, 1);
+      },
+      getRegex() {
+        let regex = new Regex(this.regex);
+        regex.description = regex.subject + " has: " + regex.expression;
+        return regex;
       }
     }
   }

frontend/src/business/components/api/test/model/ScenarioModel.js

@@ -477,7 +477,7 @@ class JMXGenerator {
     }
 
     if (assertions.duration.isValid()) {
-      let name = "Response In Time :" + assertions.duration.value
+      let name = "Response In Time: " + assertions.duration.value
       httpSamplerProxy.put(new DurationAssertion(name, assertions.duration.value));
     }
   }

frontend/src/business/components/common/components/MsTableOperator.vue

@@ -40,13 +40,7 @@
         },
         deleteClickStop() {
           this.$emit('deleteClickStop');
-        },
-        /* removeClick(){
-            this.$emit('removeClick');
-          },
-          removeClickStop(){
-            this.$emit('removeClickStop')
-          }*/
+        }
       }
     }
 </script>

frontend/src/common/js/ajax.js

@@ -14,7 +14,7 @@ export default {
     }
 
     let login = function () {
-      MessageBox.alert("认证信息已过期，请重新登录。", {
+      MessageBox.alert(this.$t('commons.tips'), {
         callback: () => {
           window.location.href = "/login"
         }
@@ -29,7 +29,7 @@ export default {
       }
       return response;
     }, error => {
-      return Promise.reject(this.$t('commons.tips'));
+      return Promise.reject(error);
     });
 
     function then(success, response, result) {

frontend/src/i18n/en-US.js

@@ -89,7 +89,7 @@ export default {
     'weeks_6': 'Sat',
     'test_unit': 'tests',
     'remove': 'Remove',
-    'remove_cancel': 'Remove Failed',
+    'remove_cancel': 'Remove Cancel',
     'remove_success': 'Remove Success',
     'tips': 'The authentication information has expired, please login again'
   },

frontend/src/i18n/zh-CN.js

@@ -88,7 +88,7 @@ export default {
     'port_cannot_be_empty': '端口号不能为空',
     'account_cannot_be_empty': '帐户不能为空',
     'remove': '移除',
-    'remove_cancel': '移除失败',
+    'remove_cancel': '移除取消',
     'remove_success': '移除成功',
     'tips': '认证信息已过期，请重新登录'
   },

frontend/src/i18n/zh-TW.js

@@ -88,7 +88,7 @@ export default {
     'port_cannot_be_empty': '埠號不能為空',
     'account_cannot_be_empty': '帳戶不能為空',
     'remove': '移除',
-    'remove_cancel': '移除失敗',
+    'remove_cancel': '移除取消',
     'remove_success': '移除成功',
     'tips': '认認證資訊已過期,請重新登入'
   },