Merge branch 'apache:dev' into fix_9355

SbloodyS · Apr 6, 2022 · ab66d70 · ab66d70
2 parents 63bab18 + aba2570
commit ab66d70
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 16 deletions.
diff --git a/...src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskDefinitionServiceImpl.java b/...src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskDefinitionServiceImpl.java
@@ -695,7 +695,6 @@ public Result queryTaskDefinitionListPaging(User loginUser,
                 });
             }
             taskMainInfoIPage.setRecords(Lists.newArrayList(taskMainInfoMap.values()));
-            taskMainInfoIPage.setTotal(taskMainInfoMap.values().size());
         }
         PageInfo<TaskMainInfo> pageInfo = new PageInfo<>(pageNo, pageSize);
         pageInfo.setTotal((int) taskMainInfoIPage.getTotal());

diff --git 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:
@@ -531,6 +531,7 @@ const project = {
       'There is not any workflows. Please create a workflow, and then visit this page again.'
   },
   task: {
+    current_task_settings: 'Current task settings',
     online: 'Online',
     offline: 'Offline',
     task_name: 'Task Name',
@@ -618,12 +619,12 @@ const project = {
     view_history: 'View history',
     view_log: 'View log',
     enter_this_child_node: 'Enter this child node',
-    name: 'Node name',
+    name: 'Name',
     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
@@ -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/detail-modal.tsx b/dolphinscheduler-ui-next/src/views/projects/task/components/node/detail-modal.tsx
@@ -181,7 +181,11 @@ const NodeDetailModal = defineComponent({
     return () => (
       <Modal
         show={props.show}
-        title={`${t('project.node.current_node_settings')}`}
+        title={
+          props.from === 1
+            ? `${t('project.task.current_task_settings')}`
+            : `${t('project.node.current_node_settings')}`
+        }
         onConfirm={onConfirm}
         confirmLoading={props.saving}
         confirmDisabled={props.readonly}

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
@@ -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
@@ -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
@@ -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']
     },