[Fix][UI][V1.0.0-Beta] Change node name to task name in the task modal on the task definition page. (#9620)

3 years ago · 93ee2e45c8
21 changed files with 23 additions and 21 deletions
--- a/dolphinscheduler-ui-next/src/locales/modules/en_US.ts
+++ b/dolphinscheduler-ui-next/src/locales/modules/en_US.ts
@ -623,7 +623,8 @@ const project = {
    view_history: 'View history',
    view_log: 'View log',
    enter_this_child_node: 'Enter this child node',
-    name: 'Name',
+    name: 'Node Name',
    task_name: 'Task Name',
    name_tips: 'Please enter name (required)',
    task_type: 'Task Type',
    task_type_tips: 'Please select a task type (required)',
--- a/dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts
+++ b/dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts
@ -620,6 +620,7 @@ const project = {
    view_log: '查看日志',
    enter_this_child_node: '进入该子节点',
    name: '节点名称',
    task_name: '任务名称',
    name_tips: '请输入名称(必填)',
    task_type: '任务类型',
    task_type_tips: '请选择任务类型(必选)',
--- a/dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-name.ts
+++ b/dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-name.ts
@ -18,13 +18,13 @@
 import { useI18n } from 'vue-i18n'
 import type { IJsonItem } from '../types'
-export function useName(): IJsonItem {
+export function useName(from?: number): IJsonItem {
  const { t } = useI18n()
  return {
    type: 'input',
    field: 'name',
    class: 'input-node-name',
-    name: t('project.node.name'),
+    name: from === 1 ? t('project.node.task_name') : t('project.node.name'),
    props: {
      placeholder: t('project.node.name_tips'),
      maxLength: 100
--- a/dolphinscheduler-ui-next/src/views/projects/task/components/node/tasks/use-conditions.ts
+++ b/dolphinscheduler-ui-next/src/views/projects/task/components/node/tasks/use-conditions.ts
@ -65,7 +65,7 @@ export function useConditions({
  return {
    json: [
-      Fields.useName(),
+      Fields.useName(from),
      ...extra,
      Fields.useRunFlag(),
      Fields.useDescription(),
--- a/dolphinscheduler-ui-next/src/views/projects/task/components/node/tasks/use-data-quality.ts
+++ b/dolphinscheduler-ui-next/src/views/projects/task/components/node/tasks/use-data-quality.ts
@ -76,7 +76,7 @@ export function useDataQuality({
  return {
    json: [
-      Fields.useName(),
+      Fields.useName(from),
      ...extra,
      Fields.useRunFlag(),
      Fields.useDescription(),
--- a/dolphinscheduler-ui-next/src/views/projects/task/components/node/tasks/use-datax.ts
+++ b/dolphinscheduler-ui-next/src/views/projects/task/components/node/tasks/use-datax.ts
@ -67,7 +67,7 @@ export function useDataX({
  return {
    json: [
-      Fields.useName(),
+      Fields.useName(from),
      ...extra,
      Fields.useRunFlag(),
      Fields.useDescription(),
--- a/dolphinscheduler-ui-next/src/views/projects/task/components/node/tasks/use-dependent.ts
+++ b/dolphinscheduler-ui-next/src/views/projects/task/components/node/tasks/use-dependent.ts
@ -67,7 +67,7 @@ export function useDependent({
  return {
    json: [
-      Fields.useName(),
+      Fields.useName(from),
      ...extra,
      Fields.useRunFlag(),
      Fields.useDescription(),
--- a/dolphinscheduler-ui-next/src/views/projects/task/components/node/tasks/use-emr.ts
+++ b/dolphinscheduler-ui-next/src/views/projects/task/components/node/tasks/use-emr.ts
@ -62,7 +62,7 @@ export function useEmr({
  return {
    json: [
-      Fields.useName(),
+      Fields.useName(from),
      ...extra,
      Fields.useRunFlag(),
      Fields.useDescription(),
--- a/dolphinscheduler-ui-next/src/views/projects/task/components/node/tasks/use-flink.ts
+++ b/dolphinscheduler-ui-next/src/views/projects/task/components/node/tasks/use-flink.ts
@ -69,7 +69,7 @@ export function useFlink({
  return {
    json: [
-      Fields.useName(),
+      Fields.useName(from),
      ...extra,
      Fields.useRunFlag(),
      Fields.useDescription(),
--- a/dolphinscheduler-ui-next/src/views/projects/task/components/node/tasks/use-http.ts
+++ b/dolphinscheduler-ui-next/src/views/projects/task/components/node/tasks/use-http.ts
@ -68,7 +68,7 @@ export function useHttp({
  return {
    json: [
-      Fields.useName(),
+      Fields.useName(from),
      ...extra,
      Fields.useRunFlag(),
      Fields.useDescription(),
--- a/dolphinscheduler-ui-next/src/views/projects/task/components/node/tasks/use-mr.ts
+++ b/dolphinscheduler-ui-next/src/views/projects/task/components/node/tasks/use-mr.ts
@ -62,7 +62,7 @@ export function useMr({
  return {
    json: [
-      Fields.useName(),
+      Fields.useName(from),
      ...extra,
      Fields.useRunFlag(),
      Fields.useDescription(),
--- a/dolphinscheduler-ui-next/src/views/projects/task/components/node/tasks/use-pigeon.ts
+++ b/dolphinscheduler-ui-next/src/views/projects/task/components/node/tasks/use-pigeon.ts
@ -61,7 +61,7 @@ export function usePigeon({
  return {
    json: [
-      Fields.useName(),
+      Fields.useName(from),
      ...extra,
      Fields.useRunFlag(),
      Fields.useDescription(),
--- a/dolphinscheduler-ui-next/src/views/projects/task/components/node/tasks/use-procedure.ts
+++ b/dolphinscheduler-ui-next/src/views/projects/task/components/node/tasks/use-procedure.ts
@ -65,7 +65,7 @@ export function useProcedure({
  return {
    json: [
-      Fields.useName(),
+      Fields.useName(from),
      ...extra,
      Fields.useRunFlag(),
      Fields.useDescription(),
--- a/dolphinscheduler-ui-next/src/views/projects/task/components/node/tasks/use-python.ts
+++ b/dolphinscheduler-ui-next/src/views/projects/task/components/node/tasks/use-python.ts
@ -63,7 +63,7 @@ export function usePython({
  return {
    json: [
-      Fields.useName(),
+      Fields.useName(from),
      ...extra,
      Fields.useRunFlag(),
      Fields.useDescription(),
--- a/dolphinscheduler-ui-next/src/views/projects/task/components/node/tasks/use-sea-tunnel.ts
+++ b/dolphinscheduler-ui-next/src/views/projects/task/components/node/tasks/use-sea-tunnel.ts
@ -67,7 +67,7 @@ export function useSeaTunnel({
  return {
    json: [
-      Fields.useName(),
+      Fields.useName(from),
      ...extra,
      Fields.useRunFlag(),
      Fields.useDescription(),
--- a/dolphinscheduler-ui-next/src/views/projects/task/components/node/tasks/use-shell.ts
+++ b/dolphinscheduler-ui-next/src/views/projects/task/components/node/tasks/use-shell.ts
@ -63,7 +63,7 @@ export function useShell({
  return {
    json: [
-      Fields.useName(),
+      Fields.useName(from),
      ...extra,
      Fields.useRunFlag(),
      Fields.useDescription(),
--- a/dolphinscheduler-ui-next/src/views/projects/task/components/node/tasks/use-spark.ts
+++ b/dolphinscheduler-ui-next/src/views/projects/task/components/node/tasks/use-spark.ts
@ -69,7 +69,7 @@ export function useSpark({
  return {
    json: [
-      Fields.useName(),
+      Fields.useName(from),
      ...extra,
      Fields.useRunFlag(),
      Fields.useDescription(),
--- a/dolphinscheduler-ui-next/src/views/projects/task/components/node/tasks/use-sql.ts
+++ b/dolphinscheduler-ui-next/src/views/projects/task/components/node/tasks/use-sql.ts
@ -69,7 +69,7 @@ export function useSql({
  return {
    json: [
-      Fields.useName(),
+      Fields.useName(from),
      ...extra,
      Fields.useRunFlag(),
      Fields.useDescription(),
--- a/dolphinscheduler-ui-next/src/views/projects/task/components/node/tasks/use-sqoop.ts
+++ b/dolphinscheduler-ui-next/src/views/projects/task/components/node/tasks/use-sqoop.ts
@ -81,7 +81,7 @@ export function useSqoop({
  return {
    json: [
-      Fields.useName(),
+      Fields.useName(from),
      ...extra,
      Fields.useRunFlag(),
      Fields.useDescription(),
--- a/dolphinscheduler-ui-next/src/views/projects/task/components/node/tasks/use-sub-process.ts
+++ b/dolphinscheduler-ui-next/src/views/projects/task/components/node/tasks/use-sub-process.ts
@ -65,7 +65,7 @@ export function useSubProcess({
  return {
    json: [
-      Fields.useName(),
+      Fields.useName(from),
      ...extra,
      Fields.useRunFlag(),
      Fields.useDescription(),
--- a/dolphinscheduler-ui-next/src/views/projects/task/components/node/tasks/use-switch.ts
+++ b/dolphinscheduler-ui-next/src/views/projects/task/components/node/tasks/use-switch.ts
@ -65,7 +65,7 @@ export function useSwitch({
  return {
    json: [
-      Fields.useName(),
+      Fields.useName(from),
      ...extra,
      Fields.useRunFlag(),
      Fields.useDescription(),