From 2ff0ce6b62a284ae6e24e29a12072eca517a9ce0 Mon Sep 17 00:00:00 2001
From: marvzhang <tikazyq@163.com>
Date: Fri, 13 Dec 2019 13:11:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E5=8F=AF=E9=85=8D=E7=BD=AE=E7=88=AC?=
 =?UTF-8?q?=E8=99=ABstages=E8=B0=83=E6=95=B4=E4=B8=BA=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/Config/ConfigList.vue | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/frontend/src/components/Config/ConfigList.vue b/frontend/src/components/Config/ConfigList.vue
index e7c79970..b1c93afc 100644
--- a/frontend/src/components/Config/ConfigList.vue
+++ b/frontend/src/components/Config/ConfigList.vue
@@ -70,7 +70,7 @@
                   :class="startStageClass"
                 >
                   <el-option
-                    v-for="n in Object.keys(spiderForm.config.stages)"
+                    v-for="n in spiderForm.config.stages.map(s => s.name)"
                     :key="n"
                     :value="n"
                     :label="n"
@@ -397,7 +397,7 @@ export default {
     },
     isCss () {
       let i = 0
-      Object.values(this.spiderForm.config.stages).forEach(stage => {
+      this.spiderForm.config.stages.forEach(stage => {
         stage.fields.forEach(field => {
           if (!field.css) i++
         })
@@ -406,7 +406,7 @@ export default {
     },
     isXpath () {
       let i = 0
-      Object.values(this.spiderForm.config.stages).forEach(stage => {
+      this.spiderForm.config.stages.forEach(stage => {
         stage.fields.forEach(field => {
           if (!field.xpath) i++
         })
@@ -414,7 +414,7 @@ export default {
       return i === 0
     },
     activeNames () {
-      return Object.values(this.spiderForm.config.stages).map(d => d.name)
+      return this.spiderForm.config.stages.map(d => d.name)
     },
     startUrlClass () {
       if (!this.spiderForm.config.start_url) {
@@ -464,7 +464,7 @@ export default {
 
       // 加入剩余阶段
       i = 0
-      const restStages = Object.values(this.spiderForm.config.stages)
+      const restStages = this.spiderForm.config.stages
         .filter(stage => !allStageNames.has(stage.name))
       restStages.forEach(stage => {
         // 加入节点信息
@@ -482,7 +482,7 @@ export default {
     },
     stageEdges () {
       const edges = []
-      const stages = Object.values(this.spiderForm.config.stages)
+      const stages = this.spiderForm.config.stages
       stages.forEach(stage => {
         for (let i = 0; i < stage.fields.length; i++) {
           const field = stage.fields[i]
@@ -595,7 +595,7 @@ export default {
       return value
     },
     onClickSelectorType (selectorType) {
-      Object.values(this.spiderForm.config.stages).forEach(stage => {
+      this.spiderForm.config.stages.forEach(stage => {
         // 列表
         if (selectorType === 'css') {
           if (stage.list_xpath) stage.list_xpath = ''
@@ -868,7 +868,7 @@ ${f.css || f.xpath} ${f.attr ? ('(' + f.attr + ')') : ''} ${f.next_stage ? (' --
     }
   },
   mounted () {
-    this.activeNames = Object.keys(this.spiderForm.config.stages)
+    this.activeNames = this.spiderForm.config.stages.map(stage => stage.name)
   }
 }
 </script>