From c0b5a3a6e9d18b5e9ac83c5c6eb343fb5dc5c3a7 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 12 Jun 2018 21:03:53 +0800
Subject: [PATCH] no message

Former-commit-id: a019dcc258de8c00c5fb53de87534a9d829fae6e [formerly a019dcc258de8c00c5fb53de87534a9d829fae6e [formerly a019dcc258de8c00c5fb53de87534a9d829fae6e [formerly a019dcc258de8c00c5fb53de87534a9d829fae6e [formerly 9145b687479e7843f32cf1493f91c5538a5f3ce0 [formerly a95eb746c9464d51413a76e269049d0bbc0334eb]]]]]
Former-commit-id: 1ee0d3a235da1bfe22b747976f4c0e4144e2ac46
Former-commit-id: 7e6a716b1ee023000fb190c3403c3eaf91e87992
Former-commit-id: 680fc5a4daa2889905ecb29ca7c97c82787c964d [formerly c96d049d93c86751f294861c52f43133345b0257]
Former-commit-id: 96f27b06512bf4b594234d24e3af4535cabc4375
Former-commit-id: 469b9e9729b1c48dbeb01e7fe31dec04007b6c29
Former-commit-id: 143dbc8e752096284ffdabe036f3e6c55a6574a8
Former-commit-id: 9a1972de507eb22e931768ed0a0498b6043f3b56
Former-commit-id: 50066a6ba5164e44707132f440d313705e326a23
---
 .../index.vue}                                 |  0
 .../components/-header-right/index.vue         | 18 ------------------
 .../components/-theme.vue => -theme/index.vue} |  0
 .../components/-user.vue => -user/index.vue}   |  0
 src/components/core/d2-layout-main/index.vue   | 11 +++++++++--
 5 files changed, 9 insertions(+), 20 deletions(-)
 rename src/components/core/d2-layout-main/components/{-header-right/components/-full-screen.vue => -full-screen/index.vue} (100%)
 delete mode 100644 src/components/core/d2-layout-main/components/-header-right/index.vue
 rename src/components/core/d2-layout-main/components/{-header-right/components/-theme.vue => -theme/index.vue} (100%)
 rename src/components/core/d2-layout-main/components/{-header-right/components/-user.vue => -user/index.vue} (100%)

diff --git a/src/components/core/d2-layout-main/components/-header-right/components/-full-screen.vue b/src/components/core/d2-layout-main/components/-full-screen/index.vue
similarity index 100%
rename from src/components/core/d2-layout-main/components/-header-right/components/-full-screen.vue
rename to src/components/core/d2-layout-main/components/-full-screen/index.vue
diff --git a/src/components/core/d2-layout-main/components/-header-right/index.vue b/src/components/core/d2-layout-main/components/-header-right/index.vue
deleted file mode 100644
index f62d5b54..00000000
--- a/src/components/core/d2-layout-main/components/-header-right/index.vue
+++ /dev/null
@@ -1,18 +0,0 @@
-<template>
-  <div class="d2-header-right">
-    <d2-layout-main-header-right-full-screen/>
-    <d2-layout-main-header-right-theme/>
-    <d2-layout-main-header-right-user/>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'd2-layout-main-header-right',
-  components: {
-    'd2-layout-main-header-right-full-screen': () => import('./components/-full-screen.vue'),
-    'd2-layout-main-header-right-theme': () => import('./components/-theme.vue'),
-    'd2-layout-main-header-right-user': () => import('./components/-user.vue')
-  }
-}
-</script>
diff --git a/src/components/core/d2-layout-main/components/-header-right/components/-theme.vue b/src/components/core/d2-layout-main/components/-theme/index.vue
similarity index 100%
rename from src/components/core/d2-layout-main/components/-header-right/components/-theme.vue
rename to src/components/core/d2-layout-main/components/-theme/index.vue
diff --git a/src/components/core/d2-layout-main/components/-header-right/components/-user.vue b/src/components/core/d2-layout-main/components/-user/index.vue
similarity index 100%
rename from src/components/core/d2-layout-main/components/-header-right/components/-user.vue
rename to src/components/core/d2-layout-main/components/-user/index.vue
diff --git a/src/components/core/d2-layout-main/index.vue b/src/components/core/d2-layout-main/index.vue
index 64428a42..0f8cda4e 100644
--- a/src/components/core/d2-layout-main/index.vue
+++ b/src/components/core/d2-layout-main/index.vue
@@ -10,7 +10,11 @@
         <d2-icon name="bars"/>
       </div>
       <d2-layout-main-header-menu/>
-      <d2-layout-main-header-right/>
+      <div class="d2-header-right">
+        <d2-layout-main-header-right-full-screen/>
+        <d2-layout-main-header-right-theme/>
+        <d2-layout-main-header-right-user/>
+      </div>
     </el-header>
     <!-- 下面 主体 -->
     <el-container>
@@ -35,7 +39,10 @@ export default {
   components: {
     'd2-layout-main-menu-side': () => import('./components/-menu-side'),
     'd2-layout-main-header-menu': () => import('./components/-header-menu'),
-    'd2-layout-main-header-right': () => import('./components/-header-right')
+    'd2-layout-main-header-right': () => import('./components/-header-right'),
+    'd2-layout-main-header-right-full-screen': () => import('./components/-full-screen'),
+    'd2-layout-main-header-right-theme': () => import('./components/-theme'),
+    'd2-layout-main-header-right-user': () => import('./components/-user')
   },
   data () {
     return {