From 2d17d09d61a99e9a6852490e897ca144cff97e9d Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Wed, 22 Aug 2018 11:12:52 +0800
Subject: [PATCH] =?UTF-8?q?D2ErrorLogList=20=E6=94=BE=E5=9C=A8=E4=BA=86=20?=
 =?UTF-8?q?layout=20=E6=96=87=E4=BB=B6=E5=A4=B9=E5=86=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: e7c5073e750de6659873bf827575e67d60fda6cc [formerly e7c5073e750de6659873bf827575e67d60fda6cc [formerly e7c5073e750de6659873bf827575e67d60fda6cc [formerly e7c5073e750de6659873bf827575e67d60fda6cc [formerly 73408af989e90a4f3fb9d7dcf87115d115784a85 [formerly 25c75956a932431724fc33b1076e72edd3bad64a]]]]]
Former-commit-id: efb244c3b1729ce3ce80fefcc2116b5682c544f8
Former-commit-id: 33cbec8cac3b464ba50691a0301816a14c92c507
Former-commit-id: 0d402138f2324a28d52f685049c3299197c2292d [formerly 715be3a1af8c720d3102a7556dd709dbb106f102]
Former-commit-id: 574cfa22abbb883db5a1bb9d83abbb59ccc15d21
Former-commit-id: 0f2ed4796206d30f827600b14603972a9a6db594
Former-commit-id: 1d1543d63a76cff518a8a6122b489395c5de8052
Former-commit-id: 10202d438c9adfa300ba3603895bab17f17d2372
Former-commit-id: 5a4bc16655a86dabed9a235699ed945466895032
---
 src/components/index.js                        |  9 ---------
 .../list}/components/ExpandItem/index.vue      |  0
 .../components/list}/index.vue                 |  0
 .../components/header-error-log/index.vue      |  4 ++++
 src/main.js                                    | 18 ++++++++++++++----
 5 files changed, 18 insertions(+), 13 deletions(-)
 rename src/{components/d2-error-log-list => layout/header-aside/components/header-error-log/components/list}/components/ExpandItem/index.vue (100%)
 rename src/{components/d2-error-log-list => layout/header-aside/components/header-error-log/components/list}/index.vue (100%)

diff --git a/src/components/index.js b/src/components/index.js
index 375d7c67..d75f9e55 100644
--- a/src/components/index.js
+++ b/src/components/index.js
@@ -1,22 +1,13 @@
 import Vue from 'vue'
 
-import { GridLayout, GridItem } from 'vue-grid-layout'
-import SplitPane from 'vue-splitpane'
-
 import d2Container from './d2-container'
 import d2LinkBtn from './d2-link-btn'
 
 // 注意 有些组件使用异步加载会有影响
-
-Vue.component('d2-grid-layout', GridLayout)
-Vue.component('d2-grid-item', GridItem)
-Vue.component('SplitPane', SplitPane)
-
 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-help', () => import('./d2-help'))
 Vue.component('d2-highlight', () => import('./d2-highlight'))
 Vue.component('d2-icon', () => import('./d2-icon'))
diff --git a/src/components/d2-error-log-list/components/ExpandItem/index.vue b/src/layout/header-aside/components/header-error-log/components/list/components/ExpandItem/index.vue
similarity index 100%
rename from src/components/d2-error-log-list/components/ExpandItem/index.vue
rename to src/layout/header-aside/components/header-error-log/components/list/components/ExpandItem/index.vue
diff --git a/src/components/d2-error-log-list/index.vue b/src/layout/header-aside/components/header-error-log/components/list/index.vue
similarity index 100%
rename from src/components/d2-error-log-list/index.vue
rename to src/layout/header-aside/components/header-error-log/components/list/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
index 563e3be6..960c9bd2 100644
--- a/src/layout/header-aside/components/header-error-log/index.vue
+++ b/src/layout/header-aside/components/header-error-log/index.vue
@@ -41,7 +41,11 @@
 
 <script>
 import { mapGetters, mapMutations } from 'vuex'
+import D2ErrorLogList from './components/list'
 export default {
+  components: {
+    D2ErrorLogList
+  },
   data () {
     return {
       dialogVisible: false
diff --git a/src/main.js b/src/main.js
index 783ccf33..39402fd6 100644
--- a/src/main.js
+++ b/src/main.js
@@ -11,13 +11,19 @@ import '@/mock'
 import i18n from './i18n'
 // 核心插件
 import d2Admin from '@/plugin/d2admin'
-// [ 可选第三方插件 ] 图表
+
+// [ 可选插件组件 ] 图表
 import VCharts from 'v-charts'
-// [ 可选第三方插件 ] 右键菜单
+// [ 可选插件组件 ] 右键菜单
 import contentmenu from 'v-contextmenu'
 import 'v-contextmenu/dist/index.css'
-// [ 可选第三方插件 ] JSON 树状视图
+// [ 可选插件组件 ] JSON 树状视图
 import vueJsonTreeView from 'vue-json-tree-view'
+// [ 可选插件组件 ] 网格布局组件
+import { GridLayout, GridItem } from 'vue-grid-layout'
+// [ 可选插件组件 ] 区域划分组件
+import SplitPane from 'vue-splitpane'
+
 // 菜单和路由设置
 import router from './router'
 import { menuHeader, menuAside } from '@/menu'
@@ -25,10 +31,14 @@ import { frameInRoutes } from '@/router/routes'
 
 // 核心插件
 Vue.use(d2Admin)
-// 可选第三方插件
+
+// 可选插件组件
 Vue.use(VCharts)
 Vue.use(contentmenu)
 Vue.use(vueJsonTreeView)
+Vue.component('d2-grid-layout', GridLayout)
+Vue.component('d2-grid-item', GridItem)
+Vue.component('SplitPane', SplitPane)
 
 new Vue({
   router,