From bfddc20a1655e7f265d8365a1a2dc0ccb0499e54 Mon Sep 17 00:00:00 2001
From: xinwen <coderWen@126.com>
Date: Tue, 16 Jun 2020 11:32:52 +0800
Subject: [PATCH] =?UTF-8?q?[Update]=20=E6=9B=B4=E6=94=B9=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83/=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8=20?=
 =?UTF-8?q?=E5=8D=A1=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ops/RunInfoCard/index.vue           |  8 ++--
 .../TaskDetail/AdhocDetail/AdhocDetail.vue    | 37 ++++++-------------
 .../HistoryExecutionDetail.vue                | 37 ++++++-------------
 src/views/ops/TaskDetail/TaskDetail.vue       | 37 ++++++-------------
 src/views/ops/TaskDetail/business.js          | 34 +++++++++++------
 5 files changed, 63 insertions(+), 90 deletions(-)

diff --git a/src/views/ops/RunInfoCard/index.vue b/src/views/ops/RunInfoCard/index.vue
index 3f4ed9bb0..27d932f5d 100644
--- a/src/views/ops/RunInfoCard/index.vue
+++ b/src/views/ops/RunInfoCard/index.vue
@@ -1,7 +1,7 @@
 <template>
   <IBox :fa="icon" :type="type" :title="title" v-bind="$attrs">
     <table class="run-info">
-      <tr>
+      <tr v-for="content in contents" :key="content.hostname">
         <td>{{ content.hostname }}</td>
         <td>{{ content.result }}</td>
       </tr>
@@ -26,9 +26,9 @@ export default {
       type: String,
       default: ''
     },
