From ca108f726c3a7e1df7fa3befdaf968802f24b876 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Fri, 15 Jun 2018 21:01:26 +0800
Subject: [PATCH 1/5] no message

Former-commit-id: fd4c157c24a3333d4f4a53d25faafc1657e6493a [formerly fd4c157c24a3333d4f4a53d25faafc1657e6493a [formerly fd4c157c24a3333d4f4a53d25faafc1657e6493a [formerly fd4c157c24a3333d4f4a53d25faafc1657e6493a [formerly 27ca102560b6cd814fb46dfb1cbb6c2999bc2f77 [formerly e57449d64d66fdb544fcfd72ecb37dc4d2a0bd81]]]]]
Former-commit-id: dbb8e66e92c0648cdd85311bd9b0dcf167d2afb8
Former-commit-id: c30a3f0328fc625465a650c3407e7c6f315f065d
Former-commit-id: 14282d9e0e66742a9e3798fe700388b17740d888 [formerly fadf80358f3ba7b22c9f5c89772b26a6de63dae1]
Former-commit-id: 6f69f62f771964fc20b2d881830e76a2d94634f0
Former-commit-id: bc84a6f027fd36454b46944b708c2af924f4364d
Former-commit-id: 3c3923b68cbea225df5a9719f2655ae51d470c1b
Former-commit-id: ee5169fda2478d40a90c714effcfa197ca209be6
Former-commit-id: 0703f60f4588cb54aa708070c03dd1e84ed24ca3
---
 docs/.vuepress/config.js            |  3 +--
 docs/zh/components/locally-valid.md | 19 -------------------
 2 files changed, 1 insertion(+), 21 deletions(-)
 delete mode 100644 docs/zh/components/locally-valid.md

diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js
index d04bed04..51845e3e 100644
--- a/docs/.vuepress/config.js
+++ b/docs/.vuepress/config.js
@@ -87,8 +87,7 @@ function sideBarComponents (title) {
         'icon-select',
         'icon-svg',
         'icon',
-        'markdown',
-        'locally-valid'
+        'markdown'
       ]
     }
   ]
diff --git a/docs/zh/components/locally-valid.md b/docs/zh/components/locally-valid.md
deleted file mode 100644
index f5980fa9..00000000
--- a/docs/zh/components/locally-valid.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# 局部组件
-
-局部组件是指在某个组件内注册的组件，它一般只在一个地方用到，全局无法访问
-
-## D2MenuItem
-
-::: tip 出现位置
-src/components/core/MainLayout/components/SideMenu/index.vue
-:::
-
-该组件会根据数据渲染 `<el-menu-item>`
-
-## D2Submenu
-
-::: tip 出现位置
-src/components/core/MainLayout/components/SideMenu/index.vue
-:::
-
-该组件会根据数据渲染 `<el-submenu>` 结构，并且在 `<el-submenu>` 中再次根据数据类型递归自身，最终生成 elementUI 的菜单组件结构，支持嵌套多级
\ No newline at end of file

From dbfe3f44d17bbfcc3c9b4b0fa5a332fca1f1f6dc Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Fri, 15 Jun 2018 22:33:30 +0800
Subject: [PATCH 2/5] no message

Former-commit-id: 7ce8731c3fbff1358a20072bfc4a311d074bbce1 [formerly e53795bf2c527ec4db52c2dcc4ddb4113b3bae04] [formerly 7ce8731c3fbff1358a20072bfc4a311d074bbce1 [formerly e53795bf2c527ec4db52c2dcc4ddb4113b3bae04] [formerly 7ce8731c3fbff1358a20072bfc4a311d074bbce1 [formerly e53795bf2c527ec4db52c2dcc4ddb4113b3bae04] [formerly e53795bf2c527ec4db52c2dcc4ddb4113b3bae04 [formerly 4a11be2c1e1dafaf1e47609aea474ed3d14ed168 [formerly cd00a1ff152b52a8b6140db354ee5162eb16b5c8]]]]]
Former-commit-id: acd23291774316c164d08701e2d47d82b9861d0b
Former-commit-id: dfcb0b86d1606d3b1ea015d3b1d9a4a14c7ebc3c
Former-commit-id: d2e0e01ee2ad509ee6eaeb21f39862046cc6298b [formerly f3891c3d17c26fe132a23460cb9237c7e05b1a78]
Former-commit-id: 70659ffa8b445c27dc99ab22546c49de9d01d6f0
Former-commit-id: 7246206ca668fe7aabe15f348f50abd07e0b30dc
Former-commit-id: 3155efaec47f066c8ddd14be1581b4c0fbacb376
Former-commit-id: d28c005035cf6986b20f7c4c934ec4a5964b180b
Former-commit-id: 3f33b8a0b166c1abab566613d7c4dde453c2121a
---
 src/assets/style/theme/theme.scss            | 22 ++++++-
 src/components/core/d2-layout-main/index.vue | 65 ++++++++++----------
 2 files changed, 53 insertions(+), 34 deletions(-)

