From c5fad12854ebf4edd05b072c0e48bb989a5004bd Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Wed, 4 Dec 2019 16:33:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20https://github.com/crawlab?=
 =?UTF-8?q?-team/crawlab/issues/185?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Common/CrawlConfirmDialog.vue  | 51 ++++++++++++++-----
 frontend/src/i18n/zh.js                       |  3 ++
 frontend/src/store/modules/spider.js          |  7 +--
 3 files changed, 44 insertions(+), 17 deletions(-)

diff --git a/frontend/src/components/Common/CrawlConfirmDialog.vue b/frontend/src/components/Common/CrawlConfirmDialog.vue
index 2286beb2..f2ad70c2 100644
--- a/frontend/src/components/Common/CrawlConfirmDialog.vue
+++ b/frontend/src/components/Common/CrawlConfirmDialog.vue
@@ -2,13 +2,21 @@
   <el-dialog
     :title="$t('Notification')"
     :visible="visible"
+    class="crawl-confirm-dialog"
     width="480px"
     :before-close="beforeClose"
   >
     <div style="margin-bottom: 20px;">{{$t('Are you sure to run this spider?')}}</div>
-    <el-form label-width="80px">
-      <el-form-item :label="$t('Node')">
-        <el-select v-model="nodeId">
+    <el-form label-width="80px" :model="form" ref="form">
+      <el-form-item :label="$t('Run Type')" prop="runType" required inline-message>
+        <el-select v-model="form.runType" :placeholder="$t('Run Type')">
+          <el-option value="all-nodes" :label="$t('All Nodes')"/>
+          <el-option value="selected-nodes" :label="$t('Selected Nodes')"/>
+          <el-option value="random" :label="$t('Random')"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item v-if="form.runType === 'selected-nodes'" prop="nodeIds" :label="$t('Node')" required inline-message>
+        <el-select v-model="form.nodeIds" :placeholder="$t('Node')" multiple clearable>
           <el-option
             v-for="op in nodeList"
             :key="op._id"
@@ -18,8 +26,8 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item :label="$t('Parameters')">
-        <el-input v-model="param" :placeholder="$t('Parameters')"></el-input>
+      <el-form-item :label="$t('Parameters')" prop="param" inline-message>
+        <el-input v-model="form.param" :placeholder="$t('Parameters')"></el-input>
       </el-form-item>
     </el-form>
     <template slot="footer">
@@ -31,6 +39,7 @@
 
 <script>
 import request from '../../api/request'
+
 export default {
   name: 'CrawlConfirmDialog',
   props: {
@@ -45,9 +54,12 @@ export default {
   },
   data () {
     return {
-      nodeId: '',
-      param: '',
-      nodeList: []
+      form: {
+        runType: 'random',
+        nodeIds: undefined,
+        param: '',
+        nodeList: []
+      }
     }
   },
   methods: {
@@ -55,12 +67,21 @@ export default {
       this.$emit('close')
     },
     onConfirm () {
-      this.$store.dispatch('spider/crawlSpider', { id: this.spiderId, nodeId: this.nodeId, param: this.param })
-        .then(() => {
-          this.$message.success(this.$t('A task has been scheduled successfully'))
+      this.$refs['form'].validate(res => {
+        if (!res) return
+
+        this.$store.dispatch('spider/crawlSpider', {
+          spiderId: this.spiderId,
+          nodeIds: this.form.nodeIds,
+          param: this.form.param,
+          runType: this.form.runType
         })
-      this.$emit('close')
-      this.$st.sendEv('爬虫', '运行')
+          .then(() => {
+            this.$message.success(this.$t('A task has been scheduled successfully'))
+          })
+        this.$emit('close')
+        this.$st.sendEv('爬虫', '运行')
+      })
     }
   },
   created () {
@@ -81,5 +102,7 @@ export default {
 </script>
 
 <style scoped>
-
+  .crawl-confirm-dialog >>> .el-form .el-form-item {
+    margin-bottom: 20px;
+  }
 </style>
diff --git a/frontend/src/i18n/zh.js b/frontend/src/i18n/zh.js
index c7d350d0..65170117 100644
--- a/frontend/src/i18n/zh.js
+++ b/frontend/src/i18n/zh.js
@@ -193,6 +193,9 @@ export default {
   'Wait Duration (sec)': '等待时长(秒)',
   'Runtime Duration (sec)': '运行时长(秒)',
   'Total Duration (sec)': '总时长(秒)',
+  'Run Type': '运行类型',
+  'Random': '随机',
+  'Selected Nodes': '指定节点',
 
   // 任务列表
   'Node': '节点',
diff --git a/frontend/src/store/modules/spider.js b/frontend/src/store/modules/spider.js
index 0b4c2724..f4d7b134 100644
--- a/frontend/src/store/modules/spider.js
+++ b/frontend/src/store/modules/spider.js
@@ -118,10 +118,11 @@ const actions = {
       })
   },
   crawlSpider ({ state, dispatch }, payload) {
-    const { id, nodeId, param } = payload
+    const { spiderId, runType, nodeIds, param } = payload
     return request.put(`/tasks`, {
-      spider_id: id,
-      node_id: nodeId,
+      spider_id: spiderId,
+      run_type: runType,
+      node_ids: nodeIds,
       param: param
     })
   },