Browse Source

[Fix][UI-Next] Rename process to workflow (#9350)

3.0.0/version-upgrade
Devosend 3 years ago committed by GitHub
parent
commit
aba257084b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      dolphinscheduler-ui-next/src/locales/modules/en_US.ts
  2. 8
      dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts
  3. 4
      dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-process-name.ts
  4. 4
      dolphinscheduler-ui-next/src/views/resource/task-group/queue/index.tsx
  5. 2
      dolphinscheduler-ui-next/src/views/resource/task-group/queue/use-table.ts

8
dolphinscheduler-ui-next/src/locales/modules/en_US.ts

@ -330,8 +330,8 @@ const resource = {
task_name: 'Task name', task_name: 'Task name',
task_group_name: 'Task group name', task_group_name: 'Task group name',
project_name: 'Project name', project_name: 'Project name',
process_name: 'Process name', workflow_name: 'Workflow name',
process_instance_name: 'Process instance', workflow_instance_name: 'Workflow instance',
queue: 'Task group queue', queue: 'Task group queue',
priority: 'Priority', priority: 'Priority',
priority_be_a_number: priority_be_a_number:
@ -623,8 +623,8 @@ const project = {
name_tips: 'Please enter name (required)', name_tips: 'Please enter name (required)',
task_type: 'Task Type', task_type: 'Task Type',
task_type_tips: 'Please select a task type (required)', task_type_tips: 'Please select a task type (required)',
process_name: 'Process Name', workflow_name: 'Workflow Name',
process_name_tips: 'Please select a process (required)', workflow_name_tips: 'Please select a workflow (required)',
child_node: 'Child Node', child_node: 'Child Node',
enter_child_node: 'Enter child node', enter_child_node: 'Enter child node',
run_flag: 'Run flag', run_flag: 'Run flag',

8
dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts

@ -326,8 +326,8 @@ const resource = {
task_name: '任务名称', task_name: '任务名称',
task_group_name: '任务组名称', task_group_name: '任务组名称',
project_name: '项目名称', project_name: '项目名称',
process_name: '工作流名称', workflow_name: '工作流名称',
process_instance_name: '工作流实例', workflow_instance_name: '工作流实例',
queue: '任务组队列', queue: '任务组队列',
priority: '组内优先级', priority: '组内优先级',
priority_be_a_number: '优先级必须是大于等于0的数值', priority_be_a_number: '优先级必须是大于等于0的数值',
@ -618,8 +618,8 @@ const project = {
name_tips: '请输入名称(必填)', name_tips: '请输入名称(必填)',
task_type: '任务类型', task_type: '任务类型',
task_type_tips: '请选择任务类型(必选)', task_type_tips: '请选择任务类型(必选)',
process_name: '工作流名称', workflow_name: '工作流名称',
process_name_tips: '请选择工作流(必选)', workflow_name_tips: '请选择工作流(必选)',
child_node: '子节点', child_node: '子节点',
enter_child_node: '进入该子节点', enter_child_node: '进入该子节点',
run_flag: '运行标志', run_flag: '运行标志',

4
dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-process-name.ts

@ -72,7 +72,7 @@ export function useProcessName({
type: 'select', type: 'select',
field: 'processName', field: 'processName',
span: 24, span: 24,
name: t('project.node.process_name'), name: t('project.node.workflow_name'),
props: { props: {
loading: loading, loading: loading,
disabled: !isCreate, disabled: !isCreate,
@ -83,7 +83,7 @@ export function useProcessName({
required: true, required: true,
validator(validate: any, value: string) { validator(validate: any, value: string) {
if (!value) { if (!value) {
return new Error(t('project.node.process_name_tips')) return new Error(t('project.node.workflow_name_tips'))
} }
} }
}, },

4
dolphinscheduler-ui-next/src/views/resource/task-group/queue/index.tsx

@ -170,13 +170,13 @@ const taskGroupQueue = defineComponent({
<NInput <NInput
size='small' size='small'
v-model={[this.searchParamRef.processName, 'value']} v-model={[this.searchParamRef.processName, 'value']}
placeholder={t('resource.task_group_queue.process_name')} placeholder={t('resource.task_group_queue.workflow_name')}
></NInput> ></NInput>
<NInput <NInput
size='small' size='small'
v-model={[this.searchParamRef.instanceName, 'value']} v-model={[this.searchParamRef.instanceName, 'value']}
placeholder={t( placeholder={t(
'resource.task_group_queue.process_instance_name' 'resource.task_group_queue.workflow_instance_name'
)} )}
></NInput> ></NInput>
<NButton size='small' type='primary' onClick={onSearch}> <NButton size='small' type='primary' onClick={onSearch}>

2
dolphinscheduler-ui-next/src/views/resource/task-group/queue/use-table.ts

@ -56,7 +56,7 @@ export function useTable(
...COLUMN_WIDTH_CONFIG['name'] ...COLUMN_WIDTH_CONFIG['name']
}, },
{ {
title: t('resource.task_group_queue.process_instance_name'), title: t('resource.task_group_queue.workflow_instance_name'),
key: 'processInstanceName', key: 'processInstanceName',
...COLUMN_WIDTH_CONFIG['name'] ...COLUMN_WIDTH_CONFIG['name']
}, },

Loading…
Cancel
Save