From 07353e0fd805e3340e58d83faa0da8487045e1d5 Mon Sep 17 00:00:00 2001
From: break60 <790061044@qq.com>
Date: Mon, 18 Nov 2019 17:25:03 +0800
Subject: [PATCH] Add required limit to SQL (#1275)

* Checkbox change background color and env to Chinese

* Remove space before and after login user name

* Modify crontab style

* Add required limit to SQL
---
 .../pages/dag/_source/formModel/tasks/sql.vue | 40 +++++++++++++------
 .../src/js/module/i18n/locale/en_US.js        |  3 ++
 .../src/js/module/i18n/locale/zh_CN.js        |  3 ++
 3 files changed, 33 insertions(+), 13 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 d7ebb26f89..42f09ebc00 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
@@ -43,9 +43,9 @@
         </div>
       </div>
     </m-list-box>
-    <template v-if="!sqlType && showType.length">
+    <template v-if="!sqlType">
       <m-list-box>
-        <div slot="text">{{$t('Title')}}</div>
+        <div slot="text"><b class='requiredIcon'>*</b>{{$t('Title')}}</div>
         <div slot="content">
           <x-input
             type="input"
@@ -56,7 +56,7 @@
         </div>
       </m-list-box>
       <m-list-box>
-        <div slot="text">{{$t('Recipient')}}</div>
+        <div slot="text"><b class='requiredIcon'>*</b>{{$t('Recipient')}}</div>
         <div slot="content">
           <m-email ref="refEmail" v-model="receivers" :disabled="isDetails" :repeat-data="receiversCc"></m-email>
         </div>
@@ -195,6 +195,9 @@
        */
       _onSqlType (a) {
         this.sqlType = a
+        if(a==0) {
+          this.showType = ['TABLE']
+        }
       },
       /**
        * return udfs
@@ -240,12 +243,24 @@
         if (!this.$refs.refDs._verifDatasource()) {
           return false
         }
+        if (this.sqlType==0 && !this.showType.length) {
+          this.$message.warning(`${i18n.$t('One form or attachment must be selected')}`)
+          return false
+        }
+        if (this.sqlType==0 && !this.title) {
+          this.$message.warning(`${i18n.$t('Mail subject required')}`)
+          return false
+        }
+        if (this.sqlType==0 && !this.receivers.length) {
+          this.$message.warning(`${i18n.$t('Recipient required')}`)
+          return false
+        }
         // receivers Subcomponent verification
-        if (!this.$refs.refEmail._manualEmail()) {
+        if (!this.sqlType && !this.$refs.refEmail._manualEmail()) {
           return false
         }
         // receiversCc Subcomponent verification
-        if (!this.$refs.refCc._manualEmail()) {
+        if (!this.sqlType && !this.$refs.refCc._manualEmail()) {
           return false
         }
         // udfs Subcomponent verification Verification only if the data type is HIVE
@@ -356,14 +371,6 @@
           this.connParams = ''
         }
       },
-      //
-      showType (val) {
-        if (!val.length) {
-          this.title = ''
-          this.receivers = []
-          this.receiversCc = []
-        }
-      }
     },
     created () {
       let o = this.backfillItem
@@ -412,3 +419,10 @@
     components: { mListBox, mDatasource, mLocalParams, mUdfs, mSqlType, mStatementList, mEmail }
   }
 </script>
+<style lang="scss" rel="stylesheet/scss">
+  .requiredIcon {
+    color: #ff0000;
+    padding-right: 4px;
+  }
+</style>
+
diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
index fd60361529..53f695f967 100644
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
@@ -119,6 +119,9 @@ export default {
   'SQL Statement': 'SQL Statement',
   'UDF Function': 'UDF Function',
   'Please enter a SQL Statement(required)': 'Please enter a SQL Statement(required)',
+  'One form or attachment must be selected': 'One form or attachment must be selected',
+  'Recipient required': 'Recipient required',
+  'Mail subject required': 'Mail subject required',
   'Child Node': 'Child Node',
   'Please select a sub-Process': 'Please select a sub-Process',
   'Edit': 'Edit',
diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
index 15e0ca5bf7..3e6d7e6dee 100644
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
@@ -119,6 +119,9 @@ export default {
   'SQL Statement': 'sql语句',
   'UDF Function': 'UDF函数',
   'Please enter a SQL Statement(required)': '请输入sql语句(必填)',
+  'One form or attachment must be selected': '表格、附件必须勾选一个',
+  'Recipient required': '收件人邮箱必填',
+  'Mail subject required': '邮件主题必填',
   'Child Node': '子节点',
   'Please select a sub-Process': '请选择子工作流',
   'Edit': '编辑',