diff --git a/dolphinscheduler-ui-next/src/locales/modules/en_US.ts b/dolphinscheduler-ui-next/src/locales/modules/en_US.ts index 1e69969ca1..59691cce51 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 e0f59205ad..3c0bdca633 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 10b334b30d..7057dc61dc 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 ? ( - 启用 - ) : ( - 停用 - ) + 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 ? ( + {t('security.user.state_enabled')} + ) : ( + {t('security.user.state_disabled')} + ) + } + }, + { + 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 ( + + + {{ + trigger: () => ( + { + onEdit(rowData) + }} + > + {{ + icon: () => ( + + + + ) + }} + + ), + default: () => t('security.user.edit') + }} + + + {{ + trigger: () => ( + { + onDelete(rowData) + }} + > + {{ + icon: () => ( + + + + ) + }} + + ), + default: () => t('security.user.delete') + }} + + + ) + } } - }, - { - 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 ( - - - {{ - trigger: () => ( - { - onEdit(rowData) - }} - > - {{ - icon: () => ( - - - - ) - }} - - ), - default: () => t('security.user.edit') - }} - - - {{ - trigger: () => ( - { - onDelete(rowData) - }} - > - {{ - icon: () => ( - - - - ) - }} - - ), - default: () => t('security.user.delete') - }} - - - ) - } - } - ].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,