From 42e6b36ddb7f5375e2bd47acbff33043de8e59b3 Mon Sep 17 00:00:00 2001
From: break60 <790061044@qq.com>
Date: Thu, 24 Oct 2019 17:19:37 +0800
Subject: [PATCH] Repair security center module prompt (#1094)

* 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
---
 .../home/pages/security/pages/queue/_source/createQueue.vue  | 5 +++--
 .../security/pages/workerGroups/_source/createWorker.vue     | 2 +-
 .../conf/home/pages/user/pages/token/_source/createToken.vue | 4 ++--
 dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js       | 4 +++-
 dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js       | 4 +++-
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/queue/_source/createQueue.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/queue/_source/createQueue.vue
index 0f00abb28..659cec4b8 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/queue/_source/createQueue.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/queue/_source/createQueue.vue
@@ -51,6 +51,7 @@
 </template>
 <script>
   import _ from 'lodash'
+  import i18n from '@/module/i18n'
   import store from '@/conf/home/store'
   import mPopup from '@/module/components/popup/popup'
   import mListBoxF from '@/module/components/listBoxF/listBoxF'
@@ -117,11 +118,11 @@
       },
       _verification () {
         if (!this.queueName) {
-          this.$message.warning(`Please enter name`)
+          this.$message.warning(`${i18n.$t('Please enter name')}`)
           return false
         }
         if (!this.queue) {
-          this.$message.warning(`请输入队列值`)
+          this.$message.warning(`${i18n.$t('Please enter queue value')}`)
           return false
         }
         return true
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/_source/createWorker.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/_source/createWorker.vue
index 2734c5ba6..7930c231c 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/_source/createWorker.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/_source/createWorker.vue
@@ -83,7 +83,7 @@
           return false
         }
         if (!this.ipList) {
-          this.$message.warning(`IP地址不能为空`)
+          this.$message.warning(`${i18n.$t('IP address cannot be empty')}`)
           return false
         }
         return true
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/_source/createToken.vue b/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/_source/createToken.vue
index 70119c3e2..cef3969c1 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/_source/createToken.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/_source/createToken.vue
@@ -67,7 +67,7 @@
 <script>
   import _ from 'lodash'
   import dayjs from 'dayjs'
-  // import i18n from '@/module/i18n'
+  import i18n from '@/module/i18n'
   import store from '@/conf/home/store'
   import Permissions from '@/module/permissions'
   import mPopup from '@/module/components/popup/popup'
@@ -98,7 +98,7 @@
       },
       _verification () {
         if (!this.token) {
-          this.$message.warning('请生成Token')
+          this.$message.warning(`${i18n.$t('Please generate token')}`)
           return false
         }
         return true
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 723174185..b7de0c4a1 100644
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
@@ -493,5 +493,7 @@ export default {
   'Http Condition':'Http Condition',
   'Please Enter Http Url': 'Please Enter Http Url(required)',
   'Please Enter Http Condition': 'Please Enter Http Condition',
-  'There is no data for this period of time': 'There is no data for this period of time'
+  'There is no data for this period of time': 'There is no data for this period of time',
+  'IP address cannot be empty': 'IP address cannot be empty',
+  'Please generate token': 'Please generate token'
 }
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 1120f760f..187928189 100644
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
@@ -498,5 +498,7 @@ export default {
   'Http Condition':'校验内容',
   'Please Enter Http Url': '请填写请求地址(必填)',
   'Please Enter Http Condition': '请填写校验内容',
-  'There is no data for this period of time': '该时间段无数据'
+  'There is no data for this period of time': '该时间段无数据',
+  'IP address cannot be empty': 'IP地址不能为空',
+  'Please generate token': '请生成Token'
 }
-- 
GitLab