From 25329e68b7c4feac565562f22cf3732c7dc5630e Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Wed, 1 Aug 2018 22:55:40 +0800
Subject: [PATCH 01/14] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: a8bf514c7999f8be7e16a1ce0a11c80ddb7669be [formerly a8bf514c7999f8be7e16a1ce0a11c80ddb7669be [formerly a8bf514c7999f8be7e16a1ce0a11c80ddb7669be [formerly a8bf514c7999f8be7e16a1ce0a11c80ddb7669be [formerly 4b80b101b9b441edfc3a52a7ef7be4d7a1eb673a [formerly 083338976fea668a05c241b503a1759bc98123ba]]]]]
Former-commit-id: f7cb601687755202fd6e9ef2270b1b68016997e0
Former-commit-id: 9ff05052fe6b6e6146c26da66f7ed484e2d84bca
Former-commit-id: c3faaf4377a616ff4473449de17ebfcbc1edb7b8 [formerly 50c632cab919970ffa8bcb4675cc163fc1404c18]
Former-commit-id: 865165843bb9c82a11312a5a9aa8a6514f486bb6
Former-commit-id: 1cafbbc8c25bad67bde221860be54af8b98b30b8
Former-commit-id: 31b05c2304e9a876c9ad4938ac7adfd885580e36
Former-commit-id: 9b18591f9ab4b78128c3112048ea30cd0334699d
Former-commit-id: 899b9c72d1c12a8ee1601cad0694689a4c7ed5bd
---
 src/components/d2-error-log-list/index.vue    | 11 ++++++++
 src/components/index.js                       |  1 +
 .../components/header-error-log/index.vue     | 26 +++++++++++++++++++
 .../components/header-help/index.vue          |  6 ++++-
 src/layout/header-aside/layout.vue            | 23 +++++++---------
 5 files changed, 52 insertions(+), 15 deletions(-)
 create mode 100644 src/components/d2-error-log-list/index.vue
 create mode 100644 src/layout/header-aside/components/header-error-log/index.vue

diff --git a/src/components/d2-error-log-list/index.vue b/src/components/d2-error-log-list/index.vue
new file mode 100644
index 00000000..620b9ee4
--- /dev/null
+++ b/src/components/d2-error-log-list/index.vue
@@ -0,0 +1,11 @@
+<template>
+  <div>
+    d2-error-log-list
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'd2-error-log-list'
+}
+</script>
diff --git a/src/components/index.js b/src/components/index.js
index ca6a67f0..e2dd374e 100644
--- a/src/components/index.js
+++ b/src/components/index.js
@@ -16,6 +16,7 @@ Vue.component('d2-container', d2Container)
 Vue.component('d2-link-btn', d2LinkBtn)
 Vue.component('d2-page-cover', () => import('./d2-page-cover'))
 Vue.component('d2-count-up', () => import('./d2-count-up'))
+Vue.component('d2-error-log-list', () => import('./d2-error-log-list'))
 Vue.component('d2-highlight', () => import('./d2-highlight'))
 Vue.component('d2-icon', () => import('./d2-icon'))
 Vue.component('d2-icon-select', () => import('./d2-icon-select/index.vue'))
diff --git a/src/layout/header-aside/components/header-error-log/index.vue b/src/layout/header-aside/components/header-error-log/index.vue
new file mode 100644
index 00000000..7bef5398
--- /dev/null
+++ b/src/layout/header-aside/components/header-error-log/index.vue
@@ -0,0 +1,26 @@
+<template>
+  <div>
+    <el-tooltip effect="dark" content="异常" placement="bottom">
+      <el-button class="d2-ml-0 d2-mr btn-text can-hover" type="text" @click="dialogVisible = true">
+        <d2-icon name="bug" style="font-size: 20px"/>
+      </el-button>
+    </el-tooltip>
+    <el-dialog
+      title="异常日志"
+      :fullscreen="true"
+      :visible.sync="dialogVisible"
+      :append-to-body="true">
+      <d2-error-log-list/>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      dialogVisible: false
+    }
+  }
+}
+</script>
diff --git a/src/layout/header-aside/components/header-help/index.vue b/src/layout/header-aside/components/header-help/index.vue
index 6aeaa638..23fa633c 100644
--- a/src/layout/header-aside/components/header-help/index.vue
+++ b/src/layout/header-aside/components/header-help/index.vue
@@ -5,7 +5,11 @@
         <d2-icon name="question-circle" style="font-size: 20px"/>
       </el-button>
     </el-tooltip>
-    <el-dialog title="帮助" width="600px" :visible.sync="dialogVisible">
+    <el-dialog
+      title="帮助"
+      width="600px"
+      :visible.sync="dialogVisible"
+      :append-to-body="true">
       <div style="margin-top: -25px; margin-bottom: -25px;">
         <el-button-group class="d2-mb">
           <el-button @click="$open('https://github.com/d2-projects/d2-admin')">
diff --git a/src/layout/header-aside/layout.vue b/src/layout/header-aside/layout.vue
index 41c56f3d..d6b053ea 100644
--- a/src/layout/header-aside/layout.vue
+++ b/src/layout/header-aside/layout.vue
@@ -19,6 +19,7 @@
         <d2-menu-header/>
         <!-- 顶栏右侧 -->
         <div class="d2-header-right">
+          <d2-header-error-log/>
           <d2-header-help/>
           <d2-header-fullscreen/>
           <d2-header-theme/>
@@ -55,23 +56,17 @@
 
 <script>
 import { mapState, mapGetters, mapMutations } from 'vuex'
