Merge branch 'feature/error-collection' into develop

# Conflicts:
#	src/layout/header-aside/components/contextmenu/components/contentmenuList/index.vue


Former-commit-id: a16df8b09110f3deec7c33dae7aed5599b8c3862 [formerly 5c7bca544286ef7a358983d233e9896b2ca6da7a] [formerly a16df8b09110f3deec7c33dae7aed5599b8c3862 [formerly 5c7bca544286ef7a358983d233e9896b2ca6da7a] [formerly a16df8b09110f3deec7c33dae7aed5599b8c3862 [formerly 5c7bca544286ef7a358983d233e9896b2ca6da7a] [formerly 5c7bca544286ef7a358983d233e9896b2ca6da7a [formerly 1f27799438509890c390866f6a08350b69784203 [formerly 56c0f3b550c89c0d0b9e363e157533c1e88b1b8a]]]]]
Former-commit-id: 8a1b5fba72c1e99b10e3051ace49ff669e195b11
Former-commit-id: 658e36a5af1185c8ab28c37824d4b7f8439ae71a
Former-commit-id: 3e0ae29967cd9cd24d183ec4efd5ed5f820917e9 [formerly 0d1450a0f05f903a57ede770c1dc3a9e0ec710d2]
Former-commit-id: 8a6020f844a854d6e4765e53c9477a9eabf061d1
Former-commit-id: 0dff2e0795f8025ca961e18b1c2fcd65dc9e3bc3
Former-commit-id: 02294aee8f5ae27ece66ff3dabf27a65258e1f3c
Former-commit-id: a66c0fe86850814ca44800db473687ec3f4705b2
Former-commit-id: 75ec5153bc6a9227404abda6b88f74355289ac85

src/layout/header-aside/components/contextmenu/components/contentmenuList/index.vue

@@ -32,17 +32,10 @@ export default {
   methods: {
     rowClick (event) {
       let target = event.target
-      try {
-        let count = 0
-        while (!target.dataset.value && count < 6) {
-          target = target.parentNode
-          count++
-        }
-        this.$emit('rowClick', target.dataset.value)
-      } catch (error) {
-        // 不做任何处理
-        console.log(error)
+      while (!target.dataset.value) {
+        target = target.parentNode
       }
+      this.$emit('rowClick', target.dataset.value)
     }
   }
 }

src/layout/header-aside/components/header-error-log/index.vue

@@ -0,0 +1,65 @@
+<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-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"/>
+        </el-badge>
+        <d2-icon
+          v-else
+          name="dot-circle-o"
+          style="font-size: 20px"/>
+      </el-button>
+    </el-tooltip>
+    <el-dialog
+      :title="tooltipContent"
+      :fullscreen="true"
+      :visible.sync="dialogVisible"
+      :append-to-body="true">
+      <d2-error-log-list/>
+    </el-dialog>
+  </div>
+</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} 个异常`
+          : ''}`
+    }
+  },
+  methods: {
+    handleClick () {
+      if (this.d2adminLogLength > 0) {
+        this.dialogVisible = true
+      }
+    }
+  }
+}
+</script>

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')">

src/layout/header-aside/layout.vue

@@ -19,6 +19,8 @@
         <d2-menu-header/>
         <!-- 顶栏右侧 -->
         <div class="d2-header-right">
+          <!-- 如果你只想在开发环境显示这个按钮请添加 v-if="$env === 'development'" -->
+          <d2-header-error-log/>
           <d2-header-help/>
           <d2-header-fullscreen/>
           <d2-header-theme/>
@@ -55,23 +57,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 {