From f0d1b60d9b71a3ddfc49f981759e3c164375fd94 Mon Sep 17 00:00:00 2001
From: break60 <790061044@qq.com>
Date: Thu, 7 Nov 2019 16:07:38 +0800
Subject: [PATCH] Resolve style conflict, recipient cannot tab and value
 verification (#1173)

* Dependency workflow add dependency correction value

* Download workflow instance map width adjustment and change "desc" field to "description"

* The third-party library that builds the dependency is recommended to be placed in 'devDependencies'

* Tree chart and Gantt chart style modification

* The workflow instance can be deleted only when its status is success, failure, stop and pause.

* change desc to description

* Maximum width of tooltip is set to 500px, note the copyright number of login page

* Delete copyright number

* No tenant in the list of selected tenants the default is default, and the status not shown in the repair page

* repair

* Repair security center module prompt

* Remove blank character during verification

* Remove blank character during verification

* Non admin users cannot create users, tenants, alarm groups, queues and worker groups

* Remove CI windows detection

* The value of loadaverage should be two decimal places

* Add license

* delete docs

* update package.json

* delete LICENSE

* Display icon when there is no data in process definition

* Worker group add IP format verification

* Modify MySQL page of monitoring center

* DB page rename and background color modification

* IO build replace with source code

* Replace ans charts with source code

* delete component-compiler-utils

* delete progress-webpack-plugin

* Release administrator delete function and select tenant not updated

* The default timing is hourly

* Resolve style conflict, recipient cannot tab and value verification
---
 .../home/pages/dag/_source/formModel/tasks/sql.vue  | 13 ++++++++++---
 .../js/conf/home/pages/monitor/pages/servers/db.vue |  4 ++--
 .../pages/definition/pages/list/_source/email.vue   | 10 ++++------
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue
index 029dcacf56..d7ebb26f89 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue
@@ -58,13 +58,13 @@
       <m-list-box>
         <div slot="text">{{$t('Recipient')}}</div>
         <div slot="content">
-          <m-email v-model="receivers" :disabled="isDetails" :repeat-data="receiversCc"></m-email>
+          <m-email ref="refEmail" v-model="receivers" :disabled="isDetails" :repeat-data="receiversCc"></m-email>
         </div>
       </m-list-box>
       <m-list-box>
         <div slot="text">{{$t('Cc')}}</div>
         <div slot="content">
-          <m-email v-model="receiversCc" :disabled="isDetails" :repeat-data="receivers"></m-email>
+          <m-email ref="refCc" v-model="receiversCc" :disabled="isDetails" :repeat-data="receivers"></m-email>
         </div>
       </m-list-box>
     </template>
@@ -240,7 +240,14 @@
         if (!this.$refs.refDs._verifDatasource()) {
           return false
         }
-
+        // receivers Subcomponent verification
+        if (!this.$refs.refEmail._manualEmail()) {
+          return false
+        }
+        // receiversCc Subcomponent verification
+        if (!this.$refs.refCc._manualEmail()) {
+          return false
+        }
         // udfs Subcomponent verification Verification only if the data type is HIVE
         if (this.type === 'HIVE') {
           if (!this.$refs.refUdfs._verifUdfs()) {
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/db.vue b/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/db.vue
index 2cdbd8f3ca..363b37bc3e 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/db.vue
+++ b/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;
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/email.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/email.vue
index 6fb138daa0..8418e67750 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/email.vue
+++ b/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: {