-import menuSide from './components/menu-side'
-import menuHeader from './components/menu-header'
-import tabs from './components/tabs'
-import headerFullscreen from './components/header-fullscreen'
-import headerTheme from './components/header-theme'
-import headerUser from './components/header-user'
-import headerHelp from './components/header-help'
 export default {
   name: 'd2-layout-header-aside',
   components: {
-    'd2-menu-side': menuSide,
-    'd2-menu-header': menuHeader,
-    'd2-tabs': tabs,
-    'd2-header-fullscreen': headerFullscreen,
-    'd2-header-theme': headerTheme,
-    'd2-header-user': headerUser,
-    'd2-header-help': headerHelp
+    'd2-menu-side': () => import('./components/menu-side'),
+    'd2-menu-header': () => import('./components/menu-header'),
+    'd2-tabs': () => import('./components/tabs'),
+    'd2-header-fullscreen': () => import('./components/header-fullscreen'),
+    'd2-header-theme': () => import('./components/header-theme'),
+    'd2-header-user': () => import('./components/header-user'),
+    'd2-header-help': () => import('./components/header-help'),
+    'd2-header-error-log': () => import('./components/header-error-log')
   },
   data () {
     return {

From 75303448d059a7776a5a4a0f8466d93cd2e7c58a Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Thu, 2 Aug 2018 08:24:51 +0800
Subject: [PATCH 02/14] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=A4=BA=E4=BE=8B?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=B8=AD=E6=97=A0=E7=94=A8=E7=9A=84=E9=83=A8?=
 =?UTF-8?q?=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 0f667e4fcf3883eba654460dc59279ac1bab259e [formerly 0f667e4fcf3883eba654460dc59279ac1bab259e [formerly 0f667e4fcf3883eba654460dc59279ac1bab259e [formerly 0f667e4fcf3883eba654460dc59279ac1bab259e [formerly 378b783ed03db1feee43d5aabede916c0c9c8c7f [formerly d0889ae86988276d50f5f3ab44c3fe6d2e8e160d]]]]]
Former-commit-id: 35d15ca17006b5c7f36297d778c19913bacc52bb
Former-commit-id: 4f162cbc3428eb8154027f13147a67e5dd823292
Former-commit-id: 25ceb52c453041c5a9e2fd5114409b17d3c165e4 [formerly 1795bd84de74f3c0f7562a5843c0cdc83d953fb1]
Former-commit-id: 8f394c678c86109e5c588f71f83476fac2977487
Former-commit-id: b86d072c5f9a42d4958e668c742e1e076996929b
Former-commit-id: 12ffbc2ac3b8e697f0a1d34dabcaa9203617fbb9
Former-commit-id: 87e7d72c44c6598a355c63a6edd9addfb9c902f4
Former-commit-id: d84a5d6c5047fc71d8a66a6f2a93e511ffa08a43
---
 src/components/d2-error-log-list/index.vue | 63 ++++++++++++++++++++--
 1 file changed, 59 insertions(+), 4 deletions(-)

diff --git a/src/components/d2-error-log-list/index.vue b/src/components/d2-error-log-list/index.vue
index 620b9ee4..704232e0 100644
--- a/src/components/d2-error-log-list/index.vue
+++ b/src/components/d2-error-log-list/index.vue
@@ -1,11 +1,66 @@
 <template>
-  <div>
-    d2-error-log-list
-  </div>
+  <el-table
+    :data="tableData5"
+    style="width: 100%">
+    <el-table-column type="expand">
+      <template slot-scope="props">
+        {{props.row}}
+      </template>
+    </el-table-column>
+    <el-table-column
+      label="商品 ID"
+      prop="id">
+    </el-table-column>
+    <el-table-column
+      label="商品名称"
+      prop="name">
+    </el-table-column>
+    <el-table-column
+      label="描述"
+      prop="desc">
+    </el-table-column>
+  </el-table>
 </template>
 
 <script>
 export default {
-  name: 'd2-error-log-list'
+  name: 'd2-error-log-list',
+  data () {
+    return {
+      tableData5: [{
+        id: '12987122',
+        name: '好滋好味鸡蛋仔',
+        category: '江浙小吃、小吃零食',
+        desc: '荷兰优质淡奶，奶香浓而不腻',
+        address: '上海市普陀区真北路',
+        shop: '王小虎夫妻店',
+        shopId: '10333'
+      }, {
+        id: '12987123',
+        name: '好滋好味鸡蛋仔',
+        category: '江浙小吃、小吃零食',
+        desc: '荷兰优质淡奶，奶香浓而不腻',
+        address: '上海市普陀区真北路',
+        shop: '王小虎夫妻店',
+        shopId: '10333'
+      }, {
+        id: '12987125',
+        name: '好滋好味鸡蛋仔',
+        category: '江浙小吃、小吃零食',
+        desc: '荷兰优质淡奶，奶香浓而不腻',
+        address: '上海市普陀区真北路',
+        shop: '王小虎夫妻店',
+        shopId: '10333'
+      }, {
+        id: '12987126',
+        name: '好滋好味鸡蛋仔',
+        category: '江浙小吃、小吃零食',
+        desc: '荷兰优质淡奶，奶香浓而不腻',
+        address: '上海市普陀区真北路',
+        shop: '王小虎夫妻店',
+        shopId: '10333'
+      }]
+    }
+  }
 }
 </script>

From c2f5bfdbfff5558069babf2cc3b128842bcf6a0b Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Thu, 2 Aug 2018 14:08:36 +0800
Subject: [PATCH 03/14] =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=AD=98=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: a52163c9c3dad22bdb40f020967e4f94edba9323 [formerly a52163c9c3dad22bdb40f020967e4f94edba9323 [formerly a52163c9c3dad22bdb40f020967e4f94edba9323 [formerly a52163c9c3dad22bdb40f020967e4f94edba9323 [formerly b393934c68c9a9fe59b96135512380c69c85f6fa [formerly 5760d5421930a548c6a3980ad76f79e9d8103027]]]]]
Former-commit-id: 5577a549703aca87a8052549d2ed6de11abac845
Former-commit-id: a29a725d6512f9c03ee9670e5764d42335de21a5
Former-commit-id: 100e09fae2c373d4e7a662460c55da1fa7d3a22a [formerly f4e93720482bb8c31fc3effb1b74cb78aa691647]
Former-commit-id: 13acfdec41ae665da4cfb5ae19160fd3a1e2fa44
Former-commit-id: babbed7319218019876bbf1b76c03ddf68886835
Former-commit-id: 642437c40f03db3ac8340ffee916c18cca9ebdc0
Former-commit-id: c8535dc780a1dd5aee99769d1863ba799221bdc6
Former-commit-id: 286ba818b9545ad4d34c67085ee342f99263cf9d
---
 docs/zh/guide/change-log.md                   |  4 ++
 src/libs/util.js                              | 48 ++++++++++++++++---
 src/main.js                                   |  8 +++-
 src/menu/modules/demo-playground.js           |  8 ++++
 src/pages/demo/playground/log/error/index.vue | 17 +++++++
 src/plugin/error/index.js                     | 21 ++++++++
 src/router/routes.js.REMOVED.git-id           |  2 +-
 src/store/modules/d2admin.js.REMOVED.git-id   |  2 +-
 8 files changed, 101 insertions(+), 9 deletions(-)
 create mode 100644 src/pages/demo/playground/log/error/index.vue
 create mode 100644 src/plugin/error/index.js

diff --git a/docs/zh/guide/change-log.md b/docs/zh/guide/change-log.md
index 3dbf2834..672b00d7 100644
--- a/docs/zh/guide/change-log.md
+++ b/docs/zh/guide/change-log.md
@@ -1,5 +1,9 @@
 # 更新日志
 
+## v1.1.6
+
+* [ 新增 ] 新增加了多页控制组件 tab 按钮上的右键操作菜单，现在你可以在 D2Admin 中像使用浏览器一样操作多标签页
+
 ## v1.1.5
 
 * [ 修改 ] vue-cli3 项目重构，目录调整
diff --git a/src/libs/util.js b/src/libs/util.js
index 1e821fed..bac289d6 100644
--- a/src/libs/util.js
+++ b/src/libs/util.js
@@ -5,7 +5,8 @@ import UaParser from 'ua-parser-js'
 import { version } from '../../package.json'
 
 let util = {
-  cookies: {}
+  cookies: {},
+  log: {}
 }
 
 /**
@@ -73,20 +74,55 @@ util.isOneOf = function (ele, targetArr) {
   }
 }
 
+/**
+ * @description 返回这个样式的颜色值
+ * @param {String} type 样式名称 [ primary | success | warning | danger | text ]
+ */
+util.typeColor = function (type = 'default') {
+  let color = ''
+  switch (type) {
+    case 'default': color = '35495E'; break
+    case 'primary': color = '#3488ff'; break
+    case 'success': color = '#43B883'; break
+    case 'warning': color = '#e6a23c'; break
+    case 'danger': color = '#f56c6c'; break
+    default:; break
+  }
+  return color
+}
+
 /**
  * @description 打印一个 “胶囊” 样式的信息
  * @param {String} title title text
  * @param {String} info info text
+ * @param {String} type style
  */
-util.logCapsule = function (title, info) {
+util.log.capsule = function (title, info, type = 'primary') {
   console.log(
     `%c ${title} %c ${info} %c`,
-    'background:#29384b; padding: 1px; border-radius: 3px 0 0 3px; color: #fff',
-    'background:#3488ff; padding: 1px; border-radius: 0 3px 3px 0;  color: #fff',
+    'background:#35495E; padding: 1px; border-radius: 3px 0 0 3px; color: #fff;',
+    `background:${util.typeColor(type)}; padding: 1px; border-radius: 0 3px 3px 0;  color: #fff;`,
     'background:transparent'
   )
 }
 
+/**
+ * @description 打印彩色文字
+ */
+util.log.colorful = function (textArr) {
+  console.log(
+    `%c ${textArr.map(t => t.text).join(' %c ')}`,
+    ...textArr.map(t => `color: ${util.typeColor(t.type)};`)
+  )
+}
+
+/**
+ * @description 打印 danger 样式的文字
+ */
+util.log.error = function (text) {
+  util.log.colorful([{ text, type: 'danger' }])
+}
+
 /**
  * @description 检查版本更新
  * @param {Object} vm vue
@@ -100,7 +136,7 @@ util.checkUpdate = function (vm) {
       let versionGet = res.tag_name
       const update = semver.lt(version, versionGet)
       if (update) {
-        util.logCapsule('D2Admin', `New version ${res.name}`)
+        util.log.capsule('D2Admin', `New version ${res.name}`)
         console.log(`版本号: ${res.tag_name} | 详情${res.html_url}`)
         vm.$store.commit('d2adminReleasesUpdateSet', true)
       }
@@ -115,7 +151,7 @@ util.checkUpdate = function (vm) {
  * @description 显示版本信息
  */
 util.showInfo = function showInfo () {
-  util.logCapsule('D2Admin', `v${version}`)
+  util.log.capsule('D2Admin', `v${version}`)
   console.log('Github https://github.com/d2-projects/d2-admin')
   console.log('Doc    http://d2admin.fairyever.com/zh/')
 }
diff --git a/src/main.js b/src/main.js
index 57483b5c..adda84f9 100644
--- a/src/main.js
+++ b/src/main.js
@@ -15,8 +15,9 @@ import util from '@/libs/util.js'
 import store from '@/store/index'
 import '@/assets/svg-icons'
 import '@/components'
-import '@/plugin/axios'
 import '@/mock/register'
+import '@/plugin/axios'
+import pluginError from '@/plugin/error'
 import pluginImport from '@/plugin/import'
 import pluginExport from '@/plugin/export'
 import pluginOpen from '@/plugin/open'
@@ -29,6 +30,7 @@ import { frameInRoutes } from '@/router/routes'
 Vue.use(ElementUI)
 Vue.use(VCharts)
 Vue.use(contentmenu)
+Vue.use(pluginError)
 Vue.use(pluginImport)
 Vue.use(pluginExport)
 Vue.use(pluginOpen)
@@ -61,6 +63,10 @@ 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/menu/modules/demo-playground.js b/src/menu/modules/demo-playground.js
index b8a8ba02..c94c3d40 100644
--- a/src/menu/modules/demo-playground.js
+++ b/src/menu/modules/demo-playground.js
@@ -45,6 +45,14 @@ export default {
         { path: `${pre}db/public`, title: '公用数据', icon: 'users' }
       ]
     },
+    {
+      path: `${pre}log`,
+      title: '日志',
+      icon: 'bullseye',
+      children: [
+        { path: `${pre}log/error`, title: '错误捕捉', icon: 'bug' }
+      ]
+    },
     { path: `${pre}env`, title: '环境信息', icon: 'exclamation-circle' }
   ])('/demo/playground/')
 }
