From d5752d4f485184d0fd92fae043032394d946dafe Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Sat, 22 Feb 2020 19:15:43 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=B8=85=E9=99=A4?=
 =?UTF-8?q?=E9=80=89=E9=A1=B9=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/spider/SpiderList.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/views/spider/SpiderList.vue b/frontend/src/views/spider/SpiderList.vue
index 4783aaab..e91bd889 100644
--- a/frontend/src/views/spider/SpiderList.vue
+++ b/frontend/src/views/spider/SpiderList.vue
@@ -1163,7 +1163,6 @@ export default {
           })
           if (!res.data.error) {
             this.$message.success('Sent signals to cancel selected tasks')
-            this.$refs['table'].clearSelection()
             await this.getList()
           }
         } finally {

From 259403d3e5c4aa4819c792eee7c4a280fa7034ee Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Sat, 22 Feb 2020 21:03:14 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E8=BF=90=E8=A1=8C=E7=88=AC=E8=99=ABbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/Common/CrawlConfirmDialog.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/Common/CrawlConfirmDialog.vue b/frontend/src/components/Common/CrawlConfirmDialog.vue
index a1d6b1ad..aa89ea9a 100644
--- a/frontend/src/components/Common/CrawlConfirmDialog.vue
+++ b/frontend/src/components/Common/CrawlConfirmDialog.vue
@@ -34,7 +34,7 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item v-if="spiderForm.is_scrapy" :label="$t('Scrapy Spider')" prop="spider" required inline-message>
+        <el-form-item v-if="spiderForm.is_scrapy && !multiple" :label="$t('Scrapy Spider')" prop="spider" required inline-message>
           <el-select v-model="form.spider" :placeholder="$t('Scrapy Spider')" :disabled="isLoading">
             <el-option
               v-for="s in spiderForm.spider_names"
@@ -59,7 +59,7 @@
           </el-select>
         </el-form-item>
         <el-form-item v-if="spiderForm.type === 'customized'" :label="$t('Parameters')" prop="param" inline-message>
-          <template v-if="spiderForm.is_scrapy">
+          <template v-if="spiderForm.is_scrapy && !multiple">
             <el-input v-model="form.param" :placeholder="$t('Parameters')" class="param-input"/>
             <el-button type="primary" icon="el-icon-edit" class="param-btn" @click="onOpenParameters"/>
           </template>

From 97bf817b221bef3db938bfd70cd3b8314ace7f58 Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Sun, 23 Feb 2020 08:45:38 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=AF=BC=E8=88=AA=E6=93=8D=E4=BD=9C=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/dockerpush.yml              |  7 ++
 .../src/components/Overview/TaskOverview.vue  | 85 ++++++++++++-------
 frontend/src/i18n/zh.js                       |  2 +
 3 files changed, 64 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/dockerpush.yml b/.github/workflows/dockerpush.yml
index 03b74552..ba65f700 100644
--- a/.github/workflows/dockerpush.yml
+++ b/.github/workflows/dockerpush.yml
@@ -51,3 +51,10 @@ jobs:
 
           docker tag image $IMAGE_ID:$VERSION
           docker push $IMAGE_ID:$VERSION
+
+      - name: Deploy
+        run: |
+          if [ $VERSION == "release"]; then
+            apt-get install -y curl
+            curl ${{ secrets.JENKINS_RELEASE_URL }}
+          fi
diff --git a/frontend/src/components/Overview/TaskOverview.vue b/frontend/src/components/Overview/TaskOverview.vue
index ec399702..8cd05d1d 100644
--- a/frontend/src/components/Overview/TaskOverview.vue
+++ b/frontend/src/components/Overview/TaskOverview.vue
@@ -1,28 +1,48 @@
 <template>
-  <el-row>
-    <el-col :span="12" style="padding-right: 20px;">
-      <el-row class="task-info-overview-wrapper wrapper">
-        <h4 class="title">{{$t('Task Info')}}</h4>
-        <task-info-view @click-log="() => $emit('click-log')"/>
-      </el-row>
-      <el-row style="border-bottom:1px solid #e4e7ed;margin:0 0 20px 0;padding-bottom:20px;"/>
-    </el-col>
+  <div class="task-overview">
+    <el-row class="action-wrapper">
+      <el-button
+        type="primary"
+        size="small"
+        icon="el-icon-position"
+        @click="onNavigateToSpider"
+      >
+        {{$t('Navigate to Spider')}}
+      </el-button>
+      <el-button
+        type="warning"
+        size="small"
+        icon="el-icon-position"
+        @click="onNavigateToNode"
+      >
+        {{$t('Navigate to Node')}}
+      </el-button>
+    </el-row>
+    <el-row class="content">
+      <el-col :span="12" style="padding-right: 20px;">
+        <el-row class="task-info-overview-wrapper wrapper">
+          <h4 class="title">{{$t('Task Info')}}</h4>
+          <task-info-view @click-log="() => $emit('click-log')"/>
+        </el-row>
+        <el-row style="border-bottom:1px solid #e4e7ed;margin:0 0 20px 0;padding-bottom:20px;"/>
+      </el-col>
 
-    <el-col :span="12">
-      <el-row class="task-info-spider-wrapper wrapper">
-        <h4 class="title spider-title" @click="onClickSpiderTitle">
-          <i class="fa fa-search" style="margin-right: 5px"></i>
-          {{$t('Spider Info')}}</h4>
-        <spider-info-view :is-view="true"/>
-      </el-row>
-      <el-row class="task-info-node-wrapper wrapper">
-        <h4 class="title node-title" @click="onClickNodeTitle">
-          <i class="fa fa-search" style="margin-right: 5px"></i>
-          {{$t('Node Info')}}</h4>
-        <node-info-view :is-view="true"/>
-      </el-row>
-    </el-col>
-  </el-row>
+      <el-col :span="12">
+        <el-row class="task-info-spider-wrapper wrapper">
+          <h4 class="title spider-title" @click="onNavigateToSpider">
+            <i class="fa fa-search" style="margin-right: 5px"></i>
+            {{$t('Spider Info')}}</h4>
+          <spider-info-view :is-view="true"/>
+        </el-row>
+        <el-row class="task-info-node-wrapper wrapper">
+          <h4 class="title node-title" @click="onNavigateToNode">
+            <i class="fa fa-search" style="margin-right: 5px"></i>
+            {{$t('Node Info')}}</h4>
+          <node-info-view :is-view="true"/>
+        </el-row>
+      </el-col>
+    </el-row>
+  </div>
 </template>
 
 <script>
@@ -40,11 +60,6 @@ export default {
     SpiderInfoView,
     TaskInfoView
   },
-  data () {
-    return {
-      // spiderForm: {}
-    }
-  },
   computed: {
     ...mapState('node', [
       'nodeForm'
@@ -54,11 +69,11 @@ export default {
     ])
   },
   methods: {
-    onClickNodeTitle () {
+    onNavigateToSpider () {
       this.$router.push(`/nodes/${this.nodeForm._id}`)
       this.$st.sendEv('任务详情', '概览', '点击节点详情')
     },
-    onClickSpiderTitle () {
+    onNavigateToNode () {
       this.$router.push(`/spiders/${this.spiderForm._id}`)
       this.$st.sendEv('任务详情', '概览', '点击爬虫详情')
     }
@@ -102,4 +117,14 @@ export default {
   .title > i {
     color: grey;
   }
+
+  .content {
+    margin-top: 10px;
+  }
+
+  .action-wrapper {
+    text-align: right;
+    padding-bottom: 10px;
+    border-bottom: 1px solid #DCDFE6;
+  }
 </style>
diff --git a/frontend/src/i18n/zh.js b/frontend/src/i18n/zh.js
index 5f68aa66..54412fd6 100644
--- a/frontend/src/i18n/zh.js
+++ b/frontend/src/i18n/zh.js
@@ -252,6 +252,8 @@ export default {
   'Error Count': '错误数',
   'Log with errors': '日志错误',
   'Empty results': '空结果',
+  'Navigate to Spider': '导航到爬虫',
+  'Navigate to Node': '导航到节点',
 
   // 任务列表
   'Node': '节点',