gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4

Browse Source 
# Conflicts:
#	nezha-fronted/src/components/common/table/settings/userTable.vue
This commit is contained in:
zhangyu
2022-06-22 11:47:20 +08:00
parent f12a067685 f3589cdd2a
commit 98decd29f9
245 changed files with 2832 additions and 1444 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
nezha-fronted/src/components/common/table/settings/userTable.vue
View File

@@ -33,7 +33,7 @@
:width="`${item.width}`"
>
<template slot="header">
<span class="data-column__span">{{item.label}}</span>
<span class="data-column__span" :class="{'margin-l-10': item.prop === 'name'}">{{item.label}}</span>
<div class="col-resize-area"></div>
</template>
<template slot-scope="scope" :column="item">
@@ -146,13 +146,13 @@ export default {
sortable: 'custom'
},
// {
// label: this.$t('config.user.username'),
// label: this.$t('login.username'),
// prop: 'username',
// show: true,
// width: 150
// },
{
label: this.$t('config.user.roles'),
label: this.$t('profile.role'),
prop: 'roles',
show: true,
width: 150
@@ -162,17 +162,17 @@ export default {
show: true,
minWidth: 150
}, {
label: this.$t('config.user.lastLoginTime'),
label: this.$t('profile.lastLoginTime'),
prop: 'lastLoginTime',
show: true,
width: 200
}, {
label: this.$t('config.user.lastLoginIp'),
label: this.$t('profile.lastLoginIp'),
prop: 'lastLoginIp',
show: true,
width: 150
}, {
label: this.$t('config.user.source'),
label: this.$t('profile.source'),
prop: 'source',
show: true,
width: 150
@@ -182,7 +182,7 @@ export default {
show: true,
width: 150
}, {
label: this.$t('config.user.state'),
label: this.$t('overall.state'),
prop: 'status',
show: true,
width: 100