From 8f3a1f12f5077e8300facaefeabda78d4e946b40 Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Mon, 2 Dec 2019 12:43:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E5=8F=AF=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E7=88=AC=E8=99=AB=E8=AE=BE=E7=BD=AE=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/Config/ConfigList.vue |   5 +
 .../components/TableView/FieldsTableView.vue  |  15 ++-
 .../TableView/SettingFieldsTableView.vue      | 116 ++++--------------
 frontend/src/i18n/zh.js                       |   1 +
 4 files changed, 38 insertions(+), 99 deletions(-)

diff --git a/frontend/src/components/Config/ConfigList.vue b/frontend/src/components/Config/ConfigList.vue
index d08b1109..2c730b3b 100644
--- a/frontend/src/components/Config/ConfigList.vue
+++ b/frontend/src/components/Config/ConfigList.vue
@@ -254,6 +254,11 @@
 
       <!--Setting-->
       <el-tab-pane name="settings" :label="$t('Settings')">
+        <div class="actions" style="text-align: right;margin-bottom: 10px">
+          <el-button type="success" size="small">
+            {{$t('Save')}}
+          </el-button>
+        </div>
         <setting-fields-table-view
           type="list"
         />
diff --git a/frontend/src/components/TableView/FieldsTableView.vue b/frontend/src/components/TableView/FieldsTableView.vue
index c9f25c89..40c276de 100644
--- a/frontend/src/components/TableView/FieldsTableView.vue
+++ b/frontend/src/components/TableView/FieldsTableView.vue
@@ -61,7 +61,7 @@
           <template slot-scope="scope">
             <span class="button-selector-item" @click="onClickIsAttribute(scope.row, false)">
               <el-tag
-                :class="!scope.row.attr ? 'active' : 'inactive'"
+                :class="!isShowAttr(scope.row) ? 'active' : 'inactive'"
                 type="success"
               >
                 {{$t('Text')}}
@@ -69,7 +69,7 @@
             </span>
             <span class="button-selector-item" @click="onClickIsAttribute(scope.row, true)">
               <el-tag
-                :class="scope.row.attr ? 'active' : 'inactive'"
+                :class="isShowAttr(scope.row) ? 'active' : 'inactive'"
                 type="primary"
               >
                 {{$t('Attribute')}}
@@ -79,8 +79,8 @@
         </el-table-column>
         <el-table-column :label="$t('Attribute')" width="200px">
           <template slot-scope="scope">
-            <template v-if="scope.row.attr">
-              <el-input v-model="scope.row.attr" :placeholder="$t('Attribute')"/>
+            <template v-if="isShowAttr(scope.row)">
+              <el-input v-model="scope.row.attr" :placeholder="$t('Attribute')" @change="onAttrChange(scope.row)"/>
             </template>
             <template v-else>
               <span style="margin-left: 15px; color: lightgrey">
@@ -188,6 +188,7 @@ export default {
         // 属性
         if (!row.attr) this.$set(row, 'attr', 'href')
       }
+      this.$set(row, 'isAttrChange', false)
     },
     onCopyField (row) {
       for (let i = 0; i < this.fields.length; i++) {
@@ -246,6 +247,12 @@ export default {
           this.$set(f, 'next_stage', '')
         }
       })
+    },
+    onAttrChange (row) {
+      this.$set(row, 'isAttrChange', !row.attr)
+    },
+    isShowAttr (row) {
+      return (row.attr || row.isAttrChange)
     }
   }
 }
diff --git a/frontend/src/components/TableView/SettingFieldsTableView.vue b/frontend/src/components/TableView/SettingFieldsTableView.vue
index cfba6d20..77caf85c 100644
--- a/frontend/src/components/TableView/SettingFieldsTableView.vue
+++ b/frontend/src/components/TableView/SettingFieldsTableView.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="setting-fields-table-view">
+  <div class="setting-list-table-view">
     <!--    <el-row class="button-group-container">-->
     <!--      <label class="title">{{$t(this.title)}}</label>-->
     <!--      <div class="button-group">-->
@@ -7,7 +7,7 @@
     <!--      </div>-->
     <!--    </el-row>-->
     <el-row>
-      <el-table :data="fields"
+      <el-table :data="list"
                 class="table edit"
                 :header-cell-style="{background:'rgb(48, 65, 86)',color:'white'}"
                 :cell-style="getCellClassStyle"
@@ -19,88 +19,14 @@
             <i class="action-item el-icon-circle-plus-outline" @click="onAddField(scope.row)"></i>
           </template>
         </el-table-column>
-        <el-table-column :label="$t('Field Name')" width="150px">
+        <el-table-column :label="$t('Name')" width="150px">
           <template slot-scope="scope">
             <el-input v-model="scope.row.name"
-                      :placeholder="$t('Field Name')"
+                      :placeholder="$t('Name')"
                       @change="onNameChange(scope.row)"
             />
           </template>
         </el-table-column>
