fix:补充国际化 修改 表达式模板表格 首次加载的问题

This commit is contained in:
zhangyu
2021-05-12 10:59:21 +08:00
parent 6de962f6eb
commit 6cd3febd5a
8 changed files with 30 additions and 29 deletions

View File

@@ -1148,7 +1148,7 @@ const cn = {
endpointInfo: 'Endpoint信息' endpointInfo: 'Endpoint信息'
}, },
project: { project: {
project: '系统', project: '名称',
projectName: '系统名称', projectName: '系统名称',
editProject: '编辑系统', editProject: '编辑系统',
description: '描述', description: '描述',
@@ -1175,7 +1175,7 @@ const cn = {
authProtocol: '认证协议', authProtocol: '认证协议',
privProtocol: '隐私协议', privProtocol: '隐私协议',
contextName: '内容名称', contextName: '内容名称',
alerts: 'Alerts', alerts: '告警',
privpin: '隐私密码', privpin: '隐私密码',
asset: 'Asset', asset: 'Asset',
editEndpoint: '编辑 Endpoint', editEndpoint: '编辑 Endpoint',

View File

@@ -1194,7 +1194,7 @@ const en = {
privProtocol: 'Priv protocol', privProtocol: 'Priv protocol',
contextName: 'Context name', contextName: 'Context name',
privpin: 'Priv password', privpin: 'Priv password',
alerts: 'Alerts', alerts: 'Alert',
asset: 'Asset', asset: 'Asset',
editEndpoint: 'Edit endpoint', editEndpoint: 'Edit endpoint',
createEndpoint: 'New endpoint', createEndpoint: 'New endpoint',

View File

@@ -127,7 +127,7 @@ export default {
sortable: 'custom' sortable: 'custom'
}, },
{ {
label: 'Name', label: this.$t('alert.silence.name'),
prop: 'name', prop: 'name',
show: true, show: true,
width: 150 width: 150

View File

@@ -125,6 +125,12 @@ export default {
}] }]
} }
} }
},
methods: {
edit (u) {
this.object ={...u}
this.rightBox.show = true
},
} }
} }
</script> </script>

View File

