From e271fb81ec8b836577dcd3dfa87e0f237bc57dfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E8=81=AA?= <389401879@qq.com>
Date: Mon, 23 Sep 2019 11:01:35 +0800
Subject: [PATCH] [BUG][#857]repair cross-project dependency delete bug (#858)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(修复跨项目流依赖删除异常)
---
 .../formModel/tasks/_source/dependItemList.vue      | 13 +++++++------
 .../pages/dag/_source/formModel/tasks/dependent.vue | 13 +++++++++++--
 .../js/conf/home/pages/dag/definitionDetails.vue    |  4 +---
 escheduler-ui/src/js/conf/home/pages/dag/index.vue  |  4 +---
 .../src/js/conf/home/pages/dag/instanceDetails.vue  |  4 +---
 5 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/dependItemList.vue b/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/dependItemList.vue
index 9537a95f23..2cd282a155 100644
--- a/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/dependItemList.vue
+++ b/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/dependItemList.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="dep-list-model">
-    <div v-for="(el,$index) in dependItemList" class="list" @click="itemIndex = $index">
+    <div v-for="(el,$index) in dependItemList" :key='$index' class="list" @click="itemIndex = $index">
       <x-select filterable :style="{width:isInstance ? '450px' : '450px'}" :disabled="isDetails" v-model="el.projectId" @on-change="_onChangeProjectId">
         <x-option v-for="item in projectList" :key="item.value" :value="item.value" :label="item.label">
         </x-option>
@@ -58,7 +58,8 @@
     mixins: [disabledState],
     props: {
       dependItemList: Array,
-      index: Number
+      index: Number,
+      dependTaskList:Array
     },
     model: {
       prop: 'dependItemList',
@@ -77,9 +78,10 @@
         let value = noArr[0] && noArr[0].value || null
         let val = value || this.definitionList[0].value
         // add task list
+        let projectId = this.projectList[0].value
         this._getDependItemList(val).then(depTasksList => {
           this.$nextTick(() => {
-            this.$emit('dependItemListEvent', _.concat(this.dependItemList, this._rtNewParams(val, depTasksList)))
+            this.$emit('dependItemListEvent', _.concat(this.dependItemList, this._rtNewParams(val, depTasksList,projectId)))
           })
         })
         // remove tooltip
@@ -89,10 +91,9 @@
        * remove task
        */
       _remove (i) {
-        this.dependItemList.splice(i, 1)
+        this.dependTaskList[this.index].dependItemList.splice(i,1)
         this._removeTip()
-
-        if (!this.dependItemList.length) {
+        if (!this.dependItemList.length || this.dependItemList.length === 0) {
           this.$emit('on-delete-all', {
             index: this.index
           })
diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/dependent.vue b/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/dependent.vue
index 96b75a065f..3de17b5f61 100644
--- a/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/dependent.vue
+++ b/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/dependent.vue
@@ -22,7 +22,7 @@
                   v-if="dependTaskList.length">
             {{relation === 'AND' ? $t('and') : $t('or')}}
           </span>
-          <div class="dep-list" v-for="(el,$index) in dependTaskList">
+          <div class="dep-list" v-for="(el,$index) in dependTaskList" :key='$index'>
             <span class="dep-line-pie"
                   v-if="el.dependItemList.length"
                   @click="!isDetails && _setRelation($index)">
@@ -37,8 +37,10 @@
               &#xe611;
             </i>
             <m-depend-item-list
+                    :dependTaskList='dependTaskList'
                     v-model="el.dependItemList"
                     @on-delete-all="_onDeleteAll"
+                    @getDependTaskList="getDependTaskList"
                     :index="$index">
             </m-depend-item-list>
           </div>
@@ -84,11 +86,18 @@
         $('body').find('.tooltip.fade.top.in').remove()
       },
       _onDeleteAll (i) {
-        this._deleteDep(i)
+        this.dependTaskList.map((item,i)=>{
+          if(item.dependItemList.length === 0){
+            this.dependTaskList.splice(i,1)
+          }
+        })
       },
       _setGlobalRelation () {
         this.relation = this.relation === 'AND' ? 'OR' : 'AND'
       },
+      getDependTaskList(i){
+        // console.log('getDependTaskList',i)
+      },
       _setRelation (i) {
         this.dependTaskList[i].relation = this.dependTaskList[i].relation === 'AND' ? 'OR' : 'AND'
       },
diff --git a/escheduler-ui/src/js/conf/home/pages/dag/definitionDetails.vue b/escheduler-ui/src/js/conf/home/pages/dag/definitionDetails.vue
index fe2544d207..7812aff2b1 100644
--- a/escheduler-ui/src/js/conf/home/pages/dag/definitionDetails.vue
+++ b/escheduler-ui/src/js/conf/home/pages/dag/definitionDetails.vue
@@ -25,7 +25,7 @@
     props: {},
     methods: {
       ...mapMutations('dag', ['resetParams', 'setIsDetails']),
-      ...mapActions('dag', ['getProcessList','getProcessByProjectId','getProjectList', 'getResourcesList', 'getProcessDetails']),
+      ...mapActions('dag', ['getProcessList','getProjectList', 'getResourcesList', 'getProcessDetails']),
       ...mapActions('security', ['getTenantList','getWorkerGroupsAll']),
       /**
        * init
@@ -42,8 +42,6 @@
           this.getProcessList(),
           // get project
           this.getProjectList(),
-          // get process definition by project id
-          this.getProcessByProjectId(),
           // get resource
           this.getResourcesList(),
           // get worker group list
diff --git a/escheduler-ui/src/js/conf/home/pages/dag/index.vue b/escheduler-ui/src/js/conf/home/pages/dag/index.vue
index 22a2ac35d3..3af74e12d3 100644
--- a/escheduler-ui/src/js/conf/home/pages/dag/index.vue
+++ b/escheduler-ui/src/js/conf/home/pages/dag/index.vue
@@ -24,7 +24,7 @@
     props: {},
     methods: {
       ...mapMutations('dag', ['resetParams']),
-      ...mapActions('dag', ['getProcessList','getProcessByProjectId','getProjectList', 'getResourcesList']),
+      ...mapActions('dag', ['getProcessList','getProjectList', 'getResourcesList']),
       ...mapActions('security', ['getTenantList','getWorkerGroupsAll']),
       /**
        * init
@@ -39,8 +39,6 @@
           this.getProcessList(),
           // get project
           this.getProjectList(),
-          // get process definition by project id
-          this.getProcessByProjectId(),
           // get resource
           this.getResourcesList(),
           // get worker group list
diff --git a/escheduler-ui/src/js/conf/home/pages/dag/instanceDetails.vue b/escheduler-ui/src/js/conf/home/pages/dag/instanceDetails.vue
index cd0f6148b3..65b76b6532 100644
--- a/escheduler-ui/src/js/conf/home/pages/dag/instanceDetails.vue
+++ b/escheduler-ui/src/js/conf/home/pages/dag/instanceDetails.vue
@@ -27,7 +27,7 @@
     props: {},
     methods: {
       ...mapMutations('dag', ['setIsDetails', 'resetParams']),
-      ...mapActions('dag', ['getProcessList','getProcessByProjectId','getProjectList', 'getResourcesList', 'getInstancedetail']),
+      ...mapActions('dag', ['getProcessList','getProjectList', 'getResourcesList', 'getInstancedetail']),
       ...mapActions('security', ['getTenantList','getWorkerGroupsAll']),
       /**
        * init
@@ -44,8 +44,6 @@
           this.getProcessList(),
           // get project
           this.getProjectList(),
-          // get process definition by project id
-          this.getProcessByProjectId(),
           // get resources
           this.getResourcesList(),
           // get worker group list