-        <el-table-column :label="$t('Selector Type')" width="150px" align="center" class-name="selector-type">
-          <template slot-scope="scope">
-            <span class="button-selector-item" @click="onClickSelectorType(scope.row, 'css')">
-              <el-tag
-                :class="scope.row.css ? 'active' : 'inactive'"
-                type="success"
-              >
-                CSS
-              </el-tag>
-            </span>
-            <span class="button-selector-item" @click="onClickSelectorType(scope.row, 'xpath')">
-              <el-tag
-                :class="scope.row.xpath ? 'active' : 'inactive'"
-                type="primary"
-              >
-                XPath
-              </el-tag>
-            </span>
-          </template>
-        </el-table-column>
-        <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 / XPath')"></el-input>
-            </template>
-            <template v-else>
-              <el-input v-model="scope.row.xpath" :placeholder="$t('CSS / XPath')"></el-input>
-            </template>
-          </template>
-        </el-table-column>
-        <el-table-column :label="$t('Is Attribute')" width="150px" align="center">
-          <template slot-scope="scope">
-            <span class="button-selector-item" @click="onClickIsAttribute(scope.row, false)">
-              <el-tag
-                :class="!scope.row.attr ? 'active' : 'inactive'"
-                type="success"
-              >
-                {{$t('Text')}}
-              </el-tag>
-            </span>
-            <span class="button-selector-item" @click="onClickIsAttribute(scope.row, true)">
-              <el-tag
-                :class="scope.row.attr ? 'active' : 'inactive'"
-                type="primary"
-              >
-                {{$t('Attribute')}}
-              </el-tag>
-            </span>
-          </template>
-        </el-table-column>
-        <el-table-column :label="$t('Attribute')" width="200px">
-          <template slot-scope="scope">
-            <template v-if="scope.row.attr">
-              <el-input v-model="scope.row.attr" :placeholder="$t('Attribute')"/>
-            </template>
-            <template v-else>
-              <span style="margin-left: 15px; color: lightgrey">
-                N/A
-              </span>
-            </template>
-          </template>
-        </el-table-column>
-        <el-table-column :label="$t('Next Stage')" width="250px">
-          <template slot-scope="scope">
-            <el-select
-              v-model="scope.row.next_stage"
-              :class="!scope.row.next_stage ? 'disabled' : ''"
-              @change="onChangeNextStage(scope.row)"
-            >
-              <el-option :label="$t('No Next Stage')" value=""/>
-              <el-option v-for="n in stageNames" :key="n" :label="n" :value="n"/>
-            </el-select>
-          </template>
-        </el-table-column>
         <el-table-column :label="$t('Remark')" width="auto" min-width="120px">
           <template slot-scope="scope">
             <el-input v-model="scope.row.remark" :placeholder="$t('Remark')"/>
@@ -133,7 +59,7 @@ export default {
         return []
       }
     },
-    fields: {
+    list: {
       type: Array,
       default () {
         return []
@@ -147,24 +73,24 @@ export default {
   },
   methods: {
     addField () {
-      this.fields.push({
+      this.list.push({
         type: 'css',
         extract_type: 'text'
       })
       this.$st.sendEv('爬虫详情-配置', '添加字段')
     },
     deleteField (index) {
-      this.fields.splice(index, 1)
+      this.list.splice(index, 1)
       this.$st.sendEv('爬虫详情-配置', '删除字段')
     },
     onNameChange (row) {
-      if (this.fields.filter(d => d.name === row.name).length > 1) {
+      if (this.list.filter(d => d.name === row.name).length > 1) {
         this.$message.error(this.$t(`Duplicated field names for ${row.name}`))
       }
       this.$st.sendEv('爬虫详情-配置', '更改字段')
     },
     onCheck (row) {
-      this.fields.forEach(d => {
+      this.list.forEach(d => {
         if (row.name !== d.name) {
           this.$set(d, 'is_detail', false)
         }
@@ -190,31 +116,31 @@ export default {
       }
     },
     onCopyField (row) {
-      for (let i = 0; i < this.fields.length; i++) {
-        if (row.name === this.fields[i].name) {
-          this.fields.splice(i, 0, JSON.parse(JSON.stringify(row)))
+      for (let i = 0; i < this.list.length; i++) {
+        if (row.name === this.list[i].name) {
+          this.list.splice(i, 0, JSON.parse(JSON.stringify(row)))
           break
         }
       }
     },
     onRemoveField (row) {
-      for (let i = 0; i < this.fields.length; i++) {
-        if (row.name === this.fields[i].name) {
-          this.fields.splice(i, 1)
+      for (let i = 0; i < this.list.length; i++) {
+        if (row.name === this.list[i].name) {
+          this.list.splice(i, 1)
           break
         }
       }
-      if (this.fields.length === 0) {
-        this.fields.push({
+      if (this.list.length === 0) {
+        this.list.push({
           css: 'body',
           next_stage: ''
         })
       }
     },
     onAddField (row) {
-      for (let i = 0; i < this.fields.length; i++) {
-        if (row.name === this.fields[i].name) {
-          this.fields.splice(i + 1, 0, {
+      for (let i = 0; i < this.list.length; i++) {
+        if (row.name === this.list[i].name) {
+          this.list.splice(i + 1, 0, {
             name: `field_${Math.floor(new Date().getTime()).toString()}`,
             css: 'body',
             next_stage: ''
@@ -241,7 +167,7 @@ export default {
       }
     },
     onChangeNextStage (row) {
-      this.fields.forEach(f => {
+      this.list.forEach(f => {
         if (f.name !== row.name) {
           this.$set(f, 'next_stage', '')
         }
diff --git a/frontend/src/i18n/zh.js b/frontend/src/i18n/zh.js
index 4d2883e1..e4659c54 100644
--- a/frontend/src/i18n/zh.js
+++ b/frontend/src/i18n/zh.js
@@ -166,6 +166,7 @@ export default {
   'Stage': '阶段',
   'Is List': '是否为列表',
   'Pagination': '分页',
+  'Settings': '设置',
 
   // 爬虫列表
   'Name': '名称',