Browse Source

Merge pull request #4639 from zhuangchong/dev-fix-ui-warning-instance-i18n

[Fix][UI] Alert-server warningInstance title support internationalization.
pull/3/MERGE
xingchun-chen 4 years ago committed by GitHub
parent
commit
86ee8ffa95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/list.vue
  2. 10
      dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningInstance/_source/createWarningInstance.vue
  3. 6
      dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningInstance/index.vue
  4. 5
      dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
  5. 5
      dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js

6
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 :data="list" size="mini" style="width: 100%">
<el-table-column type="index" :label="$t('#')" width="50"></el-table-column> <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="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"> <el-table-column :label="$t('Create Time')" width="140">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.row.createTime | formatDate}}</span> <span>{{scope.row.createTime | formatDate}}</span>

10
dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningInstance/_source/createWarningInstance.vue

@ -39,7 +39,7 @@
<template slot="content"> <template slot="content">
<el-select v-model="pluginDefineId" size="small" style="width: 100%" @change="changePlugin" disabled="true" v-if="item.id"> <el-select v-model="pluginDefineId" size="small" style="width: 100%" @change="changePlugin" disabled="true" v-if="item.id">
<el-option <el-option
v-for="items in pulginInstance" v-for="items in pluginInstance"
:key="items.id" :key="items.id"
:value="items.id" :value="items.id"
:label="items.pluginName"> :label="items.pluginName">
@ -47,7 +47,7 @@
</el-select> </el-select>
<el-select v-model="pluginDefineId" size="small" style="width: 100%" @change="changePlugin" v-else> <el-select v-model="pluginDefineId" size="small" style="width: 100%" @change="changePlugin" v-else>
<el-option <el-option
v-for="items in pulginInstance" v-for="items in pluginInstance"
:key="items.id" :key="items.id"
:value="items.id" :value="items.id"
:label="items.pluginName"> :label="items.pluginName">
@ -83,7 +83,7 @@
}, },
props: { props: {
item: Object, item: Object,
pulginInstance: Array pluginInstance: Array
}, },
methods: { methods: {
_ok () { _ok () {
@ -121,7 +121,7 @@
this.rule = JSON.parse(res.pluginParams) this.rule = JSON.parse(res.pluginParams)
this.rule.forEach(item => { this.rule.forEach(item => {
if (item.title.indexOf('$t') !== -1) { if (item.title.indexOf('$t') !== -1) {
item.title = $t(item.field) item.title = this.$t(item.field)
} }
}) })
}).catch(e => { }).catch(e => {
@ -163,7 +163,7 @@
this.pluginDefineId = this.item.pluginDefineId this.pluginDefineId = this.item.pluginDefineId
JSON.parse(this.item.pluginInstanceParams).forEach(item => { JSON.parse(this.item.pluginInstanceParams).forEach(item => {
if (item.title.indexOf('$t') !== -1) { if (item.title.indexOf('$t') !== -1) {
item.title = $t(item.field) item.title = this.$t(item.field)
} }
pluginInstanceParams.push(item) pluginInstanceParams.push(item)
}) })

6
dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningInstance/index.vue

@ -25,7 +25,7 @@
v-if="createWarningDialog" v-if="createWarningDialog"
:visible.sync="createWarningDialog" :visible.sync="createWarningDialog"
width="auto"> 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> </el-dialog>
</template> </template>
</m-conditions> </m-conditions>
@ -86,7 +86,7 @@
isADMIN: store.state.user.userInfo.userType === 'ADMIN_USER', isADMIN: store.state.user.userInfo.userType === 'ADMIN_USER',
createWarningDialog: false, createWarningDialog: false,
item: {}, item: {},
pulginInstance: [] pluginInstance: []
} }
}, },
mixins: [listUrlParamHandle], mixins: [listUrlParamHandle],
@ -114,7 +114,7 @@
}, },
_create (item) { _create (item) {
this.getPlugins({ pluginType: 'ALERT' }).then(res => { this.getPlugins({ pluginType: 'ALERT' }).then(res => {
this.pulginInstance = res this.pluginInstance = res
}).catch(e => { }).catch(e => {
this.$message.error(e.msg) this.$message.error(e.msg)
}) })

5
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 SQL Statement(required)': 'Please enter a SQL Statement(required)',
'Please enter a JSON Statement(required)': 'Please enter a JSON 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', 'One form or attachment must be selected': 'One form or attachment must be selected',
'Recipient required': 'Recipient required',
'Mail subject required': 'Mail subject required', 'Mail subject required': 'Mail subject required',
'Child Node': 'Child Node', 'Child Node': 'Child Node',
'Please select a sub-Process': 'Please select a sub-Process', 'Please select a sub-Process': 'Please select a sub-Process',
@ -400,8 +399,8 @@ export default {
'Notification strategy': 'Notification strategy', 'Notification strategy': 'Notification strategy',
'Notification group': 'Notification group', 'Notification group': 'Notification group',
'Please select a notification group': 'Please select a notification group', 'Please select a notification group': 'Please select a notification group',
Recipient: 'Recipient', receivers: 'receivers',
Cc: 'Cc', receiverCcs: 'receiverCcs',
'Whether it is a complement process?': 'Whether it is a complement process?', 'Whether it is a complement process?': 'Whether it is a complement process?',
'Schedule date': 'Schedule date', 'Schedule date': 'Schedule date',
'Mode of execution': 'Mode of execution', 'Mode of execution': 'Mode of execution',

5
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 SQL Statement(required)': '请输入sql语句(必填)',
'Please enter a JSON Statement(required)': '请输入json语句(必填)', 'Please enter a JSON Statement(required)': '请输入json语句(必填)',
'One form or attachment must be selected': '表格附件必须勾选一个', 'One form or attachment must be selected': '表格附件必须勾选一个',
'Recipient required': '收件人邮箱必填',
'Mail subject required': '邮件主题必填', 'Mail subject required': '邮件主题必填',
'Child Node': '子节点', 'Child Node': '子节点',
'Please select a sub-Process': '请选择子工作流', 'Please select a sub-Process': '请选择子工作流',
@ -400,8 +399,8 @@ export default {
'Notification strategy': '通知策略', 'Notification strategy': '通知策略',
'Notification group': '通知组', 'Notification group': '通知组',
'Please select a notification group': '请选择通知组', 'Please select a notification group': '请选择通知组',
Recipient: '收件人', receivers: '收件人',
Cc: '抄送人', receiverCcs: '抄送人',
'Whether it is a complement process?': '是否补数', 'Whether it is a complement process?': '是否补数',
'Schedule date': '调度日期', 'Schedule date': '调度日期',
'Mode of execution': '执行方式', 'Mode of execution': '执行方式',

Loading…
Cancel
Save