diff --git a/src/pages/demo/playground/log/error/index.vue b/src/pages/demo/playground/log/error/index.vue
new file mode 100644
index 00000000..e67b6dc4
--- /dev/null
+++ b/src/pages/demo/playground/log/error/index.vue
@@ -0,0 +1,17 @@
+<template>
+  <d2-container>
+    <template slot="header">错误信息</template>
+    <p class="d2-mt-0">请打开浏览器控制台，然后点击下面的按钮</p>
+    <el-button type="danger" @click="handleNewError">触发一个错误</el-button>
+  </d2-container>
+</template>
+
+<script>
+export default {
+  methods: {
+    handleNewError () {
+      console.log(a)
+    }
+  }
+}
+</script>
diff --git a/src/plugin/error/index.js b/src/plugin/error/index.js
new file mode 100644
index 00000000..7b6f02b5
--- /dev/null
+++ b/src/plugin/error/index.js
@@ -0,0 +1,21 @@
+import store from '@/store'
+import util from '@/libs/util'
+
+export default {
+  install (Vue, options) {
+    Vue.config.errorHandler = function (err, vm, info) {
+      Vue.nextTick(() => {
+        store.commit('d2adminLogAdd', {
+          err, vm, info
+        })
+        util.log.capsule('D2Admin', 'ErrorHandler', 'danger')
+        util.log.error('>>>>> err')
+        console.log(err)
+        util.log.error('>>>>> vm')
+        console.log(vm)
+        util.log.error('>>>>> info')
+        console.log(info)
+      })
+    }
+  }
+}
diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id
index 1e67b886..1fa7ded1 100644
--- a/src/router/routes.js.REMOVED.git-id
+++ b/src/router/routes.js.REMOVED.git-id
@@ -1 +1 @@
-0fa9b5a2bdc57841e4f19831dc3e2a913399a280
\ No newline at end of file
+51f901f963b0802a69efe93ef5d40b60bcd1a2fd
\ No newline at end of file
diff --git a/src/store/modules/d2admin.js.REMOVED.git-id b/src/store/modules/d2admin.js.REMOVED.git-id
index 2ea59ae8..e1ffd471 100644
--- a/src/store/modules/d2admin.js.REMOVED.git-id
+++ b/src/store/modules/d2admin.js.REMOVED.git-id
@@ -1 +1 @@
-f6b747b5dbf484da5c8b5876c9d54212c90c3550
\ No newline at end of file
+1325e2be4603dde2cf094397e4fca98a542e4ba5
\ No newline at end of file

From c2ffca2f14b564362f9acd9695e0766cd5d38668 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Thu, 2 Aug 2018 14:48:54 +0800
Subject: [PATCH 04/14] =?UTF-8?q?=E5=9B=9B=E7=A7=8D=E5=BF=AB=E9=80=9F?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=BD=A9=E8=89=B2=E6=96=87=E5=AD=97=E7=9A=84?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 35179f73b9531b2525331d0a9815df6fb8d64bde [formerly 09d5ded45c36c36a811e3fe25c34856abc98f092] [formerly 35179f73b9531b2525331d0a9815df6fb8d64bde [formerly 09d5ded45c36c36a811e3fe25c34856abc98f092] [formerly 35179f73b9531b2525331d0a9815df6fb8d64bde [formerly 09d5ded45c36c36a811e3fe25c34856abc98f092] [formerly 09d5ded45c36c36a811e3fe25c34856abc98f092 [formerly 4c018feec65dbbda9026f0c6fc911cf42f290eac [formerly 4cf28c7a2788ee5b985a6707e94fe698782a6efb]]]]]
Former-commit-id: 012f63e69f8fdbc177021b43ecb591c0f85841b8
Former-commit-id: 185c9af381750eef11c663b860b29d44d54128fc
Former-commit-id: dbed36b0c90d46e0f48ab155986bc798a18ee0e2 [formerly 6e05d568fd23bb4b59179eeeac5722dfcf7bca33]
Former-commit-id: 8068579e0c30280518dca37c2176623a522d1094
Former-commit-id: f77e82a8a9c1621d6022eb7687adccb68b00d45d
Former-commit-id: 628d1680af0687a1eff97c9b4ca44e271ba13273
Former-commit-id: d962816743d7f8518e5a6258261ee456fe2aa5ac
Former-commit-id: 14ac0e88b6525cb206a3bc7e1431006e64f5a9ec
---
 src/libs/util.js | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/libs/util.js b/src/libs/util.js
index bac289d6..74ac78b7 100644
--- a/src/libs/util.js
+++ b/src/libs/util.js
@@ -116,10 +116,31 @@ util.log.colorful = function (textArr) {
   )
 }
 
+/**
+ * @description 打印 primary 样式的文字
+ */
+util.log.primary = function (text) {
+  util.log.colorful([{ text, type: 'primary' }])
+}
+
+/**
+ * @description 打印 success 样式的文字
+ */
+util.log.success = function (text) {
+  util.log.colorful([{ text, type: 'success' }])
+}
+
+/**
+ * @description 打印 warning 样式的文字
+ */
+util.log.warning = function (text) {
+  util.log.colorful([{ text, type: 'warning' }])
+}
+
 /**
  * @description 打印 danger 样式的文字
  */
