From 610a6c31d4f6782d52746a4884e7fec04c3faeef Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Wed, 6 Feb 2019 16:51:40 +0800
Subject: [PATCH] =?UTF-8?q?log=20=E6=98=BE=E7=A4=BA=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 8c0f936351dbd934e49f2bbdc9d1afbff3099ea5 [formerly 8c0f936351dbd934e49f2bbdc9d1afbff3099ea5 [formerly 8c0f936351dbd934e49f2bbdc9d1afbff3099ea5 [formerly 8c0f936351dbd934e49f2bbdc9d1afbff3099ea5 [formerly 2f903b4559547de34efeedb78f834d6aa1512888 [formerly 699fb6633255a97c372bfe105de93047cb5b692a]]]]]
Former-commit-id: bea2b9a138c3d6e6b95912dd1a5c11efbdc30c77
Former-commit-id: 34dcaf909a6625f6eab2f0bfd419305ed5a42528
Former-commit-id: 484dde9edad2f6d0108b79910725aab6e662edc0 [formerly 1aaf88bc93fe7db5802d5bb7bd5d8de443a2b5a7]
Former-commit-id: 54afa4f033da9451cff5824d41d732265040ea85
Former-commit-id: 209b08ec0835c94d65dbb357b66f1db7d187fae6
Former-commit-id: dd03466655b0ad9f973dc9a520220eedc9d0ddba
Former-commit-id: 9210416c706abb61b46bbf06ab9c1100fd61b3c9
Former-commit-id: 93bf52dc7f6fdca82a74a4a03b52e7f4efcd7c71
---
 .../components/list/index.vue                 | 64 ++++++++-----------
 1 file changed, 27 insertions(+), 37 deletions(-)

diff --git a/src/layout/header-aside/components/header-error-log/components/list/index.vue b/src/layout/header-aside/components/header-error-log/components/list/index.vue
index a49c9f28..27ee9861 100644
--- a/src/layout/header-aside/components/header-error-log/components/list/index.vue
+++ b/src/layout/header-aside/components/header-error-log/components/list/index.vue
@@ -5,64 +5,62 @@
     stripe
     style="width: 100%"
     size="mini">
-
     <el-table-column type="expand">
-      <div slot-scope="props" class="d2-error-log-list__expand-group">
+      <div slot-scope="{ row = {} }" class="d2-error-log-list__expand-group">
         <expand-item
-          :type="props.row.type"
+          :type="row.type"
           title="类型"
-          :value="props.row.type === 'log' ? '日志' : '异常'"/>
+          :value="row.type === 'log' ? '日志' : '异常'"/>
         <expand-item
-          :type="props.row.type"
+          :type="row.type"
           title="内容"
-          :value="props.row.info"/>
+          :value="row.info"/>
         <expand-item
-          v-if="props.row.type === 'error'"
+          v-if="row.type === 'error'"
           type="error"
           title="报错组件"
-          :value="get(props.row.instance, '$vnode.tag', '')"/>
+          :value="get(row, 'instance.$vnode.tag', '')"/>
         <expand-item
-          v-if="props.row.type === 'error'"
+          v-if="row.type === 'error'"
           type="error"
           title="错误名称"
-          :value="get(props.row.err, 'name', '')"/>
+          :value="get(row, 'err.name', '')"/>
         <expand-item
-          v-if="props.row.type === 'error'"
+          v-if="row.type === 'error'"
           type="error"
           title="错误信息"
-          :value="get(props.row.err, 'message', '')"/>
+          :value="get(row, 'err.message', '')"/>
         <expand-item
-          v-if="props.row.type === 'error'"
+          v-if="row.type === 'error'"
           type="error"
           title="错误堆栈"
           value="见下">
           <div style="overflow: auto;">
-            <pre>{{stackBeautify(props.row.err)}}</pre>
+            <pre>{{stackBeautify(row.err)}}</pre>
           </div>
         </expand-item>
         <expand-item
-          :type="props.row.type"
+          :type="row.type"
           title="用户名"
-          :value="get(props.row.user, 'name', '')"/>
+          :value="get(row, 'user.name', '')"/>
         <expand-item
-          :type="props.row.type"
+          :type="row.type"
           title="uuid"
-          :value="props.row.uuid"/>
+          :value="row.uuid"/>
         <expand-item
-          :type="props.row.type"
+          :type="row.type"
           title="token"
-          :value="props.row.token"/>
+          :value="row.token"/>
         <expand-item
-          :type="props.row.type"
+          :type="row.type"
           title="页面地址"
-          :value="props.row.url"/>
+          :value="row.url"/>
         <expand-item
-          :type="props.row.type"
+          :type="row.type"
           title="时间"
-          :value="props.row.time"/>
+          :value="row.time"/>
       </div>
     </el-table-column>
-
     <el-table-column
       prop="type"
       label="类型"
@@ -77,7 +75,7 @@
       filter-placement="bottom">
       <template slot-scope="scope">
         <el-tag
-          v-if="scope.row.type === 'error'"
+          v-if="get(scope, 'row.type') === 'error'"
           size="mini"
           type="danger">
           <d2-icon name="bug"/> Bug
@@ -90,39 +88,34 @@
         </el-tag>
       </template>
     </el-table-column>
-
     <el-table-column
       label="地址"
       prop="url"
       width="140px"
       :show-overflow-tooltip="true">
     </el-table-column>
-
     <el-table-column
       label="内容"
       prop="info"
       :show-overflow-tooltip="true">
     </el-table-column>
-
     <el-table-column
       label="错误类型"
       width="140px"
       :show-overflow-tooltip="true">
       <template
         slot-scope="scope">
-        {{get(scope.row.err, 'name', '')}}
+        {{get(scope, 'row.err.name', '')}}
       </template>
     </el-table-column>
-
     <el-table-column
       label="错误信息"
       width="300px">
       <template
         slot-scope="scope">
-        {{get(scope.row.err, 'message', '')}}
+        {{get(scope, 'row.err.message', '')}}
       </template>
     </el-table-column>
-
   </el-table>
 </template>
 
@@ -155,10 +148,7 @@ export default {
       return row.type === value
     },
     stackBeautify (err) {
-      if (!err) {
-        return ''
-      }
-      return err.stack
+      return get(err, 'stack', '')
     }
   }
 }