From 5f4cb6059642f7221ea5fc1b366676c39f6715fa Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 15 Jul 2018 11:24:03 +0800
Subject: [PATCH] =?UTF-8?q?input=E7=BB=84=E4=BB=B6=E7=A4=BA=E4=BE=8B?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: f1c09b2eb0fc43b36d330381a8ad0e61388ed7d4 [formerly f1c09b2eb0fc43b36d330381a8ad0e61388ed7d4 [formerly f1c09b2eb0fc43b36d330381a8ad0e61388ed7d4 [formerly f1c09b2eb0fc43b36d330381a8ad0e61388ed7d4 [formerly 8c09ccbe58f4b7afd9c6ff30eba55fadb777676f [formerly d043388cdde2ccee069c7c7b5b42d6bd9ce36a39]]]]]
Former-commit-id: 341d5287f5d41d4078f89d6248d910a7412985f7
Former-commit-id: 5654f1388ee01c292b20323330a9bdf89fcdd64a
Former-commit-id: 0890b4c172db79efda92c29946d590a626f8d905 [formerly 1491480cf2042fd2e3efc6b3098b98be29bd233e]
Former-commit-id: f60596cf2695988396e866d8b24a4771e1704860
Former-commit-id: d31514f251a995c9b8b4d57554e91536524deedd
Former-commit-id: 1e357738b859fbcc43c8cf79705f8aa513b7ddef
Former-commit-id: 4e6b81c267b23c00f7c2abc42966dde3fcc572a4
Former-commit-id: 75c7b73a234b5b9ae71eb4dee76fd8673c6c3d27
---
 src/assets/style/theme/theme-base.scss                     | 2 +-
 src/assets/style/theme/theme.scss                          | 2 +-
 .../core/d2-layout-main/components/-menu-side/index.vue    | 2 +-
 src/menu/index.js.REMOVED.git-id                           | 2 +-
 src/pages/demo/element/form-input-number/index.vue         | 2 +-
 src/pages/demo/element/form-input/index.vue                | 7 -------
 src/pages/demo/element/form-input/index.vue.REMOVED.git-id | 1 +
 7 files changed, 6 insertions(+), 12 deletions(-)
 delete mode 100644 src/pages/demo/element/form-input/index.vue
 create mode 100644 src/pages/demo/element/form-input/index.vue.REMOVED.git-id

diff --git a/src/assets/style/theme/theme-base.scss b/src/assets/style/theme/theme-base.scss
index a80eb9ff..a9622a96 100644
--- a/src/assets/style/theme/theme-base.scss
+++ b/src/assets/style/theme/theme-base.scss
@@ -173,7 +173,7 @@
           }
         }
         // 菜单为空的时候显示的信息
-        .menu-empty {
+        .d2-layout-main-menu-empty {
           height: 160px;
           margin: 10px;
           margin-top: 0px;
diff --git a/src/assets/style/theme/theme.scss b/src/assets/style/theme/theme.scss
index ed3f3759..ffda8197 100644
--- a/src/assets/style/theme/theme.scss
+++ b/src/assets/style/theme/theme.scss
@@ -127,7 +127,7 @@
     // 侧边栏
     .d2-theme-container-aside {
       // 菜单为空的时候显示的信息
-      .menu-empty {
+      .d2-layout-main-menu-empty {
         background: $theme-aside-menu-empty-background-color;
         i {
           color: $theme-aside-menu-empty-icon-color;
diff --git a/src/components/core/d2-layout-main/components/-menu-side/index.vue b/src/components/core/d2-layout-main/components/-menu-side/index.vue
index b76dbb3e..b5f233bb 100644
--- a/src/components/core/d2-layout-main/components/-menu-side/index.vue
+++ b/src/components/core/d2-layout-main/components/-menu-side/index.vue
@@ -11,7 +11,7 @@
         <d2-layout-main-menu-sub v-else :menu="menu" :key="menuIndex"/>
       </template>
     </el-menu>
-    <div v-if="menus.length === 0 && !collapse" class="menu-empty">
+    <div v-if="menus.length === 0 && !collapse" class="d2-layout-main-menu-empty">
       <d2-icon name="hdd-o"/>
       <span>当前目录没有菜单</span>
     </div>
diff --git a/src/menu/index.js.REMOVED.git-id b/src/menu/index.js.REMOVED.git-id
index 378c39ea..11737c89 100644
--- a/src/menu/index.js.REMOVED.git-id
+++ b/src/menu/index.js.REMOVED.git-id
@@ -1 +1 @@
-2033bbd20e953d52d9c21146b8048ee1a1f8aa5b
\ No newline at end of file
+d703b0b14f62a5913e74a1b01107213a8aedbf93
\ No newline at end of file
diff --git a/src/pages/demo/element/form-input-number/index.vue b/src/pages/demo/element/form-input-number/index.vue
index b81590a2..f9a1b7c0 100644
--- a/src/pages/demo/element/form-input-number/index.vue
+++ b/src/pages/demo/element/form-input-number/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <d2-container>
+  <d2-container class="page">
     <h1 class="d2-mt-0">该页面尚未完成组件示例搬运</h1>
     <p>D2Admin 的构建依托于由饿了么出品的 ElementUI，欲了解更多该组件的信息请查阅以下链接</p>
     <d2-demo-link-btn title="Element" link="http://element.eleme.io/#/zh-CN"/>
diff --git a/src/pages/demo/element/form-input/index.vue b/src/pages/demo/element/form-input/index.vue
deleted file mode 100644
index b81590a2..00000000
--- a/src/pages/demo/element/form-input/index.vue
+++ /dev/null
@@ -1,7 +0,0 @@
-<template>
-  <d2-container>
-    <h1 class="d2-mt-0">该页面尚未完成组件示例搬运</h1>
-    <p>D2Admin 的构建依托于由饿了么出品的 ElementUI，欲了解更多该组件的信息请查阅以下链接</p>
-    <d2-demo-link-btn title="Element" link="http://element.eleme.io/#/zh-CN"/>
-  </d2-container>
-</template>
diff --git a/src/pages/demo/element/form-input/index.vue.REMOVED.git-id b/src/pages/demo/element/form-input/index.vue.REMOVED.git-id
new file mode 100644
index 00000000..e95f79ca
--- /dev/null
+++ b/src/pages/demo/element/form-input/index.vue.REMOVED.git-id
@@ -0,0 +1 @@
+e8fcb70549e365d73095f6c3f3f3390c018e4b3d
\ No newline at end of file