github
/
DolphinScheduler
mirror of https://gitee.com/dolphinscheduler/DolphinScheduler.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

[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
3.0.0/version-upgrade
lilyzhou 3 years ago 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
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      dolphinscheduler-ui-next/src/locales/modules/en_US.ts
  2. 2
      dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts
  3. 218
      dolphinscheduler-ui-next/src/views/security/user-manage/use-table.tsx

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

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

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

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

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

@ -15,7 +15,7 @@
* 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 { EditOutlined, DeleteOutlined } from '@vicons/antd'
import { queryUserList } from '@/service/modules/users'
@ -28,115 +28,117 @@ type UseTableProps = {
function useColumns({ onEdit, onDelete }: UseTableProps) {
const { t } = useI18n()
const columns: any[] = [
{
title: t('security.user.index'),
key: 'index',
width: 80,
render: (rowData: any, rowIndex: number) => rowIndex + 1
},
{
title: t('security.user.username'),
key: 'userName'
},
{
title: t('security.user.tenant_code'),
key: 'tenantCode'
},
{
title: t('security.user.queue'),
key: 'queue'
},
{
title: t('security.user.email'),
key: 'email'
},
{
title: t('security.user.phone'),
key: 'phone'
},
{
title: t('security.user.state'),
key: 'state',
render: (rowData: any, rowIndex: number) => {
return rowData.state === 1 ? (
<NTag type='success'>启用</NTag>
) : (
<NTag type='error'>停用</NTag>
)
const columns = computed(() =>
[
{
title: t('security.user.index'),
key: 'index',
width: 80,
render: (rowData: any, rowIndex: number) => rowIndex + 1
},
{
title: t('security.user.username'),
key: 'userName'
},
{
title: t('security.user.tenant_code'),
key: 'tenantCode'
},
{
title: t('security.user.queue'),
key: 'queue'
},
{
title: t('security.user.email'),
key: 'email'
},
{
title: t('security.user.phone'),
key: 'phone'
},
{
title: t('security.user.state'),
key: 'state',
render: (rowData: any, rowIndex: number) => {
return rowData.state === 1 ? (
<NTag type='success'>{t('security.user.state_enabled')}</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>
)
}
}
},
{
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 }))
].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 {
columns,

Write Preview
Loading…
Cancel
Save