From 6d95aa83c9d7c454bf1d44155bfc315e21e89d1e Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 5 Aug 2018 11:10:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 4a7cf25c3ba996a45eb5cd78b4bdecca3f5e1ac6 [formerly 4a7cf25c3ba996a45eb5cd78b4bdecca3f5e1ac6 [formerly 4a7cf25c3ba996a45eb5cd78b4bdecca3f5e1ac6 [formerly 4a7cf25c3ba996a45eb5cd78b4bdecca3f5e1ac6 [formerly 00a1f89bbf28dde544c78a5cd6ca85d6cb0af8e2 [formerly bc8e53d9b756c71a48b5297743317938be6e623b]]]]]
Former-commit-id: 0553d2a78845193b193ec40142dec84fabb37548
Former-commit-id: 3e85f148d5e5a744ee7dcc7509d41fa900b79b59
Former-commit-id: 912bc68def6df219bfe0d60cefe9dcb9e2a7f8ba [formerly 19bb68c42653c71e4178b6f064b55a0da36b03bf]
Former-commit-id: 6a39e7859d60f6186f174c1840d356a16f695b78
Former-commit-id: f5ae3e4bd9af5d4fd69c11d63dc52538a7488528
Former-commit-id: 08bb86e655a23772f82a7fad8b522f012762ec34
Former-commit-id: 9bd95b7b604280efd01da8f1182f0b4d8b084b62
Former-commit-id: a21ec55bfd4451d88553f61ddd1f5be7b2debc9d
---
 package.json                                  |  5 +-
 src/components/d2-error-log-list/index.vue    | 70 ++++++++++++++++---
 src/main.js                                   |  4 --
 src/pages/demo/playground/log/error/index.vue |  2 +-
 src/store/modules/d2admin.js.REMOVED.git-id   |  2 +-
 5 files changed, 67 insertions(+), 16 deletions(-)

diff --git a/package.json b/package.json
index 1e3cb758..ddb82f38 100644
--- a/package.json
+++ b/package.json
@@ -22,10 +22,12 @@
     "echarts": "^4.1.0",
     "element-ui": "^2.4.4",
     "file-saver": "^1.3.3",
+    "flex.css": "^1.1.7",
     "github-markdown-css": "^2.10.0",
     "highlight.js": "^9.12.0",
     "js-cookie": "^2.2.0",
     "lodash.clonedeep": "^4.5.0",
+    "lodash.get": "^4.4.2",
     "lodash.sortby": "^4.7.0",
     "lodash.uniqueid": "^4.0.1",
     "lowdb": "^1.0.0",
@@ -46,8 +48,7 @@
     "vue-router": "^3.0.1",
     "vue-splitpane": "^1.0.2",
     "vuex": "^3.0.1",
-    "xlsx": "^0.12.0",
-    "flex.css": "^1.1.7"
+    "xlsx": "^0.12.0"
   },
   "devDependencies": {
     "@kazupon/vue-i18n-loader": "^0.3.0",
diff --git a/src/components/d2-error-log-list/index.vue b/src/components/d2-error-log-list/index.vue
index ba4ad8b1..438ff7d7 100644
--- a/src/components/d2-error-log-list/index.vue
+++ b/src/components/d2-error-log-list/index.vue
@@ -1,11 +1,19 @@
 <template>
   <el-table
     :data="log"
-    style="width: 100%">
-    <!-- <el-table-column type="expand">
+    border
+    stripe
+    style="width: 100%"
+    size="mini">
+
+    <el-table-column type="expand">
       <template slot-scope="props">
+        <div style="overflow: auto;">
+          <pre>{{stackBeautify(props.row.err)}}</pre>
+        </div>
       </template>
-    </el-table-column> -->
+    </el-table-column>
+
     <el-table-column
       prop="type"
       label="类型"
@@ -33,16 +41,56 @@
         </el-tag>
       </template>
     </el-table-column>
+
     <el-table-column
-      label="info"
-      prop="info">
+      label="地址"
+      prop="url"
+      width="140px"
+      :show-overflow-tooltip="true">
     </el-table-column>
-    <el-table-column label="err">
-      <template slot-scope="scope">
+
+    <el-table-column
+      label="组件"
+      width="140px"
+      :show-overflow-tooltip="true">
+      <template
+        slot-scope="scope">
         {{scope.row.vm ? scope.row.vm.$vnode.tag : ''}}
-        {{scope.row.err}}
       </template>
     </el-table-column>
+
+    <el-table-column
+      label="信息"
+      prop="info"
+      width="200px"
+      :show-overflow-tooltip="true">
+    </el-table-column>
+
+    <el-table-column
+      label="错误类型"
+      width="140px"
+      :show-overflow-tooltip="true">
+      <template
+        slot-scope="scope">
+        {{scope.row.err ? scope.row.err.name : ''}}
+      </template>
+    </el-table-column>
+
+    <el-table-column
+      label="错误信息">
+      <template
+        slot-scope="scope">
+        {{scope.row.err ? scope.row.err.message : ''}}
+      </template>
+    </el-table-column>
+
+    <el-table-column
+      label="time"
+      prop="time"
+      width="150px"
+      :show-overflow-tooltip="true">
+    </el-table-column>
+    
   </el-table>
 </template>
 
@@ -59,6 +107,12 @@ export default {
     filterType (value, row) {
       console.log('value', value)
       return row.type === value
+    },
+    stackBeautify (err) {
+      if (!err) {
+        return ''
+      }
+      return err.stack
     }
   }
 }
diff --git a/src/main.js b/src/main.js
index 3e84a151..66b3a9ab 100644
--- a/src/main.js
+++ b/src/main.js
@@ -65,10 +65,6 @@ new Vue({
     this.$store.commit('d2adminLoginSuccessLoad')
     // 初始化全屏监听
     this.fullscreenListenerInit()
-    window.onerror = function (message, url, line, column, error) {
-      console.log('onerror')
-      console.log(message, url, line, column, error)
-    }
   },
   watch: {
     // 监听路由 控制侧边栏显示
diff --git a/src/pages/demo/playground/log/error/index.vue b/src/pages/demo/playground/log/error/index.vue
index 5661d5a8..d26e72a4 100644
--- a/src/pages/demo/playground/log/error/index.vue
+++ b/src/pages/demo/playground/log/error/index.vue
@@ -10,7 +10,7 @@
 export default {
   methods: {
     handleNewError () {
-      console.log(a)
+      console.log(a) // eslint-disable-line
     }
   }
 }
diff --git a/src/store/modules/d2admin.js.REMOVED.git-id b/src/store/modules/d2admin.js.REMOVED.git-id
index 5298b777..4b9a2c4d 100644
--- a/src/store/modules/d2admin.js.REMOVED.git-id
+++ b/src/store/modules/d2admin.js.REMOVED.git-id
@@ -1 +1 @@
-b79b9ceae995aa135d5f692a0e14798d496fba0f
\ No newline at end of file
+7b2790c378426c74689b83621eedf84a4250ff5e
\ No newline at end of file