From 3d3796ed06155a860ada6b6e23c7ff4f1260c9b2 Mon Sep 17 00:00:00 2001
From: break60 <790061044@qq.com>
Date: Mon, 1 Feb 2021 17:31:48 +0800
Subject: [PATCH] fix

---
 .../tasks/_source/dependItemList.vue          | 30 +++++++++----------
 .../dag/_source/formModel/tasks/dependent.vue |  1 -
 2 files changed, 14 insertions(+), 17 deletions(-)

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 abadc2c36b..1ff180f1fe 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
@@ -16,26 +16,21 @@
  */
 <template>
   <div class="dep-list-model">
-    <div v-for="(el,$index) in dependItemList" :key='$index' class="list" @click="itemIndex = $index">
-      <el-select filterable :style="{width:isInstance ? '450px' : '450px'}" :disabled="isDetails" v-model="el.projectId" @change="_onChangeProjectId" size="small">
-        <el-option v-for="item in projectList" :key="item.value" :value="item.value" :label="item.label">
-        </el-option>
+    <div v-for="(el,$index) in dependItemList" :key='$index' @click="itemIndex = $index">
+      <el-select filterable :disabled="isDetails" style="width: 450px" v-model="el.projectId" @change="_onChangeProjectId" 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 :style="{width:isInstance ? '450px' : '450px'}" :disabled="isDetails" v-model="el.definitionId" @change="_onChangeDefinitionId" size="small">
-        <el-option v-for="item in el.definitionList" :key="item.value" :value="item.value" :label="item.label">
-        </el-option>
+      <el-select filterable :disabled="isDetails" style="width: 450px" v-model="el.definitionId" @change="_onChangeDefinitionId" size="small">
+        <el-option v-for="item in el.definitionList" :key="item.value" :value="item.value" :label="item.label"></el-option>
       </el-select>
-      <el-select filterable :style="{width:isInstance ? '450px' : '450px'}" :disabled="isDetails" v-model="el.depTasks" size="small">
-        <el-option v-for="item in el.depTasksList || []" :key="item" :value="item" :label="item">
-        </el-option>
+      <el-select filterable :disabled="isDetails" style="width: 450px" v-model="el.depTasks" size="small">
+        <el-option v-for="item in el.depTasksList || []" :key="item" :value="item" :label="item"></el-option>
       </el-select>
-      <el-select style="width: 150px;" v-model="el.cycle" :disabled="isDetails" @change="_onChangeCycle">
-        <el-option v-for="item in cycleList" :key="item.value" :value="item.value" :label="item.label">
-        </el-option>
+      <el-select v-model="el.cycle" :disabled="isDetails" @change="_onChangeCycle" size="small">
+        <el-option v-for="item in cycleList" :key="item.value" :value="item.value" :label="item.label"></el-option>
       </el-select>
-      <el-select style="width: 116px;" v-model="el.dateValue" :disabled="isDetails">
-        <el-option v-for="item in el.dateValueList || []" :key="item.value" :value="item.value" :label="item.label">
-        </el-option>
+      <el-select v-model="el.dateValue" :disabled="isDetails" size="small">
+        <el-option v-for="item in el.dateValueList || []" :key="item.value" :value="item.value" :label="item.label"></el-option>
       </el-select>
       <template v-if="isInstance">
         <span class="instance-state">
@@ -55,6 +50,7 @@
     </div>
   </div>
 </template>
+
 <script>
   import _ from 'lodash'
   import { cycleList, dateValueList } from './commcon'
@@ -109,6 +105,7 @@
        * remove task
        */
       _remove (i) {
+        this.dependTaskList[this.index].dependItemList.splice(i, 1)
         this._removeTip()
         if (!this.dependItemList.length || this.dependItemList.length === 0) {
           this.$emit('on-delete-all', {
@@ -294,6 +291,7 @@
     .list {
       margin-bottom: 6px;
       .operation {
+        width: 80px;
         padding-left: 4px;
         a {
           i {
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 978142891e..220ec99f46 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
@@ -97,7 +97,6 @@
         $('body').find('.tooltip.fade.top.in').remove()
       },
       _onDeleteAll (i) {
-        this.dependTaskList[this.index].dependItemList.splice(i, 1)
         this.dependTaskList.map((item, i) => {
           if (item.dependItemList.length === 0) {
             this.dependTaskList.splice(i, 1)