From 91f12786d05451f05e8fe731f8b80649a1f8d41d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=9D=A8?= <1711467488@qq.com>
Date: Mon, 19 Mar 2018 21:57:16 +0800
Subject: [PATCH] no message
Former-commit-id: 9feaadf3f4fb10c3ba2e2f00db5be6eebdcd730f
Former-commit-id: 4d8eced27d2c8a388d5e10edbb80c221cbe835a3
Former-commit-id: 356c057e6780b48b7ae1afc841604d099f85c86d
---
src/components/core/Container/index.vue | 4 +-
src/pages/core/index/index.vue | 7 +++-
.../demo/business/container/full-card.vue | 2 +-
.../{full-card.vue => card-full.vue} | 2 +-
src/router/menu/_business.js | 6 +--
src/router/menu/_components.js | 6 +--
.../article/演示文章 - 长页面.md | 3 +-
.../markdownFiles/article/组件 - 页面容器.md | 2 +-
static/markdownFiles/article/首页.md | 41 -------------------
9 files changed, 17 insertions(+), 56 deletions(-)
rename src/pages/demo/components/container/{full-card.vue => card-full.vue} (87%)
delete mode 100644 static/markdownFiles/article/首页.md
diff --git a/src/components/core/Container/index.vue b/src/components/core/Container/index.vue
index 92dd8a18..f72abad3 100644
--- a/src/components/core/Container/index.vue
+++ b/src/components/core/Container/index.vue
@@ -10,8 +10,8 @@
-
-
+
+
diff --git a/src/pages/core/index/index.vue b/src/pages/core/index/index.vue
index 7bc0a631..43266e69 100644
--- a/src/pages/core/index/index.vue
+++ b/src/pages/core/index/index.vue
@@ -1,5 +1,8 @@
-
-
+
+
+ 我是插入到 header 中的内容
+
+
\ No newline at end of file
diff --git a/src/pages/demo/business/container/full-card.vue b/src/pages/demo/business/container/full-card.vue
index f22daa43..f3eeee6f 100644
--- a/src/pages/demo/business/container/full-card.vue
+++ b/src/pages/demo/business/container/full-card.vue
@@ -1,5 +1,5 @@
-
+
我是插入到 header 中的内容
diff --git a/src/pages/demo/components/container/full-card.vue b/src/pages/demo/components/container/card-full.vue
similarity index 87%
rename from src/pages/demo/components/container/full-card.vue
rename to src/pages/demo/components/container/card-full.vue
index f22daa43..f3eeee6f 100644
--- a/src/pages/demo/components/container/full-card.vue
+++ b/src/pages/demo/components/container/card-full.vue
@@ -1,5 +1,5 @@
-
+
我是插入到 header 中的内容
diff --git a/src/router/menu/_business.js b/src/router/menu/_business.js
index d79506c2..576b7e7c 100644
--- a/src/router/menu/_business.js
+++ b/src/router/menu/_business.js
@@ -39,12 +39,12 @@ export const menu = {
// {
// title: '撑满',
// icon: 'file-o',
- // path: 'container/full-card',
- // name: 'demo-business-container-full-card',
+ // path: 'container/card-full',
+ // name: 'demo-business-container-card-full',
// meta: {
// requiresAuth: true
// },
- // component: resolve => { require(['@/pages/demo/business/container/full-card.vue'], resolve) }
+ // component: resolve => { require(['@/pages/demo/business/container/card-full.vue'], resolve) }
// }
// ]
// }
diff --git a/src/router/menu/_components.js b/src/router/menu/_components.js
index e9173f23..f508bd41 100644
--- a/src/router/menu/_components.js
+++ b/src/router/menu/_components.js
@@ -49,12 +49,12 @@ export const menu = {
{
title: '撑满',
icon: 'file-o',
- path: 'container/full-card',
- name: 'demo-components-container-full-card',
+ path: 'container/card-full',
+ name: 'demo-components-container-card-full',
meta: {
requiresAuth: true
},
- component: resolve => { require(['@/pages/demo/components/container/full-card.vue'], resolve) }
+ component: resolve => { require(['@/pages/demo/components/container/card-full.vue'], resolve) }
}
]
},
diff --git a/static/markdownFiles/article/演示文章 - 长页面.md b/static/markdownFiles/article/演示文章 - 长页面.md
index 21ae8062..1f6e8fef 100644
--- a/static/markdownFiles/article/演示文章 - 长页面.md
+++ b/static/markdownFiles/article/演示文章 - 长页面.md
@@ -1,4 +1,4 @@
-> 这是一个较长的演示文章
+> 这是一个较长的演示文章，仅仅是为了演示一些文字的显示效果
## vue.js
@@ -53,4 +53,3 @@ Element，一套为开发者、设计师和产品经理准备的基于 Vue 2.0
- 用户决策：根据场景可给予用户操作建议或安全提示，但不能代替用户进行决策；
- 结果可控：用户可以自由的进行操作，包括撤销、回退和终止当前操作等。
-
diff --git a/static/markdownFiles/article/组件 - 页面容器.md b/static/markdownFiles/article/组件 - 页面容器.md
index 94d554d0..69d71b89 100644
--- a/static/markdownFiles/article/组件 - 页面容器.md
+++ b/static/markdownFiles/article/组件 - 页面容器.md
@@ -4,7 +4,7 @@
| 参数名 | 介绍 | 必选 | 值类型 | 可选值 | 默认值 |
| --- | --- | --- | --- | --- | --- |
-| type | 容器类型 | 非 | String | card ghost full-card | card |
+| type | 容器类型 | 非 | String | card ghost card-full | card |
| responsive | 响应式宽度 | 非 | Boolean | | false |
> `responsive` 参数设置只在 `type` 等于 `card` 或 `ghost` 时生效
diff --git a/static/markdownFiles/article/首页.md b/static/markdownFiles/article/首页.md
deleted file mode 100644
index 9352a222..00000000
--- a/static/markdownFiles/article/首页.md
+++ /dev/null
@@ -1,41 +0,0 @@
-# D2Admin vue
-
-`D2Admin` 是一个后台管理系统模板
-
-本模板包含
-
-* 常用插件集成
-* 常用插件封装成 `vue` 组件
-* 演示业务页面（仅是提供一些实现演示）
-
-不建议直接在此基础上开发，请根据自己的需要删除不必要的文件和设置后使用
-
-## 已经实现(提供基础简单实现)的功能
-
-> 注 以下所有提到的功能仅代表提供了一种实现方式，有些功能只是基本实现，请根据自身需要取舍和改进
-
-* `markdown` 文件加载和解析
-* `markdown` 编辑器
-* 富文本编辑器
-* 可拖拽的网格布局
-* 可拖拽调整大小的分栏布局
-* 表格文件数据解析
-* 数字渐变动画
-* 代码高亮显示
-* `HTML` 格式化输出显示
-* 自动根据路由配置生成菜单
-* 图标选择器(组件)
-* 接口 `mock` 数据拦截
-* 登陆逻辑
-* 路由鉴权(登陆状态)
-* 简化和统一调试时控制台输出
-* 响应式 `container` 组件(页面容器)
-
-## 集成的插件/库
-* 剪切板操作库
-* `cookie` 操作库
-* 图标库 `font-awesome`
-
-
-
-