feat(frontend):1.角色分页相关bug修复;2.内置角色禁止编辑和删除;3.右上角下拉菜单文案修改
This commit is contained in:
parent
ef6d89bd87
commit
440dd28fbb
@ -278,7 +278,7 @@ export default {
|
||||
default_module: 'Default Module'
|
||||
},
|
||||
datasource: 'Datasource',
|
||||
char_can_not_more_50: 'Name can not more 50 char',
|
||||
char_can_not_more_50: 'Can not more 50 char',
|
||||
share_success: 'Share Success'
|
||||
},
|
||||
documentation: {
|
||||
@ -435,7 +435,8 @@ export default {
|
||||
current_user: 'Current User',
|
||||
origin_passwd: 'Origin Password',
|
||||
new_passwd: 'New Password',
|
||||
confirm_passwd: 'Confirm Password'
|
||||
confirm_passwd: 'Confirm Password',
|
||||
change_password: 'Change Password'
|
||||
},
|
||||
role: {
|
||||
menu_authorization: 'Menu Authorization',
|
||||
|
||||
@ -278,7 +278,7 @@ export default {
|
||||
default_module: '默认模块'
|
||||
},
|
||||
datasource: '數據源',
|
||||
char_can_not_more_50: '名稱不能超過50字符',
|
||||
char_can_not_more_50: '不能超過50字符',
|
||||
share_success: '分享成功'
|
||||
},
|
||||
documentation: {
|
||||
@ -435,7 +435,8 @@ export default {
|
||||
current_user: '當前用戶',
|
||||
origin_passwd: '原始密碼',
|
||||
new_passwd: '新密碼',
|
||||
confirm_passwd: '確認密碼'
|
||||
confirm_passwd: '確認密碼',
|
||||
change_password: '修改密碼'
|
||||
},
|
||||
role: {
|
||||
menu_authorization: '菜單授權',
|
||||
|
||||
@ -278,7 +278,7 @@ export default {
|
||||
default_module: '默认模块'
|
||||
},
|
||||
datasource: '数据源',
|
||||
char_can_not_more_50: '名称不能超过50字符',
|
||||
char_can_not_more_50: '不能超过50字符',
|
||||
share_success: '分享成功'
|
||||
},
|
||||
documentation: {
|
||||
@ -435,7 +435,8 @@ export default {
|
||||
current_user: '当前用户',
|
||||
origin_passwd: '原始密码',
|
||||
new_passwd: '新密码',
|
||||
confirm_passwd: '确认密码'
|
||||
confirm_passwd: '确认密码',
|
||||
change_password: '修改密码'
|
||||
},
|
||||
role: {
|
||||
menu_authorization: '菜单授权',
|
||||
|
||||
@ -47,7 +47,7 @@
|
||||
<el-dropdown-item>{{ $t('commons.personal_info') }}</el-dropdown-item>
|
||||
</router-link>
|
||||
<router-link to="/person-pwd/index">
|
||||
<el-dropdown-item>{{ $t('user.reset_password') }}</el-dropdown-item>
|
||||
<el-dropdown-item>{{ $t('user.change_password') }}</el-dropdown-item>
|
||||
</router-link>
|
||||
<a href="/swagger-ui.html" target="_blank">
|
||||
<el-dropdown-item>{{ $t('commons.help_documentation') }} </el-dropdown-item>
|
||||
|
||||
@ -30,7 +30,7 @@ export default {
|
||||
name: [
|
||||
{ required: true, trigger: 'blur', validator: this.roleValidator }
|
||||
],
|
||||
code: [{ required: true, message: '请输入代码', trigger: 'blur' }]
|
||||
description: [{ max: 50, message: this.$t('commons.char_can_not_more_50'), trigger: 'blur' }]
|
||||
},
|
||||
roles: [],
|
||||
originName: null
|
||||
|
||||
@ -18,6 +18,7 @@
|
||||
</template>
|
||||
|
||||
<el-table-column prop="name" :label="$t('commons.name')" />
|
||||
<el-table-column :show-overflow-tooltip="true" prop="description" :label="$t('commons.description')" />
|
||||
<el-table-column :show-overflow-tooltip="true" prop="createTime" :label="$t('commons.create_time')">
|
||||
<template v-slot:default="scope">
|
||||
<span>{{ scope.row.createTime | timestampFormatDate }}</span>
|
||||
@ -118,9 +119,9 @@ export default {
|
||||
columns: [],
|
||||
buttons: [
|
||||
{
|
||||
label: this.$t('commons.edit'), icon: 'el-icon-edit', type: 'primary', click: this.edit
|
||||
label: this.$t('commons.edit'), icon: 'el-icon-edit', type: 'primary', click: this.edit, disabled: this.btnDisabled
|
||||
}, {
|
||||
label: this.$t('commons.delete'), icon: 'el-icon-delete', type: 'danger', click: this.handleDelete
|
||||
label: this.$t('commons.delete'), icon: 'el-icon-delete', type: 'danger', click: this.handleDelete, disabled: this.btnDisabled
|
||||
}
|
||||
],
|
||||
searchConfig: {
|
||||
@ -156,7 +157,7 @@ export default {
|
||||
const param = temp || {}
|
||||
roleGrid(this.paginationConfig.currentPage, this.paginationConfig.pageSize, param).then(response => {
|
||||
const data = response.data
|
||||
this.total = data.itemCount
|
||||
this.paginationConfig.total = data.itemCount
|
||||
this.tableData = data.listObject
|
||||
})
|
||||
},
|
||||
@ -263,6 +264,9 @@ export default {
|
||||
}).catch(() => {
|
||||
|
||||
})
|
||||
},
|
||||
btnDisabled(row) {
|
||||
return !row.createTime
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<layout-content :header="$t('member.edit_password')">
|
||||
<layout-content :header="$t('user.change_password')">
|
||||
|
||||
<el-form ref="createUserForm" :model="form" :rules="rule" size="small" label-width="auto" label-position="right">
|
||||
<el-form-item :label="$t('user.origin_passwd')" prop="oldPwd">
|
||||
|
||||
Loading…
Reference in New Issue
Block a user