This is an automated email from the ASF dual-hosted git repository.
songjian 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 aba257084b [Fix][UI-Next] Rename process to workflow (#9350)
aba257084b is described below
commit aba257084bc856ff39c6e0ac35f97650130f9d99
Author: Devosend <[email protected]>
AuthorDate: Wed Apr 6 10:23:30 2022 +0800
[Fix][UI-Next] Rename process to workflow (#9350)
---
dolphinscheduler-ui-next/src/locales/modules/en_US.ts | 8 ++++----
dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts | 8 ++++----
.../projects/task/components/node/fields/use-process-name.ts | 4 ++--
.../src/views/resource/task-group/queue/index.tsx | 4 ++--
.../src/views/resource/task-group/queue/use-table.ts | 2 +-
5 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/dolphinscheduler-ui-next/src/locales/modules/en_US.ts
b/dolphinscheduler-ui-next/src/locales/modules/en_US.ts
index f0ee2b6e57..a76690effd 100644
--- a/dolphinscheduler-ui-next/src/locales/modules/en_US.ts
+++ b/dolphinscheduler-ui-next/src/locales/modules/en_US.ts
@@ -330,8 +330,8 @@ const resource = {
task_name: 'Task name',
task_group_name: 'Task group name',
project_name: 'Project name',
- process_name: 'Process name',
- process_instance_name: 'Process instance',
+ workflow_name: 'Workflow name',
+ workflow_instance_name: 'Workflow instance',
queue: 'Task group queue',
priority: 'Priority',
priority_be_a_number:
@@ -623,8 +623,8 @@ const project = {
name_tips: 'Please enter name (required)',
task_type: 'Task Type',
task_type_tips: 'Please select a task type (required)',
- process_name: 'Process Name',
- process_name_tips: 'Please select a process (required)',
+ workflow_name: 'Workflow Name',
+ workflow_name_tips: 'Please select a workflow (required)',
child_node: 'Child Node',
enter_child_node: 'Enter child node',
run_flag: 'Run flag',
diff --git a/dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts
b/dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts
index fae3a1a33e..a435f59371 100644
--- a/dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts
+++ b/dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts
@@ -326,8 +326,8 @@ const resource = {
task_name: '任务名称',
task_group_name: '任务组名称',
project_name: '项目名称',
- process_name: '工作流名称',
- process_instance_name: '工作流实例',
+ workflow_name: '工作流名称',
+ workflow_instance_name: '工作流实例',
queue: '任务组队列',
priority: '组内优先级',
priority_be_a_number: '优先级必须是大于等于0的数值',
@@ -618,8 +618,8 @@ const project = {
name_tips: '请输入名称(必填)',
task_type: '任务类型',
task_type_tips: '请选择任务类型(必选)',
- process_name: '工作流名称',
- process_name_tips: '请选择工作流(必选)',
+ workflow_name: '工作流名称',
+ workflow_name_tips: '请选择工作流(必选)',
child_node: '子节点',
enter_child_node: '进入该子节点',
run_flag: '运行标志',
diff --git
a/dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-process-name.ts
b/dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-process-name.ts
index 027a250c46..d754acbf46 100644
---
a/dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-process-name.ts
+++
b/dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-process-name.ts
@@ -72,7 +72,7 @@ export function useProcessName({
type: 'select',
field: 'processName',
span: 24,
- name: t('project.node.process_name'),
+ name: t('project.node.workflow_name'),
props: {
loading: loading,
disabled: !isCreate,
@@ -83,7 +83,7 @@ export function useProcessName({
required: true,
validator(validate: any, value: string) {
if (!value) {
- return new Error(t('project.node.process_name_tips'))
+ return new Error(t('project.node.workflow_name_tips'))
}
}
},
diff --git
a/dolphinscheduler-ui-next/src/views/resource/task-group/queue/index.tsx
b/dolphinscheduler-ui-next/src/views/resource/task-group/queue/index.tsx
index 89f669fb01..5470694a2b 100644
--- a/dolphinscheduler-ui-next/src/views/resource/task-group/queue/index.tsx
+++ b/dolphinscheduler-ui-next/src/views/resource/task-group/queue/index.tsx
@@ -170,13 +170,13 @@ const taskGroupQueue = defineComponent({
<NInput
size='small'
v-model={[this.searchParamRef.processName, 'value']}
- placeholder={t('resource.task_group_queue.process_name')}
+ placeholder={t('resource.task_group_queue.workflow_name')}
></NInput>
<NInput
size='small'
v-model={[this.searchParamRef.instanceName, 'value']}
placeholder={t(
- 'resource.task_group_queue.process_instance_name'
+ 'resource.task_group_queue.workflow_instance_name'
)}
></NInput>
<NButton size='small' type='primary' onClick={onSearch}>
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 bd862742d3..8a532656d9 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
@@ -56,7 +56,7 @@ export function useTable(
...COLUMN_WIDTH_CONFIG['name']
},
{
- title: t('resource.task_group_queue.process_instance_name'),
+ title: t('resource.task_group_queue.workflow_instance_name'),
key: 'processInstanceName',
...COLUMN_WIDTH_CONFIG['name']
},
