You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ki...@apache.org on 2022/02/08 06:04:14 UTC
[dolphinscheduler] branch dev updated: [Fix][UI Next] Fix table of user-manage did not switch language correctly (#8302)
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/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new f93dcea [Fix][UI Next] Fix table of user-manage did not switch language correctly (#8302)
f93dcea is described below
commit f93dceaf9b951f2925b9cafa2f68796e8734e9ff
Author: lilyzhou <lj...@outlook.com>
AuthorDate: Tue Feb 8 14:04:05 2022 +0800
[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
---
.../src/locales/modules/en_US.ts | 2 +
.../src/locales/modules/zh_CN.ts | 2 +
.../src/views/security/user-manage/use-table.tsx | 218 +++++++++++----------
3 files changed, 114 insertions(+), 108 deletions(-)
diff --git a/dolphinscheduler-ui-next/src/locales/modules/en_US.ts b/dolphinscheduler-ui-next/src/locales/modules/en_US.ts
index 1e69969..59691cc 100644
--- a/dolphinscheduler-ui-next/src/locales/modules/en_US.ts
+++ b/dolphinscheduler-ui-next/src/locales/modules/en_US.ts
@@ -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',
diff --git a/dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts b/dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts
index e0f5920..3c0bdca 100644
--- a/dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts
+++ b/dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts
@@ -620,6 +620,8 @@ const security = {
phone: '手机',
phone_rule_msg: '请输入正确的手机号',
state: '状态',
+ state_enabled: '启用',
+ state_disabled: '停用',
create_time: '创建时间',
update_time: '更新时间',
operation: '操作',
diff --git a/dolphinscheduler-ui-next/src/views/security/user-manage/use-table.tsx b/dolphinscheduler-ui-next/src/views/security/user-manage/use-table.tsx
index 10b334b..7057dc6 100644
--- a/dolphinscheduler-ui-next/src/views/security/user-manage/use-table.tsx
+++ b/dolphinscheduler-ui-next/src/views/security/user-manage/use-table.tsx
@@ -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,