From f4a2b6df509cace181a21aa940e4c1b6c327ed3c Mon Sep 17 00:00:00 2001
From: Wangyizhi1 <87303815+Wangyizhi1@users.noreply.github.com>
Date: Wed, 15 Sep 2021 23:33:03 +0800
Subject: [PATCH] [Fix-6139][UI] fix some UI bugs (#6225)

* Hide the reference task feature

* fix the bug that Element-ui(2.13.2) auto focus on the first input

* Fix delete process version error

* add switch and tis task icons

* Change the default value of environmentCode to - 1

* Replace projectId to projectCode & remove definitionList field in the DEPENDENT node

* fix delete process instance error

* Fix error entering sub process instance page
---
 .../pages/dag/_source/canvas/taskbar.scss     |  12 ++++++
 .../home/pages/dag/_source/canvas/toolbar.vue |   2 +-
 .../js/conf/home/pages/dag/_source/dag.vue    |  40 +++++++++++-------
 ...copyFromTask.vue => referenceFromTask.vue} |   4 +-
 .../pages/dag/_source/formModel/formModel.vue |  23 +++++-----
 .../tasks/_source/dependItemList.vue          |  34 +++++++--------
 .../formModel/tasks/_source/nodeStatus.vue    |   6 +--
 .../dag/_source/formModel/tasks/dependent.vue |   4 +-
 .../dag/_source/formModel/tasks/pre_tasks.vue |   3 +-
 .../dag/_source/images/task-icos/switch.png   | Bin 0 -> 885 bytes
 .../_source/images/task-icos/switch_hover.png | Bin 0 -> 825 bytes
 .../dag/_source/images/task-icos/tis.png      | Bin 0 -> 1361 bytes
 .../_source/images/task-icos/tis_hover.png    | Bin 0 -> 1445 bytes
 .../src/js/conf/home/store/dag/actions.js     |  10 ++---
 .../src/js/module/i18n/locale/en_US.js        |   2 +-
 .../src/js/module/i18n/locale/zh_CN.js        |   2 +-
 16 files changed, 82 insertions(+), 60 deletions(-)
 rename dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/{copyFromTask.vue => referenceFromTask.vue} (98%)
 create mode 100755 dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/images/task-icos/switch.png
 create mode 100755 dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/images/task-icos/switch_hover.png
 create mode 100755 dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/images/task-icos/tis.png
 create mode 100755 dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/images/task-icos/tis_hover.png

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/canvas/taskbar.scss b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/canvas/taskbar.scss
index 3ad2416ee3..35a811f442 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/canvas/taskbar.scss
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/canvas/taskbar.scss
@@ -105,6 +105,12 @@
           &.icos-spark {
             background-image: url("../images/task-icos/spark.png");
           }
+          &.icos-switch {
+            background-image: url("../images/task-icos/switch.png");
+          }
+          &.icos-tis {
+            background-image: url("../images/task-icos/tis.png");
+          }
         }
 
         span {
@@ -159,6 +165,12 @@
             &.icos-spark {
               background-image: url("../images/task-icos/spark_hover.png");
             }
+            &.icos-switch {
+              background-image: url("../images/task-icos/switch_hover.png");
+            }
+            &.icos-tis {
+              background-image: url("../images/task-icos/tis_hover.png");
+            }
           }
         }
       }
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/canvas/toolbar.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/canvas/toolbar.vue
index 4fcde2cfe1..4071fd955b 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/canvas/toolbar.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/canvas/toolbar.vue
@@ -112,7 +112,7 @@
       >
       <el-button
         class="toolbar-el-btn"
-        v-if="$route.query.subProcessCodes"
+        v-if="$route.query.subs"
         type="primary"
         size="mini"
         icon="el-icon-back"
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
index d2cb02c0b6..a94395a47b 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
@@ -24,6 +24,10 @@
       :with-header="false"
       :wrapperClosable="false"
     >
+      <!-- fix the bug that Element-ui(2.13.2) auto focus on the first input -->
+      <div style="width:0px;height:0px;overflow:hidden;">
+        <el-input type="text" />
+      </div>
       <m-form-model
         v-if="taskDrawer"
         :nodeData="nodeData"
@@ -134,13 +138,16 @@
           pageSize: null
         },
         // the task status refresh timer
