From 6ada352ac0bebdaa0753f7c3336134fe62236d4e Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Wed, 27 Nov 2019 19:59:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=AF=E9=85=8D=E7=BD=AE=E7=88=AC=E8=99=AB?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/Config/ConfigList.vue | 218 +++++++++++-------
 .../components/TableView/FieldsTableView.vue  |  41 +++-
 2 files changed, 167 insertions(+), 92 deletions(-)

diff --git a/frontend/src/components/Config/ConfigList.vue b/frontend/src/components/Config/ConfigList.vue
index cc405950..e54469a0 100644
--- a/frontend/src/components/Config/ConfigList.vue
+++ b/frontend/src/components/Config/ConfigList.vue
@@ -43,75 +43,63 @@
     <!--config detail-->
     <el-row>
       <el-form label-width="150px" ref="form" :model="spiderForm.config">
-        <el-col :span="11" :offset="1">
-          <!--          <el-form-item :label="$t('Crawl Type')">-->
-          <!--            <el-button-group>-->
-          <!--              <el-button v-for="type in crawlTypeList"-->
-          <!--                         :key="type.value"-->
-          <!--                         :type="type.value === spiderForm.crawl_type ? 'primary' : ''"-->
-          <!--                         @click="onSelectCrawlType(type.value)">-->
-          <!--                {{$t(type.label)}}-->
-          <!--              </el-button>-->
-          <!--            </el-button-group>-->
-          <!--          </el-form-item>-->
-          <!--          <el-form-item :label="$t('Start URL')" prop="start_url" required>-->
-          <!--            <el-input v-model="spiderForm.config.start_url" :placeholder="$t('Start URL')"></el-input>-->
-          <!--          </el-form-item>-->
-          <!--          <el-form-item :label="$t('Obey robots.txt')">-->
-          <!--            <el-switch v-model="spiderForm.obey_robots_txt" :placeholder="$t('Obey robots.txt')"></el-switch>-->
-          <!--          </el-form-item>-->
-          <!--<el-form-item :label="$t('URL Pattern')">-->
-          <!--<el-input v-model="spiderForm.url_pattern" :placeholder="$t('URL Pattern')"></el-input>-->
-          <!--</el-form-item>-->
-        </el-col>
-        <el-col :span="11" :offset="1">
-          <!--          <el-form-item :label="$t('Item Selector')"-->
-          <!--                        v-if="['list','list-detail'].includes(spiderForm.crawl_type)">-->
-          <!--            <el-select style="width: 35%;margin-right: 10px;"-->
-          <!--                       v-model="spiderForm.item_selector_type"-->
-          <!--                       :placeholder="$t('Item Selector Type')">-->
-          <!--              <el-option value="xpath" :label="$t('XPath')"></el-option>-->
-          <!--              <el-option value="css" :label="$t('CSS')"></el-option>-->
-          <!--            </el-select>-->
-          <!--            <el-input style="width: calc(65% - 10px);"-->
-          <!--                      v-model="spiderForm.item_selector"-->
-          <!--                      :placeholder="$t('Item Selector')">-->
-          <!--            </el-input>-->
-          <!--          </el-form-item>-->
-          <!--          <el-form-item :label="$t('Pagination Selector')"-->
-          <!--                        v-if="['list','list-detail'].includes(spiderForm.crawl_type)">-->
-          <!--            <el-select style="width: 35%;margin-right: 10px;"-->
-          <!--                       v-model="spiderForm.page"-->
-          <!--                       :placeholder="$t('Pagination Selector Type')">-->
-          <!--              <el-option value="xpath" :label="$t('XPath')"></el-option>-->
-          <!--              <el-option value="css" :label="$t('CSS')"></el-option>-->
-          <!--            </el-select>-->
-          <!--            <el-input style="width: calc(65% - 10px);"-->
-          <!--                      v-model="spiderForm.pagination_selector"-->
-          <!--                      :placeholder="$t('Pagination Selector')">-->
-          <!--            </el-input>-->
-          <!--          </el-form-item>-->
-          <!--          <el-form-item :label="$t('Item Threshold')"-->
-          <!--                        v-if="['list','list-detail'].includes(spiderForm.crawl_type)">-->
-          <!--            <el-input-number v-model="spiderForm.item_threshold"/>-->
-          <!--          </el-form-item>-->
-        </el-col>
       </el-form>
     </el-row>
     <!--./config detail-->
 
     <el-row>