-util.log.error = function (text) {
+util.log.danger = function (text) {
   util.log.colorful([{ text, type: 'danger' }])
 }
 

From 924f3f75b02434d68b1700c03bc827d7473dfc93 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Thu, 2 Aug 2018 14:49:00 +0800
Subject: [PATCH 05/14] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 518325287c1e6e0f203ff95a68a6bc9e10d8176d [formerly 518325287c1e6e0f203ff95a68a6bc9e10d8176d [formerly 518325287c1e6e0f203ff95a68a6bc9e10d8176d [formerly 518325287c1e6e0f203ff95a68a6bc9e10d8176d [formerly 3076b15aa6adcfe557f59ab6e5a6d4e46b077e1c [formerly 5fd8c763d74870c0d08713cec0535e0d8db54e29]]]]]
Former-commit-id: 8f2c087320cad50b9296fa694a0f4e19f67e3e29
Former-commit-id: b58d6ac8670dd34d02b47e06376b9323b3783bd8
Former-commit-id: a0e51048197a5c3c8b2d86bde6a646b2337ebad3 [formerly 03da21fa80f8e9aa841caac11fbc4ea6d50ec1b2]
Former-commit-id: e282f586620f996c959c788da13ebf94d19356e1
Former-commit-id: 6157b36ac59e42d0c2551ee232917615b4e234ef
Former-commit-id: 713ab622619120f3f4d6f6b862ef7e431ef258ae
Former-commit-id: 533d7705a18e963117a805546c81589b5134ff28
Former-commit-id: 96ae542246f8eac3ddf0356f3cb9a22ddb7b7c48
---
 src/plugin/error/index.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/plugin/error/index.js b/src/plugin/error/index.js
index 7b6f02b5..e20aff33 100644
--- a/src/plugin/error/index.js
+++ b/src/plugin/error/index.js
@@ -6,14 +6,16 @@ export default {
     Vue.config.errorHandler = function (err, vm, info) {
       Vue.nextTick(() => {
         store.commit('d2adminLogAdd', {
-          err, vm, info
+          err,
+          vm,
+          info
         })
         util.log.capsule('D2Admin', 'ErrorHandler', 'danger')
-        util.log.error('>>>>> err')
+        util.log.danger('>>>>>> 错误对象 >>>>>>')
         console.log(err)
-        util.log.error('>>>>> vm')
+        util.log.danger('>>>>>> 报错 Vue 实例 >>>>>>')
         console.log(vm)
-        util.log.error('>>>>> info')
+        util.log.danger('>>>>>> 错误信息 >>>>>>')
         console.log(info)
       })
     }

From a20f12629acae8d9c24ff4aceac4e366b84a8404 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Thu, 2 Aug 2018 19:44:45 +0800
Subject: [PATCH 06/14] =?UTF-8?q?=E5=BF=AB=E9=80=9F=E6=89=93=E5=8D=B0log?=
 =?UTF-8?q?=E6=8F=92=E4=BB=B6=E5=92=8C=E8=AE=B0=E5=BD=95log=E6=8F=92?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: c60fd22146486b9ae40a017f54eac22861d63cfe [formerly c60fd22146486b9ae40a017f54eac22861d63cfe [formerly c60fd22146486b9ae40a017f54eac22861d63cfe [formerly c60fd22146486b9ae40a017f54eac22861d63cfe [formerly b19f1dba3b8716c4ec0693a83882bf9f0c10ee3e [formerly 163a31502dcf1a0e10a73b65e29e7260d36afcc9]]]]]
Former-commit-id: e5b3780565f7a1645b4fe207c41035513515ca0b
Former-commit-id: ef544bb7604fc43b2b88c3890e4b3cc799df7845
Former-commit-id: 915e4dc616ce563853356e5839acd156fd4fd69f [formerly e920289a8782940d1b5c3f498afd483c364462a0]
Former-commit-id: 0085d6c633ce61d78083afdfbff15a2a77d5db42
Former-commit-id: 1eea98ae975cb2f3d79a81eaf39e7b3865264f82
Former-commit-id: 1cf7126ab22e15afbf99c7bbb1e250e6dfcae5e9
Former-commit-id: a680edf65c0ce825cc494e085e9f0e90f2775127
Former-commit-id: c400c163f351492944c53fbd1a59e27c4bb25fa5
---
 src/main.js                                   |  2 ++
 src/menu/modules/demo-playground.js           |  1 +
 src/pages/demo/playground/log/error/index.vue |  2 +-
 src/pages/demo/playground/log/log/index.vue   | 27 +++++++++++++++++++
 src/plugin/error/index.js                     | 17 +++++++-----
 src/plugin/log/index.js                       | 16 +++++++++++
 src/router/routes.js.REMOVED.git-id           |  2 +-
 src/store/modules/d2admin.js.REMOVED.git-id   |  2 +-
 8 files changed, 59 insertions(+), 10 deletions(-)
 create mode 100644 src/pages/demo/playground/log/log/index.vue
 create mode 100644 src/plugin/log/index.js

diff --git a/src/main.js b/src/main.js
index adda84f9..3e84a151 100644
--- a/src/main.js
+++ b/src/main.js
@@ -17,6 +17,7 @@ import '@/assets/svg-icons'
 import '@/components'
 import '@/mock/register'
 import '@/plugin/axios'
+import pluginLog from '@/plugin/log'
 import pluginError from '@/plugin/error'
 import pluginImport from '@/plugin/import'
 import pluginExport from '@/plugin/export'
@@ -30,6 +31,7 @@ import { frameInRoutes } from '@/router/routes'
 Vue.use(ElementUI)
 Vue.use(VCharts)
 Vue.use(contentmenu)
+Vue.use(pluginLog)
 Vue.use(pluginError)
 Vue.use(pluginImport)
 Vue.use(pluginExport)
diff --git a/src/menu/modules/demo-playground.js b/src/menu/modules/demo-playground.js
index c94c3d40..b0b4ed77 100644
--- a/src/menu/modules/demo-playground.js
+++ b/src/menu/modules/demo-playground.js
@@ -50,6 +50,7 @@ export default {
       title: '日志',
       icon: 'bullseye',
       children: [
+        { path: `${pre}log/log`, title: '日志记录', icon: 'sticky-note-o' },
         { path: `${pre}log/error`, title: '错误捕捉', icon: 'bug' }
       ]
     },
diff --git a/src/pages/demo/playground/log/error/index.vue b/src/pages/demo/playground/log/error/index.vue
index e67b6dc4..5661d5a8 100644
--- a/src/pages/demo/playground/log/error/index.vue
+++ b/src/pages/demo/playground/log/error/index.vue
@@ -1,6 +1,6 @@
 <template>
   <d2-container>
-    <template slot="header">错误信息</template>
+    <template slot="header">捕获错误信息</template>
     <p class="d2-mt-0">请打开浏览器控制台，然后点击下面的按钮</p>
     <el-button type="danger" @click="handleNewError">触发一个错误</el-button>
   </d2-container>
diff --git a/src/pages/demo/playground/log/log/index.vue b/src/pages/demo/playground/log/log/index.vue
new file mode 100644
index 00000000..c8115578
--- /dev/null
+++ b/src/pages/demo/playground/log/log/index.vue
@@ -0,0 +1,27 @@
+<template>
+  <d2-container>
+    <template slot="header">记录日志内容</template>
+    <p class="d2-mt-0">在下方输入你要记录的日志，然后点击记录按钮</p>
+    <el-input
+      v-model="text"
+      placeholder="日志内容"
+      class="d2-mr-10"
+      style="width: 200px;"/>
+    <el-button type="primary" @click="handleAdd">记录</el-button>
+  </d2-container>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      text: 'D2Admin log info'
+    }
+  },
+  methods: {
+    handleAdd () {
+      this.$logAdd(this.text)
+    }
+  }
+}
+</script>
diff --git a/src/plugin/error/index.js b/src/plugin/error/index.js
index e20aff33..094ea867 100644
--- a/src/plugin/error/index.js
+++ b/src/plugin/error/index.js
@@ -6,17 +6,20 @@ export default {
     Vue.config.errorHandler = function (err, vm, info) {
       Vue.nextTick(() => {
         store.commit('d2adminLogAdd', {
+          type: 'error',
           err,
           vm,
           info
         })
-        util.log.capsule('D2Admin', 'ErrorHandler', 'danger')
-        util.log.danger('>>>>>> 错误对象 >>>>>>')
-        console.log(err)
-        util.log.danger('>>>>>> 报错 Vue 实例 >>>>>>')
-        console.log(vm)
-        util.log.danger('>>>>>> 错误信息 >>>>>>')
-        console.log(info)
+        if (process.env.NODE_ENV === 'development') {
+          util.log.capsule('D2Admin', 'ErrorHandler', 'danger')
+          util.log.danger('>>>>>> 错误对象 >>>>>>')
+          console.log(err)
+          util.log.danger('>>>>>> 报错 Vue 实例 >>>>>>')
+          console.log(vm)
+          util.log.danger('>>>>>> 错误信息 >>>>>>')
+          console.log(info)
+        }
       })
     }
   }
diff --git a/src/plugin/log/index.js b/src/plugin/log/index.js
new file mode 100644
index 00000000..6d56a13f
--- /dev/null
+++ b/src/plugin/log/index.js
@@ -0,0 +1,16 @@
+import store from '@/store'
+import util from '@/libs/util'
+
+export default {
+  install (Vue, options) {
+    // 快速打印 log
+    Vue.prototype.$log = util.log
+    // 快速记录日志
+    Vue.prototype.$logAdd = function (info) {
+      store.commit('d2adminLogAdd', {
+        type: 'log',
+        info
+      })
+    }
+  }
+}
diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id
index 1fa7ded1..6e8e4a81 100644
--- a/src/router/routes.js.REMOVED.git-id
+++ b/src/router/routes.js.REMOVED.git-id
@@ -1 +1 @@
-51f901f963b0802a69efe93ef5d40b60bcd1a2fd
\ No newline at end of file
+ba57c1878d7069d1c0d9ccfdee2c9497d1303b12
\ No newline at end of file
diff --git a/src/store/modules/d2admin.js.REMOVED.git-id b/src/store/modules/d2admin.js.REMOVED.git-id
index e1ffd471..8ca006ec 100644
--- a/src/store/modules/d2admin.js.REMOVED.git-id
+++ b/src/store/modules/d2admin.js.REMOVED.git-id
@@ -1 +1 @@
-1325e2be4603dde2cf094397e4fca98a542e4ba5
\ No newline at end of file
+d581b883c6d0533c0ae662760c8c665af3a5eec7
\ No newline at end of file

