From e256d63b605de5041680932ad8c5fcc8cb0a539a Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Sun, 10 Jun 2018 09:21:26 +0800 Subject: [PATCH] no message Former-commit-id: 90b140d703fb3fce2bef2d98516293854ef9d014 Former-commit-id: a77a9d22757d33850b7366f9d603a920458a29e0 Former-commit-id: d8f16caa59b4ebe374d26c011f967e3dc7e4eef0 --- docs/zh/components/count-up.md | 6 ++-- docs/zh/components/highlight.md | 2 +- docs/zh/components/icon-svg.md | 2 +- docs/zh/components/icon.md | 10 +++--- .../HeaderRight/components/FullScreen.vue | 28 ++++++++++++++++ .../HeaderRight/components/UserDropdown.vue | 33 +++++++++++++++++++ .../core/d2-container-full/index.vue | 6 ++-- src/components/core/d2-container/index.vue | 14 ++++---- .../-header-right/components/FullScreen.vue | 4 +-- .../-header-right/components/UserDropdown.vue | 4 +-- .../demo/PageIndexArticle/index.vue | 2 +- .../chart/demo/components/ChartDemoCard.vue | 4 +-- src/pages/demo/components/countup/index.vue | 12 +++---- .../demo/components/editor-quill/index.vue | 2 +- src/pages/demo/components/highlight/index.vue | 8 ++--- .../components/icon/components/IconCell.vue | 2 +- src/pages/demo/components/icon/icon.vue | 8 ++--- src/pages/demo/components/icon/select.vue | 4 +-- src/pages/demo/components/icon/svg.vue | 2 +- src/pages/demo/plugins/export/table.vue | 4 +-- src/pages/demo/plugins/export/txt.vue | 2 +- src/pages/demo/plugins/import/csv.vue | 4 +-- src/pages/demo/plugins/import/xlsx.vue | 4 +-- .../plugins/mock/components/MockDemoCard.vue | 4 +-- static/md/组件 - 代码高亮.md | 2 +- static/md/组件 - 图标组件 - svg.md | 2 +- static/md/组件 - 图标组件.md | 10 +++--- static/md/组件 - 数字动画.md | 6 ++-- 28 files changed, 126 insertions(+), 65 deletions(-) create mode 100644 src/components/core/MainLayout/components/HeaderRight/components/FullScreen.vue create mode 100644 src/components/core/MainLayout/components/HeaderRight/components/UserDropdown.vue diff --git a/docs/zh/components/count-up.md b/docs/zh/components/count-up.md index d88a3ce9..a8f1844b 100644 --- a/docs/zh/components/count-up.md +++ b/docs/zh/components/count-up.md @@ -15,13 +15,13 @@ ``` vue // 基本使用方法 - + // 设置始末值 - + // 设置动画时间 - + ``` 组件会在页面上渲染 `` 标签 diff --git a/docs/zh/components/highlight.md b/docs/zh/components/highlight.md index e68c8de1..275f0bca 100644 --- a/docs/zh/components/highlight.md +++ b/docs/zh/components/highlight.md @@ -9,7 +9,7 @@ ## 示例 ``` vue - + ``` ::: tip diff --git a/docs/zh/components/icon-svg.md b/docs/zh/components/icon-svg.md index 69273a35..a9616141 100644 --- a/docs/zh/components/icon-svg.md +++ b/docs/zh/components/icon-svg.md @@ -13,7 +13,7 @@ 然后使用组件 ``` vue - + ``` ## 获取已经注册的所有图标 diff --git a/docs/zh/components/icon.md b/docs/zh/components/icon.md index 414d08f5..aae2eab4 100644 --- a/docs/zh/components/icon.md +++ b/docs/zh/components/icon.md @@ -12,22 +12,22 @@ ``` vue // 这样用没有毛病 但是也没什么用 - + // 指定图标名称 - + // 设置行内样式 - + // 设置 class - + ``` 这个组件只是简化了写法而已 ``` vue - + // 等同于 ``` diff --git a/src/components/core/MainLayout/components/HeaderRight/components/FullScreen.vue b/src/components/core/MainLayout/components/HeaderRight/components/FullScreen.vue new file mode 100644 index 00000000..da2344e2 --- /dev/null +++ b/src/components/core/MainLayout/components/HeaderRight/components/FullScreen.vue @@ -0,0 +1,28 @@ + + + diff --git a/src/components/core/MainLayout/components/HeaderRight/components/UserDropdown.vue b/src/components/core/MainLayout/components/HeaderRight/components/UserDropdown.vue new file mode 100644 index 00000000..808dc81c --- /dev/null +++ b/src/components/core/MainLayout/components/HeaderRight/components/UserDropdown.vue @@ -0,0 +1,33 @@ + + + diff --git a/src/components/core/d2-container-full/index.vue b/src/components/core/d2-container-full/index.vue index d02c0b4e..7432efcc 100644 --- a/src/components/core/d2-container-full/index.vue +++ b/src/components/core/d2-container-full/index.vue @@ -1,13 +1,13 @@ diff --git a/src/components/core/d2-container/index.vue b/src/components/core/d2-container/index.vue index 466f9fb3..71bb2f08 100644 --- a/src/components/core/d2-container/index.vue +++ b/src/components/core/d2-container/index.vue @@ -2,19 +2,19 @@
- - + +
- - + +
- - - + + +
diff --git a/src/components/core/d2-layout-main/components/-header-right/components/FullScreen.vue b/src/components/core/d2-layout-main/components/-header-right/components/FullScreen.vue index ab7136d0..da2344e2 100644 --- a/src/components/core/d2-layout-main/components/-header-right/components/FullScreen.vue +++ b/src/components/core/d2-layout-main/components/-header-right/components/FullScreen.vue @@ -5,8 +5,8 @@ :content="isFullScreen ? '退出全屏' : '全屏'" placement="bottom"> - - + + diff --git a/src/components/core/d2-layout-main/components/-header-right/components/UserDropdown.vue b/src/components/core/d2-layout-main/components/-header-right/components/UserDropdown.vue index 5b12e6f6..808dc81c 100644 --- a/src/components/core/d2-layout-main/components/-header-right/components/UserDropdown.vue +++ b/src/components/core/d2-layout-main/components/-header-right/components/UserDropdown.vue @@ -2,8 +2,8 @@ 你好 - 注销 - 个人中心 + 注销 + 个人中心 diff --git a/src/components/demo/PageIndexArticle/index.vue b/src/components/demo/PageIndexArticle/index.vue index 76d40583..2b9c66d6 100644 --- a/src/components/demo/PageIndexArticle/index.vue +++ b/src/components/demo/PageIndexArticle/index.vue @@ -1,7 +1,7 @@ diff --git a/src/pages/demo/components/countup/index.vue b/src/pages/demo/components/countup/index.vue index 89537a14..8baf119f 100644 --- a/src/pages/demo/components/countup/index.vue +++ b/src/pages/demo/components/countup/index.vue @@ -11,7 +11,7 @@

