From 52f610ada1ff9c6eef6ecf2c8033091f5a5dbf93 Mon Sep 17 00:00:00 2001
From: songjianet <1778651752@qq.com>
Date: Sun, 5 Dec 2021 13:51:13 +0800
Subject: [PATCH] [Fix][Warning instance manage] Expand the support of `i18n`.
 (#7186)

---
 .../warningInstance/_source/createWarningInstance.vue    | 9 +++------
 dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js   | 2 ++
 dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js   | 2 ++
 3 files changed, 7 insertions(+), 6 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 4abdf53d15..101b5ad992 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
@@ -122,15 +122,12 @@
         this.store.dispatch('security/getUiPluginById', {
           pluginId: this.pluginDefineId
         }).then(res => {
-          this.rule = JSON.parse(res.pluginParams)
-          this.rule.forEach(item => {
+          this.rule = JSON.parse(res.pluginParams).map(item => {
             if (item.title.indexOf('$t') !== -1) {
               item.title = this.$t(item.field)
             }
-            // fix null pointer exception
-            if (!item.props) {
-              item.props = {}
-            }
+            item.props = item.props || {}
+            return item
           })
         }).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 4f6b866bb7..192d12ea04 100755
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
@@ -722,6 +722,7 @@ export default {
   'Recover serial wait': 'Recover serial wait',
   IsEnableProxy: 'Enable Proxy',
   WebHook: 'WebHook',
+  webHook: 'WebHook',
   Keyword: 'Keyword',
   Proxy: 'Proxy',
   receivers: 'Receivers',
@@ -747,6 +748,7 @@ export default {
   agentId: 'AgentId',
   users: 'Users',
   Username: 'Username',
+  username: 'Username',
   showType: 'Show Type',
   'Please select a task type (required)': 'Please select a task type (required)',
   layoutType: 'Layout Type',
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 3339880677..1b29794c32 100644
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
@@ -721,6 +721,7 @@ export default {
   'Recover serial wait': '串行恢复',
   IsEnableProxy: '启用代理',
   WebHook: 'Web钩子',
+  webHook: 'Web钩子',
   Keyword: '密钥',
   Proxy: '代理',
   receivers: '收件人',
@@ -747,6 +748,7 @@ export default {
   agentId: '应用ID',
   users: '群员',
   Username: '用户名',
+  username: '用户名',
   showType: '内容展示类型',
   'Please select a task type (required)': '请选择任务类型(必选)',
   layoutType: '布局类型',