This is an automated email from the ASF dual-hosted git repository.
kirs pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 3f7759e [FIX][UI ] security user state tenantCode User Type Display
abnormal (#4255)
3f7759e is described below
commit 3f7759ef643120cb49793faf83a384373a32e185
Author: felix.wang <[email protected]>
AuthorDate: Thu Dec 17 17:39:47 2020 +0800
[FIX][UI ] security user state tenantCode User Type Display abnormal
(#4255)
* fix user state error
* fix userType error
* fix tenantCode error
---
.../js/conf/home/pages/security/pages/users/_source/list.vue | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/list.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/list.vue
index 32e02d1..bb2f797 100644
---
a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/list.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/list.vue
@@ -21,14 +21,18 @@
<el-table-column type="index" :label="$t('#')"
width="50"></el-table-column>
<el-table-column prop="userName" :label="$t('User
Name')"></el-table-column>
<el-table-column :label="$t('User Type')">
- {{userType === 'GENERAL_USER' ? `${$t('Ordinary users')}` :
`${$t('Administrator')}`}}
+ <template slot-scope="scope">
+ <span>{{scope.row.userType === 'GENERAL_USER'? `${$t('Ordinary
users')}` : `${$t('Administrator')}`}}</span>
+ </template>
</el-table-column>
- <el-table-column prop="tenantName" :label="$t('Tenant')"
width="160"></el-table-column>
+ <el-table-column prop="tenantCode" :label="$t('Tenant')"
width="160"></el-table-column>
<el-table-column prop="queue" :label="$t('Queue')"></el-table-column>
<el-table-column prop="email" :label="$t('Email')"
min-width="120"></el-table-column>
<el-table-column prop="phone" :label="$t('Phone')"
min-width="90"></el-table-column>
- <el-table-column :label="$t('State')">
- {{state === 1 ? `${$t('Enable')}` : `${$t('Disable')}`}}
+ <el-table-column :label="$t('State')">
+ <template slot-scope="scope">
+ <span>{{scope.row.state === 1? `${$t('Enable')}` :
`${$t('Disable')}`}}</span>
+ </template>
</el-table-column>
<el-table-column :label="$t('Create Time')" min-width="120">
<template slot-scope="scope">