只设置目标数字

- +
@@ -19,7 +19,7 @@

设置起止数值

- +
@@ -27,7 +27,7 @@

小数位数

- +
@@ -35,7 +35,7 @@

动画时长

- +
@@ -43,7 +43,7 @@

回调函数

- +
@@ -51,7 +51,7 @@

结束一秒后更新数值

- +
diff --git a/src/pages/demo/components/editor-quill/index.vue b/src/pages/demo/components/editor-quill/index.vue index 1c96cacc..910f7218 100644 --- a/src/pages/demo/components/editor-quill/index.vue +++ b/src/pages/demo/components/editor-quill/index.vue @@ -15,7 +15,7 @@ - + diff --git a/src/pages/demo/components/highlight/index.vue b/src/pages/demo/components/highlight/index.vue index e998f258..bd20d7d4 100644 --- a/src/pages/demo/components/highlight/index.vue +++ b/src/pages/demo/components/highlight/index.vue @@ -8,25 +8,25 @@

javascript

- +

css

- +

scss

- +

html

- +
diff --git a/src/pages/demo/components/icon/components/IconCell.vue b/src/pages/demo/components/icon/components/IconCell.vue index 80196643..48f1c8e4 100644 --- a/src/pages/demo/components/icon/components/IconCell.vue +++ b/src/pages/demo/components/icon/components/IconCell.vue @@ -54,7 +54,7 @@ export default { return `` }, iconComponent () { - return `` + return `` } }, methods: { diff --git a/src/pages/demo/components/icon/icon.vue b/src/pages/demo/components/icon/icon.vue index 0ad219b4..ffd92d2e 100644 --- a/src/pages/demo/components/icon/icon.vue +++ b/src/pages/demo/components/icon/icon.vue @@ -6,10 +6,10 @@ title="图标组件" url="https://github.com/FairyEver/d2admin-vue-element/blob/master/src/components/core/Icon/index.vue"> - - - - + + + + diff --git a/src/pages/demo/components/icon/select.vue b/src/pages/demo/components/icon/select.vue index 061873ec..82a3ba77 100644 --- a/src/pages/demo/components/icon/select.vue +++ b/src/pages/demo/components/icon/select.vue @@ -16,7 +16,7 @@

- +

用户可以输入

@@ -27,7 +27,7 @@

- +
diff --git a/src/pages/demo/components/icon/svg.vue b/src/pages/demo/components/icon/svg.vue index f4f8d4b2..6a584676 100644 --- a/src/pages/demo/components/icon/svg.vue +++ b/src/pages/demo/components/icon/svg.vue @@ -7,7 +7,7 @@ - +
{{icon}}
diff --git a/src/pages/demo/plugins/export/table.vue b/src/pages/demo/plugins/export/table.vue index e6345463..22691373 100644 --- a/src/pages/demo/plugins/export/table.vue +++ b/src/pages/demo/plugins/export/table.vue @@ -6,11 +6,11 @@
- + 导出 CSV - + 导出 Excel
diff --git a/src/pages/demo/plugins/export/txt.vue b/src/pages/demo/plugins/export/txt.vue index 7acffb07..01a33ad5 100644 --- a/src/pages/demo/plugins/export/txt.vue +++ b/src/pages/demo/plugins/export/txt.vue @@ -12,7 +12,7 @@
- + 保存为 txt
diff --git a/src/pages/demo/plugins/import/csv.vue b/src/pages/demo/plugins/import/csv.vue index 0356de94..f9bc7d0a 100644 --- a/src/pages/demo/plugins/import/csv.vue +++ b/src/pages/demo/plugins/import/csv.vue @@ -7,14 +7,14 @@
- + 下载演示 .csv 表格
- + 选择要导入的 .csv 表格 diff --git a/src/pages/demo/plugins/import/xlsx.vue b/src/pages/demo/plugins/import/xlsx.vue index 1a555a0e..82cf8091 100644 --- a/src/pages/demo/plugins/import/xlsx.vue +++ b/src/pages/demo/plugins/import/xlsx.vue @@ -7,14 +7,14 @@
- + 下载演示 .xlsx 表格
- + 选择要导入的 .xlsx 表格 diff --git a/src/pages/demo/plugins/mock/components/MockDemoCard.vue b/src/pages/demo/plugins/mock/components/MockDemoCard.vue index 81ffc448..585df91c 100644 --- a/src/pages/demo/plugins/mock/components/MockDemoCard.vue +++ b/src/pages/demo/plugins/mock/components/MockDemoCard.vue @@ -9,12 +9,12 @@
- +
- +
diff --git a/static/md/组件 - 代码高亮.md b/static/md/组件 - 代码高亮.md index 0feb72ec..2ababbb3 100644 --- a/static/md/组件 - 代码高亮.md +++ b/static/md/组件 - 代码高亮.md @@ -7,7 +7,7 @@ ## 示例 ``` - + ``` > 本框架只是提供代码高亮的简单实现,如需实现更高级的设置请修改组件代码 \ No newline at end of file diff --git a/static/md/组件 - 图标组件 - svg.md b/static/md/组件 - 图标组件 - svg.md index 44164e28..e9dd1a34 100644 --- a/static/md/组件 - 图标组件 - svg.md +++ b/static/md/组件 - 图标组件 - svg.md @@ -11,7 +11,7 @@ 然后使用组件 ``` - + ``` ## 获取已经注册的所有图标 diff --git a/static/md/组件 - 图标组件.md b/static/md/组件 - 图标组件.md index d593cef6..122c6418 100644 --- a/static/md/组件 - 图标组件.md +++ b/static/md/组件 - 图标组件.md @@ -10,22 +10,22 @@ ``` // 这样用没有毛病 但是也没什么用 - + // 指定图标名称 - + // 设置行内样式 - + // 设置 class - + ``` 这个组件只是简化了写法而已 ``` - + // 等同于 ``` diff --git a/static/md/组件 - 数字动画.md b/static/md/组件 - 数字动画.md index 31a3a7d6..44c1797b 100644 --- a/static/md/组件 - 数字动画.md +++ b/static/md/组件 - 数字动画.md @@ -13,13 +13,13 @@ ``` // 基本使用方法 - + // 设置始末值 - + // 设置动画时间 - + ``` 组件会在页面上渲染 `` 标签