-      <el-col :span="12">
-        <el-row>
-          <span class="selector-type-item" @click="onClickSelectorType('css')">
-              <el-tag
-                :class="isCss ? 'active' : 'inactive'"
-                type="success"
-              >
-                CSS
-              </el-tag>
-            </span>
-          <span class="selector-type-item" @click="onClickSelectorType('xpath')">
+      <div class="top-wrapper">
+        <ul class="list">
+          <li class="item">
+            <label>{{$t('Start URL')}}: </label>
+            <el-input
+              v-model="spiderForm.config.start_url"
+              :placeholder="$t('Start URL')"
+              :class="startUrlClass"
+            />
+          </li>
+          <li class="item">
+            <label>{{$t('Start Stage')}}: </label>
+            <el-select
+              v-model="spiderForm.config.start_stage"
+              :placeholder="$t('Start Stage')"
+              :class="startStageClass"
+            >
+              <el-option
+                v-for="n in Object.keys(spiderForm.config.stages)"
+                :key="n"
+                :value="n"
+                :label="n"
+              />
+            </el-select>
+          </li>
+          <li class="item">
+            <label>{{$t('Engine')}}: </label>
+            <el-select
+              v-model="spiderForm.config.engine"
+              :placeholder="$t('Start Stage')"
+              :class="startStageClass"
+            >
+              <el-option
+                v-for="n in Object.keys(spiderForm.config.stages)"
+                :key="n"
+                :value="n"
+                :label="n"
+              />
+            </el-select>
+          </li>
+          <li class="item">
+            <label>{{$t('Selector Type')}}: </label>
+            <div class="selector-type">
+              <span class="selector-type-item" @click="onClickSelectorType('css')">
+                <el-tag
+                  :class="isCss ? 'active' : 'inactive'"
+                  type="success"
+                >
+                  CSS
+                </el-tag>
+              </span>
+              <span class="selector-type-item" @click="onClickSelectorType('xpath')">
               <el-tag
                 :class="isXpath ? 'active' : 'inactive'"
                 type="primary"
@@ -119,22 +107,20 @@
                 XPath
               </el-tag>
             </span>
-        </el-row>
-      </el-col>
+            </div>
+          </li>
+        </ul>
+      </div>
 
-      <el-col :span="12">
-        <!--button group-->
-        <el-row class="button-group-container">
-          <div class="button-group">
-            <el-button type="danger" @click="onCrawl">{{$t('Run')}}</el-button>
-            <el-button type="primary" @click="onExtractFields" v-loading="extractFieldsLoading">{{$t('Extract Fields')}}
-            </el-button>
-            <el-button type="warning" @click="onPreview" v-loading="previewLoading">{{$t('Preview')}}</el-button>
-            <el-button type="success" @click="onSave" v-loading="saveLoading">{{$t('Save')}}</el-button>
-          </div>
-        </el-row>
-        <!--./button group-->
-      </el-col>
+      <div class="button-group-container">
+        <div class="button-group">
+          <el-button type="danger" @click="onCrawl">{{$t('Run')}}</el-button>
+          <el-button type="primary" @click="onExtractFields" v-loading="extractFieldsLoading">{{$t('Extract Fields')}}
+          </el-button>
+          <el-button type="warning" @click="onPreview" v-loading="previewLoading">{{$t('Preview')}}</el-button>
+          <el-button type="success" @click="onSave" v-loading="saveLoading">{{$t('Save')}}</el-button>
+        </div>
+      </div>
     </el-row>
 
     <el-collapse
