no message

Former-commit-id: 5a497d156a66299830a672ff1b8d22165c19a8cb Former-commit-id: 6429c53c4c9592bf05987029d8ae7a62ee383df9 Former-commit-id: 6d3b1470b390e23f2f5fe6c58ddb762bedb96e98
2018-06-04 14:47:25 +08:00
parent 3b09d88200
commit 73f6741477
15 changed files with 31 additions and 31 deletions
--- 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;
--- 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;
    }
  }
 }
--- 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;
--- 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>
--- 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>
--- 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'
        },
--- 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="追求简约美感 & 上手即用的后台管理系统模板">
--- 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="如果用不到 建议删除相关代码">
--- 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>
--- 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="如果用不到 建议删除相关代码和依赖">
--- a/src/pages/demo/components/container/card-full.vue
+++ b/src/pages/demo/components/container/card-full.vue
@@ -1,5 +1,5 @@
 <template>
-  <Container type="card-full">
+  <Container type="full">
    <template slot="header">
      我是插入到 header 中的内容
    </template>
--- 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 为你提供了一些上手即用的组件">
--- 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>
--- 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 集成了许多实用插件">
--- 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) }
        }
      ]
    },