From 374247203c916f1098df3dcacc91f13d9378fcc0 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Thu, 2 Aug 2018 20:16:41 +0800
Subject: [PATCH 07/14] =?UTF-8?q?=E9=A1=B6=E6=A0=8F=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E4=B8=8A=E6=97=A5=E5=BF=97=E6=8C=89=E9=92=AE=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 05466c2afd7cbdf8c90536a589d9da481d04084c [formerly 05466c2afd7cbdf8c90536a589d9da481d04084c [formerly 05466c2afd7cbdf8c90536a589d9da481d04084c [formerly 05466c2afd7cbdf8c90536a589d9da481d04084c [formerly b5eeb276a6288b0a4823459abd31d861e1f2fdfc [formerly 0127cb9480a76f66905cc9f2b17577985c2515c5]]]]]
Former-commit-id: 7ee5d762dad20128318a03854d30f2300a04c596
Former-commit-id: 07f32627ad9c5e4aafd204329284cfba25c3c3c1
Former-commit-id: a5ba8716f43554ceabf1be3e6d0bdffcc27623ed [formerly 0e5b1c3685d92cdf1f56048e4e4463e253677530]
Former-commit-id: 47b8417048b992b065c7bf2b411e0f8a88953158
Former-commit-id: a450a7cbd2f5c979e827c1cfdd741cea6a9f4146
Former-commit-id: df6023b040f9310fa76996ee2f787fd70706f26e
Former-commit-id: b1d4622a7601ea3cb2eae8ac58b61473366c8958
Former-commit-id: c3d6396c4e33b85a29b1583c06377cd5893adb23
---
 .../components/header-error-log/index.vue     | 24 +++++++++++++++++--
 src/store/modules/d2admin.js.REMOVED.git-id   |  2 +-
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/layout/header-aside/components/header-error-log/index.vue b/src/layout/header-aside/components/header-error-log/index.vue
index 7bef5398..d7da5836 100644
--- a/src/layout/header-aside/components/header-error-log/index.vue
+++ b/src/layout/header-aside/components/header-error-log/index.vue
@@ -1,8 +1,14 @@
 <template>
   <div>
-    <el-tooltip effect="dark" content="异常" placement="bottom">
+    <el-tooltip effect="dark" :content="tooltipContent" placement="bottom">
       <el-button class="d2-ml-0 d2-mr btn-text can-hover" type="text" @click="dialogVisible = true">
-        <d2-icon name="bug" style="font-size: 20px"/>
+        <el-badge
+          v-if="d2adminLogLength > 0"
+          :value="d2adminLogErrorLength"
+          :is-dot="d2adminLogErrorLength === 0">
+          <d2-icon name="bug" style="font-size: 20px"/>
+        </el-badge>
+        <d2-icon v-else name="bug" style="font-size: 20px"/>
       </el-button>
     </el-tooltip>
     <el-dialog
@@ -16,11 +22,25 @@
 </template>
 
 <script>
+import { mapGetters } from 'vuex'
 export default {
   data () {
     return {
       dialogVisible: false
     }
+  },
+  computed: {
+    ...mapGetters([
+      'd2adminLogLength',
+      'd2adminLogErrorLength'
+    ]),
+    tooltipContent () {
+      return this.d2adminLogLength === 0 ?
+        '没有日志或异常' :
+        `${this.d2adminLogLength} 条日志${this.d2adminLogErrorLength > 0 ?
+          ` | 包含 ${this.d2adminLogErrorLength} 个异常` :
+          ''}`
+    }
   }
 }
 </script>
diff --git a/src/store/modules/d2admin.js.REMOVED.git-id b/src/store/modules/d2admin.js.REMOVED.git-id
index 8ca006ec..af75f22c 100644
--- a/src/store/modules/d2admin.js.REMOVED.git-id
+++ b/src/store/modules/d2admin.js.REMOVED.git-id
@@ -1 +1 @@
-d581b883c6d0533c0ae662760c8c665af3a5eec7
\ No newline at end of file
+2bac47df865ef744c88006edd9f1302cf50ac230
\ No newline at end of file

From 0b21ec7f7afd5972c49c09cb2d252eac0fdc39cd Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Thu, 2 Aug 2018 20:21:40 +0800
Subject: [PATCH 08/14] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E6=9D=A1=E6=95=B0=E5=88=87=E6=8D=A2=E6=98=BE=E7=A4=BA=E6=95=88?=
 =?UTF-8?q?=E6=9E=9C=EF=BC=8C=E4=BB=A5=E5=8F=8A=E5=9C=A8=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=97=B6=E4=B8=8D=E6=89=93=E5=BC=80=E5=BC=B9?=
 =?UTF-8?q?=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 4c10bcee0f35fd62f9d3ecd34c046d4275150c32 [formerly bf6bd6d8c4275275a2c071d297ef55add44185cd] [formerly 4c10bcee0f35fd62f9d3ecd34c046d4275150c32 [formerly bf6bd6d8c4275275a2c071d297ef55add44185cd] [formerly 4c10bcee0f35fd62f9d3ecd34c046d4275150c32 [formerly bf6bd6d8c4275275a2c071d297ef55add44185cd] [formerly bf6bd6d8c4275275a2c071d297ef55add44185cd [formerly b214ebc7eb637b79f5835464e787b469cb834259 [formerly ae65abb3f765ebc8e4175290f632fedffc1fd7ea]]]]]
Former-commit-id: eb861c588a228b19c655a3144ce85fd484d43e09
Former-commit-id: e4db8fae2ef1f5b777fe04b50de7ca686b1dae00
Former-commit-id: 8e35190ff85e922785898ad7baabf80e04a62bae [formerly 9e0e99c3324c391a2f728641ba8abfd2240816f9]
Former-commit-id: a51027324ccf23238b918de533847a506719d006
Former-commit-id: 7b64d9d213409e27cfb3c2b78fa233392a18c6d6
Former-commit-id: 3b6c6fc83017e92fce1063b77ecc061cb192d9d3
Former-commit-id: 992c8866dd2be0748ee7409789eb2486ec03fde3
Former-commit-id: 267be05da04894b8cdc3a0f16158597cec2ec119
---
 .../components/header-error-log/index.vue           | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/layout/header-aside/components/header-error-log/index.vue b/src/layout/header-aside/components/header-error-log/index.vue
index d7da5836..92bf12cd 100644
--- a/src/layout/header-aside/components/header-error-log/index.vue
+++ b/src/layout/header-aside/components/header-error-log/index.vue
@@ -1,14 +1,14 @@
 <template>
   <div>
     <el-tooltip effect="dark" :content="tooltipContent" placement="bottom">
-      <el-button class="d2-ml-0 d2-mr btn-text can-hover" type="text" @click="dialogVisible = true">
+      <el-button class="d2-ml-0 d2-mr btn-text can-hover" type="text" @click="handleClick">
         <el-badge
           v-if="d2adminLogLength > 0"
           :value="d2adminLogErrorLength"
           :is-dot="d2adminLogErrorLength === 0">
-          <d2-icon name="bug" style="font-size: 20px"/>
+          <d2-icon :name="d2adminLogErrorLength === 0 ? 'dot-circle-o' : 'bug'" style="font-size: 20px"/>
         </el-badge>
-        <d2-icon v-else name="bug" style="font-size: 20px"/>
+        <d2-icon v-else name="dot-circle-o" style="font-size: 20px"/>
       </el-button>
     </el-tooltip>
     <el-dialog
