From 73292851a66b69ab84fbc72de3b3fe7de47c106c Mon Sep 17 00:00:00 2001 From: labbomb <739955946@qq.com> Date: Wed, 2 Mar 2022 10:08:39 +0800 Subject: [PATCH] [Feature][UI Next][V1.0.0-Alpha] Fixed an issue with # under internationalization (#8641) --- dolphinscheduler-ui-next/src/locales/modules/en_US.ts | 10 ---------- dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts | 10 ---------- .../src/views/data-quality/rule/use-table.ts | 1 - .../src/views/data-quality/task-result/use-table.ts | 4 ++-- .../src/views/datasource/list/use-columns.ts | 2 +- dolphinscheduler-ui-next/src/views/home/types.ts | 1 - .../src/views/home/use-process-state.ts | 3 +-- dolphinscheduler-ui-next/src/views/home/use-table.ts | 2 +- .../src/views/home/use-task-state.ts | 1 - .../src/views/monitor/servers/worker/index.tsx | 4 ++-- .../views/monitor/statistics/audit-log/use-table.ts | 4 ++-- .../src/views/projects/list/use-table.ts | 3 +-- .../src/views/projects/overview/types.ts | 1 - .../src/views/projects/overview/use-process-state.ts | 1 - .../src/views/projects/overview/use-task-state.ts | 1 - .../projects/task/definition/components/use-version.ts | 4 ++-- .../src/views/projects/task/definition/use-table.ts | 4 ++-- .../src/views/projects/task/instance/use-table.ts | 4 ++-- .../workflow/definition/components/use-table.ts | 2 +- .../projects/workflow/definition/timing/use-table.ts | 2 +- .../views/projects/workflow/definition/use-table.ts | 2 +- .../src/views/projects/workflow/instance/use-table.ts | 5 +++-- .../src/views/resource/file/table/use-table.ts | 2 +- .../src/views/resource/task-group/option/use-table.ts | 3 +-- .../src/views/resource/task-group/queue/use-table.ts | 3 +-- .../src/views/resource/udf/function/use-table.ts | 2 +- .../src/views/resource/udf/resource/use-table.ts | 2 +- .../src/views/security/alarm-group-manage/use-table.ts | 4 ++-- .../security/alarm-instance-manage/use-columns.ts | 2 +- .../src/views/security/environment-manage/use-table.ts | 4 ++-- .../views/security/k8s-namespace-manage/use-table.ts | 4 ++-- .../src/views/security/tenant-manage/use-table.ts | 6 +++--- .../src/views/security/token-manage/use-table.ts | 4 ++-- .../src/views/security/user-manage/use-table.tsx | 2 +- .../views/security/worker-group-manage/use-table.ts | 4 ++-- .../src/views/security/yarn-queue-manage/use-table.ts | 4 ++-- 36 files changed, 44 insertions(+), 73 deletions(-) diff --git a/dolphinscheduler-ui-next/src/locales/modules/en_US.ts b/dolphinscheduler-ui-next/src/locales/modules/en_US.ts index 7e62882960..dbec59e1d8 100644 --- a/dolphinscheduler-ui-next/src/locales/modules/en_US.ts +++ b/dolphinscheduler-ui-next/src/locales/modules/en_US.ts @@ -182,7 +182,6 @@ const resource = { create_file: 'Create File', upload_files: 'Upload Files', enter_keyword_tips: 'Please enter keyword', - id: '#', name: 'Name', user_name: 'Resource userName', whether_directory: 'Whether directory', @@ -215,7 +214,6 @@ const resource = { udf_resources: 'UDF resources', create_folder: 'Create Folder', upload_udf_resources: 'Upload UDF Resources', - id: '#', udf_source_name: 'UDF Resource Name', whether_directory: 'Whether directory', file_name: 'File Name', @@ -243,7 +241,6 @@ const resource = { udf_function: 'UDF Function', create_udf_function: 'Create UDF Function', edit_udf_function: 'Create UDF Function', - id: '#', udf_function_name: 'UDF Function Name', class_name: 'Class Name', type: 'Type', @@ -272,7 +269,6 @@ const resource = { enter_description_tips: 'Please enter description' }, task_group_option: { - id: 'No.', manage: 'Task group manage', option: 'Task group option', create: 'Create task group', @@ -302,7 +298,6 @@ const resource = { please_enter_keywords: 'Please enter keywords' }, task_group_queue: { - id: 'No.', actions: 'Actions', task_name: 'Task name', task_group_name: 'Task group name', @@ -373,7 +368,6 @@ const project = { schedule_publish_status: 'Schedule Publish Status', workflow_definition: 'Workflow Definition', workflow_instance: 'Workflow Instance', - id: '#', status: 'Status', create_time: 'Create Time', update_time: 'Update Time', @@ -843,7 +837,6 @@ const security = { tenant_manage: 'Tenant Manage', create_tenant: 'Create Tenant', search_tips: 'Please enter keywords', - num: 'Serial number', tenant_code: 'Operating System Tenant', description: 'Description', queue_name: 'QueueName', @@ -957,7 +950,6 @@ const security = { authorize_resource: 'Resource Authorize', authorize_datasource: 'Datasource Authorize', authorize_udf: 'UDF Function Authorize', - index: 'Index', username: 'Username', username_exists: 'The username already exists', username_rule_msg: 'Please enter username', @@ -990,7 +982,6 @@ const security = { search_input_tips: 'Please input the keywords', alarm_instance_manage: 'Alarm instance manage', alarm_instance: 'Alarm Instance', - serial_number: '#', alarm_instance_name: 'Alarm instance name', alarm_instance_name_tips: 'Please enter alarm plugin instance name', alarm_plugin_name: 'Alarm plugin name', @@ -1073,7 +1064,6 @@ const datasource = { datasource: 'DataSource', create_datasource: 'Create DataSource', search_input_tips: 'Please input the keywords', - serial_number: '#', datasource_name: 'Datasource Name', datasource_name_tips: 'Please enter datasource name', datasource_user_name: 'Owner', diff --git a/dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts b/dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts index 90d268eabe..51f5c8e7b2 100644 --- a/dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts +++ b/dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts @@ -180,7 +180,6 @@ const resource = { create_file: '创建文件', upload_files: '上传文件', enter_keyword_tips: '请输入关键词', - id: '编号', name: '名称', user_name: '所属用户', whether_directory: '是否文件夹', @@ -214,7 +213,6 @@ const resource = { udf_resources: 'UDF资源', create_folder: '创建文件夹', upload_udf_resources: '上传UDF资源', - id: '编号', udf_source_name: 'UDF资源名称', whether_directory: '是否文件夹', file_name: '文件名称', @@ -242,7 +240,6 @@ const resource = { udf_function: 'UDF函数', create_udf_function: '创建UDF函数', edit_udf_function: '编辑UDF函数', - id: '编号', udf_function_name: 'UDF函数名称', class_name: '类名', type: '类型', @@ -270,7 +267,6 @@ const resource = { enter_description_tips: '请输入描述' }, task_group_option: { - id: '编号', manage: '任务组管理', option: '任务组配置', create: '创建任务组', @@ -298,7 +294,6 @@ const resource = { please_enter_keywords: '请输入搜索关键词' }, task_group_queue: { - id: '编号', actions: '操作', task_name: '任务名称', task_group_name: '任务组名称', @@ -368,7 +363,6 @@ const project = { schedule_publish_status: '定时状态', workflow_definition: '工作流定义', workflow_instance: '工作流实例', - id: '编号', status: '状态', create_time: '创建时间', update_time: '更新时间', @@ -833,7 +827,6 @@ const security = { tenant_manage: '租户管理', create_tenant: '创建租户', search_tips: '请输入关键词', - num: '编号', tenant_code: '操作系统租户', description: '描述', queue_name: '队列', @@ -946,7 +939,6 @@ const security = { authorize_resource: '资源授权', authorize_datasource: '数据源授权', authorize_udf: 'UDF函数授权', - index: '序号', username: '用户名', username_exists: '用户名已存在', username_rule_msg: '请输入用户名', @@ -978,7 +970,6 @@ const security = { search_input_tips: '请输入关键字', alarm_instance_manage: '告警实例管理', alarm_instance: '告警实例', - serial_number: '编号', alarm_instance_name: '告警实例名称', alarm_instance_name_tips: '请输入告警实例名称', alarm_plugin_name: '告警插件名称', @@ -1061,7 +1052,6 @@ const datasource = { datasource: '数据源', create_datasource: '创建数据源', search_input_tips: '请输入关键字', - serial_number: '编号', datasource_name: '数据源名称', datasource_name_tips: '请输入数据源名称', datasource_user_name: '所属用户', diff --git a/dolphinscheduler-ui-next/src/views/data-quality/rule/use-table.ts b/dolphinscheduler-ui-next/src/views/data-quality/rule/use-table.ts index ae440808dd..c1fd06a706 100644 --- a/dolphinscheduler-ui-next/src/views/data-quality/rule/use-table.ts +++ b/dolphinscheduler-ui-next/src/views/data-quality/rule/use-table.ts @@ -129,7 +129,6 @@ export function useTable(viewRuleEntry = (ruleJson: string): void => {}) { ) return { - index: index + 1, ...item, ruleName: ruleNameLocale, ruleTypeName: ruleTypeName diff --git a/dolphinscheduler-ui-next/src/views/data-quality/task-result/use-table.ts b/dolphinscheduler-ui-next/src/views/data-quality/task-result/use-table.ts index 04157d1c7f..e5115a1e85 100644 --- a/dolphinscheduler-ui-next/src/views/data-quality/task-result/use-table.ts +++ b/dolphinscheduler-ui-next/src/views/data-quality/task-result/use-table.ts @@ -44,7 +44,8 @@ export function useTable() { variables.columns = [ { title: '#', - key: 'index' + key: 'index', + render: (row: any, index: number) => index + 1 }, { title: t('data_quality.task_result.task_name'), @@ -181,7 +182,6 @@ export function useTable() { queryExecuteResultListPaging(data).then((res: ResultListRes) => { variables.tableData = res.totalList.map((item, index) => { return { - index: index + 1, ...item } }) as any diff --git a/dolphinscheduler-ui-next/src/views/datasource/list/use-columns.ts b/dolphinscheduler-ui-next/src/views/datasource/list/use-columns.ts index 124f52dbbd..0255fd3d9f 100644 --- a/dolphinscheduler-ui-next/src/views/datasource/list/use-columns.ts +++ b/dolphinscheduler-ui-next/src/views/datasource/list/use-columns.ts @@ -28,7 +28,7 @@ export function useColumns(onCallback: Function) { const columnsRef: TableColumns = [ { - title: t('datasource.serial_number'), + title: '#', key: 'index', render: (rowData, rowIndex) => rowIndex + 1 }, diff --git a/dolphinscheduler-ui-next/src/views/home/types.ts b/dolphinscheduler-ui-next/src/views/home/types.ts index 3874761d0c..8e9bf6b2bb 100644 --- a/dolphinscheduler-ui-next/src/views/home/types.ts +++ b/dolphinscheduler-ui-next/src/views/home/types.ts @@ -21,7 +21,6 @@ interface DefinitionChartData { } interface StateTableData { - index: number number: number state: string } diff --git a/dolphinscheduler-ui-next/src/views/home/use-process-state.ts b/dolphinscheduler-ui-next/src/views/home/use-process-state.ts index b8adc6810a..1b6eca9138 100644 --- a/dolphinscheduler-ui-next/src/views/home/use-process-state.ts +++ b/dolphinscheduler-ui-next/src/views/home/use-process-state.ts @@ -29,9 +29,8 @@ export function useProcessState() { endDate: format(date[1], 'yyyy-MM-dd HH:mm:ss'), projectCode: 0 }).then((res: TaskStateRes): StateData => { - const table = res.taskCountDtos.map((item, index) => { + const table = res.taskCountDtos.map((item) => { return { - index: index + 1, state: item.taskStateType, number: item.count } diff --git a/dolphinscheduler-ui-next/src/views/home/use-table.ts b/dolphinscheduler-ui-next/src/views/home/use-table.ts index 1c16f4aab3..10e6947020 100644 --- a/dolphinscheduler-ui-next/src/views/home/use-table.ts +++ b/dolphinscheduler-ui-next/src/views/home/use-table.ts @@ -22,7 +22,7 @@ export function useTable() { const { t } = useI18n() const columnsRef: TableColumns = [ - { title: '#', key: 'index' }, + { title: '#', key: 'index',render: (row, index) => index + 1}, { title: t('home.number'), key: 'number' }, { title: t('home.state'), key: 'state' } ] diff --git a/dolphinscheduler-ui-next/src/views/home/use-task-state.ts b/dolphinscheduler-ui-next/src/views/home/use-task-state.ts index d9ce190838..7023a46507 100644 --- a/dolphinscheduler-ui-next/src/views/home/use-task-state.ts +++ b/dolphinscheduler-ui-next/src/views/home/use-task-state.ts @@ -31,7 +31,6 @@ export function useTaskState() { }).then((res: TaskStateRes): StateData => { const table = res.taskCountDtos.map((item, index) => { return { - index: index + 1, state: item.taskStateType, number: item.count } diff --git a/dolphinscheduler-ui-next/src/views/monitor/servers/worker/index.tsx b/dolphinscheduler-ui-next/src/views/monitor/servers/worker/index.tsx index 8e82b8afcd..7ea27b40fd 100644 --- a/dolphinscheduler-ui-next/src/views/monitor/servers/worker/index.tsx +++ b/dolphinscheduler-ui-next/src/views/monitor/servers/worker/index.tsx @@ -35,7 +35,7 @@ const master = defineComponent({ const { getWorker } = useWorker() const workerRef: Ref> = ref(getWorker()) const columnsRef: TableColumns = [ - { title: '#', key: 'index' }, + { title: '#', key: 'index',render: (row, index) => index + 1 }, { title: t('monitor.worker.directory'), key: 'directory' } ] @@ -122,7 +122,7 @@ const master = defineComponent({ { - return { index: index + 1, directory: item } + return { directory: item } })} striped size={'small'} diff --git a/dolphinscheduler-ui-next/src/views/monitor/statistics/audit-log/use-table.ts b/dolphinscheduler-ui-next/src/views/monitor/statistics/audit-log/use-table.ts index bff2c3f6c8..4ac17efa12 100644 --- a/dolphinscheduler-ui-next/src/views/monitor/statistics/audit-log/use-table.ts +++ b/dolphinscheduler-ui-next/src/views/monitor/statistics/audit-log/use-table.ts @@ -41,7 +41,8 @@ export function useTable() { variables.columns = [ { title: '#', - key: 'index' + key: 'index', + render: (row: any, index: number) => index + 1 }, { title: t('monitor.audit_log.user_name'), @@ -85,7 +86,6 @@ export function useTable() { queryAuditLogListPaging(data).then((res: AuditListRes) => { variables.tableData = res.totalList.map((item, index) => { return { - index: index + 1, ...item } }) as any diff --git a/dolphinscheduler-ui-next/src/views/projects/list/use-table.ts b/dolphinscheduler-ui-next/src/views/projects/list/use-table.ts index 1f01025aef..6987547000 100644 --- a/dolphinscheduler-ui-next/src/views/projects/list/use-table.ts +++ b/dolphinscheduler-ui-next/src/views/projects/list/use-table.ts @@ -41,7 +41,7 @@ export function useTable( const menuStore = useMenuStore() const columns: TableColumns = [ - { title: '#', key: 'index' }, + { title: '#', key: 'index',render: (row, index) => index + 1 }, { title: t('project.list.project_name'), key: 'name', @@ -111,7 +111,6 @@ export function useTable( 'yyyy-MM-dd HH:mm:ss' ) return { - index: index + 1, ...item } }) as any diff --git a/dolphinscheduler-ui-next/src/views/projects/overview/types.ts b/dolphinscheduler-ui-next/src/views/projects/overview/types.ts index 3874761d0c..8e9bf6b2bb 100644 --- a/dolphinscheduler-ui-next/src/views/projects/overview/types.ts +++ b/dolphinscheduler-ui-next/src/views/projects/overview/types.ts @@ -21,7 +21,6 @@ interface DefinitionChartData { } interface StateTableData { - index: number number: number state: string } diff --git a/dolphinscheduler-ui-next/src/views/projects/overview/use-process-state.ts b/dolphinscheduler-ui-next/src/views/projects/overview/use-process-state.ts index 82f0019870..7a99f28a57 100644 --- a/dolphinscheduler-ui-next/src/views/projects/overview/use-process-state.ts +++ b/dolphinscheduler-ui-next/src/views/projects/overview/use-process-state.ts @@ -34,7 +34,6 @@ export function useProcessState() { }).then((res: TaskStateRes): StateData => { const table = res.taskCountDtos.map((item, index) => { return { - index: index + 1, state: item.taskStateType, number: item.count } diff --git a/dolphinscheduler-ui-next/src/views/projects/overview/use-task-state.ts b/dolphinscheduler-ui-next/src/views/projects/overview/use-task-state.ts index a95b397f3c..ae39f99b37 100644 --- a/dolphinscheduler-ui-next/src/views/projects/overview/use-task-state.ts +++ b/dolphinscheduler-ui-next/src/views/projects/overview/use-task-state.ts @@ -34,7 +34,6 @@ export function useTaskState() { }).then((res: TaskStateRes): StateData => { const table = res.taskCountDtos.map((item, index) => { return { - index: index + 1, state: item.taskStateType, number: item.count } diff --git a/dolphinscheduler-ui-next/src/views/projects/task/definition/components/use-version.ts b/dolphinscheduler-ui-next/src/views/projects/task/definition/components/use-version.ts index 64fd56ffcf..8c7d2f8c31 100644 --- a/dolphinscheduler-ui-next/src/views/projects/task/definition/components/use-version.ts +++ b/dolphinscheduler-ui-next/src/views/projects/task/definition/components/use-version.ts @@ -40,7 +40,8 @@ export function useVersion() { variables.columns = [ { title: '#', - key: 'index' + key: 'index', + render: (row: any, index: number) => index + 1 }, { title: t('project.task.version'), @@ -189,7 +190,6 @@ export function useVersion() { ).then((res: TaskDefinitionVersionRes) => { variables.tableData = res.totalList.map((item, index) => { return { - index: index + 1, ...item } }) as any diff --git a/dolphinscheduler-ui-next/src/views/projects/task/definition/use-table.ts b/dolphinscheduler-ui-next/src/views/projects/task/definition/use-table.ts index b3a3a2c891..b336431a0c 100644 --- a/dolphinscheduler-ui-next/src/views/projects/task/definition/use-table.ts +++ b/dolphinscheduler-ui-next/src/views/projects/task/definition/use-table.ts @@ -46,7 +46,8 @@ export function useTable(onEdit: Function) { variables.columns = [ { title: '#', - key: 'index' + key: 'index', + render: (row: any, index: number) => index + 1 }, { title: t('project.task.task_name'), @@ -281,7 +282,6 @@ export function useTable(onEdit: Function) { } return { - index: index + 1, ...item } }) as any diff --git a/dolphinscheduler-ui-next/src/views/projects/task/instance/use-table.ts b/dolphinscheduler-ui-next/src/views/projects/task/instance/use-table.ts index 3a7a914d17..0ff6f31289 100644 --- a/dolphinscheduler-ui-next/src/views/projects/task/instance/use-table.ts +++ b/dolphinscheduler-ui-next/src/views/projects/task/instance/use-table.ts @@ -60,7 +60,8 @@ export function useTable() { variables.columns = [ { title: '#', - key: 'index' + key: 'index', + render: (row: any, index: number) => index + 1 }, { title: t('project.task.task_name'), @@ -253,7 +254,6 @@ export function useTable() { ) item.endTime = format(new Date(item.endTime), 'yyyy-MM-dd HH:mm:ss') return { - index: index + 1, ...item } }) as any diff --git a/dolphinscheduler-ui-next/src/views/projects/workflow/definition/components/use-table.ts b/dolphinscheduler-ui-next/src/views/projects/workflow/definition/components/use-table.ts index 1b147b2b17..c9e4dd6234 100644 --- a/dolphinscheduler-ui-next/src/views/projects/workflow/definition/components/use-table.ts +++ b/dolphinscheduler-ui-next/src/views/projects/workflow/definition/components/use-table.ts @@ -37,7 +37,7 @@ export function useTable( const columns: TableColumns = [ { - title: t('project.workflow.id'), + title: '#', key: 'id', width: 50, render: (_row, index) => index + 1 diff --git a/dolphinscheduler-ui-next/src/views/projects/workflow/definition/timing/use-table.ts b/dolphinscheduler-ui-next/src/views/projects/workflow/definition/timing/use-table.ts index b9061942cf..18f9b07600 100644 --- a/dolphinscheduler-ui-next/src/views/projects/workflow/definition/timing/use-table.ts +++ b/dolphinscheduler-ui-next/src/views/projects/workflow/definition/timing/use-table.ts @@ -42,7 +42,7 @@ export function useTable() { const columns: TableColumns = [ { - title: t('project.workflow.id'), + title: '#', key: 'id', width: 50, render: (_row, index) => index + 1 diff --git a/dolphinscheduler-ui-next/src/views/projects/workflow/definition/use-table.ts b/dolphinscheduler-ui-next/src/views/projects/workflow/definition/use-table.ts index 8bd68eb5fc..cd22708257 100644 --- a/dolphinscheduler-ui-next/src/views/projects/workflow/definition/use-table.ts +++ b/dolphinscheduler-ui-next/src/views/projects/workflow/definition/use-table.ts @@ -56,7 +56,7 @@ export function useTable() { const createColumns = (variables: any) => { variables.columns = [ { - title: t('project.workflow.id'), + title: '#', key: 'id', width: 50, render: (row, index) => index + 1 diff --git a/dolphinscheduler-ui-next/src/views/projects/workflow/instance/use-table.ts b/dolphinscheduler-ui-next/src/views/projects/workflow/instance/use-table.ts index 158117583f..5a84ced8cc 100644 --- a/dolphinscheduler-ui-next/src/views/projects/workflow/instance/use-table.ts +++ b/dolphinscheduler-ui-next/src/views/projects/workflow/instance/use-table.ts @@ -64,9 +64,10 @@ export function useTable() { type: 'selection' }, { - title: t('project.workflow.id'), + title: '#', key: 'id', - width: 50 + width: 50, + render: (rowData: any, rowIndex: number) => rowIndex + 1 }, { title: t('project.workflow.workflow_name'), diff --git a/dolphinscheduler-ui-next/src/views/resource/file/table/use-table.ts b/dolphinscheduler-ui-next/src/views/resource/file/table/use-table.ts index 9ef5c59f9e..7153d8374b 100644 --- a/dolphinscheduler-ui-next/src/views/resource/file/table/use-table.ts +++ b/dolphinscheduler-ui-next/src/views/resource/file/table/use-table.ts @@ -44,7 +44,7 @@ export function useTable(renameResource: IRenameFile, updateList: () => void) { const columnsRef: TableColumns = [ { - title: t('resource.file.id'), + title: '#', key: 'id', width: 50, render: (_row, index) => index + 1 diff --git a/dolphinscheduler-ui-next/src/views/resource/task-group/option/use-table.ts b/dolphinscheduler-ui-next/src/views/resource/task-group/option/use-table.ts index 40e71794c2..9b4761a471 100644 --- a/dolphinscheduler-ui-next/src/views/resource/task-group/option/use-table.ts +++ b/dolphinscheduler-ui-next/src/views/resource/task-group/option/use-table.ts @@ -42,7 +42,7 @@ export function useTable( const router: Router = useRouter() const columns: TableColumns = [ - { title: t('resource.task_group_option.id'), key: 'index' }, + { title: '#', key: 'index',render: (row, index) => index + 1 }, { title: t('resource.task_group_option.name'), key: 'name' }, { title: t('resource.task_group_option.project_name'), key: 'projectName' }, { @@ -115,7 +115,6 @@ export function useTable( 'yyyy-MM-dd HH:mm:ss' ) return { - index: index + 1, ...item } } diff --git a/dolphinscheduler-ui-next/src/views/resource/task-group/queue/use-table.ts b/dolphinscheduler-ui-next/src/views/resource/task-group/queue/use-table.ts index a74ecfa480..7cb5919191 100644 --- a/dolphinscheduler-ui-next/src/views/resource/task-group/queue/use-table.ts +++ b/dolphinscheduler-ui-next/src/views/resource/task-group/queue/use-table.ts @@ -37,7 +37,7 @@ export function useTable( const router: Router = useRouter() const columns: TableColumns = [ - { title: t('resource.task_group_queue.id'), key: 'index' }, + { title: '#', key: 'index',render: (row, index) => index + 1 }, { title: t('resource.task_group_queue.project_name'), key: 'projectName' }, { title: t('resource.task_group_queue.task_name'), key: 'taskName' }, { @@ -116,7 +116,6 @@ export function useTable( 'yyyy-MM-dd HH:mm:ss' ) return { - index: index + 1, ...item } } diff --git a/dolphinscheduler-ui-next/src/views/resource/udf/function/use-table.ts b/dolphinscheduler-ui-next/src/views/resource/udf/function/use-table.ts index d00d7edf57..6698922b6c 100644 --- a/dolphinscheduler-ui-next/src/views/resource/udf/function/use-table.ts +++ b/dolphinscheduler-ui-next/src/views/resource/udf/function/use-table.ts @@ -48,7 +48,7 @@ export function useTable() { const createColumns = (variables: any) => { variables.columns = [ { - title: t('resource.function.id'), + title: '#', key: 'id', width: 50, render: (_row, index) => index + 1 diff --git a/dolphinscheduler-ui-next/src/views/resource/udf/resource/use-table.ts b/dolphinscheduler-ui-next/src/views/resource/udf/resource/use-table.ts index 0ed6c96a3a..fa1e6b672c 100644 --- a/dolphinscheduler-ui-next/src/views/resource/udf/resource/use-table.ts +++ b/dolphinscheduler-ui-next/src/views/resource/udf/resource/use-table.ts @@ -66,7 +66,7 @@ export function useTable() { const createColumns = (variables: any) => { variables.columns = [ { - title: t('resource.udf.id'), + title: '#', key: 'id', width: 50, render: (_row, index) => index + 1 diff --git a/dolphinscheduler-ui-next/src/views/security/alarm-group-manage/use-table.ts b/dolphinscheduler-ui-next/src/views/security/alarm-group-manage/use-table.ts index a77dcf9644..b796ef6d67 100644 --- a/dolphinscheduler-ui-next/src/views/security/alarm-group-manage/use-table.ts +++ b/dolphinscheduler-ui-next/src/views/security/alarm-group-manage/use-table.ts @@ -40,7 +40,8 @@ export function useTable() { variables.columns = [ { title: '#', - key: 'index' + key: 'index', + render: (row: any, index: number) => index + 1 }, { title: t('security.alarm_group.alert_group_name'), @@ -162,7 +163,6 @@ export function useTable() { 'yyyy-MM-dd HH:mm:ss' ) return { - index: index + 1, ...item } }) as any diff --git a/dolphinscheduler-ui-next/src/views/security/alarm-instance-manage/use-columns.ts b/dolphinscheduler-ui-next/src/views/security/alarm-instance-manage/use-columns.ts index f87574b491..a5cc9c2fd6 100644 --- a/dolphinscheduler-ui-next/src/views/security/alarm-instance-manage/use-columns.ts +++ b/dolphinscheduler-ui-next/src/views/security/alarm-instance-manage/use-columns.ts @@ -26,7 +26,7 @@ export function useColumns(onCallback: Function) { const columnsRef: TableColumns = [ { - title: t('security.alarm_instance.serial_number'), + title: '#', key: 'index', render: (rowData, rowIndex) => rowIndex + 1 }, diff --git a/dolphinscheduler-ui-next/src/views/security/environment-manage/use-table.ts b/dolphinscheduler-ui-next/src/views/security/environment-manage/use-table.ts index be208f1a5b..c89350f199 100644 --- a/dolphinscheduler-ui-next/src/views/security/environment-manage/use-table.ts +++ b/dolphinscheduler-ui-next/src/views/security/environment-manage/use-table.ts @@ -43,7 +43,8 @@ export function useTable() { variables.columns = [ { title: '#', - key: 'index' + key: 'index', + render: (row: any, index: number) => index + 1 }, { title: t('security.environment.environment_name'), @@ -187,7 +188,6 @@ export function useTable() { 'yyyy-MM-dd HH:mm:ss' ) return { - index: index + 1, ...item } }) as any diff --git a/dolphinscheduler-ui-next/src/views/security/k8s-namespace-manage/use-table.ts b/dolphinscheduler-ui-next/src/views/security/k8s-namespace-manage/use-table.ts index a14408cad8..5b558b78f7 100644 --- a/dolphinscheduler-ui-next/src/views/security/k8s-namespace-manage/use-table.ts +++ b/dolphinscheduler-ui-next/src/views/security/k8s-namespace-manage/use-table.ts @@ -56,7 +56,8 @@ export function useTable() { variables.columns = [ { title: '#', - key: 'index' + key: 'index', + render: (row: any, index: number) => index + 1 }, { title: t('security.k8s_namespace.k8s_namespace'), @@ -181,7 +182,6 @@ export function useTable() { 'yyyy-MM-dd HH:mm:ss' ) return { - index: index + 1, ...item } }) as any diff --git a/dolphinscheduler-ui-next/src/views/security/tenant-manage/use-table.ts b/dolphinscheduler-ui-next/src/views/security/tenant-manage/use-table.ts index 18b8a04503..6e5ff130f6 100644 --- a/dolphinscheduler-ui-next/src/views/security/tenant-manage/use-table.ts +++ b/dolphinscheduler-ui-next/src/views/security/tenant-manage/use-table.ts @@ -50,8 +50,9 @@ export function useTable() { const createColumns = (variables: any) => { variables.columns = [ { - title: t('security.tenant.num'), - key: 'num' + title: '#', + key: 'index', + render: (row: any, index: number) => index + 1 }, { title: t('security.tenant.tenant_code'), @@ -159,7 +160,6 @@ export function useTable() { queryTenantListPaging({ ...params }).then((res: any) => { variables.tableData = res.totalList.map((item: any, index: number) => { return { - num: index + 1, ...item } }) diff --git a/dolphinscheduler-ui-next/src/views/security/token-manage/use-table.ts b/dolphinscheduler-ui-next/src/views/security/token-manage/use-table.ts index 06929115ed..c7e3aba66c 100644 --- a/dolphinscheduler-ui-next/src/views/security/token-manage/use-table.ts +++ b/dolphinscheduler-ui-next/src/views/security/token-manage/use-table.ts @@ -42,7 +42,8 @@ export function useTable() { variables.columns = [ { title: '#', - key: 'index' + key: 'index', + render: (row: any, index: number) => index + 1 }, { title: t('security.token.user'), @@ -176,7 +177,6 @@ export function useTable() { 'yyyy-MM-dd HH:mm:ss' ) return { - index: index + 1, ...item } }) as any 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 c340bd588e..d8c46c68b5 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 @@ -32,7 +32,7 @@ function useColumns({ onEdit, onDelete }: UseTableProps) { const columns = computed(() => [ { - title: t('security.user.index'), + title: '#', key: 'index', width: 80, render: (rowData: any, rowIndex: number) => rowIndex + 1 diff --git a/dolphinscheduler-ui-next/src/views/security/worker-group-manage/use-table.ts b/dolphinscheduler-ui-next/src/views/security/worker-group-manage/use-table.ts index 892e5c6c1e..0e71c052bf 100644 --- a/dolphinscheduler-ui-next/src/views/security/worker-group-manage/use-table.ts +++ b/dolphinscheduler-ui-next/src/views/security/worker-group-manage/use-table.ts @@ -42,7 +42,8 @@ export function useTable() { variables.columns = [ { title: '#', - key: 'index' + key: 'index', + render: (row: any, index: number) => index + 1 }, { title: t('security.worker_group.group_name'), @@ -176,7 +177,6 @@ export function useTable() { queryAllWorkerGroupsPaging({ ...params }).then((res: WorkerGroupRes) => { variables.tableData = res.totalList.map((item, index) => { return { - index: index + 1, ...item } }) as any diff --git a/dolphinscheduler-ui-next/src/views/security/yarn-queue-manage/use-table.ts b/dolphinscheduler-ui-next/src/views/security/yarn-queue-manage/use-table.ts index bd1ce12ffe..4ebd8d44c6 100644 --- a/dolphinscheduler-ui-next/src/views/security/yarn-queue-manage/use-table.ts +++ b/dolphinscheduler-ui-next/src/views/security/yarn-queue-manage/use-table.ts @@ -36,7 +36,8 @@ export function useTable() { variables.columns = [ { title: '#', - key: 'index' + key: 'index', + render: (row: any, index: number) => index + 1 }, { title: t('security.yarn_queue.queue_name'), @@ -104,7 +105,6 @@ export function useTable() { queryQueueListPaging({ ...params }).then((res: QueueRes) => { variables.tableData = res.totalList.map((item, index) => { return { - index: index + 1, ...item } }) as any