Merge branch 'dev' of https://github.com/BoYiZhang/incubator-dolphinscheduler into dev

dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue

@@ -101,6 +101,17 @@
                   @click="_rtNodesDag" >
             {{$t('Return_1')}}
           </x-button>
+          <x-button
+            type="primary"
+            v-tooltip.light="$t('Close')"
+            icon="ans-icon-off"
+            size="xsmall"
+            data-container="body"
+            v-if="(type === 'instance' || 'definition') "
+            style="vertical-align: middle;"
+            @click="_closeDAG">
+            {{$t('Close')}}
+          </x-button>
           <x-button
                   style="vertical-align: middle;"
                   type="primary"
@@ -377,6 +388,14 @@
           })
         })
       },
+      _closeDAG(){
+        let $name = this.$route.name
+        if($name && $name.indexOf("definition") != -1){
+          this.$router.push({ name: 'projects-definition-list'})
+        }else{
+          this.$router.push({ name: 'projects-instance-list'})
+        }
+      },
       _verifConditions (value) {
         let tasks = value
         let bool = true