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] =?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