From f047f517310931b61b0484f50af7d48ceab0561b Mon Sep 17 00:00:00 2001
From: BoYiZhang <39816903+BoYiZhang@users.noreply.github.com>
Date: Fri, 13 Nov 2020 17:35:01 +0800
Subject: [PATCH] Enhance user experience, add close button, return to the
 previous page (#4006)

Co-authored-by: zhanglong <zhanglong@ysstech.com>
---
 .../projects/pages/definition/pages/tree/index.vue     |  8 ++++++++
 .../pages/projects/pages/definition/timing/index.vue   | 10 ++++++++++
 .../components/listConstruction/listConstruction.vue   |  1 +
 3 files changed, 19 insertions(+)

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/tree/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/tree/index.vue
index 4bc102dc2..bbc182514 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/tree/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/tree/index.vue
@@ -16,6 +16,11 @@
  */
 <template>
   <m-list-construction :title="$t('TreeView')">
+    <template slot="operation">
+      <span style=" float: right; padding-right:50px">
+        <em class="ans-icon-fail-empty" style="font-size:20px " data-container="body" data-toggle="tooltip" :title="$t('Return')" @click="_close()"></em>
+      </span>
+    </template>
     <template slot="conditions"></template>
     <template slot="content">
       <div class="tree-view-index-model">
@@ -101,6 +106,9 @@
     props: {},
     methods: {
       ...mapActions('dag', ['getViewTree']),
+      _close(){
+        this.$router.go(-1)
+      },
       /**
        * get tree data
        */
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/timing/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/timing/index.vue
index 64cbc02dd..efd5489f5 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/timing/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/timing/index.vue
@@ -16,6 +16,11 @@
  */
 <template>
   <m-list-construction :title="$t('Cron Manage')">
+    <template slot="operation">
+      <span style=" float: right; padding-right:50px">
+        <em class="ans-icon-fail-empty" style="font-size:20px " data-container="body" data-toggle="tooltip" :title="$t('Return')" @click="_close()"></em>
+      </span>
+    </template>
     <template slot="content">
       <m-list></m-list>
     </template>
@@ -27,6 +32,11 @@
   import mListConstruction from '@/module/components/listConstruction/listConstruction'
   export default {
     name: 'definition-timing-index',
+    methods :{
+      _close(){
+        this.$router.go(-1)
+      }
+    },
     components: { mList, mListConstruction, mSecondaryMenu }
   }
 </script>
diff --git a/dolphinscheduler-ui/src/js/module/components/listConstruction/listConstruction.vue b/dolphinscheduler-ui/src/js/module/components/listConstruction/listConstruction.vue
index f0d01b361..7bffa9ca1 100644
--- a/dolphinscheduler-ui/src/js/module/components/listConstruction/listConstruction.vue
+++ b/dolphinscheduler-ui/src/js/module/components/listConstruction/listConstruction.vue
@@ -18,6 +18,7 @@
   <div class="home-main list-construction-model">
     <div class="content-title">
       <span>{{title}}</span>
+      <slot name="operation"></slot>
     </div>
     <div class="conditions-box">
       <slot name="conditions">
-- 
GitLab