From 8cc55e1bf74e4aaf6d4d12ac4ca29bff8bebad1c Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 10 Jun 2018 08:39:06 +0800
Subject: [PATCH] no message

Former-commit-id: afef3af60139bd559aa150052fc3a72ec2f384a4
Former-commit-id: e2b324d8476ca2a52c625f2aee16972708a43bec
Former-commit-id: ab3a3d9097c684c0fb1b54b1a5f228157b2f81ff
---
 docs/zh/components/container.md               | 20 +++++++++----------
 docs/zh/guide/change-log.md                   |  1 +
 src/assets/style/fixed/base.scss              |  4 ----
 src/components/core/Highlight/index.vue       |  9 ++++++++-
 .../index.vue                                 |  1 +
 .../{Container => d2-container}/index.vue     |  7 ++++---
 src/components/core/register.js               |  2 +-
 src/pages/core/index/index.vue                |  4 ++--
 src/pages/demo/business/index/index.vue       |  4 ++--
 .../demo/business/user-center/home/index.vue  |  4 ++--
 src/pages/demo/chart/all/index.vue            |  4 ++--
 src/pages/demo/chart/demo/PieBase.vue         |  4 ++--
 src/pages/demo/chart/demo/areaBase.vue        |  4 ++--
 src/pages/demo/chart/demo/barBase.vue         |  4 ++--
 src/pages/demo/chart/demo/columnBase.vue      |  4 ++--
 src/pages/demo/chart/demo/lineBase.vue        |  4 ++--
 src/pages/demo/chart/demo/lineStep.vue        |  4 ++--
 .../demo/chart/demo/nightingaleRoseBase.vue   |  4 ++--
 src/pages/demo/chart/demo/radarBase.vue       |  4 ++--
 src/pages/demo/chart/dynamicSize/index.vue    |  4 ++--
 src/pages/demo/chart/index/index.vue          |  4 ++--
 src/pages/demo/components/container/full.vue  |  4 ++--
 src/pages/demo/components/container/ghost.vue |  4 ++--
 .../demo/components/container/normal.vue      |  4 ++--
 src/pages/demo/components/countup/index.vue   |  4 ++--
 .../demo/components/editor-quill/index.vue    |  4 ++--
 .../components/editor-simpleMDE/index.vue     |  4 ++--
 src/pages/demo/components/highlight/index.vue |  4 ++--
 src/pages/demo/components/icon/icon.vue       |  4 ++--
 src/pages/demo/components/icon/list.vue       |  4 ++--
 src/pages/demo/components/icon/select.vue     |  4 ++--
 src/pages/demo/components/icon/svg.vue        |  4 ++--
 src/pages/demo/components/index/index.vue     |  4 ++--
 src/pages/demo/components/layout/grid.vue     |  4 ++--
 .../demo/components/layout/splitpane.vue      |  4 ++--
 src/pages/demo/components/markdown/index.vue  |  4 ++--
 src/pages/demo/plugins/build/index.vue        |  4 ++--
 .../demo/plugins/clipboard-polyfill/index.vue |  4 ++--
 src/pages/demo/plugins/export/table.vue       |  4 ++--
 src/pages/demo/plugins/export/txt.vue         |  4 ++--
 src/pages/demo/plugins/i18n/demo1.vue         |  4 ++--
 src/pages/demo/plugins/i18n/demo2.vue         |  4 ++--
 src/pages/demo/plugins/import/csv.vue         |  4 ++--
 src/pages/demo/plugins/import/xlsx.vue        |  4 ++--
 src/pages/demo/plugins/index/index.vue        |  4 ++--
 src/pages/demo/plugins/js-cookie/index.vue    |  4 ++--
 src/pages/demo/plugins/mock/ajax.vue          |  4 ++--
 src/pages/demo/plugins/mock/dpd.vue           |  4 ++--
 src/pages/demo/plugins/mock/dtd.vue           |  4 ++--
 src/pages/demo/plugins/timeago/index.vue      |  4 ++--
 static/md/组件 - 页面容器 - 基础.md           |  8 ++++----
 static/md/组件 - 页面容器 - 撑满.md           |  4 ++--
 static/md/组件 - 页面容器 - 隐形.md           |  4 ++--
 static/md/组件 - 页面容器.md                  |  4 ++--
 54 files changed, 121 insertions(+), 115 deletions(-)
 rename src/components/core/{ContainerFull => d2-container-full}/index.vue (97%)
 rename src/components/core/{Container => d2-container}/index.vue (89%)

diff --git a/docs/zh/components/container.md b/docs/zh/components/container.md
index 7bd91393..e5dabe9a 100644
--- a/docs/zh/components/container.md
+++ b/docs/zh/components/container.md
@@ -19,12 +19,12 @@
 
 ``` vue
 <template>
-  <Container>
+  <d2-container>
     <template slot="header">
       可选的 header 内容 ...
     </template>
     主体内容 ...
-  </Container>
+  </d2-container>
 </template>
 
 <script>
@@ -44,18 +44,18 @@ export default {
 高度根据内容适应
 
 ``` vue
-<Container>
+<d2-container>
   主体内容
-</Container>
+</d2-container>
 ```
 
 使用 `slot`
 
 ``` vue
-<Container>
+<d2-container>
   <template slot="header">我是插入到 header 中的内容</template>
   主体内容
-</Container>
+</d2-container>
 ```
 
 ## 自适应填充页面容器
@@ -66,7 +66,7 @@ export default {
 
 ``` vue
 <template>