@@ -41,6 +41,13 @@ export default {
           ` | 包含 ${this.d2adminLogErrorLength} 个异常` :
           ''}`
     }
+  },
+  methods: {
+    handleClick () {
+      if (this.d2adminLogLength > 0) {
+        this.dialogVisible = true
+      }
+    }
   }
 }
 </script>

From 3a5a1a4a6b992636e3822ebc3985a2e536e98e40 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Thu, 2 Aug 2018 20:28:50 +0800
Subject: [PATCH 09/14] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 413df45a4d8c1874155d14a829ab973e2bef895d [formerly 413df45a4d8c1874155d14a829ab973e2bef895d [formerly 413df45a4d8c1874155d14a829ab973e2bef895d [formerly 413df45a4d8c1874155d14a829ab973e2bef895d [formerly 06113ad3f1eebcaf8dbbb0ba114e2231fd2b89b6 [formerly fdbbc29ca773dc31b0104d3e136bfd09dd50d35d]]]]]
Former-commit-id: 72dde69d7b7cc2a2159bbc6369cdee400aa3fb6e
Former-commit-id: e48ee6af2fe9fc6c36cbcccdbd2d276d8df5e0f8
Former-commit-id: b047e679f18690225d5724c4752c6d06ed7d404f [formerly 79e62e16d454e6ea8657cd0e4e51c8bcbfa5ba06]
Former-commit-id: a7b5e45c98bca85f709a9cca05d1d40392a44d63
Former-commit-id: 67718f023be9cd2205e56beb8682f8e442e299ef
Former-commit-id: bc7482a6ee5f658c32fc9f0877ec0f3a698b0818
Former-commit-id: e4e83add12288b5d534acacdf4242c80dcde55f7
Former-commit-id: a3746845e5a443ae5dacb0e8a96a9565ca8a11e4
---
 .../components/header-error-log/index.vue     | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/layout/header-aside/components/header-error-log/index.vue b/src/layout/header-aside/components/header-error-log/index.vue
index 92bf12cd..2fd733ee 100644
--- a/src/layout/header-aside/components/header-error-log/index.vue
+++ b/src/layout/header-aside/components/header-error-log/index.vue
@@ -1,14 +1,26 @@
 <template>
   <div>
-    <el-tooltip effect="dark" :content="tooltipContent" placement="bottom">
-      <el-button class="d2-ml-0 d2-mr btn-text can-hover" type="text" @click="handleClick">
+    <el-tooltip
+      effect="dark"
+      :content="tooltipContent"
+      placement="bottom">
+      <el-button
+        class="d2-ml-0 d2-mr btn-text can-hover"
+        type="text"
+        @click="handleClick">
         <el-badge
           v-if="d2adminLogLength > 0"
+          :max="99"
           :value="d2adminLogErrorLength"
           :is-dot="d2adminLogErrorLength === 0">
-          <d2-icon :name="d2adminLogErrorLength === 0 ? 'dot-circle-o' : 'bug'" style="font-size: 20px"/>
+          <d2-icon
+            :name="d2adminLogErrorLength === 0 ? 'dot-circle-o' : 'bug'"
+            style="font-size: 20px"/>
         </el-badge>
-        <d2-icon v-else name="dot-circle-o" style="font-size: 20px"/>
+        <d2-icon
+          v-else
+          name="dot-circle-o"
+          style="font-size: 20px"/>
       </el-button>
     </el-tooltip>
     <el-dialog

From 67d8eb19cd01dfc8c1bfd59388dead5fbd2ee68f Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Thu, 2 Aug 2018 20:29:28 +0800
Subject: [PATCH 10/14] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 62fc5a31e42890d08fdd8b25c4dbeb731f94df97 [formerly 62fc5a31e42890d08fdd8b25c4dbeb731f94df97 [formerly 62fc5a31e42890d08fdd8b25c4dbeb731f94df97 [formerly 62fc5a31e42890d08fdd8b25c4dbeb731f94df97 [formerly d91edf4471a409b10186f680d00e0cb3e9408788 [formerly 9e03f24ff613cb32cd6c9517ddc4704e82249325]]]]]
Former-commit-id: 33d983b8a3d818b162ca201be9f7b1f1830020d9
Former-commit-id: c291c2b450438baf2308f5fa89c16549563d885a
Former-commit-id: bf6c487821e25875b371adcae900cc78629fd82e [formerly 36c30aafa31aad809e7f27442ad2c6ef0b41f713]
Former-commit-id: 46c4c4fb516b5bf7481dd76ea48be796f4d69e96
Former-commit-id: ef1ce888af07de426497e5bb0bc65a0d12881823
Former-commit-id: 85668b3f72a313739106496869e191a74ef1621a
Former-commit-id: 975239c926e2d6235fc62841230e7e436aa4099c
Former-commit-id: 723852d4a15d7e57efcb5df1d911ea2d51e44c50
---
 src/plugin/error/index.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/plugin/error/index.js b/src/plugin/error/index.js
index 094ea867..463a74e7 100644
--- a/src/plugin/error/index.js
+++ b/src/plugin/error/index.js
@@ -11,14 +11,15 @@ export default {
           vm,
           info
         })
+        // 只在开发模式下打印 log
         if (process.env.NODE_ENV === 'development') {
           util.log.capsule('D2Admin', 'ErrorHandler', 'danger')
-          util.log.danger('>>>>>> 错误对象 >>>>>>')
-          console.log(err)
-          util.log.danger('>>>>>> 报错 Vue 实例 >>>>>>')
-          console.log(vm)
           util.log.danger('>>>>>> 错误信息 >>>>>>')
           console.log(info)
+          util.log.danger('>>>>>> Vue 实例 >>>>>>')
+          console.log(vm)
+          util.log.danger('>>>>>> Error >>>>>>')
+          console.log(err)
         }
       })
     }

From 706e11cdbf817eba730506a26d85681c66b348c8 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Thu, 2 Aug 2018 21:30:04 +0800
Subject: [PATCH 11/14] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=88=97=E8=A1=A8=E7=9A=84=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 8b6f707d3e80b2cafe96ac8261cf4c794eecb140 [formerly 8b6f707d3e80b2cafe96ac8261cf4c794eecb140 [formerly 8b6f707d3e80b2cafe96ac8261cf4c794eecb140 [formerly 8b6f707d3e80b2cafe96ac8261cf4c794eecb140 [formerly 92f128b9522afb2b44b35814cb6db205881119d6 [formerly b5da325b3a9e38c3b122033711f6fcb70d0029d9]]]]]
Former-commit-id: 7b104907aab0f536fbedf5c6e1cdf4bd6ca9821d
Former-commit-id: 8456327db3a2336ef1a034512076871fbabdf4b7
Former-commit-id: 09e79b8ed7149d01cb442e1e56cdc0f1eeae25d7 [formerly 7ee40d1348b0c180acdabcc08c215d1a9584e6b0]
Former-commit-id: b4fce00b5c24a12a06ebd7efe2ba0ac7bcaaccc1
Former-commit-id: af25e8b4045cff9224801d6b9025df3a5423459f
Former-commit-id: 346f222a7023fdbb49ed557c0ae82b9753778596
Former-commit-id: 7aa55fa561add5e91076e40f30a5f868cec39365
Former-commit-id: 7b03adf95716035581331854b3b5ffc8752a986b
---
 src/components/d2-error-log-list/index.vue    | 93 +++++++++----------
 .../components/header-error-log/index.vue     |  2 +-
 src/menu/modules/demo-playground.js           |  2 +-
 src/store/modules/d2admin.js.REMOVED.git-id   |  2 +-
 4 files changed, 49 insertions(+), 50 deletions(-)

diff --git a/src/components/d2-error-log-list/index.vue b/src/components/d2-error-log-list/index.vue
index 704232e0..ba4ad8b1 100644
--- a/src/components/d2-error-log-list/index.vue
+++ b/src/components/d2-error-log-list/index.vue
@@ -1,65 +1,64 @@
 <template>
   <el-table
-    :data="tableData5"
+    :data="log"
     style="width: 100%">
-    <el-table-column type="expand">
+    <!-- <el-table-column type="expand">
       <template slot-scope="props">
-        {{props.row}}
+      </template>
+    </el-table-column> -->
+    <el-table-column
+      prop="type"
+      label="类型"
+      width="80px"
+      align="center"
+      :filters="[
+        { text: '日志', value: 'log' },
+        { text: '异常', value: 'error' }
+      ]"
+      :filter-multiple="false"
+      :filter-method="filterType"
+      filter-placement="bottom">
+      <template slot-scope="scope">
+        <el-tag
+          v-if="scope.row.type === 'error'"
+          size="mini"
+          type="danger">
+          <d2-icon name="bug"/> Bug
+        </el-tag>
+        <el-tag
+          v-else
+          size="mini"
+          type="info">
+          <d2-icon name="dot-circle-o"/> Log
+        </el-tag>
       </template>
     </el-table-column>
     <el-table-column
-      label="商品 ID"
-      prop="id">
+      label="info"
+      prop="info">
     </el-table-column>
-    <el-table-column
-      label="商品名称"
-      prop="name">
-    </el-table-column>
-    <el-table-column
-      label="描述"
-      prop="desc">
+    <el-table-column label="err">
+      <template slot-scope="scope">
+        {{scope.row.vm ? scope.row.vm.$vnode.tag : ''}}
+        {{scope.row.err}}
+      </template>
     </el-table-column>
   </el-table>
 </template>
 
 <script>
+import { mapState } from 'vuex'
 export default {
   name: 'd2-error-log-list',
-  data () {
-    return {
-      tableData5: [{
-        id: '12987122',
-        name: '好滋好味鸡蛋仔',
-        category: '江浙小吃、小吃零食',
-        desc: '荷兰优质淡奶，奶香浓而不腻',
-        address: '上海市普陀区真北路',
-        shop: '王小虎夫妻店',
-        shopId: '10333'
-      }, {
-        id: '12987123',
-        name: '好滋好味鸡蛋仔',
-        category: '江浙小吃、小吃零食',
-        desc: '荷兰优质淡奶，奶香浓而不腻',
-        address: '上海市普陀区真北路',
-        shop: '王小虎夫妻店',
-        shopId: '10333'
-      }, {
-        id: '12987125',
-        name: '好滋好味鸡蛋仔',
-        category: '江浙小吃、小吃零食',
-        desc: '荷兰优质淡奶，奶香浓而不腻',
-        address: '上海市普陀区真北路',
-        shop: '王小虎夫妻店',
-        shopId: '10333'
-      }, {
-        id: '12987126',
-        name: '好滋好味鸡蛋仔',
-        category: '江浙小吃、小吃零食',
-        desc: '荷兰优质淡奶，奶香浓而不腻',
-        address: '上海市普陀区真北路',
-        shop: '王小虎夫妻店',
-        shopId: '10333'
-      }]
+  computed: {
+    ...mapState({
+      log: state => state.d2admin.log
+    })
+  },
+  methods: {
+    filterType (value, row) {
+      console.log('value', value)
+      return row.type === value
     }
   }
 }
diff --git a/src/layout/header-aside/components/header-error-log/index.vue b/src/layout/header-aside/components/header-error-log/index.vue
index 2fd733ee..66fcd38d 100644
--- a/src/layout/header-aside/components/header-error-log/index.vue
+++ b/src/layout/header-aside/components/header-error-log/index.vue
@@ -24,7 +24,7 @@
       </el-button>
     </el-tooltip>
     <el-dialog
-      title="异常日志"
+      :title="tooltipContent"
       :fullscreen="true"
       :visible.sync="dialogVisible"
       :append-to-body="true">
diff --git a/src/menu/modules/demo-playground.js b/src/menu/modules/demo-playground.js
index b0b4ed77..2694de35 100644
--- a/src/menu/modules/demo-playground.js
+++ b/src/menu/modules/demo-playground.js
@@ -50,7 +50,7 @@ export default {
       title: '日志',
       icon: 'bullseye',
       children: [
-        { path: `${pre}log/log`, title: '日志记录', icon: 'sticky-note-o' },
+        { path: `${pre}log/log`, title: '日志记录', icon: 'dot-circle-o' },
         { path: `${pre}log/error`, title: '错误捕捉', icon: 'bug' }
       ]
     },
diff --git a/src/store/modules/d2admin.js.REMOVED.git-id b/src/store/modules/d2admin.js.REMOVED.git-id
index af75f22c..5298b777 100644
--- a/src/store/modules/d2admin.js.REMOVED.git-id
+++ b/src/store/modules/d2admin.js.REMOVED.git-id
@@ -1 +1 @@
-2bac47df865ef744c88006edd9f1302cf50ac230
\ No newline at end of file
+b79b9ceae995aa135d5f692a0e14798d496fba0f
\ No newline at end of file

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 12/14] =?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

From 79935b8e98b4dea4fd40e57ec3850cc073de4ee1 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 5 Aug 2018 21:32:13 +0800
Subject: [PATCH 13/14] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?=
 =?UTF-8?q?=E5=92=8C=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: a61f10bc8b6b24328f7e4221128f1921158e2acf [formerly a61f10bc8b6b24328f7e4221128f1921158e2acf [formerly a61f10bc8b6b24328f7e4221128f1921158e2acf [formerly a61f10bc8b6b24328f7e4221128f1921158e2acf [formerly 31cf030ac09457bd774065e437af8e9e0899ea55 [formerly 74c812bc31bec5085868d803efd472fb9ff50ca2]]]]]
Former-commit-id: 8c21b7cbb34e806e5a00d6f2b58b4e33356d62e5
Former-commit-id: ac0de984825b294627e24315d37aa54dcb2956c8
Former-commit-id: bd22f774d9d09b5dd19656f52c286a9e8883d080 [formerly 189d3354075e67db11b6abd750dc6bad278ec670]
Former-commit-id: 8539445287dcc0b1b026ba32316bfe3c9e5173b6
Former-commit-id: 71a393ec7cca8e8c01e0a93fa6ba0f0158ea4f4f
Former-commit-id: b76e8561ad281191b92ca88a9ba70ef477b87bc5
Former-commit-id: e870d1ab3fd69002f8e7b327a0fcd5fa26f4fa6c
Former-commit-id: 5d6b3d844cb94b90a4d33007a4406212bd45e136
---
 src/layout/header-aside/layout.vue          | 1 +
 src/store/modules/d2admin.js.REMOVED.git-id | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/layout/header-aside/layout.vue b/src/layout/header-aside/layout.vue
index d6b053ea..9f672db9 100644
--- a/src/layout/header-aside/layout.vue
+++ b/src/layout/header-aside/layout.vue
@@ -19,6 +19,7 @@
         <d2-menu-header/>
         <!-- 顶栏右侧 -->
         <div class="d2-header-right">
+          <!-- 如果你只想在开发环境显示这个按钮请添加 v-if="$env === 'development'" -->
           <d2-header-error-log/>
           <d2-header-help/>
           <d2-header-fullscreen/>
diff --git a/src/store/modules/d2admin.js.REMOVED.git-id b/src/store/modules/d2admin.js.REMOVED.git-id
index 4b9a2c4d..36758b1c 100644
--- a/src/store/modules/d2admin.js.REMOVED.git-id
+++ b/src/store/modules/d2admin.js.REMOVED.git-id
@@ -1 +1 @@
-7b2790c378426c74689b83621eedf84a4250ff5e
\ No newline at end of file
+4cface6164da68d3cea17037b6b987e26238da22
\ No newline at end of file

From f28718943b6694df603dbcc818f2ef5d03c616c1 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 7 Aug 2018 16:07:05 +0800
Subject: [PATCH 14/14] =?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 9001eac1b65eeaa0bdd4d7f563ebebbd4854c1c5 [formerly 9001eac1b65eeaa0bdd4d7f563ebebbd4854c1c5 [formerly 9001eac1b65eeaa0bdd4d7f563ebebbd4854c1c5 [formerly 9001eac1b65eeaa0bdd4d7f563ebebbd4854c1c5 [formerly 1c2b3829fe2458a1dc678aa3e3e20c069fd186e9 [formerly 87efd77bd6c9e4842534b22a90a3c57f8ad49e15]]]]]
Former-commit-id: 51b7d845391107170b6d6055fae0db9204391cab
Former-commit-id: 16c827f13aeb87f8fcbdf7c667dd60a1681833f4
Former-commit-id: a9589d815008a1c41b625905413582a2225cc811 [formerly 58f118d7086495f51c085ecfe22e046dc25a1703]
Former-commit-id: de173859d5e70870200f9eb02220b0edda9ad6d3
Former-commit-id: ec7d195132cac799568d534473a70ce9e638a21f
Former-commit-id: fb49b3ce0453630207ec44212587c3df209529a2
Former-commit-id: 76d0b5475c8b665fd9eae851ae21e4c102254b2f
Former-commit-id: fb71b68aee8dd0627982ce3c39a91017abda502e
---
 .../components/ExpandItem/index.vue           |  30 ++++
 src/components/d2-error-log-list/index.vue    | 136 ++++++++++++++----
 .../components/contentmenuList/index.vue      |  30 ++--
 .../components/header-error-log/index.vue     |  10 +-
 src/pages/demo/playground/env/index.vue       |   1 -
 src/pages/error-page-404/page.vue             |   2 +-
 src/store/modules/d2admin.js.REMOVED.git-id   |   2 +-
 7 files changed, 158 insertions(+), 53 deletions(-)
 create mode 100644 src/components/d2-error-log-list/components/ExpandItem/index.vue

diff --git a/src/components/d2-error-log-list/components/ExpandItem/index.vue b/src/components/d2-error-log-list/components/ExpandItem/index.vue
new file mode 100644
index 00000000..531b9a24
--- /dev/null
+++ b/src/components/d2-error-log-list/components/ExpandItem/index.vue
@@ -0,0 +1,30 @@
+<template>
+  <div
+    class="d2-error-log-list__expand"
+    :class="className">
+    <p class="d2-error-log-list__expand-title">{{title}}</p>
+    <p class="d2-error-log-list__expand-value">{{value === '' ? '无数据' : value}}</p>
+    <slot/>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    type: {
+      default: 'log'
+    },
+    title: {
+      default: ''
+    },
+    value: {
+      default: ''
+    }
+  },
+  computed: {
+    className () {
+      return this.type === 'log' ? 'd2-error-log-list__expand--log' : 'd2-error-log-list__expand--error'
+    }
+  }
+}
+</script>
diff --git a/src/components/d2-error-log-list/index.vue b/src/components/d2-error-log-list/index.vue
index 438ff7d7..34a93065 100644
--- a/src/components/d2-error-log-list/index.vue
+++ b/src/components/d2-error-log-list/index.vue
@@ -1,17 +1,66 @@
 <template>
   <el-table
-    :data="log"
+    :data="logReverse"
     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>
+      <div slot-scope="props" class="d2-error-log-list__expand-group">
+        <expand-item
+          :type="props.row.type"
+          title="类型"
+          :value="props.row.type === 'log' ? '日志' : '异常'"/>
+        <expand-item
+          :type="props.row.type"
+          title="内容"
+          :value="props.row.info"/>
+        <expand-item
+          v-if="props.row.type === 'error'"
+          type="error"
+          title="报错组件"
+          :value="get(props.row.vm, '$vnode.tag', '')"/>
+        <expand-item
+          v-if="props.row.type === 'error'"
+          type="error"
+          title="错误名称"
+          :value="get(props.row.err, 'name', '')"/>
+        <expand-item
+          v-if="props.row.type === 'error'"
+          type="error"
+          title="错误信息"
+          :value="get(props.row.err, 'message', '')"/>
+        <expand-item
+          v-if="props.row.type === 'error'"
+          type="error"
+          title="错误堆栈"
+          value="见下">
+          <div style="overflow: auto;">
+            <pre>{{stackBeautify(props.row.err)}}</pre>
+          </div>
+        </expand-item>
+        <expand-item
+          :type="props.row.type"
+          title="用户名"
+          :value="get(props.row.user, 'name', '')"/>
+        <expand-item
+          :type="props.row.type"
+          title="uuid"
+          :value="props.row.uuid"/>
+        <expand-item
+          :type="props.row.type"
+          title="token"
+          :value="props.row.token"/>
+        <expand-item
+          :type="props.row.type"
+          title="页面地址"
+          :value="props.row.url"/>
+        <expand-item
+          :type="props.row.type"
+          title="时间"
+          :value="props.row.time"/>
+      </div>
     </el-table-column>
 
     <el-table-column
@@ -50,19 +99,8 @@
     </el-table-column>
 
     <el-table-column
-      label="组件"
-      width="140px"
-      :show-overflow-tooltip="true">
-      <template
-        slot-scope="scope">
-        {{scope.row.vm ? scope.row.vm.$vnode.tag : ''}}
-      </template>
-    </el-table-column>
-
-    <el-table-column
-      label="信息"
+      label="内容"
       prop="info"
-      width="200px"
       :show-overflow-tooltip="true">
     </el-table-column>
 
@@ -72,40 +110,48 @@
       :show-overflow-tooltip="true">
       <template
         slot-scope="scope">
-        {{scope.row.err ? scope.row.err.name : ''}}
+        {{get(scope.row.err, 'name', '')}}
       </template>
     </el-table-column>
 
     <el-table-column
-      label="错误信息">
+      label="错误信息"
+      width="140px">
       <template
         slot-scope="scope">
-        {{scope.row.err ? scope.row.err.message : ''}}
+        {{get(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>
 
 <script>
 import { mapState } from 'vuex'
+import get from 'lodash.get'
+import ExpandItem from './components/ExpandItem'
 export default {
   name: 'd2-error-log-list',
+  components: {
+    ExpandItem
+  },
   computed: {
     ...mapState({
       log: state => state.d2admin.log
-    })
+    }),
+    logReverse () {
+      // 直接 reverse 的话有点问题
+      const res = []
+      const loglength = this.log.length
+      this.log.forEach((log, index) => {
+        res.push(this.log[loglength - 1 - index])
+      })
+      return res
+    }
   },
   methods: {
+    get,
     filterType (value, row) {
-      console.log('value', value)
       return row.type === value
     },
     stackBeautify (err) {
@@ -117,3 +163,33 @@ export default {
   }
 }
 </script>
+
+<style lang="scss">
+@import '~@/assets/style/public.scss';
+.d2-error-log-list__expand-group {
+  .d2-error-log-list__expand {
+    padding-left: 20px;
+    margin-bottom: 10px;
+    &:last-child {
+      margin-bottom: 0px;
+    }
+    .d2-error-log-list__expand-title {
+      font-size: 16px;
+      font-weight: bold;
+      margin-top: 0px;
+      margin-bottom: 10px;
+    }
+    .d2-error-log-list__expand-value {
+      font-size: 12px;
+      margin-top: 0px;
+      margin-bottom: 0px;
+    }
+  }
+  .d2-error-log-list__expand--log {
+    border-left: 4px solid $color-info;
+  }
+  .d2-error-log-list__expand--error {
+    border-left: 4px solid $color-danger;
+  }
+}
+</style>
diff --git a/src/layout/header-aside/components/contextmenu/components/contentmenuList/index.vue b/src/layout/header-aside/components/contextmenu/components/contentmenuList/index.vue
index d3ce5f40..06594cbb 100644
--- a/src/layout/header-aside/components/contextmenu/components/contentmenuList/index.vue
+++ b/src/layout/header-aside/components/contextmenu/components/contentmenuList/index.vue
@@ -21,24 +21,24 @@
 </template>
 
 <script>
-  export default {
-    name: 'd2-contextmenu-list',
-    props: {
-      menulist: {
-        type: Array,
-        default: () => []
-      }
-    },
-    methods: {
-      rowClick (event) {
-        let target = event.target
-        while(!target.dataset.value) {
-          target = target.parentNode
-        }
-        this.$emit('rowClick', target.dataset.value)
+export default {
+  name: 'd2-contextmenu-list',
+  props: {
+    menulist: {
+      type: Array,
+      default: () => []
+    }
+  },
+  methods: {
+    rowClick (event) {
+      let target = event.target
+      while (!target.dataset.value) {
+        target = target.parentNode
       }
+      this.$emit('rowClick', target.dataset.value)
     }
   }
+}
 </script>
 
 <style lang="scss">
diff --git a/src/layout/header-aside/components/header-error-log/index.vue b/src/layout/header-aside/components/header-error-log/index.vue
index 66fcd38d..32b42c25 100644
--- a/src/layout/header-aside/components/header-error-log/index.vue
+++ b/src/layout/header-aside/components/header-error-log/index.vue
@@ -47,11 +47,11 @@ export default {
       'd2adminLogErrorLength'
     ]),
     tooltipContent () {
-      return this.d2adminLogLength === 0 ?
-        '没有日志或异常' :
-        `${this.d2adminLogLength} 条日志${this.d2adminLogErrorLength > 0 ?
-          ` | 包含 ${this.d2adminLogErrorLength} 个异常` :
-          ''}`
+      return this.d2adminLogLength === 0
+        ? '没有日志或异常'
+        : `${this.d2adminLogLength} 条日志${this.d2adminLogErrorLength > 0
+          ? ` | 包含 ${this.d2adminLogErrorLength} 个异常`
+          : ''}`
     }
   },
   methods: {
diff --git a/src/pages/demo/playground/env/index.vue b/src/pages/demo/playground/env/index.vue
index 8ed20ace..1da4ba51 100644
--- a/src/pages/demo/playground/env/index.vue
+++ b/src/pages/demo/playground/env/index.vue
@@ -18,4 +18,3 @@ export default {
   }
 }
 </script>
-
diff --git a/src/pages/error-page-404/page.vue b/src/pages/error-page-404/page.vue
index d8f1215e..a1c7843a 100644
--- a/src/pages/error-page-404/page.vue
+++ b/src/pages/error-page-404/page.vue
@@ -10,7 +10,7 @@
 <style lang="scss" scoped>
 @import '~@/assets/style/public.scss';
 .page-404 {
-  background: linear-gradient(to bottom, rgba(255,255,255,0.15) 0%, rgba(0,0,0,0.15) 100%), radial-gradient(at top center, rgba(255,255,255,0.40) 0%, rgba(0,0,0,0.40) 120%) #989898; 
+  background: linear-gradient(to bottom, rgba(255,255,255,0.15) 0%, rgba(0,0,0,0.15) 100%), radial-gradient(at top center, rgba(255,255,255,0.40) 0%, rgba(0,0,0,0.40) 120%) #989898;
   background-blend-mode: multiply,multiply;
   height: 100%;
   display: flex;
diff --git a/src/store/modules/d2admin.js.REMOVED.git-id b/src/store/modules/d2admin.js.REMOVED.git-id
index 36758b1c..dc92c562 100644
--- a/src/store/modules/d2admin.js.REMOVED.git-id
+++ b/src/store/modules/d2admin.js.REMOVED.git-id
@@ -1 +1 @@
-4cface6164da68d3cea17037b6b987e26238da22
\ No newline at end of file
+082feab1bf6e53d7b8e4b5ec8fc6e0198453af65
\ No newline at end of file