From 86d7ee6578414f69ae67b59fb277189df0185e21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=85=B5=E5=85=B5?= <liubingbing@qimai.cn>
Date: Mon, 26 Nov 2018 18:54:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=BB=E5=8A=A1=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E4=BD=93=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/ui/src/components/Job.vue         | 22 ++++++++++++++++++++--
 web/ui/src/components/JobEditForm.vue |  2 +-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/web/ui/src/components/Job.vue b/web/ui/src/components/Job.vue
index a90a708..e175073 100644
--- a/web/ui/src/components/Job.vue
+++ b/web/ui/src/components/Job.vue
@@ -48,7 +48,7 @@
             <div class="ui icon dropdown" v-show="!batched">
               <i class="content icon"></i>
               <div class="menu">
-                <div class="item" v-on:click="$router.push('/job/edit/'+job.group+'/'+job.id)">{{$L('edit')}}</div>
+                <div class="item" v-on:click="editJob(job.group, job.id)">{{$L('edit')}}</div>
                 <div class="item" v-if="job.pause" v-on:click="changeStatus(job.group, job.id, index, !job.pause)">{{$L('open')}}</div>
                 <div class="item" v-if="!job.pause" v-on:click="changeStatus(job.group, job.id, index, !job.pause)">{{$L('pause')}}</div>
                 <div class="divider"></div>
@@ -62,7 +62,7 @@
           <td class="center aligned"><i class="icon" v-bind:class="{pause: job.pause, play: !job.pause, green: !job.pause}"></i></td>
           <td>{{job.group}}</td>
           <td>{{job.user && job.user.length > 0 ? job.user : '-'}}</td>
-          <td><router-link :to="'/job/edit/'+job.group+'/'+job.id">{{job.name}}</router-link></td>
+          <td><router-link :to="toJob(job.group, job.id)">{{job.name}}</router-link></td>
           <td>
             <span v-if="!job.latestStatus">-</span>
             <span v-else>{{formatLatest(job.latestStatus)}}</span>
@@ -165,6 +165,24 @@ export default {
       this.fetchList(this.buildQuery());
     },
 
+    editJob: function(group, id){
+        var query = this.buildQuery();
+        if(query == ''){
+            this.$router.push('/job/edit/'+group+'/'+id)
+        }else{
+            this.$router.push('/job/edit/'+group+'/'+id + '?'+query)
+        }
+    },
+
+    toJob: function(group, id){
+        var query = this.buildQuery();
+        if(query == ''){
+            return '/job/edit/'+group+'/'+id;
+        }else{
+            return '/job/edit/'+group+'/'+id+ '?'+query;
+        }
+    },
+
     removeJob: function(group, id, index){
       var vm = this;
       this.$rest.DELETE('job/'+group+'-'+id).onsucceed(204, (resp)=>{
diff --git a/web/ui/src/components/JobEditForm.vue b/web/ui/src/components/JobEditForm.vue
index 3b66c54..62d0c07 100644
--- a/web/ui/src/components/JobEditForm.vue
+++ b/web/ui/src/components/JobEditForm.vue
@@ -174,7 +174,7 @@ export default {
       this.loading = true;
       var vm = this;
       this.$rest.PUT('job', this.job)
-        .onsucceed(exceptCode, ()=>{vm.$router.push('/job')})
+        .onsucceed(exceptCode, ()=>{vm.$router.push('/job',{query:vm.$route.query})})
         .onfailed((resp)=>{vm.$bus.$emit('error', resp)})
         .onend(()=>{vm.loading=false})
         .do();