natas_hw
/
dolphinscheduler
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Fix][UI Next] Fix table of user-manage did not switch language correctly (#8302) 

* [Fix][UI Next] Fix Security User Manage route was outdated

* [Fix][UI Next] Fix table of user-manage did not switch language correctly
This commit is contained in:
lilyzhou 2022-02-08 14:04:05 +08:00 committed by GitHub
parent fd38ef129b
commit f93dceaf9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 114 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dolphinscheduler-ui-next/src/locales/modules/en_US.ts
View File

@ -623,6 +623,8 @@ const security = {
phone: 'Phone', phone: 'Phone',
phone_rule_msg: 'Please enter valid phone number', phone_rule_msg: 'Please enter valid phone number',
state: 'State', state: 'State',
state_enabled: 'Enabled',
state_disabled: 'Disabled',
create_time: 'Create Time', create_time: 'Create Time',
update_time: 'Update Time', update_time: 'Update Time',
operation: 'Operation', operation: 'Operation',

2
dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts
View File

@ -620,6 +620,8 @@ const security = {
phone: '手机', phone: '手机',
phone_rule_msg: '请输入正确的手机号', phone_rule_msg: '请输入正确的手机号',
state: '状态', state: '状态',
state_enabled: '启用',
state_disabled: '停用',
create_time: '创建时间', create_time: '创建时间',
update_time: '更新时间', update_time: '更新时间',
operation: '操作', operation: '操作',

218
dolphinscheduler-ui-next/src/views/security/user-manage/use-table.tsx
View File

@ -15,7 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
import { ref, watch, onBeforeMount } from 'vue' import { ref, watch, onBeforeMount, computed } from 'vue'
import { NSpace, NTooltip, NButton, NIcon, NTag } from 'naive-ui' import { NSpace, NTooltip, NButton, NIcon, NTag } from 'naive-ui'
import { EditOutlined, DeleteOutlined } from '@vicons/antd' import { EditOutlined, DeleteOutlined } from '@vicons/antd'
import { queryUserList } from '@/service/modules/users' import { queryUserList } from '@/service/modules/users'
@ -28,115 +28,117 @@ type UseTableProps = {
function useColumns({ onEdit, onDelete }: UseTableProps) { function useColumns({ onEdit, onDelete }: UseTableProps) {
const { t } = useI18n() const { t } = useI18n()
const columns: any[] = [ const columns = computed(() =>
{ [
title: t('security.user.index'), {
key: 'index', title: t('security.user.index'),
width: 80, key: 'index',
render: (rowData: any, rowIndex: number) => rowIndex + 1 width: 80,
}, render: (rowData: any, rowIndex: number) => rowIndex + 1
{ },
title: t('security.user.username'), {
key: 'userName' title: t('security.user.username'),
}, key: 'userName'
{ },
title: t('security.user.tenant_code'), {
key: 'tenantCode' title: t('security.user.tenant_code'),
}, key: 'tenantCode'
{ },
title: t('security.user.queue'), {
key: 'queue' title: t('security.user.queue'),
}, key: 'queue'
{ },
title: t('security.user.email'), {
key: 'email' title: t('security.user.email'),
}, key: 'email'
{ },
title: t('security.user.phone'), {
key: 'phone' title: t('security.user.phone'),
}, key: 'phone'
{ },
title: t('security.user.state'), {
key: 'state', title: t('security.user.state'),
render: (rowData: any, rowIndex: number) => { key: 'state',
return rowData.state === 1 ? ( render: (rowData: any, rowIndex: number) => {
<NTag type='success'>启用</NTag> return rowData.state === 1 ? (
) : ( <NTag type='success'>{t('security.user.state_enabled')}</NTag>
<NTag type='error'>停用</NTag> ) : (
) <NTag type='error'>{t('security.user.state_disabled')}</NTag>
)
}
},
{
title: t('security.user.create_time'),
key: 'createTime',
width: 200
},
{
title: t('security.user.update_time'),
key: 'updateTime',
width: 200
},
{
title: t('security.user.operation'),
key: 'operation',
fixed: 'right',
width: 120,
render: (rowData: any, rowIndex: number) => {
return (
<NSpace>
<NTooltip trigger='hover'>
{{
trigger: () => (
<NButton
circle
type='info'
size='small'
onClick={() => {
onEdit(rowData)
}}
>
{{
icon: () => (
<NIcon>
<EditOutlined />
</NIcon>
)
}}
</NButton>
),
default: () => t('security.user.edit')
}}
</NTooltip>
<NTooltip trigger='hover'>
{{
trigger: () => (
<NButton
circle
type='error'
size='small'
onClick={() => {
onDelete(rowData)
}}
>
{{
icon: () => (
<NIcon>
<DeleteOutlined />
</NIcon>
)
}}
</NButton>
),
default: () => t('security.user.delete')
}}
</NTooltip>
</NSpace>
)
}
} }
}, ].map((d: any) => ({ ...d, width: d.width || 160 }))
{ )
title: t('security.user.create_time'),
key: 'createTime',
width: 200
},
{
title: t('security.user.update_time'),
key: 'updateTime',
width: 200
},
{
title: t('security.user.operation'),
key: 'operation',
fixed: 'right',
width: 120,
render: (rowData: any, rowIndex: number) => {
return (
<NSpace>
<NTooltip trigger='hover'>
{{
trigger: () => (
<NButton
circle
type='info'
size='small'
onClick={() => {
onEdit(rowData)
}}
>
{{
icon: () => (
<NIcon>
<EditOutlined />
</NIcon>
)
}}
</NButton>
),
default: () => t('security.user.edit')
}}
</NTooltip>
<NTooltip trigger='hover'>
{{
trigger: () => (
<NButton
circle
type='error'
size='small'
onClick={() => {
onDelete(rowData)
}}
>
{{
icon: () => (
<NIcon>
<DeleteOutlined />
</NIcon>
)
}}
</NButton>
),
default: () => t('security.user.delete')
}}
</NTooltip>
</NSpace>
)
}
}
].map((d: any) => ({ ...d, width: d.width || 160 }))
const scrollX = columns.reduce((p, c) => p + c.width, 0) const scrollX = columns.value.reduce((p, c) => p + c.width, 0)
return { return {
columns, columns,