Merge incomplete (#1283)

dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/db.vue

@@ -16,7 +16,7 @@
  */
 <template>
   <div>
-    <div class="servers-wrapper mysql-model content-box" v-show="mysqlList.length">
+    <div class="servers-wrapper mysql-model content-wrap" v-show="mysqlList.length">
       <div class="row" v-for="(item,$index) in mysqlList">
         <div class="col-md-12">
           <div class="db-title">
@@ -130,7 +130,7 @@ export default {
 </script>
 <style lang="scss" rel="stylesheet/scss">
 @import "./servers";
-.content-box {
+.content-wrap {
   background: #fff;
   min-height: calc(100vh - 100px);
   margin: 20px;

dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/email.vue

@@ -98,7 +98,7 @@
        */
       _manualEmail () {
         if (this.email === '') {
-          return
+          return true
         }
         this.email = _.trim(this.email).replace(/(;$)|(；$)/g, "")
 
@@ -114,11 +114,14 @@
             this.activeList.push(email)
             this.email = ''
             this._handlerEmailWitch()
+            return true
           } else {
             this.$message.warning(`${i18n.$t('Mailbox already exists! Recipients and copyers cannot repeat')}`)
+            return false
           }
         } else {
           this.$message.warning(`${i18n.$t('Mailbox input is illegal')}`)
+          return false
         }
       },
       /**
@@ -252,11 +255,6 @@
       _emailTab () {
         // Data processing
         this._emailEnter()
-        // Focus acquisition
-        setTimeout(() => {
-          // Focus position
-          this.$refs.emailInput.focus()
-        }, 100)
       }
     },
     watch: {