From 73f67414772b0144c4bf0a0a02e5aeb02b6c3f6e Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 4 Jun 2018 14:47:25 +0800
Subject: [PATCH] no message

Former-commit-id: 5a497d156a66299830a672ff1b8d22165c19a8cb
Former-commit-id: 6429c53c4c9592bf05987029d8ae7a62ee383df9
Former-commit-id: 6d3b1470b390e23f2f5fe6c58ddb762bedb96e98
---
 src/assets/style/theme/_bak.scss                     |  8 ++++----
 src/assets/style/theme/classic/index.scss            | 12 ++++++------
 src/assets/style/theme/theme-base.scss               |  8 ++++----
 src/components/core/Container/index.vue              |  2 +-
 src/components/core/ContainerFull/index.vue          |  8 ++++----
 .../core/MainLayout/components/SideMenu/index.vue    |  2 +-
 src/pages/core/index/index.vue                       |  2 +-
 src/pages/demo/business/index/index.vue              |  2 +-
 src/pages/demo/business/user-center/home/index.vue   |  2 +-
 src/pages/demo/chart/index/index.vue                 |  2 +-
 .../components/container/{card-full.vue => full.vue} |  2 +-
 src/pages/demo/components/index/index.vue            |  2 +-
 src/pages/demo/plugins/build/index.vue               |  2 +-
 src/pages/demo/plugins/index/index.vue               |  2 +-
 src/router/menu/_components.js                       |  6 +++---
 15 files changed, 31 insertions(+), 31 deletions(-)
 rename src/pages/demo/components/container/{card-full.vue => full.vue} (90%)

diff --git a/src/assets/style/theme/_bak.scss b/src/assets/style/theme/_bak.scss
index 97ed2787..3e49ed4d 100644
--- a/src/assets/style/theme/_bak.scss
+++ b/src/assets/style/theme/_bak.scss
@@ -19,7 +19,7 @@ $border-color: #d8dfea;
         box-shadow: none;
       }
     }