-    content: {
-      type: Object,
-      default: () => ({})
+    contents: {
+      type: Array,
+      default: () => ([])
     },
     url: {
       type: String,
diff --git a/src/views/ops/TaskDetail/AdhocDetail/AdhocDetail.vue b/src/views/ops/TaskDetail/AdhocDetail/AdhocDetail.vue
index 0a8d81b28..3fb57e014 100644
--- a/src/views/ops/TaskDetail/AdhocDetail/AdhocDetail.vue
+++ b/src/views/ops/TaskDetail/AdhocDetail/AdhocDetail.vue
@@ -4,8 +4,8 @@
       <DetailCard :title="cardTitle" :items="detailCardItems" />
     </el-col>
     <el-col :span="10">
-      <RunInfoCard v-for="config in RunSuccessConfigs" :key="config.host" type="info" v-bind="config" />
-      <RunInfoCard v-for="config in RunFailedConfigs" :key="config.host" type="danger" style="margin-top: 15px" v-bind="config" />
+      <RunInfoCard type="danger" style="margin-top: 15px" v-bind="RunFailedConfig" />
+      <RunInfoCard type="info" v-bind="RunSuccessConfig" />
     </el-col>
   </el-row>
 </template>
@@ -29,30 +29,17 @@ export default {
     }
   },
   data() {
-    const last_success = toLastSucessDisplay(this.object.latest_execution)
-    const last_failure = toLastFailureDisplay(this.object.latest_execution)
-
     return {
-      RunSuccessConfigs: last_success.map(host => {
-        return {
-          icon: 'fa-info',
-          title: this.$t('ops.lastRunSuccessHosts'),
-          content: {
-            hostname: host,
-            result: ''
-          }
-        }
-      }),
-      RunFailedConfigs: last_failure.map(([host, msg]) => {
-        return {
-          icon: 'fa-info',
-          title: this.$t('ops.lastRunFailedHosts'),
-          content: {
-            hostname: host,
-            result: msg
-          }
-        }
-      })
+      RunSuccessConfig: {
+        icon: 'fa-info',
+        title: this.$t('ops.lastRunSuccessHosts'),
+        contents: toLastSucessDisplay(this.object.latest_execution)
+      },
+      RunFailedConfig: {
+        icon: 'fa-info',
+        title: this.$t('ops.lastRunFailedHosts'),
+        contents: toLastFailureDisplay(this.object.latest_execution)
+      }
     }
   },
   computed: {
diff --git a/src/views/ops/TaskDetail/HistoryExecutionDetail/HistoryExecutionDetail.vue b/src/views/ops/TaskDetail/HistoryExecutionDetail/HistoryExecutionDetail.vue
index 9bdf3259a..5cfe5bd55 100644
--- a/src/views/ops/TaskDetail/HistoryExecutionDetail/HistoryExecutionDetail.vue
+++ b/src/views/ops/TaskDetail/HistoryExecutionDetail/HistoryExecutionDetail.vue
@@ -4,8 +4,8 @@
       <DetailCard :title="cardTitle" :items="detailCardItems" />
     </el-col>
     <el-col :span="10">
-      <RunInfoCard v-for="config in RunSuccessConfigs" :key="config.host" type="info" v-bind="config" />
-      <RunInfoCard v-for="config in RunFailedConfigs" :key="config.host" type="danger" style="margin-top: 15px" v-bind="config" />
+      <RunInfoCard type="danger" style="margin-top: 15px" v-bind="RunFailedConfig" />
+      <RunInfoCard type="info" v-bind="RunSuccessConfig" />
     </el-col>
   </el-row>
 </template>
@@ -29,30 +29,17 @@ export default {
     }
   },
   data() {
-    const last_success = toLastSucessDisplay(this.object)
-    const last_failure = toLastFailureDisplay(this.object)
-
     return {
-      RunSuccessConfigs: last_success.map(host => {
-        return {
-          icon: 'fa-info',
-          title: this.$t('ops.lastRunSuccessHosts'),
-          content: {
-            hostname: host,
-            result: ''
-          }
-        }
-      }),
-      RunFailedConfigs: last_failure.map(([host, msg]) => {
-        return {
-          icon: 'fa-info',
-          title: this.$t('ops.lastRunFailedHosts'),
-          content: {
-            hostname: host,
-            result: msg
-          }
-        }
-      })
+      RunSuccessConfig: {
+        icon: 'fa-info',
+        title: this.$t('ops.lastRunSuccessHosts'),
+        contents: toLastSucessDisplay(this.object)
+      },
+      RunFailedConfig: {
+        icon: 'fa-info',
+        title: this.$t('ops.lastRunFailedHosts'),
+        contents: toLastFailureDisplay(this.object)
+      }
     }
   },
   computed: {
diff --git a/src/views/ops/TaskDetail/TaskDetail.vue b/src/views/ops/TaskDetail/TaskDetail.vue
index 8a053fae9..f385c7b17 100644
--- a/src/views/ops/TaskDetail/TaskDetail.vue
+++ b/src/views/ops/TaskDetail/TaskDetail.vue
@@ -4,8 +4,8 @@
       <DetailCard :title="cardTitle" :items="detailCardItems" />
     </el-col>
     <el-col :span="10">
-      <RunInfoCard v-for="config in RunSuccessConfigs" :key="config.host" type="info" v-bind="config" />
-      <RunInfoCard v-for="config in RunFailedConfigs" :key="config.host" type="danger" style="margin-top: 15px" v-bind="config" />
+      <RunInfoCard type="danger" style="margin-top: 15px" v-bind="RunFailedConfig" />
+      <RunInfoCard type="info" v-bind="RunSuccessConfig" />
     </el-col>
   </el-row>
 </template>
@@ -28,30 +28,17 @@ export default {
     }
   },
   data() {
-    const last_success = toLastSucessDisplay(this.object.latest_execution)
-    const last_failure = toLastFailureDisplay(this.object.latest_execution)
-
     return {
-      RunSuccessConfigs: last_success.map(host => {
-        return {
-          icon: 'fa-info',
-          title: this.$t('ops.lastRunSuccessHosts'),
-          content: {
-            hostname: host,
-            result: ''
-          }
-        }
-      }),
-      RunFailedConfigs: last_failure.map(([host, msg]) => {
-        return {
-          icon: 'fa-info',
-          title: this.$t('ops.lastRunFailedHosts'),
-          content: {
-            hostname: host,
-            result: msg
-          }
-        }
-      }),
+      RunSuccessConfig: {
+        icon: 'fa-info',
+        title: this.$t('ops.lastRunSuccessHosts'),
+        contents: toLastSucessDisplay(this.object.latest_execution)
+      },
+      RunFailedConfig: {
+        icon: 'fa-info',
+        title: this.$t('ops.lastRunFailedHosts'),
+        contents: toLastFailureDisplay(this.object.latest_execution)
+      },
       taskData: {}
     }
   },
diff --git a/src/views/ops/TaskDetail/business.js b/src/views/ops/TaskDetail/business.js
index 77bec6eac..0a775ef84 100644
--- a/src/views/ops/TaskDetail/business.js
+++ b/src/views/ops/TaskDetail/business.js
@@ -1,24 +1,36 @@
 
 export const toLastSucessDisplay = function(object) {
-  if (!object) return ['']
-  const last_success = object.last_success
-  last_success.length || last_success.push('')
-  return last_success
+  const last_success = object && object.last_success
+
+  if (!(last_success instanceof Array)) return []
+  return last_success.map(host => {
+    return {
+      hostname: host,
+      result: ''
+    }
+  })
 }
 
 export const toLastFailureDisplay = function(object) {
-  if (!object) return [['', '']]
-  const last_failure = []
-  for (const host in object.last_failure) {
-    const task = object.last_failure[host]
+  const last_failure = object && object.last_failure
+  if (!(last_failure instanceof Object)) return []
+
+  const ret = []
+
+  for (const host in last_failure) {
+    const task = last_failure[host]
     const msgs = []
     for (const name in task) {
       msgs.push(`${name} => ${task[name].msg}`)
     }
 
-    last_failure.push([host, msgs.join('\n')])
+    ret.push(
+      {
+        hostname: host,
+        result: msgs.join('\n')
+      }
+    )
   }
 
-  last_failure.length || last_failure.push(['', ''])
-  return last_failure
+  return ret
 }