From e05d93aa335d872730fb55ece75e093c051ea600 Mon Sep 17 00:00:00 2001
From: zhuangchong <zhuangchong6@163.com>
Date: Sun, 31 Jan 2021 21:04:03 +0800
Subject: [PATCH 1/3] fix ui warningInstance title support
 internationalization.

---
 .../warningInstance/_source/createWarningInstance.vue  | 10 +++++-----
 .../pages/security/pages/warningInstance/index.vue     |  6 +++---
 dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js |  2 ++
 dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js |  2 ++
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningInstance/_source/createWarningInstance.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningInstance/_source/createWarningInstance.vue
index c41af3db42..b46e477803 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningInstance/_source/createWarningInstance.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningInstance/_source/createWarningInstance.vue
@@ -39,7 +39,7 @@
           <template slot="content">
             <el-select v-model="pluginDefineId" size="small" style="width: 100%" @change="changePlugin" disabled="true" v-if="item.id">
               <el-option
-                      v-for="items in pulginInstance"
+                      v-for="items in pluginInstance"
                       :key="items.id"
                       :value="items.id"
                       :label="items.pluginName">
@@ -47,7 +47,7 @@
             </el-select>
             <el-select v-model="pluginDefineId" size="small" style="width: 100%" @change="changePlugin" v-else>
               <el-option
-                      v-for="items in pulginInstance"
+                      v-for="items in pluginInstance"
                       :key="items.id"
                       :value="items.id"
                       :label="items.pluginName">
@@ -83,7 +83,7 @@
     },
     props: {
       item: Object,
-      pulginInstance: Array
+      pluginInstance: Array
     },
     methods: {
       _ok () {
@@ -121,7 +121,7 @@
           this.rule = JSON.parse(res.pluginParams)
           this.rule.forEach(item => {
             if (item.title.indexOf('$t') !== -1) {
-              item.title = $t(item.field)
+              item.title = this.$t(item.field)
             }
           })
         }).catch(e => {
@@ -163,7 +163,7 @@
         this.pluginDefineId = this.item.pluginDefineId
         JSON.parse(this.item.pluginInstanceParams).forEach(item => {
           if (item.title.indexOf('$t') !== -1) {
-            item.title = $t(item.field)
+            item.title = this.$t(item.field)
           }
           pluginInstanceParams.push(item)
         })
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningInstance/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningInstance/index.vue
index a0623ab2e0..c4619f986f 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningInstance/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningInstance/index.vue
@@ -25,7 +25,7 @@
             v-if="createWarningDialog"
             :visible.sync="createWarningDialog"
             width="auto">
-            <m-create-warning-instance :item="item" :pulginInstance="pulginInstance" @onUpdate="onUpdate" @close="close"></m-create-warning-instance>
+            <m-create-warning-instance :item="item" :pluginInstance="pluginInstance" @onUpdate="onUpdate" @close="close"></m-create-warning-instance>
           </el-dialog>
         </template>
       </m-conditions>
@@ -86,7 +86,7 @@
         isADMIN: store.state.user.userInfo.userType === 'ADMIN_USER',
         createWarningDialog: false,
         item: {},
-        pulginInstance: []
+        pluginInstance: []
       }
     },
     mixins: [listUrlParamHandle],
@@ -114,7 +114,7 @@
       },
       _create (item) {
         this.getPlugins({ pluginType: 'ALERT' }).then(res => {
-          this.pulginInstance = res
+          this.pluginInstance = res
         }).catch(e => {
           this.$message.error(e.msg)
         })
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 168258a9f6..9038e21fa7 100755
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
@@ -400,6 +400,8 @@ export default {
   'Please select a notification group': 'Please select a notification group',
   Recipient: 'Recipient',
   Cc: 'Cc',
+  receivers: 'receivers',
+  receiverCcs: 'receiverCcs',
   'Whether it is a complement process?': 'Whether it is a complement process?',
   'Schedule date': 'Schedule date',
   'Mode of execution': 'Mode of execution',
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 fb3bd3fb5b..61174ae867 100755
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
@@ -400,6 +400,8 @@ export default {
   'Please select a notification group': '请选择通知组',
   Recipient: '收件人',
   Cc: '抄送人',
+  receivers: '收件人',
+  receiverCcs: '抄送人',
   'Whether it is a complement process?': '是否补数',
   'Schedule date': '调度日期',
   'Mode of execution': '执行方式',

From 7db8ca239365abaccfcf83b677b639f8003efd57 Mon Sep 17 00:00:00 2001
From: zhuangchong <zhuangchong6@163.com>
Date: Mon, 1 Feb 2021 13:08:35 +0800
Subject: [PATCH 2/3] imp ui alert groups description add filter null.

---
 .../pages/security/pages/warningGroups/_source/list.vue     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/list.vue
index c3c0a9e343..914c46b66a 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/list.vue
@@ -20,7 +20,11 @@
       <el-table :data="list" size="mini" style="width: 100%">
         <el-table-column type="index" :label="$t('#')" width="50"></el-table-column>
         <el-table-column prop="groupName" :label="$t('Group Name')"></el-table-column>
-        <el-table-column prop="description" :label="$t('Remarks')" width="200"></el-table-column>
+        <el-table-column prop="description" :label="$t('Remarks')" width="200">
+          <template slot-scope="scope">
+            <span>{{scope.row.description | filterNull}}</span>
+          </template>
+        </el-table-column>
         <el-table-column :label="$t('Create Time')" width="140">
           <template slot-scope="scope">
             <span>{{scope.row.createTime | formatDate}}</span>

From 3a3abddd9c5cc2bae79272fc642054bde8459e66 Mon Sep 17 00:00:00 2001
From: zhuangchong <zhuangchong6@163.com>
Date: Mon, 1 Feb 2021 13:51:19 +0800
Subject: [PATCH 3/3] remove abandoned fields.

---
 dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js | 3 ---
 dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js | 3 ---
 2 files changed, 6 deletions(-)

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 9038e21fa7..cffac67e1e 100755
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
@@ -133,7 +133,6 @@ export default {
   'Please enter a SQL Statement(required)': 'Please enter a SQL Statement(required)',
   'Please enter a JSON Statement(required)': 'Please enter a JSON 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',
@@ -398,8 +397,6 @@ export default {
   'Notification strategy': 'Notification strategy',
   'Notification group': 'Notification group',
   'Please select a notification group': 'Please select a notification group',
-  Recipient: 'Recipient',
-  Cc: 'Cc',
   receivers: 'receivers',
   receiverCcs: 'receiverCcs',
   'Whether it is a complement process?': 'Whether it is a complement process?',
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 61174ae867..84d1553140 100755
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
@@ -133,7 +133,6 @@ export default {
   'Please enter a SQL Statement(required)': '请输入sql语句(必填)',
   'Please enter a JSON Statement(required)': '请输入json语句(必填)',
   'One form or attachment must be selected': '表格、附件必须勾选一个',
-  'Recipient required': '收件人邮箱必填',
   'Mail subject required': '邮件主题必填',
   'Child Node': '子节点',
   'Please select a sub-Process': '请选择子工作流',
@@ -398,8 +397,6 @@ export default {
   'Notification strategy': '通知策略',
   'Notification group': '通知组',
   'Please select a notification group': '请选择通知组',
-  Recipient: '收件人',
-  Cc: '抄送人',
   receivers: '收件人',
   receiverCcs: '抄送人',
   'Whether it is a complement process?': '是否补数',