-    .dd-card-full {
+    .dd-container-full {
       position: absolute;
       border-top-left-radius: 4px;
       border-top-right-radius: 4px;
@@ -33,7 +33,7 @@ $border-color: #d8dfea;
         // box-shadow: 0 0 8px 0 rgba(232,237,250,.6), 0 2px 4px 0 rgba(232,237,250,.5);
         box-shadow: none;
       }
-      .dd-card-full__header {
+      .dd-container-full__header {
         position: absolute;
         top: 0px;
         left: 0px;
@@ -42,7 +42,7 @@ $border-color: #d8dfea;
         border-bottom: 1px solid $border-color;
         box-sizing: border-box;
       }
-      .dd-card-full__body {
+      .dd-container-full__body {
         position: absolute;
         padding: 20px;
         left: 0px;
@@ -50,7 +50,7 @@ $border-color: #d8dfea;
         bottom: 0px;
         overflow: auto;
       }
-      .dd-card-full__footer {
+      .dd-container-full__footer {
         position: absolute;
         bottom: 0px;
         left: 0px;
diff --git a/src/assets/style/theme/classic/index.scss b/src/assets/style/theme/classic/index.scss
index 4ec34a22..b3034fd7 100644
--- a/src/assets/style/theme/classic/index.scss
+++ b/src/assets/style/theme/classic/index.scss
@@ -3,17 +3,17 @@
 $theme-name: 'star';
 $theme-bg-color: #EFF4F8;
 $theme-bg-image: '/static/image/bg/star.jpg';
-$theme-card-full-border-color: #d8dfea;
+$theme-container-full-border-color: #d8dfea;
 
 .theme-#{$theme-name} {
   background-color: $theme-bg-color;
   background-image: url($theme-bg-image);
-  .dd-card-full {
-    .dd-card-full__header {
-      border-bottom: 1px solid $theme-card-full-border-color;
+  .dd-container-full {
+    .dd-container-full__header {
+      border-bottom: 1px solid $theme-container-full-border-color;
     }
-    .dd-card-full__footer {
-      border-top: 1px solid $theme-card-full-border-color;
+    .dd-container-full__footer {
+      border-top: 1px solid $theme-container-full-border-color;
     }
   }
 }
\ No newline at end of file
diff --git a/src/assets/style/theme/theme-base.scss b/src/assets/style/theme/theme-base.scss
index c5e99d16..3a0d270c 100644
--- a/src/assets/style/theme/theme-base.scss
+++ b/src/assets/style/theme/theme-base.scss
@@ -14,7 +14,7 @@ $theme-color: #EFF4F8;
       box-shadow: 0 0 8px 0 rgba(232,237,250,.6), 0 2px 4px 0 rgba(232,237,250,.5);
     }
   }
-  .dd-card-full {
+  .dd-container-full {
     position: absolute;
     border-top-left-radius: 4px;
     border-top-right-radius: 4px;
@@ -24,7 +24,7 @@ $theme-color: #EFF4F8;
     &:hover {
       box-shadow: none;
     }
-    .dd-card-full__header {
+    .dd-container-full__header {
       position: absolute;
       top: 0px;
       left: 0px;
@@ -32,7 +32,7 @@ $theme-color: #EFF4F8;
       padding: 18px 20px;
       box-sizing: border-box;
     }
-    .dd-card-full__body {
+    .dd-container-full__body {
       position: absolute;
       padding: 20px;
       left: 0px;
@@ -40,7 +40,7 @@ $theme-color: #EFF4F8;
       bottom: 0px;
       overflow: auto;
     }
-    .dd-card-full__footer {
+    .dd-container-full__footer {
       position: absolute;
       bottom: 0px;
       left: 0px;
diff --git a/src/components/core/Container/index.vue b/src/components/core/Container/index.vue
index 1e27b3e2..10775106 100644
--- a/src/components/core/Container/index.vue
+++ b/src/components/core/Container/index.vue
@@ -11,7 +11,7 @@
       <slot></slot>
     </div>
     <!-- [container-full] 撑满 -->
-    <container-full v-if="type === 'card-full'" :right="10" :bottom="0">
+    <container-full v-if="type === 'full'" :right="10" :bottom="0">
       <slot v-if="$slots.header" name="header" slot="header"></slot>
       <slot></slot>
       <slot v-if="$slots.footer" name="footer" slot="footer"></slot>
diff --git a/src/components/core/ContainerFull/index.vue b/src/components/core/ContainerFull/index.vue
index 9ac535a0..3b114a70 100644
--- a/src/components/core/ContainerFull/index.vue
+++ b/src/components/core/ContainerFull/index.vue
@@ -1,12 +1,12 @@
 <template>
-  <div class="dd-card-full" :style="cardStyle">
-    <div v-if="$slots.header" class="dd-card-full__header" ref="header">
+  <div class="dd-container-full" :style="cardStyle">
+    <div v-if="$slots.header" class="dd-container-full__header" ref="header">
       <slot name="header"></slot>
     </div>
-    <div class="dd-card-full__body" :style="bodyStyle">
+    <div class="dd-container-full__body" :style="bodyStyle">
       <slot></slot>
     </div>
-    <div v-if="$slots.footer" class="dd-card-full__footer" ref="footer">
+    <div v-if="$slots.footer" class="dd-container-full__footer" ref="footer">
       <slot name="footer"></slot>
     </div>
   </div>
diff --git a/src/components/core/MainLayout/components/SideMenu/index.vue b/src/components/core/MainLayout/components/SideMenu/index.vue
index 186d25d1..b026e9f2 100644
--- a/src/components/core/MainLayout/components/SideMenu/index.vue
+++ b/src/components/core/MainLayout/components/SideMenu/index.vue
@@ -28,7 +28,7 @@ export default {
     return {
       menus: [
         {
-          path: '/demo/components/container/card-full',
+          path: '/demo/components/container/container-full',
           title: 'menu-a',
           icon: 'plus'
         },
diff --git a/src/pages/core/index/index.vue b/src/pages/core/index/index.vue
index 0cf4c89c..1ff41795 100644
--- a/src/pages/core/index/index.vue
+++ b/src/pages/core/index/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <Container type="card-full">
+  <Container type="full">
     <PageIndexArticle
       title="I AM D2ADMIN"
       sub-title="追求简约美感 & 上手即用的后台管理系统模板">
diff --git a/src/pages/demo/business/index/index.vue b/src/pages/demo/business/index/index.vue
index 4cd14eec..c8bbc4e1 100644
--- a/src/pages/demo/business/index/index.vue
+++ b/src/pages/demo/business/index/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <Container type="card-full">
+  <Container type="full">
     <PageIndexArticle
       title="示例业务页面"
       sub-title="如果用不到 建议删除相关代码">
diff --git a/src/pages/demo/business/user-center/home/index.vue b/src/pages/demo/business/user-center/home/index.vue
index 774cb308..4e64bf09 100644
--- a/src/pages/demo/business/user-center/home/index.vue
+++ b/src/pages/demo/business/user-center/home/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <Container type="card-full">
+  <Container type="full">
     <template slot="header">
       用户中心
     </template>
diff --git a/src/pages/demo/chart/index/index.vue b/src/pages/demo/chart/index/index.vue
index 3406c743..f4b49f7c 100644
--- a/src/pages/demo/chart/index/index.vue
+++ b/src/pages/demo/chart/index/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <Container type="card-full">
+  <Container type="full">
     <PageIndexArticle
       title="内置 G2 图表库"
       sub-title="如果用不到 建议删除相关代码和依赖">
diff --git a/src/pages/demo/components/container/card-full.vue b/src/pages/demo/components/container/full.vue
similarity index 90%
rename from src/pages/demo/components/container/card-full.vue
rename to src/pages/demo/components/container/full.vue
index 5fb74839..e8aeeda0 100644
--- a/src/pages/demo/components/container/card-full.vue
+++ b/src/pages/demo/components/container/full.vue
@@ -1,5 +1,5 @@
 <template>
-  <Container type="card-full">
+  <Container type="full">
     <template slot="header">
       我是插入到 header 中的内容
     </template>
diff --git a/src/pages/demo/components/index/index.vue b/src/pages/demo/components/index/index.vue
index d17da97c..0962999b 100644
--- a/src/pages/demo/components/index/index.vue
+++ b/src/pages/demo/components/index/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <Container type="card-full">
+  <Container type="full">
     <PageIndexArticle
       title="内置组件"
       sub-title="D2Admin 为你提供了一些上手即用的组件">
diff --git a/src/pages/demo/plugins/build/index.vue b/src/pages/demo/plugins/build/index.vue
index d68f191e..deb1c3ff 100644
--- a/src/pages/demo/plugins/build/index.vue
+++ b/src/pages/demo/plugins/build/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <Container type="card-full">
+  <Container type="full">
     <template slot="header">
       多环境发布
     </template>
diff --git a/src/pages/demo/plugins/index/index.vue b/src/pages/demo/plugins/index/index.vue
index 1f4da72c..76757b45 100644
--- a/src/pages/demo/plugins/index/index.vue
+++ b/src/pages/demo/plugins/index/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <Container type="card-full">
+  <Container type="full">
     <PageIndexArticle
       title="插件演示"
       sub-title="D2Admin 集成了许多实用插件">
diff --git a/src/router/menu/_components.js b/src/router/menu/_components.js
index 1e3f7931..650ef860 100644
--- a/src/router/menu/_components.js
+++ b/src/router/menu/_components.js
@@ -58,12 +58,12 @@ export const menu = {
         {
           title: '撑满',
           icon: 'file-o',
-          path: 'container/card-full',
-          name: 'demo-components-container-card-full',
+          path: 'container/full',
+          name: 'demo-components-container-full',
           meta: {
             requiresAuth: true
           },
-          component: resolve => { require(['@/pages/demo/components/container/card-full.vue'], resolve) }
+          component: resolve => { require(['@/pages/demo/components/container/full.vue'], resolve) }
         }
       ]
     },