Merge remote-tracking branch 'remotes/upstream/dev-1.1.0' into dev-1.1.0

escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/timing.vue

@@ -254,11 +254,6 @@
 
                 this.store.dispatch(api, searchParams).then(res => {
                   this.previewTimes = res
-                  if (this.previewTimes.length) {
-                    resolve()
-                  } else {
-                    reject(new Error(0))
-                  }
                 })
               }
             },

escheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue

@@ -131,7 +131,8 @@
         }
       },
       _verification () {
-        let regEmail = /^([a-zA-Z0-9]+[_|\-|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\-|\.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/ // eslint-disable-line
+        let regEmail = /^([a-zA-Z0-9]+[_|\-|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\-|\.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,}$/ // eslint-disable-line
+
         // Mobile phone number regular
         let regPhone = /^1(3|4|5|6|7|8)\d{9}$/; // eslint-disable-line