@@ -1,6 +1,6 @@
<template> <template>
<div> <div>
<nz-data-list <nzDataList
ref="dataList" ref="dataList"
:api="url" :api="url"
:layout="['searchInput', 'elementSet']" :layout="['searchInput', 'elementSet']"
@@ -37,7 +37,8 @@
</export-excel> </export-excel>
<delete-button :delete-objs="batchDeleteObjs" @after="getTableData" <delete-button :delete-objs="batchDeleteObjs" @after="getTableData"
id="alert-msg-batch-delete" v-has="'expressionTemplate_delete'" :api="url"></delete-button></template> id="alert-msg-batch-delete" v-has="'expressionTemplate_delete'" :api="url"></delete-button>
</template>
<template v-slot:default="slotProps"> <template v-slot:default="slotProps">
<expr-tmpl-table <expr-tmpl-table
ref="dataTable" ref="dataTable"
@@ -58,7 +59,7 @@
<template v-slot:pagination> <template v-slot:pagination>
<Pagination ref="Pagination" :pageObj="pageObj" :tableId="tableId" @pageNo='pageNo' @pageSize='pageSize'></Pagination> <Pagination ref="Pagination" :pageObj="pageObj" :tableId="tableId" @pageNo='pageNo' @pageSize='pageSize'></Pagination>
</template> </template>
</nz-data-list> </nzDataList>
<transition name="right-box"> <transition name="right-box">
<expr-tmpl-box v-if="rightBox.show" :exprTemp="object" @close="closeRightBox"></expr-tmpl-box> <expr-tmpl-box v-if="rightBox.show" :exprTemp="object" @close="closeRightBox"></expr-tmpl-box>
</transition> </transition>
@@ -84,7 +85,6 @@ import bus from '@/libs/bus'
import exportXLSX from '@/components/common/exportXLSX' import exportXLSX from '@/components/common/exportXLSX'
import exprTmplBox from '@/components/common/rightBox/exprTmplBox' import exprTmplBox from '@/components/common/rightBox/exprTmplBox'
import deleteButton from '@/components/common/deleteButton' import deleteButton from '@/components/common/deleteButton'
import nzDataList from '@/components/common/table/nzDataList'
import dataListMixin from '@/components/common/mixin/dataList' import dataListMixin from '@/components/common/mixin/dataList'
import exprTmplTable from '@/components/common/table/settings/exprTmplTable' import exprTmplTable from '@/components/common/table/settings/exprTmplTable'
@@ -93,7 +93,6 @@ export default {
components: { components: {
deleteButton, deleteButton,
exprTmplBox, exprTmplBox,
nzDataList,
exprTmplTable, exprTmplTable,
'export-excel': exportXLSX 'export-excel': exportXLSX
}, },

View File

@@ -1,7 +1,7 @@
<template> <template>
<div> <div class="temp">
<exprTemp class="template-tab" :show-tab="showTab" v-show="showTab == 'exprTemp'" @changeShowTab="changeShowTab" @toCredentialTab="changeTab(['mib','credentials'],'credentials')" @toBrowserTab="changeTab(['mib','browser'],'browser')"></exprTemp> <exprTemp class="template-tab" :show-tab="showTab" v-if="showTab == 'exprTemp'" @changeShowTab="changeShowTab"></exprTemp>
<chartTemp class="template-tab" :show-tab="showTab" v-if="showTab == 'chartTemp'" @changeShowTab="changeShowTab" @toCredentialTab="changeTab(['mib','credentials'],'credentials')" @toBrowserTab="changeTab(['mib','browser'],'browser')"></chartTemp> <chartTemp class="template-tab" :show-tab="showTab" v-if="showTab == 'chartTemp'" @changeShowTab="changeShowTab"></chartTemp>
</div> </div>
</template> </template>
@@ -9,14 +9,14 @@
import exprTemp from './exprTemp' import exprTemp from './exprTemp'
import chartTemp from './chartTemp' import chartTemp from './chartTemp'
export default { export default {
name: 'template', name: 'v-template',
components: { components: {
exprTemp, exprTemp,
chartTemp chartTemp
}, },
data () { data () {
return { return {
showTab: 'exprTemp' showTab: ''
} }
}, },
methods: { methods: {
@@ -45,16 +45,10 @@ export default {
this.showTab = showTab this.showTab = showTab
} }
}, },
watch: { mounted () {
$routePath: { this.$nextTick(()=>{
this.showTab = 'exprTemp'
immediate: true, })
handler (n, o) {
if (n.indexOf('mib') != -1 && this.$route.params.tab) {
this.$set(this, 'showTab', this.$route.params.tab)
}
}
}
} }
} }
</script> </script>

View File

@@ -33,6 +33,7 @@ import bus from '@/libs/bus'
import theme from '@/assets/css/theme.scss' import theme from '@/assets/css/theme.scss'
import myDatePicker from '@/components/common/myDatePicker' import myDatePicker from '@/components/common/myDatePicker'
import vSelectPage from 'v-selectpage' import vSelectPage from 'v-selectpage'
import nzDataList from '@/components/common/table/nzDataList'
Vue.use(vSelectPage, { Vue.use(vSelectPage, {
dataLoad: function (vue, url, params) { dataLoad: function (vue, url, params) {
if (params.pageNumber) { if (params.pageNumber) {
@@ -52,6 +53,7 @@ Vue.component('element-set', elementSet)
Vue.component('loading', loading) Vue.component('loading', loading)
Vue.component('pick-time', pickTime) Vue.component('pick-time', pickTime)
Vue.component('myDatePicker', myDatePicker) Vue.component('myDatePicker', myDatePicker)
Vue.component('nzDataList', nzDataList)
Vue.prototype.$axios = axios Vue.prototype.$axios = axios
Vue.prototype.$post = post Vue.prototype.$post = post