@@ -256,6 +242,23 @@ export default {
     },
     activeNames () {
       return Object.values(this.spiderForm.config.stages).map(d => d.name)
+    },
+    startUrlClass () {
+      if (!this.spiderForm.config.start_url) {
+        return 'invalid'
+      } else if (!this.spiderForm.config.start_url.match(/^https?:\/\/.+|^\/\/.+/i)) {
+        return 'invalid'
+      }
+
+      return ''
+    },
+    startStageClass () {
+      if (!this.spiderForm.config.start_stage) {
+        return 'invalid'
+      } else if (!this.activeNames.includes(this.spiderForm.config.start_stage)) {
+        return 'invalid'
+      }
+      return ''
     }
   },
   methods: {
@@ -408,8 +411,27 @@ export default {
       const stages = JSON.parse(JSON.stringify(this.spiderForm.config.stages))
       delete stages[stage.name]
       this.$set(this.spiderForm.config, 'stages', stages)
+      if (Object.keys(stages).length === 0) {
+        this.onAddStage()
+      }
     },
     onAddStage (stage) {
+      const stages = JSON.parse(JSON.stringify(this.spiderForm.config.stages))
+      const ts = Math.floor(new Date().getTime()).toString()
+      const newStageName = `stage_${ts}`
+      const newField = { name: `field_${ts}`, next_stage: '' }
+      if (this.isCss) {
+        newField['css'] = 'body'
+      } else if (this.isXpath) {
+        newField['xpath'] = '//body'
+      } else {
+        newField['css'] = 'body'
+      }
+      stages[newStageName] = {
+        name: newStageName,
+        fields: [newField]
+      }
+      this.$set(this.spiderForm.config, 'stages', stages)
     }
   },
   created () {
@@ -492,9 +514,6 @@ export default {
   .selector-type-item {
     margin: 0 5px;
     cursor: pointer;
-  }
-
-  .selector-type-item > .el-tag.active {
     font-weight: bolder;
   }
 
@@ -572,4 +591,39 @@ export default {
     height: 32px;
     line-height: 32px;
   }
+
+  .top-wrapper {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+  }
+
+  .top-wrapper .list {
+    list-style: none;
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    padding: 0;
+  }
+
+  .top-wrapper .list .item {
+    margin-bottom: 10px;
+    display: flex;
+    align-items: center;
+  }
+
+  .top-wrapper .list .item label {
+    width: 100px;
+    text-align: right;
+    margin-right: 10px;
+    font-size: 12px;
+  }
+
+  .top-wrapper .list .item label + * {
+    width: 240px;
+  }
+
+  .invalid >>> .el-input__inner {
+    border: 1px solid red !important;
+  }
 </style>
diff --git a/frontend/src/components/TableView/FieldsTableView.vue b/frontend/src/components/TableView/FieldsTableView.vue
index 7b1ef9f5..220deda8 100644
--- a/frontend/src/components/TableView/FieldsTableView.vue
+++ b/frontend/src/components/TableView/FieldsTableView.vue
@@ -10,6 +10,7 @@
       <el-table :data="fields"
                 class="table edit"
                 :header-cell-style="{background:'rgb(48, 65, 86)',color:'white'}"
+                :cell-style="getCellClassStyle"
       >
         <el-table-column class-name="action" width="80px" align="right">
           <template slot-scope="scope">
@@ -20,8 +21,10 @@
         </el-table-column>
         <el-table-column :label="$t('Field Name')" width="150px">
           <template slot-scope="scope">
-            <el-input v-model="scope.row.name" :placeholder="$t('Field Name')"
-                      @change="onNameChange(scope.row)"></el-input>
+            <el-input v-model="scope.row.name"
+                      :placeholder="$t('Field Name')"
+                      @change="onNameChange(scope.row)"
+            />
           </template>
         </el-table-column>
         <el-table-column :label="$t('Selector Type')" width="150px" align="center" class-name="selector-type">
@@ -47,10 +50,10 @@
         <el-table-column :label="$t('Selector')" width="200px">
           <template slot-scope="scope">
             <template v-if="scope.row.css">
-              <el-input v-model="scope.row.css" :placeholder="$t('CSS')"></el-input>
+              <el-input v-model="scope.row.css" :placeholder="$t('CSS / XPath')"></el-input>
             </template>
             <template v-else>
-              <el-input v-model="scope.row.xpath" :placeholder="$t('XPath')"></el-input>
+              <el-input v-model="scope.row.xpath" :placeholder="$t('CSS / XPath')"></el-input>
             </template>
           </template>
         </el-table-column>
@@ -168,20 +171,20 @@ export default {
     },
     onClickSelectorType (row, selectorType) {
       if (selectorType === 'css') {
-        if (row.xpath) row.xpath = ''
-        if (!row.css) row.css = 'body'
+        if (row.xpath) this.$set(row, 'xpath', '')
+        if (!row.css) this.$set(row, 'css', 'body')
       } else {
-        if (row.css) row.css = ''
-        if (!row.xpath) row.xpath = '//body'
+        if (row.css) this.$set(row, 'css', '')
+        if (!row.xpath) this.$set(row, 'xpath', '//body')
       }
     },
     onClickIsAttribute (row, isAttribute) {
       if (!isAttribute) {
         // 文本
-        if (row.attr) row.attr = ''
+        if (row.attr) this.$set(row, 'attr', '')
       } else {
         // 属性
-        if (!row.attr) row.attr = 'href'
+        if (!row.attr) this.$set(row, 'attr', 'href')
       }
     },
     onCopyField (row) {
@@ -210,12 +213,30 @@ export default {
       for (let i = 0; i < this.fields.length; i++) {
         if (row.name === this.fields[i].name) {
           this.fields.splice(i + 1, 0, {
+            name: `field_${Math.floor(new Date().getTime()).toString()}`,
             css: 'body',
             next_stage: ''
           })
           break
         }
       }
+    },
+    getCellClassStyle ({ row, columnIndex }) {
+      if (columnIndex === 1) {
+        // 字段名称
+        if (!row.name) {
+          return {
+            'border': '1px solid red'
+          }
+        }
+      } else if (columnIndex === 3) {
+        // 选择器
+        if (!row.css && !row.xpath) {
+          return {
+            'border': '1px solid red'
+          }
+        }
+      }
     }
   }
 }