diff --git a/src/assets/style/theme/theme.scss b/src/assets/style/theme/theme.scss
index ac7fc46a..21cfa499 100644
--- a/src/assets/style/theme/theme.scss
+++ b/src/assets/style/theme/theme.scss
@@ -1,10 +1,26 @@
-// 主题公用
-.layout-main {
+.layout-main-group {
   height: 100vh;
   width: 100vw;
   background-size: cover;
   background-position: center;
   position: relative;
+  .layout-main-mask {
+    position: absolute;
+    top: 0px;
+    right: 0px;
+    bottom: 0px;
+    left: 0px;
+    background-color: rgba(#000, .3);
+  }
+}
+
+// 主题公用
+.layout-main {
+  position: absolute;
+  top: 0px;
+  right: 0px;
+  bottom: 0px;
+  left: 0px;
   // [布局] 顶栏
   .el-header {
     padding: 0px;
@@ -168,7 +184,7 @@
 
 .theme-#{$theme-name} {
 
-  .layout-main {
+  .layout-main-group {
     background-color: $theme-bg-color;
     background-image: $theme-bg-image;
   }
diff --git a/src/components/core/d2-layout-main/index.vue b/src/components/core/d2-layout-main/index.vue
index 089e8fcf..05bb5c62 100644
--- a/src/components/core/d2-layout-main/index.vue
+++ b/src/components/core/d2-layout-main/index.vue
@@ -1,36 +1,39 @@
 <template>
-  <el-container class="layout-main">
-    <!-- 顶栏 -->
-    <el-header>
-      <div class="logo-group" :style="{width: collapse ? asideWidthCollapse : asideWidth}">
-        <img v-if="collapse" :src="`/static/image/theme/${themeName}/logo/icon-only.png`">
-        <img v-else :src="`/static/image/theme/${themeName}/logo/all.png`">
-      </div>
-      <div class="toggle-aside-btn" @click="collapse = !collapse">
-        <d2-icon name="bars"/>
-      </div>
-      <d2-layout-main-header-menu/>
-      <!-- 顶栏右侧 -->
-      <div class="d2-header-right">
-        <d2-layout-main-header-full-screen/>
-        <d2-layout-main-header-theme/>
-        <d2-layout-main-header-user/>
-      </div>
-    </el-header>
-    <!-- 下面 主体 -->
-    <el-container>
-      <!-- 主体 侧边栏 -->
-      <el-aside ref="aside" :style="{width: collapse ? asideWidthCollapse : asideWidth}">
-        <d2-layout-main-menu-side :collapse="collapse"/>
-      </el-aside>
-      <!-- 主体 -->
-      <el-main>
-        <transition name="fade-transverse">
-          <router-view/>
-        </transition>
-      </el-main>
+  <div class="layout-main-group">
+    <div class="layout-main-mask"></div>
+    <el-container class="layout-main">
+      <!-- 顶栏 -->
+      <el-header>
+        <div class="logo-group" :style="{width: collapse ? asideWidthCollapse : asideWidth}">
+          <img v-if="collapse" :src="`/static/image/theme/${themeName}/logo/icon-only.png`">
+          <img v-else :src="`/static/image/theme/${themeName}/logo/all.png`">
+        </div>
+        <div class="toggle-aside-btn" @click="collapse = !collapse">
+          <d2-icon name="bars"/>
+        </div>
+        <d2-layout-main-header-menu/>
+        <!-- 顶栏右侧 -->
+        <div class="d2-header-right">
+          <d2-layout-main-header-full-screen/>
+          <d2-layout-main-header-theme/>
+          <d2-layout-main-header-user/>
+        </div>
+      </el-header>
+      <!-- 下面 主体 -->
+      <el-container>
+        <!-- 主体 侧边栏 -->
+        <el-aside ref="aside" :style="{width: collapse ? asideWidthCollapse : asideWidth}">
+          <d2-layout-main-menu-side :collapse="collapse"/>
+        </el-aside>
+        <!-- 主体 -->
+        <el-main>
+          <transition name="fade-transverse">
+            <router-view/>
+          </transition>
+        </el-main>
+      </el-container>
     </el-container>
-  </el-container>
+  </div>
 </template>
 
 <script>

From fc3536eb2722000e8957733337f24884b7f6381e Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Fri, 15 Jun 2018 22:40:01 +0800
Subject: [PATCH 3/5] no message

Former-commit-id: 7027cff0d07eb6e8500ce4812ca96668b4bdfc2f [formerly 7027cff0d07eb6e8500ce4812ca96668b4bdfc2f [formerly 7027cff0d07eb6e8500ce4812ca96668b4bdfc2f [formerly 7027cff0d07eb6e8500ce4812ca96668b4bdfc2f [formerly 053227b1dd275eaf51ec88490e169565c7be9ca8 [formerly ad41b73e168c840d22ecbc83653631f8705d52cf]]]]]
Former-commit-id: 818a788f3e46f07a5cab88bceb8aa3de302e3372
Former-commit-id: 3c2f81e69fb3029131f1d562d1c31d8bff7baf4b
Former-commit-id: 64505b817685514db8f72a39fde457620f518efe [formerly 772c6245b228cb833f61a21935571ad1c4caea11]
Former-commit-id: 2f6ed75df5d2944290b81e5ebd7f89f262df1930
Former-commit-id: 58799ead13d249a4c2e1db9273fca1b4cab2de8c
Former-commit-id: 3257aa89aefd9f65985259e213cb9ad61a38692b
Former-commit-id: 1cc9384582ffb9813cbe7a0ea3113c6229853131
Former-commit-id: d44e198a52d2f629631cc1ea2ea0370715d4aa6c
---
 src/assets/style/theme/theme.scss | 307 +++++++++++++++---------------
 1 file changed, 154 insertions(+), 153 deletions(-)

diff --git a/src/assets/style/theme/theme.scss b/src/assets/style/theme/theme.scss
index 21cfa499..a9087e33 100644
--- a/src/assets/style/theme/theme.scss
+++ b/src/assets/style/theme/theme.scss
@@ -1,9 +1,11 @@
+// 主题公用
 .layout-main-group {
-  height: 100vh;
-  width: 100vw;
+  height: 100%;
+  width: 100%;
   background-size: cover;
   background-position: center;
   position: relative;
+  // 背景上面的半透明遮罩
   .layout-main-mask {
     position: absolute;
     top: 0px;
@@ -12,170 +14,169 @@
     left: 0px;
     background-color: rgba(#000, .3);
   }
-}
-
-// 主题公用
-.layout-main {
-  position: absolute;
-  top: 0px;
-  right: 0px;
-  bottom: 0px;
-  left: 0px;
-  // [布局] 顶栏
-  .el-header {
-    padding: 0px;
-    // logo区域
-    .logo-group {
-      transition: width .3s;
-      float: left;
-      text-align: center;
-      img {
+  // 主体
+  .layout-main {
+    position: absolute;
+    top: 0px;
+    right: 0px;
+    bottom: 0px;
+    left: 0px;
+    // [布局] 顶栏
+    .el-header {
+      padding: 0px;
+      // logo区域
+      .logo-group {
+        transition: width .3s;
+        float: left;
+        text-align: center;
+        img {
+          height: 60px;
+        }
+      }
+      // 折叠侧边栏切换按钮
+      .toggle-aside-btn {
+        float: left;
         height: 60px;
-      }
-    }
-    // 折叠侧边栏切换按钮
-    .toggle-aside-btn {
-      float: left;
-      height: 60px;
-      width: 60px;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      @extend %unable-select;
-      i {
-        font-size: 20px;
-        margin-top: 4px;
-      }
-    }
-    // [菜单] 顶栏
-    .el-menu {
-      float: left;
-      border-bottom: none;
-      background-color: transparent;
-      .el-menu-item {
-        @extend %unable-select;
-        border-bottom: none;
-      }
-      .el-submenu {
-        @extend %unable-select;
-        .el-submenu__title {
-          border-bottom: none;
-        }
-      }
-    }
-    // 顶栏右侧的按钮
-    .d2-header-right {
-      float: right;
-      height: 60px;
-      display: flex;
-      align-items: center;
-      .btn-text {
-        padding: 14px 12px;
-        border-radius: 4px;
-        margin: 0px !important;
-        margin-left: 10px !important;
-      }
-      .el-dropdown {
-        @extend %unable-select;
-      }
-    }
-  }
-  // [布局] 顶栏下面
-  .el-container {
-    // 侧边栏
-    .el-aside {
-      transition: width .3s;
-      overflow: auto;
-      // [菜单] 正常状态
-      .el-menu {
-        @extend %unable-select;
-        background-color: transparent;
-        border-right: none;
-        .el-menu-item {
-          i {
-            margin-right: 5px;
-            font-size: 20px;
-          }
-        }
-      }
-      .el-submenu {
-        @extend %unable-select;
-        .el-submenu__title {
-          i {
-            margin-right: 5px;
-            font-size: 20px;
-          }
-          .el-submenu__icon-arrow {
-            margin-top: -10px;
-          }
-        }
-      }
-      // 菜单为空的时候显示的信息
-      .menu-empty {
-        height: 160px;
-        margin: 10px;
-        margin-top: 0px;
-        border-radius: 4px;
+        width: 60px;
         display: flex;
         justify-content: center;
         align-items: center;
-        flex-direction: column;
         @extend %unable-select;
         i {
-          font-size: 30px;
-          margin-bottom: 10px;
-        }
-        span {
-          font-size: 14px;
+          font-size: 20px;
+          margin-top: 4px;
         }
       }
-      // [菜单] 折叠状态
-      .el-menu--collapse {
+      // [菜单] 顶栏
+      .el-menu {
+        float: left;
+        border-bottom: none;
         background-color: transparent;
-        .el-submenu__title {
-          text-align: center;
+        .el-menu-item {
+          @extend %unable-select;
+          border-bottom: none;
+        }
+        .el-submenu {
+          @extend %unable-select;
+          .el-submenu__title {
+            border-bottom: none;
+          }
+        }
+      }
+      // 顶栏右侧的按钮
+      .d2-header-right {
+        float: right;
+        height: 60px;
+        display: flex;
+        align-items: center;
+        .btn-text {
+          padding: 14px 12px;
+          border-radius: 4px;
+          margin: 0px !important;
+          margin-left: 10px !important;
+        }
+        .el-dropdown {
+          @extend %unable-select;
         }
       }
     }
-    .el-main {
-      padding: 0px;
-      position: relative;
+    // [布局] 顶栏下面
+    .el-container {
+      // 侧边栏
+      .el-aside {
+        transition: width .3s;
+        overflow: auto;
+        // [菜单] 正常状态
+        .el-menu {
+          @extend %unable-select;
+          background-color: transparent;
+          border-right: none;
+          .el-menu-item {
+            i {
+              margin-right: 5px;
+              font-size: 20px;
+            }
+          }
+        }
+        .el-submenu {
+          @extend %unable-select;
+          .el-submenu__title {
+            i {
+              margin-right: 5px;
+              font-size: 20px;
+            }
+            .el-submenu__icon-arrow {
+              margin-top: -10px;
+            }
+          }
+        }
+        // 菜单为空的时候显示的信息
+        .menu-empty {
+          height: 160px;
+          margin: 10px;
+          margin-top: 0px;
+          border-radius: 4px;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          flex-direction: column;
+          @extend %unable-select;
+          i {
+            font-size: 30px;
+            margin-bottom: 10px;
+          }
+          span {
+            font-size: 14px;
+          }
+        }
+        // [菜单] 折叠状态
+        .el-menu--collapse {
+          background-color: transparent;
+          .el-submenu__title {
+            text-align: center;
+          }
+        }
+      }
+      .el-main {
+        padding: 0px;
+        position: relative;
+        overflow: hidden;
+      }
+    }
+    // [组件] d2-container-full
+    .d2-container-full {
+      position: absolute;
+      border-top-left-radius: 4px;
+      border-top-right-radius: 4px;
       overflow: hidden;
-    }
-  }
-  // [组件] d2-container-full
-  .d2-container-full {
-    position: absolute;
-    border-top-left-radius: 4px;
-    border-top-right-radius: 4px;
-    overflow: hidden;
-    color: #303133;
-    &:hover {
-      box-shadow: none;
-    }
-    .d2-container-full__header {
-      position: absolute;
-      top: 0px;
-      left: 0px;
-      width: 100%;
-      padding: 18px 20px;
-      box-sizing: border-box;
-    }
-    .d2-container-full__body {
-      position: absolute;
-      padding: 20px;
-      left: 0px;
-      right: 0px;
-      bottom: 0px;
-      overflow: auto;
-    }
-    .d2-container-full__footer {
-      position: absolute;
-      bottom: 0px;
-      left: 0px;
-      width: 100%;
-      padding: 18px 20px;
-      box-sizing: border-box;
+      color: #303133;
+      &:hover {
+        box-shadow: none;
+      }
+      .d2-container-full__header {
+        position: absolute;
+        top: 0px;
+        left: 0px;
+        width: 100%;
+        padding: 18px 20px;
+        box-sizing: border-box;
+      }
+      .d2-container-full__body {
+        position: absolute;
+        padding: 20px;
+        left: 0px;
+        right: 0px;
+        bottom: 0px;
+        overflow: auto;
+      }
+      .d2-container-full__footer {
+        position: absolute;
+        bottom: 0px;
+        left: 0px;
+        width: 100%;
+        padding: 18px 20px;
+        box-sizing: border-box;
+      }
     }
   }
 }

From 882411293badf45bab953e5d0041f2242fc5077f Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Fri, 15 Jun 2018 22:49:03 +0800
Subject: [PATCH 4/5] no message

Former-commit-id: 76806845c40e10aa0a2ab0796c782a99ab8a4b44 [formerly 3a77952a75d9a257a1b40befdfa5d52ebccd2fc0] [formerly 76806845c40e10aa0a2ab0796c782a99ab8a4b44 [formerly 3a77952a75d9a257a1b40befdfa5d52ebccd2fc0] [formerly 76806845c40e10aa0a2ab0796c782a99ab8a4b44 [formerly 3a77952a75d9a257a1b40befdfa5d52ebccd2fc0] [formerly 3a77952a75d9a257a1b40befdfa5d52ebccd2fc0 [formerly 4883743b90443196942de10c1c9bf3c8dd50d5e8 [formerly 6d1f870637fa1e2b0e37389893b0c1b9f424ef3a]]]]]
Former-commit-id: d0349d72df65db504a5d91e27b9b924f1d93bb09
Former-commit-id: 33cab27531ad14cd435418e9db30840f278b9435
Former-commit-id: 700c39ffcd7fc1edc0dd8faa515cdf765e685069 [formerly 395d83db93d411e9b985cbabbb943b8b12751631]
Former-commit-id: 2a4e5491304fb94e68d8bb650cc38485bfe80eb3
Former-commit-id: acccf1da2e86a4f96b32034a86ca90a7d6a0d68f
Former-commit-id: e0a8b6b17c40b2d24d877e7ccb9cd678f578c068
Former-commit-id: cba434c6926224844e3e5497db251b3cf0a3f0ed
Former-commit-id: 994c026387cda23614ec017c0eb9292ee78b2c94
---
 src/assets/style/theme/d2/setting.scss                  | 2 ++
 src/assets/style/theme/line/setting.scss                | 2 ++
 src/assets/style/theme/star/setting.scss                | 2 ++
 src/assets/style/theme/theme.scss                       | 4 +++-
 src/assets/style/theme/tomorrow-night-blue/setting.scss | 2 ++
 5 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/assets/style/theme/d2/setting.scss b/src/assets/style/theme/d2/setting.scss
index 92b1718a..e9cc35e4 100644
--- a/src/assets/style/theme/d2/setting.scss
+++ b/src/assets/style/theme/d2/setting.scss
@@ -4,6 +4,8 @@ $theme-name: 'd2';
 $theme-bg-color: #f8f8f9;
 // 主题背景图片
 $theme-bg-image: none;
+// 主题背景图片遮罩
+$theme-bg-mask: rgba(#000, 0);
 
 // container组件
 $theme-container-background-color: rgba(#FFF, 1);
diff --git a/src/assets/style/theme/line/setting.scss b/src/assets/style/theme/line/setting.scss
index 26cfec94..e995f543 100644
--- a/src/assets/style/theme/line/setting.scss
+++ b/src/assets/style/theme/line/setting.scss
@@ -4,6 +4,8 @@ $theme-name: 'line';
 $theme-bg-color: #f8f8f9;
 // 主题背景图片
 $theme-bg-image: url('/static/image/bg/line-squashed.jpg');
+// 主题背景图片遮罩
+$theme-bg-mask: rgba(#000, 0);
 
 // container组件
 $theme-container-background-color: rgba(#FFF, .8);
diff --git a/src/assets/style/theme/star/setting.scss b/src/assets/style/theme/star/setting.scss
index ece6c2c0..b2f69439 100644
--- a/src/assets/style/theme/star/setting.scss
+++ b/src/assets/style/theme/star/setting.scss
@@ -4,6 +4,8 @@ $theme-name: 'star';
 $theme-bg-color: #EFF4F8;
 // 主题背景图片
 $theme-bg-image: url('/static/image/bg/star-squashed.jpg');
+// 主题背景图片遮罩
+$theme-bg-mask: rgba(#000, .3);
 
 // container组件
 $theme-container-background-color: rgba(#FFF, .9);
diff --git a/src/assets/style/theme/theme.scss b/src/assets/style/theme/theme.scss
index a9087e33..28255142 100644
--- a/src/assets/style/theme/theme.scss
+++ b/src/assets/style/theme/theme.scss
@@ -12,7 +12,6 @@
     right: 0px;
     bottom: 0px;
     left: 0px;
-    background-color: rgba(#000, .3);
   }
   // 主体
   .layout-main {
@@ -188,6 +187,9 @@
   .layout-main-group {
     background-color: $theme-bg-color;
     background-image: $theme-bg-image;
+    .layout-main-mask {
+      background-color: $theme-bg-mask;
+    }
   }
   // 菜单项目
   @mixin theme-menu-hover-style {
diff --git a/src/assets/style/theme/tomorrow-night-blue/setting.scss b/src/assets/style/theme/tomorrow-night-blue/setting.scss
index de55406a..a3381ecf 100644
--- a/src/assets/style/theme/tomorrow-night-blue/setting.scss
+++ b/src/assets/style/theme/tomorrow-night-blue/setting.scss
@@ -4,6 +4,8 @@ $theme-name: 'tomorrow-night-blue';
 $theme-bg-color: #002147;
 // 主题背景图片
 $theme-bg-image: none;
+// 主题背景图片遮罩
+$theme-bg-mask: rgba(#000, 0);
 
 // container组件
 $theme-container-background-color: #FFF;

From f9f3ca8991a8496680410d201fa0e7a9f9b02242 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Fri, 15 Jun 2018 22:52:02 +0800
Subject: [PATCH 5/5] no message

Former-commit-id: 368a758bafc1e5236bb645cfedf853114a915c23 [formerly 368a758bafc1e5236bb645cfedf853114a915c23 [formerly 368a758bafc1e5236bb645cfedf853114a915c23 [formerly 368a758bafc1e5236bb645cfedf853114a915c23 [formerly 39d1b8f5e00c9cbb8ca80529819ba5a661ea82f6 [formerly f969de8ca0d90950d1c41818b544d16d897fc662]]]]]
Former-commit-id: 86a35e928649d29d94cdcf744b6827fa8fe54e14
Former-commit-id: b259f34a9948028abdc55ce35ccc1e3ba8280d7f
Former-commit-id: e5298a9bb80b83e98e9998b5018a47a427ab84c3 [formerly 908c209e3a04ec47d85ac73363f5f43af8ff752e]
Former-commit-id: f06c3195e91a1843683a50346afaf228520a61c2
Former-commit-id: f4107d04821884709c980e586dd9bf4c4e8bceda
Former-commit-id: 0eb496989ae4153a3ce21dac9c6f1803532764e5
Former-commit-id: 9e25cd7b811e3ce5e48516944949364285224569
Former-commit-id: 75b5eea9859dc494eae4abed1ecf7db640f53da3
---
 src/assets/style/theme/theme.scss             | 392 ------------------
 .../style/theme/theme.scss.REMOVED.git-id     |   1 +
 2 files changed, 1 insertion(+), 392 deletions(-)
 delete mode 100644 src/assets/style/theme/theme.scss
 create mode 100644 src/assets/style/theme/theme.scss.REMOVED.git-id

diff --git a/src/assets/style/theme/theme.scss b/src/assets/style/theme/theme.scss
deleted file mode 100644
index 28255142..00000000
--- a/src/assets/style/theme/theme.scss
+++ /dev/null
@@ -1,392 +0,0 @@
-// 主题公用
-.layout-main-group {
-  height: 100%;
-  width: 100%;
-  background-size: cover;
-  background-position: center;
-  position: relative;
-  // 背景上面的半透明遮罩
-  .layout-main-mask {
-    position: absolute;
-    top: 0px;
-    right: 0px;
-    bottom: 0px;
-    left: 0px;
-  }
-  // 主体
-  .layout-main {
-    position: absolute;
-    top: 0px;
-    right: 0px;
-    bottom: 0px;
-    left: 0px;
-    // [布局] 顶栏
-    .el-header {
-      padding: 0px;
-      // logo区域
-      .logo-group {
-        transition: width .3s;
-        float: left;
-        text-align: center;
-        img {
-          height: 60px;
-        }
-      }
-      // 折叠侧边栏切换按钮
-      .toggle-aside-btn {
-        float: left;
-        height: 60px;
-        width: 60px;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        @extend %unable-select;
-        i {
-          font-size: 20px;
-          margin-top: 4px;
-        }
-      }
-      // [菜单] 顶栏
-      .el-menu {
-        float: left;
-        border-bottom: none;
-        background-color: transparent;
-        .el-menu-item {
-          @extend %unable-select;
-          border-bottom: none;
-        }
-        .el-submenu {
-          @extend %unable-select;
-          .el-submenu__title {
-            border-bottom: none;
-          }
-        }
-      }
-      // 顶栏右侧的按钮
-      .d2-header-right {
-        float: right;
-        height: 60px;
-        display: flex;
-        align-items: center;
-        .btn-text {
-          padding: 14px 12px;
-          border-radius: 4px;
-          margin: 0px !important;
-          margin-left: 10px !important;
-        }
-        .el-dropdown {
-          @extend %unable-select;
-        }
-      }
-    }
-    // [布局] 顶栏下面
-    .el-container {
-      // 侧边栏
-      .el-aside {
-        transition: width .3s;
-        overflow: auto;
-        // [菜单] 正常状态
-        .el-menu {
-          @extend %unable-select;
-          background-color: transparent;
-          border-right: none;
-          .el-menu-item {
-            i {
-              margin-right: 5px;
-              font-size: 20px;
-            }
-          }
-        }
-        .el-submenu {
-          @extend %unable-select;
-          .el-submenu__title {
-            i {
-              margin-right: 5px;
-              font-size: 20px;
-            }
-            .el-submenu__icon-arrow {
-              margin-top: -10px;
-            }
-          }
-        }
-        // 菜单为空的时候显示的信息
-        .menu-empty {
-          height: 160px;
-          margin: 10px;
-          margin-top: 0px;
-          border-radius: 4px;
-          display: flex;
-          justify-content: center;
-          align-items: center;
-          flex-direction: column;
-          @extend %unable-select;
-          i {
-            font-size: 30px;
-            margin-bottom: 10px;
-          }
-          span {
-            font-size: 14px;
-          }
-        }
-        // [菜单] 折叠状态
-        .el-menu--collapse {
-          background-color: transparent;
-          .el-submenu__title {
-            text-align: center;
-          }
-        }
-      }
-      .el-main {
-        padding: 0px;
-        position: relative;
-        overflow: hidden;
-      }
-    }
-    // [组件] d2-container-full
-    .d2-container-full {
-      position: absolute;
-      border-top-left-radius: 4px;
-      border-top-right-radius: 4px;
-      overflow: hidden;
-      color: #303133;
-      &:hover {
-        box-shadow: none;
-      }
-      .d2-container-full__header {
-        position: absolute;
-        top: 0px;
-        left: 0px;
-        width: 100%;
-        padding: 18px 20px;
-        box-sizing: border-box;
-      }
-      .d2-container-full__body {
-        position: absolute;
-        padding: 20px;
-        left: 0px;
-        right: 0px;
-        bottom: 0px;
-        overflow: auto;
-      }
-      .d2-container-full__footer {
-        position: absolute;
-        bottom: 0px;
-        left: 0px;
-        width: 100%;
-        padding: 18px 20px;
-        box-sizing: border-box;
-      }
-    }
-  }
-}
-
-// 每个主题特有的设置
-
-.theme-#{$theme-name} {
-
-  .layout-main-group {
-    background-color: $theme-bg-color;
-    background-image: $theme-bg-image;
-    .layout-main-mask {
-      background-color: $theme-bg-mask;
-    }
-  }
-  // 菜单项目
-  @mixin theme-menu-hover-style {
-    color: $theme-menu-item-color-hover;
-    i {
-      color: $theme-menu-item-color-hover;
-    }
-    background-color: $theme-menu-item-background-color-hover;
-  }
-  .el-submenu__title {
-    @extend %unable-select;
-  }
-  .el-menu-item {
-    @extend %unable-select;
-  }
-  .el-submenu__title:hover {
-    @include theme-menu-hover-style;
-  }
-  .el-menu-item:hover {
-    @include theme-menu-hover-style;
-  }
-  .el-menu--horizontal .el-menu-item:not(.is-disabled):hover {
-    @include theme-menu-hover-style;
-  }
-  .el-menu--horizontal .el-menu .el-submenu__title:hover {
-    @include theme-menu-hover-style;
-  }
-
-  // [组件] d2-container-full
-  .d2-container-full {
-    border: $theme-container-border-outer;
-    border-bottom: none;
-    background-color: $theme-container-background-color;
-    .d2-container-full__header {
-      border-bottom: $theme-container-border-inner;
-      background-color: $theme-container-header-footer-background-color;
-    }
-    .d2-container-full__footer {
-      border-top: $theme-container-border-inner;
-      background-color: $theme-container-header-footer-background-color;
-    }
-  }
-  // [组件] d2-container-card
-  .d2-container-card {
-    border: $theme-container-border-outer;
-    background-color: $theme-container-background-color;
-    .el-card__header {
-      border-bottom: $theme-container-border-inner;
-      background-color: $theme-container-header-footer-background-color;
-    }
-  }
-  
-  // 顶栏
-  .el-header {
-    // 切换按钮
-    .toggle-aside-btn {
-      i {
-        color: $theme-header-item-color;
-        background-color: $theme-header-item-background-color;
-        &:hover {
-          color: $theme-header-item-color-hover;
-        }
-      }
-    }
-    // 顶栏菜单
-    .el-menu {
-      .el-menu-item {
-        transition: border-top-color 0s;
-        color: $theme-header-item-color;
-        background-color: $theme-header-item-background-color;
-        &:hover {
-          color: $theme-header-item-color-hover;
-          background-color: $theme-header-item-background-color-hover;
-        }
-        &:focus {
-          color: $theme-header-item-color-focus;
-          background-color: $theme-header-item-background-color-focus;
-        }
-        &.is-active {
-          color: $theme-header-item-color-active;
-          background-color: $theme-header-item-background-color-active;
-        }
-      }
-      .el-submenu {
-        .el-submenu__title {
-          transition: border-top-color 0s;
-          color: $theme-header-item-color;
-          background-color: $theme-header-item-background-color;
-          .el-submenu__icon-arrow {
-            color: $theme-header-item-color;
-          }
-          &:hover {
-            color: $theme-header-item-color-hover;
-            background-color: $theme-header-item-background-color-hover;
-            .el-submenu__icon-arrow {
-              color: $theme-header-item-color-hover;
-            }
-          }
-          &:focus {
-            color: $theme-header-item-color-focus;
-            background-color: $theme-header-item-background-color-focus;
-            .el-submenu__icon-arrow {
-              color: $theme-header-item-color-focus;
-            }
-          }
-        }
-      }
-    }
-    // 顶栏右侧
-    .d2-header-right {
-      .btn-text {
-        color: $theme-header-item-color;
-        &.can-hover {
-          &:hover {
-            color: $theme-header-item-color-hover;
-            background-color: $theme-header-item-background-color-hover;
-          }
-        }
-      }
-    }
-  }
-  // [布局] 顶栏下面
-  .el-container {
-    // 侧边栏
-    .el-aside {
-      // 菜单为空的时候显示的信息
-      .menu-empty {
-        background-color: $theme-aside-menu-empty-background-color;
-        i {
-          color: $theme-aside-menu-empty-icon-color;
-        }
-        span {
-          color: $theme-aside-menu-empty-text-color;
-        }
-        &:hover {
-          background-color: $theme-aside-menu-empty-background-color-hover;
-          i {
-            color: $theme-aside-menu-empty-icon-color-hover;
-          }
-          span {
-            color: $theme-aside-menu-empty-text-color-hover;
-          }
-        }
-      }
-      // [菜单] 正常状态
-      .el-menu {
-        .el-menu-item {
-          color: $theme-aside-item-color;
-          background-color: $theme-aside-item-background-color;
-          i {
-            color: $theme-aside-item-color;
-          }
-          &:hover {
-            color: $theme-aside-item-color-hover;
-            background-color: $theme-aside-item-background-color-hover;
-            i {
-              color: $theme-aside-item-color-hover;
-            }
-          }
-          &:focus {
-            color: $theme-aside-item-color-focus;
-            background-color: $theme-aside-item-background-color-focus;
-            i {
-              color: $theme-aside-item-color-focus;
-            }
-          }
-          &.is-active {
-            color: $theme-aside-item-color-active;
-            background-color: $theme-aside-item-background-color-active;
-            i {
-              color: $theme-aside-item-color-active;
-            }
-          }
-        }
-      }
-      .el-submenu {
-        .el-submenu__title {
-          color: $theme-aside-item-color;
-          background-color: $theme-aside-item-background-color;
-          i {
-            color: $theme-aside-item-color;
-          }
-          .el-submenu__icon-arrow {
-            color: $theme-aside-item-color;
-          }
-          &:hover {
-            color: $theme-aside-item-color-hover;
-            background-color: $theme-aside-item-background-color-hover;
-            i {
-              color: $theme-aside-item-color-hover;
-            }
-            .el-submenu__icon-arrow {
-              color: $theme-aside-item-color-hover;
-            }
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/src/assets/style/theme/theme.scss.REMOVED.git-id b/src/assets/style/theme/theme.scss.REMOVED.git-id
new file mode 100644
index 00000000..8dffd24a
--- /dev/null
+++ b/src/assets/style/theme/theme.scss.REMOVED.git-id
@@ -0,0 +1 @@
+76b231c8f2b45f72c095f47ab055fbebb41ff160
\ No newline at end of file