-  <Container type="full">
+  <d2-container type="full">
     <template slot="header">
       可选的 header 内容 ...
     </template>
@@ -74,7 +74,7 @@ export default {
     <template slot="footer">
       可选的 footer 内容 ...
     </template>
-  </Container>
+  </d2-container>
 </template>
 ```
 
@@ -83,7 +83,7 @@ export default {
 不显示任何背景色和边框
 
 ``` vue
-<Container type="ghost">
+<d2-container type="ghost">
   主体内容
-</Container>
+</d2-container>
 ```
\ No newline at end of file
diff --git a/docs/zh/guide/change-log.md b/docs/zh/guide/change-log.md
index 032ee1fa..8af971e0 100644
--- a/docs/zh/guide/change-log.md
+++ b/docs/zh/guide/change-log.md
@@ -10,6 +10,7 @@
 * [ 修改 ] 路由注册回归最简单的写法
 * [ 修复 ] 首次加载 loading 样式类名和程序内类名冲突，新的加载类名使用 `d2-app-loading` 前缀
 * [ 修改 ] 所有类似 `dd-` 的样式前缀(包括自动注册图标的id前缀)统一改为 `d2-`
+* [ 修复 ] 修复 `highlight` 组件和 `markdown` 组件的样式冲突
 
 ## v1.0.0
 
diff --git a/src/assets/style/fixed/base.scss b/src/assets/style/fixed/base.scss
index 398b7a17..f16eb47d 100644
--- a/src/assets/style/fixed/base.scss
+++ b/src/assets/style/fixed/base.scss
@@ -10,10 +10,6 @@ html, body {
     bottom: 0px;
     left: 0px;
     right: 0px;
-    pre {
-      margin: 0px;
-      border-radius: 4px;
-    }
     a {
       text-decoration: none;
     }
diff --git a/src/components/core/Highlight/index.vue b/src/components/core/Highlight/index.vue
index 444abb0e..7e358eaa 100644
--- a/src/components/core/Highlight/index.vue
+++ b/src/components/core/Highlight/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <pre v-html="highlightHTML"></pre>
+  <pre class="high-light-component" v-html="highlightHTML"></pre>
 </template>
 
 <script>
@@ -34,3 +34,10 @@ export default {
   }
 }
 </script>
+
+<style lang="scss" scoped>
+.high-light-component {
+  margin: 0px;
+  border-radius: 4px;
+}
+</style>
diff --git a/src/components/core/ContainerFull/index.vue b/src/components/core/d2-container-full/index.vue
similarity index 97%
rename from src/components/core/ContainerFull/index.vue
rename to src/components/core/d2-container-full/index.vue
index 817c8b0f..d02c0b4e 100644
--- a/src/components/core/ContainerFull/index.vue
+++ b/src/components/core/d2-container-full/index.vue
@@ -14,6 +14,7 @@
 
 <script>
 export default {
+  name: 'd2-container-full',
   props: {
     // 定位 上 右 下 左
     top: {
diff --git a/src/components/core/Container/index.vue b/src/components/core/d2-container/index.vue
similarity index 89%
rename from src/components/core/Container/index.vue
rename to src/components/core/d2-container/index.vue
index f004270c..466f9fb3 100644
--- a/src/components/core/Container/index.vue
+++ b/src/components/core/d2-container/index.vue
@@ -11,16 +11,17 @@
       <slot></slot>
     </div>
     <!-- [container-full] 撑满 -->
-    <container-full v-if="type === 'full'" :right="20" :bottom="0">
+    <d2-container-full v-if="type === 'full'" :right="20" :bottom="0">
       <slot v-if="$slots.header" name="header" slot="header"></slot>
       <slot></slot>
       <slot v-if="$slots.footer" name="footer" slot="footer"></slot>
-    </container-full>
+    </d2-container-full>
   </div>
 </template>
 
 <script>
 export default {
+  name: 'd2-container',
   props: {
     // 容器样式
     type: {
@@ -36,7 +37,7 @@ export default {
     }
   },
   components: {
-    containerFull: () => import('../ContainerFull/index.vue')
+    'd2-container-full': () => import('../d2-container-full/index.vue')
   }
 }
 </script>
diff --git a/src/components/core/register.js b/src/components/core/register.js
index a6a10f95..179c6e8d 100644
--- a/src/components/core/register.js
+++ b/src/components/core/register.js
@@ -1,6 +1,6 @@
 import Vue from 'vue'
 
-Vue.component('Container', resolve => { require(['@/components/core/Container'], resolve) })
+Vue.component('d2-container', resolve => { require(['@/components/core/d2-container'], resolve) })
 Vue.component('CountUp', resolve => { require(['@/components/core/CountUp'], resolve) })
 Vue.component('Highlight', resolve => { require(['@/components/core/Highlight'], resolve) })
 Vue.component('Icon', resolve => { require(['@/components/core/Icon'], resolve) })
diff --git a/src/pages/core/index/index.vue b/src/pages/core/index/index.vue
index 1ff41795..b390df7e 100644
--- a/src/pages/core/index/index.vue
+++ b/src/pages/core/index/index.vue
@@ -1,9 +1,9 @@
 <template>
-  <Container type="full">
+  <d2-container type="full">
     <PageIndexArticle
       title="I AM D2ADMIN"
       sub-title="追求简约美感 & 上手即用的后台管理系统模板">
       <img src="@/assets/image/logo/w500.png">
     </PageIndexArticle>
-  </Container>
+  </d2-container>
 </template>
diff --git a/src/pages/demo/business/index/index.vue b/src/pages/demo/business/index/index.vue
index c8bbc4e1..0dbf3bf4 100644
--- a/src/pages/demo/business/index/index.vue
+++ b/src/pages/demo/business/index/index.vue
@@ -1,9 +1,9 @@
 <template>
-  <Container type="full">
+  <d2-container type="full">
     <PageIndexArticle
       title="示例业务页面"
       sub-title="如果用不到 建议删除相关代码">
       <img src="@/assets/image/logo/w500-business.png">
     </PageIndexArticle>
-  </Container>
+  </d2-container>
 </template>
\ No newline at end of file
diff --git a/src/pages/demo/business/user-center/home/index.vue b/src/pages/demo/business/user-center/home/index.vue
index 4e64bf09..2ae077a6 100644
--- a/src/pages/demo/business/user-center/home/index.vue
+++ b/src/pages/demo/business/user-center/home/index.vue
@@ -1,8 +1,8 @@
 <template>
-  <Container type="full">
+  <d2-container type="full">
     <template slot="header">
       用户中心
     </template>
     doing...
-  </Container>
+  </d2-container>
 </template>
diff --git a/src/pages/demo/chart/all/index.vue b/src/pages/demo/chart/all/index.vue
index 6812e4a4..53a9a4c0 100644
--- a/src/pages/demo/chart/all/index.vue
+++ b/src/pages/demo/chart/all/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <Container type="ghost" :responsive="true" class="demo-chart-index">
+  <d2-container type="ghost" :responsive="true" class="demo-chart-index">
     <el-row :gutter="20">
       <el-col class="col" :span="8">
         <el-card class="header-in">
@@ -50,7 +50,7 @@
         </el-card>
       </el-col>
     </el-row>
-  </Container>
+  </d2-container>
 </template>
 
 <script>
diff --git a/src/pages/demo/chart/demo/PieBase.vue b/src/pages/demo/chart/demo/PieBase.vue
index 20fb980b..5d6b435e 100644
--- a/src/pages/demo/chart/demo/PieBase.vue
+++ b/src/pages/demo/chart/demo/PieBase.vue
@@ -1,12 +1,12 @@
 <template>
-  <Container type="ghost" :responsive="true">
+  <d2-container type="ghost" :responsive="true">
     <ChartDemoCard class="d2-mb" v-bind="card" @resize="$refs.chart.resize()">
       <G2PieBase slot-scope="{data}" ref="chart" :data="data" v-bind="chart"></G2PieBase>
     </ChartDemoCard>
     <el-card>
       <Markdown url="/static/md/组件 - 图表.md"></Markdown>
     </el-card>
-  </Container>
+  </d2-container>
 </template>
 
 <script>
diff --git a/src/pages/demo/chart/demo/areaBase.vue b/src/pages/demo/chart/demo/areaBase.vue
index 5c0b4bee..db053702 100644
--- a/src/pages/demo/chart/demo/areaBase.vue
+++ b/src/pages/demo/chart/demo/areaBase.vue
@@ -1,12 +1,12 @@
 <template>
-  <Container type="ghost" :responsive="true">
+  <d2-container type="ghost" :responsive="true">
     <ChartDemoCard class="d2-mb" v-bind="card" @resize="$refs.chart.resize()">
       <G2AreaBase slot-scope="{data}" ref="chart" :data="data" v-bind="chart"></G2AreaBase>
     </ChartDemoCard>
     <el-card>
       <Markdown url="/static/md/组件 - 图表.md"></Markdown>
     </el-card>
-  </Container>
+  </d2-container>
 </template>
 
 <script>
diff --git a/src/pages/demo/chart/demo/barBase.vue b/src/pages/demo/chart/demo/barBase.vue
index c03a0c4a..f2bf92e1 100644
--- a/src/pages/demo/chart/demo/barBase.vue
+++ b/src/pages/demo/chart/demo/barBase.vue
@@ -1,12 +1,12 @@
 <template>
-  <Container type="ghost" :responsive="true">
+  <d2-container type="ghost" :responsive="true">
     <ChartDemoCard class="d2-mb" v-bind="card" @resize="$refs.chart.resize()">
       <G2BarBase slot-scope="{data}" ref="chart" :data="data" v-bind="chart"></G2BarBase>
     </ChartDemoCard>
     <el-card>
       <Markdown url="/static/md/组件 - 图表.md"></Markdown>
     </el-card>
-  </Container>
+  </d2-container>
 </template>
 
 <script>
diff --git a/src/pages/demo/chart/demo/columnBase.vue b/src/pages/demo/chart/demo/columnBase.vue
index a86ae22c..81c03687 100644
--- a/src/pages/demo/chart/demo/columnBase.vue
+++ b/src/pages/demo/chart/demo/columnBase.vue
@@ -1,12 +1,12 @@
 <template>
-  <Container type="ghost" :responsive="true">
+  <d2-container type="ghost" :responsive="true">
     <ChartDemoCard class="d2-mb" v-bind="card" @resize="$refs.chart.resize()">
       <G2ColumnBase slot-scope="{data}" ref="chart" :data="data" v-bind="chart"></G2ColumnBase>
     </ChartDemoCard>
     <el-card>
       <Markdown url="/static/md/组件 - 图表.md"></Markdown>
     </el-card>
-  </Container>
+  </d2-container>
 </template>
 
 <script>
diff --git a/src/pages/demo/chart/demo/lineBase.vue b/src/pages/demo/chart/demo/lineBase.vue
index 04e3983d..2bdf00bf 100644
--- a/src/pages/demo/chart/demo/lineBase.vue
+++ b/src/pages/demo/chart/demo/lineBase.vue
@@ -1,12 +1,12 @@
 <template>
-  <Container type="ghost" :responsive="true">
+  <d2-container type="ghost" :responsive="true">
     <ChartDemoCard class="d2-mb" v-bind="card" @resize="$refs.chart.resize()">
       <G2LineBase slot-scope="{data}" ref="chart" :data="data" v-bind="chart"></G2LineBase>
     </ChartDemoCard>
     <el-card>
       <Markdown url="/static/md/组件 - 图表.md"></Markdown>
     </el-card>
-  </Container>
+  </d2-container>
 </template>
 
 <script>
diff --git a/src/pages/demo/chart/demo/lineStep.vue b/src/pages/demo/chart/demo/lineStep.vue
index 808e26de..7de1f5d5 100644
--- a/src/pages/demo/chart/demo/lineStep.vue
+++ b/src/pages/demo/chart/demo/lineStep.vue
@@ -1,12 +1,12 @@
 <template>
-  <Container type="ghost" :responsive="true">
+  <d2-container type="ghost" :responsive="true">
     <ChartDemoCard class="d2-mb" v-bind="card" @resize="$refs.chart.resize()">
       <G2LineStep slot-scope="{data}" ref="chart" :data="data" v-bind="chart"></G2LineStep>
     </ChartDemoCard>
     <el-card>
       <Markdown url="/static/md/组件 - 图表.md"></Markdown>
     </el-card>
-  </Container>
+  </d2-container>
 </template>
 
 <script>
diff --git a/src/pages/demo/chart/demo/nightingaleRoseBase.vue b/src/pages/demo/chart/demo/nightingaleRoseBase.vue
index a891307c..de2b2cb2 100644
--- a/src/pages/demo/chart/demo/nightingaleRoseBase.vue
+++ b/src/pages/demo/chart/demo/nightingaleRoseBase.vue
@@ -1,12 +1,12 @@
 <template>
-  <Container type="ghost" :responsive="true">
+  <d2-container type="ghost" :responsive="true">
     <ChartDemoCard class="d2-mb" v-bind="card" @resize="$refs.chart.resize()">
       <G2NightingaleRoseBase slot-scope="{data}" ref="chart" :data="data" v-bind="chart"></G2NightingaleRoseBase>
     </ChartDemoCard>
     <el-card>
       <Markdown url="/static/md/组件 - 图表.md"></Markdown>
     </el-card>
-  </Container>
+  </d2-container>
 </template>
 
 <script>
diff --git a/src/pages/demo/chart/demo/radarBase.vue b/src/pages/demo/chart/demo/radarBase.vue
index 9d7a9de5..5b94b597 100644
--- a/src/pages/demo/chart/demo/radarBase.vue
+++ b/src/pages/demo/chart/demo/radarBase.vue
@@ -1,12 +1,12 @@
 <template>
-  <Container type="ghost" :responsive="true">
+  <d2-container type="ghost" :responsive="true">
     <ChartDemoCard class="d2-mb" v-bind="card" @resize="$refs.chart.resize()">
       <G2RadarBase slot-scope="{data}" ref="chart" :data="data" v-bind="chart"></G2RadarBase>
     </ChartDemoCard>
     <el-card>
       <Markdown url="/static/md/组件 - 图表.md"></Markdown>
     </el-card>
-  </Container>
+  </d2-container>
 </template>
 
 <script>
diff --git a/src/pages/demo/chart/dynamicSize/index.vue b/src/pages/demo/chart/dynamicSize/index.vue
index 88b11974..b55cb71e 100644
--- a/src/pages/demo/chart/dynamicSize/index.vue
+++ b/src/pages/demo/chart/dynamicSize/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <Container type="ghost" :responsive="true" class="demo-chart-index">
+  <d2-container type="ghost" :responsive="true" class="demo-chart-index">
     <GridLayout v-bind="layout" @layout-updated="layoutUpdatedHandler">
       <!-- 卡片 -->
       <GridItem v-bind="layout.layout[0]" @resized="handleResized(chart[0].refName)">
@@ -58,7 +58,7 @@
         </el-card>
       </GridItem>
     </GridLayout>
-  </Container>
+  </d2-container>
 </template>
 
 <script>
diff --git a/src/pages/demo/chart/index/index.vue b/src/pages/demo/chart/index/index.vue
index f4b49f7c..71958399 100644
--- a/src/pages/demo/chart/index/index.vue
+++ b/src/pages/demo/chart/index/index.vue
@@ -1,9 +1,9 @@
 <template>
-  <Container type="full">
+  <d2-container type="full">
     <PageIndexArticle
       title="内置 G2 图表库"
       sub-title="如果用不到 建议删除相关代码和依赖">
       <img src="@/assets/image/logo/w500-chart.png">
     </PageIndexArticle>
-  </Container>
+  </d2-container>
 </template>
\ No newline at end of file
diff --git a/src/pages/demo/components/container/full.vue b/src/pages/demo/components/container/full.vue
index e8aeeda0..0dc62ee3 100644
--- a/src/pages/demo/components/container/full.vue
+++ b/src/pages/demo/components/container/full.vue
@@ -1,5 +1,5 @@
 <template>
-  <Container type="full">
+  <d2-container type="full">
     <template slot="header">
       我是插入到 header 中的内容
     </template>
@@ -7,5 +7,5 @@
     <template slot="footer">
       我是插入到 footer 中的内容
     </template>
-  </Container>
+  </d2-container>
 </template>
diff --git a/src/pages/demo/components/container/ghost.vue b/src/pages/demo/components/container/ghost.vue
index 224416ff..5511534e 100644
--- a/src/pages/demo/components/container/ghost.vue
+++ b/src/pages/demo/components/container/ghost.vue
@@ -1,7 +1,7 @@
 <template>
-  <Container type="ghost">
+  <d2-container type="ghost">
     <el-card style="width: 50%;">
       <Markdown url="/static/md/组件 - 页面容器 - 隐形.md"></Markdown>
     </el-card>
-  </Container>
+  </d2-container>
 </template>
diff --git a/src/pages/demo/components/container/normal.vue b/src/pages/demo/components/container/normal.vue
index 8abe52b1..301506e6 100644
--- a/src/pages/demo/components/container/normal.vue
+++ b/src/pages/demo/components/container/normal.vue
@@ -1,6 +1,6 @@
 <template>
-  <Container>
+  <d2-container>
     <template slot="header">我是插入到 header 中的内容</template>
     <Markdown url="/static/md/组件 - 页面容器 - 基础.md"></Markdown>
-  </Container>
+  </d2-container>
 </template>
diff --git a/src/pages/demo/components/countup/index.vue b/src/pages/demo/components/countup/index.vue
index a83408b3..e04b30e8 100644
--- a/src/pages/demo/components/countup/index.vue
+++ b/src/pages/demo/components/countup/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <Container type="ghost" class="page">
+  <d2-container type="ghost" class="page">
     <el-card>
       <PageHeader
         title="数字动画组件"
@@ -59,7 +59,7 @@
     <el-card>
       <Markdown url="/static/md/组件 - 数字动画.md"></Markdown>
     </el-card>
-  </Container>
+  </d2-container>
 </template>
 
 <script>
diff --git a/src/pages/demo/components/editor-quill/index.vue b/src/pages/demo/components/editor-quill/index.vue
index 022eb98b..f07590c3 100644
--- a/src/pages/demo/components/editor-quill/index.vue
+++ b/src/pages/demo/components/editor-quill/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <Container type="ghost">
+  <d2-container type="ghost">
     <el-card class="d2-mb">
       <PageHeader
         slot="header"
@@ -18,7 +18,7 @@
       <template slot="header">输出</template>
       <Highlight :code="formated"></Highlight>
     </el-card>
-  </Container>
+  </d2-container>
 </template>
 
 <script>
diff --git a/src/pages/demo/components/editor-simpleMDE/index.vue b/src/pages/demo/components/editor-simpleMDE/index.vue
index 19e1714c..2b8d1cf6 100644
--- a/src/pages/demo/components/editor-simpleMDE/index.vue
+++ b/src/pages/demo/components/editor-simpleMDE/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <Container type="ghost">
+  <d2-container type="ghost">
     <el-card class="d2-mb">
       <PageHeader
         slot="header"
@@ -15,7 +15,7 @@
       <template slot="header">输出</template>
       <pre>{{text}}</pre>
     </el-card>
-  </Container>
+  </d2-container>
 </template>
 
 <script>
diff --git a/src/pages/demo/components/highlight/index.vue b/src/pages/demo/components/highlight/index.vue
index 403f326d..8a7c98cd 100644
--- a/src/pages/demo/components/highlight/index.vue
+++ b/src/pages/demo/components/highlight/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <Container type="ghost">
+  <d2-container type="ghost">
     <el-card class="d2-mb">
       <PageHeader
         title="代码高亮组件"
@@ -33,7 +33,7 @@
     <el-card>
       <Markdown url="/static/md/组件 - 代码高亮.md"></Markdown>
     </el-card>
-  </Container>
+  </d2-container>
 </template>
 
 <script>
diff --git a/src/pages/demo/components/icon/icon.vue b/src/pages/demo/components/icon/icon.vue
index b8041793..8019fb2f 100644
--- a/src/pages/demo/components/icon/icon.vue
+++ b/src/pages/demo/components/icon/icon.vue
@@ -1,5 +1,5 @@
 <template>
-  <Container type="ghost">
+  <d2-container type="ghost">
     <el-card class="d2-mb">
       <PageHeader
         slot="header"
@@ -14,7 +14,7 @@
     <el-card>
       <Markdown url="/static/md/组件 - 图标组件.md"></Markdown>
     </el-card>
-  </Container>
+  </d2-container>
 </template>
 
 <style lang="scss">
diff --git a/src/pages/demo/components/icon/list.vue b/src/pages/demo/components/icon/list.vue
index c67e8dfc..239d4dfd 100644
--- a/src/pages/demo/components/icon/list.vue
+++ b/src/pages/demo/components/icon/list.vue
@@ -1,5 +1,5 @@
 <template>
-  <Container type="ghost">
+  <d2-container type="ghost">
     <el-card>
       <template slot="header">
         <el-radio-group v-model="showIndex" size="mini">
@@ -23,7 +23,7 @@
         </el-col>
       </el-row>
     </el-card>
-  </Container>
+  </d2-container>
 </template>
 
 <script>
diff --git a/src/pages/demo/components/icon/select.vue b/src/pages/demo/components/icon/select.vue
index 446452da..7bb52f5b 100644
--- a/src/pages/demo/components/icon/select.vue
+++ b/src/pages/demo/components/icon/select.vue
@@ -1,5 +1,5 @@
 <template>
-  <Container type="ghost">
+  <d2-container type="ghost">
     <el-card class="d2-mb">
       <PageHeader
         slot="header"
@@ -32,7 +32,7 @@
     <el-card>
       <Markdown url="/static/md/组件 - 图标选择器.md"></Markdown>
     </el-card>
-  </Container>
+  </d2-container>
 </template>
 
 <script>
diff --git a/src/pages/demo/components/icon/svg.vue b/src/pages/demo/components/icon/svg.vue
index 32f91524..14477b17 100644
--- a/src/pages/demo/components/icon/svg.vue
+++ b/src/pages/demo/components/icon/svg.vue
@@ -1,5 +1,5 @@
 <template>
-  <Container type="ghost">
+  <d2-container type="ghost">
     <el-card class="d2-mb">
       <PageHeader
         slot="header"
@@ -17,7 +17,7 @@
     <el-card>
       <Markdown url="/static/md/组件 - 图标组件 - svg.md"></Markdown>
     </el-card>
-  </Container>
+  </d2-container>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/pages/demo/components/index/index.vue b/src/pages/demo/components/index/index.vue
index 0962999b..a32ef350 100644
--- a/src/pages/demo/components/index/index.vue
+++ b/src/pages/demo/components/index/index.vue
@@ -1,9 +1,9 @@
 <template>
-  <Container type="full">
+  <d2-container type="full">
     <PageIndexArticle
       title="内置组件"
       sub-title="D2Admin 为你提供了一些上手即用的组件">
       <img src="@/assets/image/logo/w500-component.png">
     </PageIndexArticle>
-  </Container>
+  </d2-container>
 </template>
\ No newline at end of file
diff --git a/src/pages/demo/components/layout/grid.vue b/src/pages/demo/components/layout/grid.vue
index 18cc4ea5..e098b635 100644
--- a/src/pages/demo/components/layout/grid.vue
+++ b/src/pages/demo/components/layout/grid.vue
@@ -1,5 +1,5 @@
 <template>
-  <Container type="ghost" class="demo-plugins-vue-grid-layout-demo">
+  <d2-container type="ghost" class="demo-plugins-vue-grid-layout-demo">
     <GridLayout
       v-bind="layout"
       @layout-updated="layoutUpdatedHandler">
@@ -26,7 +26,7 @@
         </el-card>
       </GridItem>
     </GridLayout>
-  </Container>
+  </d2-container>
 </template>
 
 <script>
diff --git a/src/pages/demo/components/layout/splitpane.vue b/src/pages/demo/components/layout/splitpane.vue
index c8cb9293..a1caa048 100644
--- a/src/pages/demo/components/layout/splitpane.vue
+++ b/src/pages/demo/components/layout/splitpane.vue
@@ -1,5 +1,5 @@
 <template>
-  <Container>
+  <d2-container>
     <PageHeader
       slot="header"
       title="基本示例"
@@ -16,7 +16,7 @@
         </template>
       </SplitPane>
     </div>
-  </Container>
+  </d2-container>
 </template>
 
 <script>
diff --git a/src/pages/demo/components/markdown/index.vue b/src/pages/demo/components/markdown/index.vue
index e0c7684f..fb43e7b2 100644
--- a/src/pages/demo/components/markdown/index.vue
+++ b/src/pages/demo/components/markdown/index.vue
@@ -1,10 +1,10 @@
 <template>
-  <Container>
+  <d2-container>
     <PageHeader
       slot="header"
       title="效果演示"
       url="https://github.com/FairyEver/d2admin-vue-element/blob/master/src/components/core/Markdown/index.vue">
     </PageHeader>
     <markdown url="/static/md/组件 - markdown - 演示.md"></markdown>
-  </Container>
+  </d2-container>
 </template>
\ No newline at end of file
diff --git a/src/pages/demo/plugins/build/index.vue b/src/pages/demo/plugins/build/index.vue
index deb1c3ff..90f3fb16 100644
--- a/src/pages/demo/plugins/build/index.vue
+++ b/src/pages/demo/plugins/build/index.vue
@@ -1,8 +1,8 @@
 <template>
-  <Container type="full">
+  <d2-container type="full">
     <template slot="header">
       多环境发布
     </template>
     <p>当前是{{$env ? '开发' : '生产'}}环境</p>
-  </Container>
+  </d2-container>
 </template>
\ No newline at end of file
diff --git a/src/pages/demo/plugins/clipboard-polyfill/index.vue b/src/pages/demo/plugins/clipboard-polyfill/index.vue
index f2f4389f..ce668d28 100644
--- a/src/pages/demo/plugins/clipboard-polyfill/index.vue
+++ b/src/pages/demo/plugins/clipboard-polyfill/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <Container>
+  <d2-container>
     <PageHeader
       slot="header"
       title="基本示例"
@@ -31,7 +31,7 @@
         <el-input type="textarea" placeholder="在这里检验你的剪贴板 ( text/plain 数据 )"></el-input>
       </el-col>
     </el-row>
-  </Container>
+  </d2-container>
 </template>
 
 <script>
diff --git a/src/pages/demo/plugins/export/table.vue b/src/pages/demo/plugins/export/table.vue
index 204ffeef..93e71d8c 100644
--- a/src/pages/demo/plugins/export/table.vue
+++ b/src/pages/demo/plugins/export/table.vue
@@ -1,5 +1,5 @@
 <template>
-  <Container>
+  <d2-container>
     <PageHeader
       slot="header"
       title="导出表格">
@@ -23,7 +23,7 @@
       </el-table-column>
     </el-table>
     <Markdown url="/static/md/插件 - 导出.md"></Markdown>
-  </Container>
+  </d2-container>
 </template>
 
 <script>
diff --git a/src/pages/demo/plugins/export/txt.vue b/src/pages/demo/plugins/export/txt.vue
index b3cf53e6..df5b9f6c 100644
--- a/src/pages/demo/plugins/export/txt.vue
+++ b/src/pages/demo/plugins/export/txt.vue
@@ -1,5 +1,5 @@
 <template>
-  <Container>
+  <d2-container>
     <PageHeader
       slot="header"
       title="导出文本">
@@ -17,7 +17,7 @@
       </el-button>
     </div>
     <Markdown url="/static/md/插件 - 导出.md"></Markdown>
-  </Container>
+  </d2-container>
 </template>
 
 <script>
diff --git a/src/pages/demo/plugins/i18n/demo1.vue b/src/pages/demo/plugins/i18n/demo1.vue
index d5c471b7..9bd222a8 100644
--- a/src/pages/demo/plugins/i18n/demo1.vue
+++ b/src/pages/demo/plugins/i18n/demo1.vue
@@ -1,5 +1,5 @@
 <template>
-  <Container>
+  <d2-container>
     <PageHeader
       slot="header"
       :title="`${$t('pub.pageHeader.demo')} 1`"
@@ -7,7 +7,7 @@
     </PageHeader>
     <DemoI18nControl></DemoI18nControl>
     <DemoI18n></DemoI18n>
-  </Container>
+  </d2-container>
 </template>
 
 <script>
diff --git a/src/pages/demo/plugins/i18n/demo2.vue b/src/pages/demo/plugins/i18n/demo2.vue
index 26f8e8a3..5bad8bd5 100644
--- a/src/pages/demo/plugins/i18n/demo2.vue
+++ b/src/pages/demo/plugins/i18n/demo2.vue
@@ -1,5 +1,5 @@
 <template>
-  <Container>
+  <d2-container>
     <PageHeader
       slot="header"
       :title="`${$t('pub.pageHeader.demo')} 2`"
@@ -7,7 +7,7 @@
     </PageHeader>
     <DemoI18nControl></DemoI18nControl>
     <DemoI18n></DemoI18n>
-  </Container>
+  </d2-container>
 </template>
 
 <script>
diff --git a/src/pages/demo/plugins/import/csv.vue b/src/pages/demo/plugins/import/csv.vue
index 208230f6..a21f0ccb 100644
--- a/src/pages/demo/plugins/import/csv.vue
+++ b/src/pages/demo/plugins/import/csv.vue
@@ -1,5 +1,5 @@
 <template>
-  <Container>
+  <d2-container>
     <PageHeader
       slot="header"
       title="导入 csv"
@@ -28,7 +28,7 @@
       </el-table-column>
     </el-table>
     <Markdown url="/static/md/插件 - 导入.md"></Markdown>
-  </Container>
+  </d2-container>
 </template>
 
 <script>
diff --git a/src/pages/demo/plugins/import/xlsx.vue b/src/pages/demo/plugins/import/xlsx.vue
index d495d073..05857b58 100644
--- a/src/pages/demo/plugins/import/xlsx.vue
+++ b/src/pages/demo/plugins/import/xlsx.vue
@@ -1,5 +1,5 @@
 <template>
-  <Container>
+  <d2-container>
     <PageHeader
       slot="header"
       title="导入 xlsx"
@@ -28,7 +28,7 @@
       </el-table-column>
     </el-table>
     <Markdown url="/static/md/插件 - 导入.md"></Markdown>
-  </Container>
+  </d2-container>
 </template>
 
 <script>
diff --git a/src/pages/demo/plugins/index/index.vue b/src/pages/demo/plugins/index/index.vue
index 76757b45..3ea52624 100644
--- a/src/pages/demo/plugins/index/index.vue
+++ b/src/pages/demo/plugins/index/index.vue
@@ -1,9 +1,9 @@
 <template>
-  <Container type="full">
+  <d2-container type="full">
     <PageIndexArticle
       title="插件演示"
       sub-title="D2Admin 集成了许多实用插件">
       <img src="@/assets/image/logo/w500-plugin.png">
     </PageIndexArticle>
-  </Container>
+  </d2-container>
 </template>
\ No newline at end of file
diff --git a/src/pages/demo/plugins/js-cookie/index.vue b/src/pages/demo/plugins/js-cookie/index.vue
index 2e446acd..749e97c8 100644
--- a/src/pages/demo/plugins/js-cookie/index.vue
+++ b/src/pages/demo/plugins/js-cookie/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <Container type="ghost">
+  <d2-container type="ghost">
     <el-card class="d2-mb">
       <PageHeader
         slot="header"
@@ -17,7 +17,7 @@
       <p>获取所有可以获得的数据</p>
       <el-button type="info" @click="getAll">getAll</el-button>
     </el-card>
-  </Container>
+  </d2-container>
 </template>
 
 <script>
diff --git a/src/pages/demo/plugins/mock/ajax.vue b/src/pages/demo/plugins/mock/ajax.vue
index 82477c32..ab325790 100644
--- a/src/pages/demo/plugins/mock/ajax.vue
+++ b/src/pages/demo/plugins/mock/ajax.vue
@@ -1,5 +1,5 @@
 <template>
-  <Container type="ghost">
+  <d2-container type="ghost">
     <el-card>
       <div slot="header">
         <el-button @click="ajax">发送请求</el-button>
@@ -14,7 +14,7 @@
       </el-table>
       <Markdown url="/static/md/插件 - mock拦截ajax.md"></Markdown>
     </el-card>
-  </Container>
+  </d2-container>
 </template>
 
 <script>
diff --git a/src/pages/demo/plugins/mock/dpd.vue b/src/pages/demo/plugins/mock/dpd.vue
index b6cbbfc1..70bc791a 100644
--- a/src/pages/demo/plugins/mock/dpd.vue
+++ b/src/pages/demo/plugins/mock/dpd.vue
@@ -1,5 +1,5 @@
 <template>
-  <Container type="ghost">
+  <d2-container type="ghost">
     <el-card class="d2-mb">
       <PageHeader
         slot="header"
@@ -16,7 +16,7 @@
       :mock="mockResult[index]"
       @reload="doMock(index)">
     </MockDemoCard>
-  </Container>
+  </d2-container>
 </template>
 
 <script>
diff --git a/src/pages/demo/plugins/mock/dtd.vue b/src/pages/demo/plugins/mock/dtd.vue
index e5186ffe..1fd8428f 100644
--- a/src/pages/demo/plugins/mock/dtd.vue
+++ b/src/pages/demo/plugins/mock/dtd.vue
@@ -1,5 +1,5 @@
 <template>
-  <Container type="ghost">
+  <d2-container type="ghost">
     <el-card class="d2-mb">
       <PageHeader
         slot="header"
@@ -28,7 +28,7 @@
       :mock="regexp.mocked"
       @reload="regexpMock()">
     </MockDemoCard>
-  </Container>
+  </d2-container>
 </template>
 
 <script>
diff --git a/src/pages/demo/plugins/timeago/index.vue b/src/pages/demo/plugins/timeago/index.vue
index 0de01e21..3e22dd35 100644
--- a/src/pages/demo/plugins/timeago/index.vue
+++ b/src/pages/demo/plugins/timeago/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <Container type="ghost">
+  <d2-container type="ghost">
     <el-card class="d2-mb">
       <PageHeader
         title="基本示例"
@@ -27,7 +27,7 @@
     <el-card>
       <Markdown url="/static/md/插件 - timeago.md"></Markdown>
     </el-card>
-  </Container>
+  </d2-container>
 </template>
 
 <script>
diff --git a/static/md/组件 - 页面容器 - 基础.md b/static/md/组件 - 页面容器 - 基础.md
index 487b666b..9cd9c4c8 100644
--- a/static/md/组件 - 页面容器 - 基础.md	
+++ b/static/md/组件 - 页面容器 - 基础.md	
@@ -3,16 +3,16 @@
 高度根据内容适应
 
 ```
-<Container>
+<d2-container>
   主体内容
-</Container>
+</d2-container>
 ```
 
 使用 `slot`
 
 ```
-<Container>
+<d2-container>
   <template slot="header">我是插入到 header 中的内容</template>
   主体内容
-</Container>
+</d2-container>
 ```
\ No newline at end of file
diff --git a/static/md/组件 - 页面容器 - 撑满.md b/static/md/组件 - 页面容器 - 撑满.md
index 8d183f44..df8b36f4 100644
--- a/static/md/组件 - 页面容器 - 撑满.md	
+++ b/static/md/组件 - 页面容器 - 撑满.md	
@@ -6,7 +6,7 @@
 
 ```
 <template>
-  <Container type="card-full">
+  <d2-container type="card-full">
     <template slot="header">
       可选的 header 内容 ...
     </template>
@@ -14,7 +14,7 @@
     <template slot="footer">
       可选的 footer 内容 ...
     </template>
-  </Container>
+  </d2-container>
 </template>
 ```
 
diff --git a/static/md/组件 - 页面容器 - 隐形.md b/static/md/组件 - 页面容器 - 隐形.md
index b35618ac..9a5ab565 100644
--- a/static/md/组件 - 页面容器 - 隐形.md	
+++ b/static/md/组件 - 页面容器 - 隐形.md	
@@ -3,7 +3,7 @@
 不显示任何背景色和边框
 
 ```
-<Container type="ghost">
+<d2-container type="ghost">
   主体内容
-</Container>
+</d2-container>
 ```
\ No newline at end of file
diff --git a/static/md/组件 - 页面容器.md b/static/md/组件 - 页面容器.md
index e4c009b5..b3a6b5e8 100644
--- a/static/md/组件 - 页面容器.md	
+++ b/static/md/组件 - 页面容器.md	
@@ -15,12 +15,12 @@
 
 ```
 <template>
-  <Container>
+  <d2-container>
     <template slot="header">
       可选的 header 内容 ...
     </template>
     主体内容 ...
-  </Container>
+  </d2-container>
 </template>
 
 <script>