-        statusTimer: null
+        statusTimer: null,
+        // the process instance id
+        instanceId: -1
       }
     },
     mounted () {
       this.setIsEditDag(false)
 
       if (this.type === 'instance') {
+        this.instanceId = this.$route.params.id
         this.definitionCode = this.$route.query.code
       } else if (this.type === 'definition') {
         this.definitionCode = this.$route.params.code
@@ -463,28 +470,29 @@
        */
       returnToPrevProcess () {
         let $name = this.$route.name.split('-')
-        let subProcessCodes = this.$route.query.subProcessCodes
-        let codes = subProcessCodes.split(',')
-        const last = codes.pop()
+        let subs = this.$route.query.subs
+        let ids = subs.split(',')
+        const last = ids.pop()
         this.$router.push({
-          path: `/${$name[0]}/${this.projectId}/${$name[1]}/list/${last}`,
-          query: codes.length > 0 ? { subProcessCodes: codes.join(',') } : null
+          path: `/${$name[0]}/${this.projectCode}/${$name[1]}/list/${last}`,
+          query: ids.length > 0 ? { subs: ids.join(',') } : null
         })
       },
-      toSubProcess ({ subProcessCode, fromThis }) {
-        let subProcessCodes = []
-        let getIds = this.$route.query.subProcessCodes
-        if (getIds) {
-          let newId = getIds.split(',')
-          newId.push(this.definitionCode)
-          subProcessCodes = newId
+      toSubProcess ({ subProcessCode, subInstanceId }) {
+        const tarIdentifier = this.type === 'instance' ? subInstanceId : subProcessCode
+        const curIdentifier = this.type === 'instance' ? this.instanceId : this.definitionCode
+        let subs = []
+        let olds = this.$route.query.subs
+        if (olds) {
+          subs = olds.split(',')
+          subs.push(curIdentifier)
         } else {
-          subProcessCodes.push(this.definitionCode)
+          subs.push(curIdentifier)
         }
         let $name = this.$route.name.split('-')
         this.$router.push({
-          path: `/${$name[0]}/${this.projectCode}/${$name[1]}/list/${subProcessCode}`,
-          query: { subProcessCodes: subProcessCodes.join(',') }
+          path: `/${$name[0]}/${this.projectCode}/${$name[1]}/list/${tarIdentifier}`,
+          query: { subs: subs.join(',') }
         })
       },
       seeHistory (taskName) {
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/copyFromTask.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/referenceFromTask.vue
similarity index 98%
rename from dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/copyFromTask.vue
rename to dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/referenceFromTask.vue
index cc5ad42fde..ef1489cb85 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/copyFromTask.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/referenceFromTask.vue
@@ -16,7 +16,7 @@
  */
 <template>
   <list-box>
-    <div slot="text">{{ $t("Copy from") }}</div>
+    <div slot="text">{{ $t("Reference from") }}</div>
     <div slot="content" class="copy-from" ref="copyFrom">
       <div class="copy-from-content">
         <el-input
@@ -121,7 +121,7 @@
           this.formModel.backfillRefresh = false
           this.$nextTick(() => {
             this.formModel.backfillItem = backfillItem
-            this.formModel.backfill(backfillItem, true)
+            this.formModel.backfill(backfillItem)
             this.formModel.backfillRefresh = true
           })
         }
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
index 956547f5c5..34dfdb8b9b 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
@@ -46,6 +46,10 @@
     </div>
     <div class="content-box" v-if="isContentBox">
       <div class="form-model">
+
+        <!-- Reference from task -->
+        <!-- <reference-from-task :taskType="nodeData.taskType" /> -->
+
         <!-- Node name -->
         <m-list-box>
           <div slot="text">{{ $t("Node name") }}</div>
@@ -63,9 +67,6 @@
           </div>
         </m-list-box>
 
-        <!-- Copy from task -->
-        <copy-from-task v-if="!isDetails" :taskType="nodeData.taskType" />
-
         <!-- Running sign -->
         <m-list-box>
           <div slot="text">{{ $t("Run flag") }}</div>
@@ -442,7 +443,7 @@
   import disabledState from '@/module/mixin/disabledState'
   import mPriority from '@/module/components/priority/priority'
   import { findComponentDownward } from '@/module/util/'
-  import CopyFromTask from './_source/copyFromTask.vue'
+  // import ReferenceFromTask from './_source/referenceFromTask.vue'
 
   export default {
     name: 'form-model',
@@ -632,7 +633,7 @@
             .dispatch('dag/getSubProcessId', { taskId: this.taskInstance.id })
             .then((res) => {
               this.$emit('onSubProcess', {
-                subProcessId: res.data.subProcessInstanceId,
+                subInstanceId: res.data.subProcessInstanceId,
                 fromThis: this
               })
             })
@@ -768,7 +769,7 @@
             timeoutNotifyStrategy: this.timeout.strategy,
             timeout: this.timeout.interval || 0,
             delayTime: this.delayTime,
-            environmentCode: this.environmentCode,
+            environmentCode: this.environmentCode || -1,
             status: this.status,
             branch: this.branch
           },
@@ -839,12 +840,12 @@
           fromThis: this
         })
       },
-      backfill (backfillItem, copyFromTask) {
+      backfill (backfillItem) {
         const o = backfillItem
         // Non-null objects represent backfill
         if (!_.isEmpty(o)) {
           this.code = o.code
-          !copyFromTask && (this.name = o.name)
+          this.name = o.name
           this.taskInstancePriority = o.taskInstancePriority
           this.runFlag = o.runFlag || 'YES'
           this.desc = o.desc
@@ -880,7 +881,7 @@
           } else {
             this.workerGroup = o.workerGroup
           }
-          this.environmentCode = o.environmentCode
+          this.environmentCode = o.environmentCode === -1 ? '' : o.environmentCode
           this.params = o.params || {}
           this.dependence = o.dependence || {}
           this.cacheDependence = o.dependence || {}
@@ -971,8 +972,8 @@
       mPriority,
       mWorkerGroups,
       mRelatedEnvironment,
-      mPreTasks,
-      CopyFromTask
+      mPreTasks
+      // ReferenceFromTask
     }
   }
 </script>
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/dependItemList.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/dependItemList.vue
index 416ce77eec..fa27494dd6 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/dependItemList.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/dependItemList.vue
@@ -17,7 +17,7 @@
 <template>
   <div class="dep-list-model">
     <div v-for="(el,$index) in dependItemList" :key='$index'>
-      <el-select filterable :disabled="isDetails" style="width: 450px" v-model="el.projectId" @change="v => _onChangeProjectId(v, $index)" size="small">
+      <el-select filterable :disabled="isDetails" style="width: 450px" v-model="el.projectCode" @change="v => _onChangeProjectCode(v, $index)" size="small">
         <el-option v-for="item in projectList" :key="item.value" :value="item.value" :label="item.label"></el-option>
       </el-select>
       <el-select filterable :disabled="isDetails" style="width: 450px" v-model="el.definitionCode" @change="v => _onChangeDefinitionCode(v, $index)" size="small">
@@ -84,8 +84,8 @@
         this.isLoading = true
 
         // add task list
-        let projectId = this.projectList[0].value
-        this._getProcessByProjectCode().then(definitionList => {
+        let projectCode = this.projectList[0].value
+        this._getProcessByProjectCode(projectCode).then(definitionList => {
           // dependItemList index
           let is = (value) => _.some(this.dependItemList, { definitionCode: value })
           let noArr = _.filter(definitionList, v => !is(v.value))
@@ -93,7 +93,7 @@
           let val = value || definitionList[0].value
           this._getDependItemList(val).then(depTasksList => {
             this.$nextTick(() => {
-              this.$emit('dependItemListEvent', _.concat(this.dependItemList, this._rtNewParams(val, definitionList, depTasksList, projectId)))
+              this.$emit('dependItemListEvent', _.concat(this.dependItemList, this._rtNewParams(val, definitionList, depTasksList, projectCode)))
             })
           })
         })
@@ -117,16 +117,16 @@
         return new Promise((resolve, reject) => {
           this.projectList = _.map(_.cloneDeep(this.store.state.dag.projectListS), v => {
             return {
-              value: v.id,
+              value: v.code,
               label: v.name
             }
           })
           resolve()
         })
       },
-      _getProcessByProjectCode () {
+      _getProcessByProjectCode (code) {
         return new Promise((resolve, reject) => {
-          this.store.dispatch('dag/getProcessByProjectCode').then(res => {
+          this.store.dispatch('dag/getProcessByProjectCode', code).then(res => {
             let definitionList = _.map(_.cloneDeep(res), v => {
               return {
                 value: v.processDefinition.code,
@@ -156,8 +156,8 @@
       /**
        * change process get dependItemList
        */
-      _onChangeProjectId (value, itemIndex) {
-        this._getProcessByProjectCode().then(definitionList => {
+      _onChangeProjectCode (value, itemIndex) {
+        this._getProcessByProjectCode(value).then(definitionList => {
           /* this.$set(this.dependItemList, itemIndex, this._dlOldParams(value, definitionList, item)) */
           let definitionCode = definitionList[0].value
           this._getDependItemList(definitionCode).then(depTasksList => {
@@ -184,9 +184,9 @@
         this.$set(this.dependItemList[itemIndex], 'dateValue', list[0].value)
         this.$set(this.dependItemList[itemIndex], 'dateValueList', list)
       },
-      _rtNewParams (value, definitionList, depTasksList, projectId) {
+      _rtNewParams (value, definitionList, depTasksList, projectCode) {
         return {
-          projectId: projectId,
+          projectCode: projectCode,
           definitionCode: value,
           // dependItem need private definitionList
           definitionList: definitionList,
@@ -200,7 +200,7 @@
       },
       _rtOldParams (value, definitionList, depTasksList, item) {
         return {
-          projectId: item.projectId,
+          projectCode: item.projectCode,
           definitionCode: value,
           // dependItem need private definitionList
           definitionList: definitionList,
@@ -215,7 +215,7 @@
 
       _cpOldParams (value, definitionCode, definitionList, depTasksList, item) {
         return {
-          projectId: value,
+          projectCode: value,
           definitionList: definitionList,
           definitionCode: definitionCode,
           depTasks: item.depTasks || 'ALL',
@@ -244,11 +244,11 @@
       this._getProjectList().then(() => {
         if (!this.dependItemList.length) {
           if (!this.projectList.length) return
-          let projectId = this.projectList[0].value
-          this._getProcessByProjectCode().then(definitionList => {
+          let projectCode = this.projectList[0].value
+          this._getProcessByProjectCode(projectCode).then(definitionList => {
             let value = definitionList[0].value
             this._getDependItemList(value).then(depTasksList => {
-              this.$emit('dependItemListEvent', _.concat(this.dependItemList, this._rtNewParams(value, definitionList, depTasksList, projectId)))
+              this.$emit('dependItemListEvent', _.concat(this.dependItemList, this._rtNewParams(value, definitionList, depTasksList, projectCode)))
             })
           })
         } else {
@@ -257,7 +257,7 @@
           // get item list
           this._getDependItemList(codes, false).then(res => {
             _.map(this.dependItemList, (v, i) => {
-              this._getProcessByProjectCode().then(definitionList => {
+              this._getProcessByProjectCode(v.projectCode).then(definitionList => {
                 this.$set(this.dependItemList, i, this._rtOldParams(v.definitionCode, definitionList, ['ALL'].concat(_.map(res[v.definitionCode] || [], v => v.name)), v))
               })
             })
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/nodeStatus.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/nodeStatus.vue
index 276374f7ed..7ff4acfcb0 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/nodeStatus.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/nodeStatus.vue
@@ -107,9 +107,9 @@
           resolve()
         })
       },
-      _getProcessByProjectCode () {
+      _getProcessByProjectCode (code) {
         return new Promise((resolve, reject) => {
-          this.store.dispatch('dag/getProcessByProjectCode').then(res => {
+          this.store.dispatch('dag/getProcessByProjectCode', code).then(res => {
             this.definitionList = _.map(_.cloneDeep(res), v => {
               return {
                 value: v.code,
@@ -168,7 +168,7 @@
           // get item list
           this._getDependItemList(codes, false).then(res => {
             _.map(this.dependItemList, (v, i) => {
-              this._getProcessByProjectCode().then(definitionList => {
+              this._getProcessByProjectCode(v.projectCode).then(definitionList => {
                 this.$set(this.dependItemList, i, this._rtOldParams(v.definitionCode, ['ALL'].concat(_.map(res[v.definitionCode] || [], v => v.name)), v))
               })
             })
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/dependent.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/dependent.vue
index a81fb73d83..7a6ca024fd 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/dependent.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/dependent.vue
@@ -119,7 +119,7 @@
           dependTaskList: _.map(this.dependTaskList, v => {
             return {
               relation: v.relation,
-              dependItemList: _.map(v.dependItemList, v1 => _.omit(v1, ['depTasksList', 'state', 'dateValueList']))
+              dependItemList: _.map(v.dependItemList, v1 => _.omit(v1, ['depTasksList', 'state', 'dateValueList', 'definitionList']))
             }
           })
         })
@@ -163,7 +163,7 @@
           dependTaskList: _.map(this.dependTaskList, v => {
             return {
               relation: v.relation,
-              dependItemList: _.map(v.dependItemList, v1 => _.omit(v1, ['depTasksList', 'state', 'dateValueList']))
+              dependItemList: _.map(v.dependItemList, v1 => _.omit(v1, ['depTasksList', 'state', 'dateValueList', 'definitionList']))
             }
           })
         }
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/pre_tasks.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/pre_tasks.vue
index a8774c77dc..cc976966fd 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/pre_tasks.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/pre_tasks.vue
@@ -64,16 +64,17 @@
     mounted () {
       const canvas = this.getDagCanvasRef()
       const edges = canvas.getEdges()
+      this.preTasks = canvas.getPrevNodes(this.code).map(node => node.id)
       this.options = this.tasks.filter((task) => {
         // The current node cannot be used as the prev node
         if (task.code === this.code) return false
+        if (this.preTasks.includes(task.code)) return true
         // The number of edges start with CONDITIONS task cannot be greater than 2
         if (task.taskType === 'CONDITIONS') {
           return edges.filter((e) => e.sourceId === task.code).length < 2
         }
         return true
       })
-      this.preTasks = canvas.getPrevNodes(this.code).map(node => node.id)
     },
     computed: {
       ...mapState('dag', ['tasks'])
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/images/task-icos/switch.png b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/images/task-icos/switch.png
new file mode 100755
index 0000000000000000000000000000000000000000..02717ea0f9ceb15999ae72fd294eb35bbdcb1274
GIT binary patch
literal 885
zcmeAS@N?(olHy`uVBq!ia0vp^Y9P$P3?%12mYf5m7>k44ofy`glX(eb#|QX?xB><L
zgTc(1Gq-KqwrbTXAY;*@MRVuQ1v2K(pTBV7LLhhc?AbsrP!Pxkvggg4H)qZq2m`1F
zC=O9DYt}5FG9Vkm0IC6UXUv!ZQ4C}Q89*rr3FHFV5XC?e0w5wlDYz_<0hEFm2vGx(
z0;vF-0Fi=_5D_?u#sI2;C_`qz4MCHF>xGB|xyS$_2=p3I5Lp45AqD@U@_<2HQWE4B
z%)rRR%FfBf&C4$!EG8}~B`qT>uc)M|uBmHaWNd0~ZDVKW<mTby>lY9h9uXOrn3SB7
zmtRm=TvA)#(%RP5(>H1M+<6NYEnT)^?Yi}wcI-cJ@X(PHCr_O^bMeN_d-oqcefI3-
z>o@N{eE#zF+qdsOe*OOQ_wT<=oJ)Yw&*<Xm;uvCa`tIeM=1zekY#-jc#U{6%&{?;0
z!i1ST;cYxiJ5I>B2EP0LUq63mw&n8Q_rCv$e*R|f`I`=<N5uC|Q`z@pxmEX+^d)DG
zNxq)`q~V~^><25?%*oaJn=EG>v2x;uopWX`UDT_T#{JR#dZ{^s$(xtIq%YrPGRvHx
z;?JPqGU?9@q1actQ~rE@f2E<XN$`t(YTMDRU+*!l_R+F<WG7H|$|{#hhJTKviQR1m
zS1SRA55}_3tB&quY<SyNvu<;Wg!1&nvtlP?v%~(MdNlp^q}-1+(~pbZG<l#UQF~6O
zond~9ru6*-iiZzK2|H-TXeVX0xV<@aVmtFI<;fdm*3V+iG4Y>thoynRbCZZbtks90
zD<;0I46~PIez#n|qxG8i=j}GHCzfWJ8&^LKpRm5C{bsbM(Hvc4Ri*pSS`L?#c~4i-
dW4$^l{`STRCm9`9w*ljm!PC{xWt~$(69D~t#H#=R

literal 0
HcmV?d00001

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/images/task-icos/switch_hover.png b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/images/task-icos/switch_hover.png
new file mode 100755
index 0000000000000000000000000000000000000000..0f9f0c152f0ec9d09f94a37f8c38c7573bd37e91
GIT binary patch
literal 825
zcmeAS@N?(olHy`uVBq!ia0vp^Y9P$P3?%12mYf5m7>k44ofy`glX(eby9fA$xB>+m
z{{IhM_1|Itf6qz(t>^yNnDXCv=6}OU|Fx$6*PQuZZ_<CAssFVm{5R<TuQ&O>?zI1!
z6G2FK@_%ih8X%hRUvtub?TP<2fb4z{TVuk1jeZbUdjd!n$ObCY1TrT6R|kqu1PN*Z
z4FR&j3P1(|HG&m@#DPYEr9dJul^`}m5KIEu5M@Ad6a+R0Y8qGz$QFp<a5EulU<LxM
zfEo@K2f7e$7sMkF6F}@fs2iXL!cFM^uXg0HJTNG8N`m}?8JL(^*m;FTL?t9;WaShT
zl~i?f^$pD}9Nj#<eS(65LnEW(;*-+SGct4X@(T(}O3Ethnp@jCySjTOOq?`r=Bzmj
zmn~npZp*eEJ9q9qeB|i)OIL5-z5n>d%hzw-zyI*@)0Z#bzJ34k<JYf0fB(5AOy3TS
zN)1mJ#}JFtPp`NKGdT*dKG=R@mRNDwnMEColKd9WFl-MM*}RVP#`pi{<uoR0mCvw^
zdTL!CdinBY+XM0be}8OIN;b7WRkg%u`&3r3XE*mKneFDznZX%q8U5z}(KAUG7A2is
zepE;HTUu?txl@M`0|%Glyqy^p8yu&rNU}Dp{G-cmGo$jr^(TUt)dD^qIQ%3%@5<+Z
z<eyv?&tx{7vVE{Aw)C>zf~%!#+I+SNZkWQ$*pQp|u4r${eTD_^4nOstIxVqtPUAe@
ziMCZ@J`>9vPCv5QpRh!QoAK%QH!q%U<!lLAbD1q{2mhRcu)Ft8-ig(jchZzGw?r+;
z&+O4rw@>HyGBQ}dTF$@bqo-FSFT>WLQ{{RR^R~JM*B$#*y{^=GU9{wU?ia;#YwP&_
aE5&!eZ5FeRKCS|cD+W(jKbLh*2~7Y$Uz<$;

literal 0
HcmV?d00001

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/images/task-icos/tis.png b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/images/task-icos/tis.png
new file mode 100755
index 0000000000000000000000000000000000000000..652f5c4172e182cdeefc326de735941c4fce8fb3
GIT binary patch
literal 1361
zcmeAS@N?(olHy`uVBq!ia0vp^Y9P$P3?%12mYf5m7>k44ofy`glX=O&z@!o26XFUK
z{Qv*|s#UA@@83Uj=1d@C+qP}<=g$W+fZRok76BP^=gwWSWC>7k>C&Zh=FC~Ra3Mr$
z_Uzd}K_D9_0%XsdHxI}LDgX+?xj^=;S+jr&fQHPNF$1UoC<SCgOaMv&)dSf;5g-Ey
zfU*!ZKq(*tNJ2y)3?LgW4zvzvAVeIl45$ET2t*@X5XgYDAyQ}xAjSgK0L39va0XZ_
z$PEw^AT~k-;VL0qxFAp*s2*7*PzqTwn&HS&aHHUY5XHz^kl7HEA&TJ+0NM@_fvCj8
zhD*WqLgEN64riRnY+wbZmF*=#e!&ck%q*;I>>Qk2+&sK|0)j%qB4XkalF~A=a`Fm_
zO3JEgYU*0Ldiq8tre@}r)^-k#PA+clUfw?bLBXM6;gQiXv2pQ<N$I)y1%*W=rDYYB
z)irhXO)VXrT|K@16DLodF>@9$8t2YmuxRm;Wy@EtTDx}Lx(ypQZ`rne$Id-__a8cZ
z^w{x}r_P+cc<J)h8@F!XxqI*4gNKhEKYse``STYqUcPzv?!(7VpFV&6_Wk>hA3uNn
z{{83A-+%wY*Zg7wCVLT27sn6@$-4(%M|(3eus^teZP~2Tms<VAm5jU;FFuL$-03>$
z#9uMh)<xV!oWX*E3nR~X$y&cHx%K{j@wszvoX>CmHuL+@`Yg}P2HE1(|DP3Dv_-a9
zrvBR0_~KqR$N5V|2P;;K9=K`#SupGi^QU`XvKBa;a*KFYHtAlP!ar}(L$j_sUj4$g
z;O$1iT`N*&pFVTpY3RJ2KR29zy4-6G`>8vb2M(=$`rInc`$_1F9_RDYuluIF(b?*4
zRI7PHB%j&hZDrNss&c=Z5ke*3<i%L#{5jS6+2E_!nj=d6vRa>SYq6A?E?v%$dAt0N
zh^E@YFqO!<HRq?Sv-+pWwu{I9CPzu{?)}A|M9fZHsqpGrd9ztzv+42qtuZrKeYALe
zg2z;D^5SEwj1-;(sed@&TC_;2`u&z|-vU0)Ke2q7jAG|K-xISJo!ZN=Y6qjf>*=7`
zXUiT;7ghYu-stW(X>$9*u3E)O(-&s$>zhz}N-t;13dtWYZV6pgog`CgHTSph(yu>O
zdlX7uv^~SHQ<hiB({-9?<;RN?V^~DJPB}iQUMU=$wU=jCwuDUadS{1yCq7Ep{5-($
zG2p0(=YP=*F13>vbu!v4iVYKQ=d+#od(<e@cpHoF?es}^FW4-8Cd)h}OFlijNiFND
zm!rTm?p0UrO;0v$%38bNv;d3Z&4x&=7pt9JPRf}{2n2Fl`*y6DU@PV#@_V1X+{Cq&
eQ@iRf%YWhhk^RfbuoRfY89ZJ6T-G@yGywp+D$J$;

literal 0
HcmV?d00001

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/images/task-icos/tis_hover.png b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/images/task-icos/tis_hover.png
new file mode 100755
index 0000000000000000000000000000000000000000..9e0e3315d8fda715f93f28ceea47a5082009c52c
GIT binary patch
literal 1445
zcmYk42T&AO7{~9ZC(R@j0Tn?IuD~5dDc&eW+7UWOuZao42$6E2jBqN$L{Z=xCwDX%
zKoEi#g$$rUF%Tpe0}_Oxh)5iRFsF!wUS8hrQrvmF`@R4B{r}&$Gn?b<?WU@vtAxYh
zR2lBh{_stNw=qE$J};3;H2A`&_`5mbBt844a5$MLUr(kB6afH%b-<wwScw6-4j457
zha14I4%t#G09gp=rND*{%sIg9I-ryQVgY(o2u!)iDM<`yg@DQjrb0mG0#X4&QUwTX
z$_FGKAc+tQu?SGPfFc5B0>nsxM+LxC1Sl|sj~Iy@KoI~E7ns6=ht_;R<RbtQ0&6ZX
z;Q=xaC7}y0s0)xSmVjU|2W2n?0pQ}GI>b-_DliJVHg(jpiERO-e1ySxq<}L(Y)gS-
zn4k(4h2(6tfEcpSEn>+>wk9Y5?Fi4=^kT8_xibj|X|X*O7PaF=k1&24Lt0=i%m^Ey
zEieE}Ml4(29e!)z9Xl3<rfrLe7gM%lQ3Vc(Wg<huFM``ojNA2_IDR(#!@61i-T^qg
ztem`pB4L-3vWlwOXP<weuA#L@TW9aS{dx!V4GtO}I%I5YLN=q)EDs;Cwy~ohcW`ua
zc6Iak($mMsKOitDI5a#WGAjD3ufIz;lbDpuN=-YLem;YJAuBukO3u~XJPuDF6p4$9
zOG-*_lvh+%RoB$k-Ihr1+_~HMOH)&GbIZMZtq<DTJ31eCb$35``d8oI{r&v|Lqj8@
zFJ6qjd^PdU>o@;SPQHcLlvFBx|6z9a<J{c*!s6o6($ezs%F4>>+S=Os`o>0{UljZ%
z8GVMcBU4*v?6>9cYj~XEhnd0ZqLWkQ%^f;AH@WV~!Tu8W{68{X7`zfvvX$HWTP5m!
z1?e?I|4A0se{P)_Y`8obx+?5d1Z{r9)G2MxZhB?kP`irC!Jaal+)FwknkD>oz|99Y
zG#f|EAk-WBcnB^r!(}p_l^G02;<F!;FYZ3k<7e!JtE1IUXqm^R<!kA6FOPB};+9@j
zd79#rM^0XxNJ%+cmKkTb`_YLpR%QLUgux1Fx^>P1@%K;)KHe(YE~3TAqQ+20Z|Xp5
z;_yd)^jXK0Mf#jYdx@HO;S^rs`SmVWyoIt>kxQ7NuMz)g<al|GFd<GYtIO6TRN;9V
z`}@joDY5QMQKMyT$W?q;W`&g=<5)rJk8j71)|#KrEuOd3Y?a=|PlqwWl<rDH0tb#P
z9JQ(T<tfu9A{)8!HT9X=-x&DZU-GgUi7~HVtGHYkkoTz5#>ninzVbs7f3^IUtsL#o
z{nsq!6g4@;<Gs6VY5aIAu_vWHp?@~q^~_JY^Jc8&blsald^N_j&{cB2G#h`)x{F-J
z>hsDaPsg^su6x}3uKyXW^GT0>1lxO0QfgUgRf@evtyY7X-Va{VQFZHakHWH5@v(w=
zopy}@n)_hKJF;dTD@kKyxhA<q-m{2EXb*AJ%A5@9GIq2MOx#N&I8`ZK=&pRA&AxKD
xktuJ_Y;cveubRED#wM^A^ffj_$#h-N5*>3~IhZ~(WDkE99K*%iS>hCv^*^7x-fsW^

literal 0
HcmV?d00001

diff --git a/dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js b/dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js
index fdee700844..161cfd4ee5 100644
--- a/dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js
+++ b/dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js
@@ -81,7 +81,7 @@ export default {
    */
   deleteProcessDefinitionVersion ({ state }, payload) {
     return new Promise((resolve, reject) => {
-      io.delete(`projects/${state.projectCode}/process-definition/${payload.code}/versiond/${payload.version}`, {}, res => {
+      io.delete(`projects/${state.projectCode}/process-definition/${payload.code}/versions/${payload.version}`, {}, res => {
         resolve(res)
       }).catch(e => {
         reject(e)
@@ -384,11 +384,11 @@ export default {
     })
   },
   /**
-   * Get a list of process definitions by project id
+   * Get a list of process definitions by project code
    */
-  getProcessByProjectCode ({ state }, payload) {
+  getProcessByProjectCode ({ state }, code) {
     return new Promise((resolve, reject) => {
-      io.get(`projects/${state.projectCode}/process-definition/all`, payload, res => {
+      io.get(`projects/${code}/process-definition/all`, res => {
         resolve(res.data)
       }).catch(res => {
         reject(res)
@@ -606,7 +606,7 @@ export default {
    */
   deleteInstance ({ state }, payload) {
     return new Promise((resolve, reject) => {
-      io.delete(`projects/${state.projectCode}/process-instances/${payload.code}`, {}, res => {
+      io.delete(`projects/${state.projectCode}/process-instances/${payload.processInstanceId}`, {}, res => {
         resolve(res)
       }).catch(e => {
         reject(e)
diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
index e72a1d0dd0..f450cede83 100755
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
@@ -707,6 +707,6 @@ export default {
   'Please select worker groups': 'Please select worker groups',
   condition: 'condition',
   'The condition content cannot be empty': 'The condition content cannot be empty',
-  'Copy from': 'Copy from',
+  'Reference from': 'Reference from',
   'No more...': 'No more...'
 }
diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
index 03935341f6..104fd7c105 100644
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
@@ -706,6 +706,6 @@ export default {
   'Please select worker groups': '请选择Worker分组',
   condition: '条件',
   'The condition content cannot be empty': '条件内容不能为空',
-  'Copy from': '从任务复制',
+  'Reference from': '使用已有任务',
   'No more...': '没有更多了...'
 }