diff --git a/examples/app.vue b/examples/app.vue
index 7d328be04..4a568f7d4 100644
--- a/examples/app.vue
+++ b/examples/app.vue
@@ -268,10 +268,6 @@
-
-
\ No newline at end of file
diff --git a/examples/components/table-filter.vue b/examples/components/table-filter.vue
deleted file mode 100644
index a0390df30..000000000
--- a/examples/components/table-filter.vue
+++ /dev/null
@@ -1,30 +0,0 @@
-
- haha
-
-
-
-
-
\ No newline at end of file
diff --git a/examples/components/toc-item.vue b/examples/components/toc-item.vue
deleted file mode 100644
index 971513ab2..000000000
--- a/examples/components/toc-item.vue
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/examples/components/toc.vue b/examples/components/toc.vue
deleted file mode 100644
index f7ef3c675..000000000
--- a/examples/components/toc.vue
+++ /dev/null
@@ -1,203 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/examples/data/cascader.json b/examples/data/cascader.json
deleted file mode 100644
index fe758cdc1..000000000
--- a/examples/data/cascader.json
+++ /dev/null
@@ -1,29 +0,0 @@
-[
- {
- "label": "普通业务",
- "value": "普通业务",
- "children": [
- {
- "label": "业务1",
- "value": "业务1",
- "children": [
- {
- "label": "业务5",
- "value": "业务5",
- "children": []
- }
- ]
- },
- {
- "label": "业务2",
- "value": "业务2",
- "children": []
- }
- ]
- },
- {
- "label": "会员业务",
- "value": "会员业务",
- "children": []
- }
-]
diff --git a/examples/data/select-disabled.json b/examples/data/select-disabled.json
deleted file mode 100644
index d977035bb..000000000
--- a/examples/data/select-disabled.json
+++ /dev/null
@@ -1,19 +0,0 @@
-[
- {
- "label": "选项1",
- "value": "结果1"
- },
- {
- "label": "选项2",
- "value": "结果2",
- "disabled": true
- },
- {
- "label": "选项3",
- "value": "结果3"
- },
- {
- "label": "选项4",
- "value": "结果4"
- }
-]
diff --git a/examples/data/select-group.json b/examples/data/select-group.json
deleted file mode 100644
index c30ebb732..000000000
--- a/examples/data/select-group.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
- "gourp1": [
- {
- "label": "选项1",
- "value": "结果1"
- },
- {
- "label": "选项2",
- "value": "结果2"
- },
- {
- "label": "选项3",
- "value": "结果3"
- },
- {
- "label": "选项4",
- "value": "结果4"
- },
- {
- "label": "选项5",
- "value": "结果5"
- },
- {
- "label": "选项6",
- "value": "结果6"
- }
- ],
- "gourp2": [
- {
- "label": "选项7",
- "value": "结果7"
- },
- {
- "label": "选项8",
- "value": "结果8"
- },
- {
- "label": "选项9",
- "value": "结果9"
- },
- {
- "label": "选项10",
- "value": "结果10"
- },
- {
- "label": "选项11",
- "value": "结果11"
- },
- {
- "label": "选项12",
- "value": "结果12"
- }
- ]
-}
\ No newline at end of file
diff --git a/examples/data/select-normal.json b/examples/data/select-normal.json
deleted file mode 100644
index 2310060da..000000000
--- a/examples/data/select-normal.json
+++ /dev/null
@@ -1,32 +0,0 @@
-[
- {
- "label": "选项1",
- "value": "结果1",
- "remark": "remark1"
- },
- {
- "label": "选项2",
- "value": "结果2",
- "remark": "remark2"
- },
- {
- "label": "选项3",
- "value": "结果3",
- "remark": "remark3"
- },
- {
- "label": "选项4",
- "value": "结果4",
- "remark": "remark4"
- },
- {
- "label": "选项5",
- "value": "结果5",
- "remark": "remark5"
- },
- {
- "label": "选项6",
- "value": "结果6",
- "remark": "remark6"
- }
-]
diff --git a/examples/docs/guideline.md b/examples/docs/guideline.md
deleted file mode 100644
index f28fa723a..000000000
--- a/examples/docs/guideline.md
+++ /dev/null
@@ -1,123 +0,0 @@
-
- 选择合适的导航
- 选择合适的导航可以让用户在产品的使用过程中非常流畅,相反若是不合适就会引起用户操作不适(方向不明确),以下是「侧栏导航」和「顶部导航」的区别。
-
- 侧栏导航:
- 可将导航栏固定在左侧,提高导航可见性,方便页面之间切换;顶部可放置常用工具,如搜索条、帮助按钮、通知按钮等。适用于中后台的管理型、工具型网站。
-
-
-
- 顶部导航:
- 顺应了从上至下的正常浏览顺序,方便浏览信息;顶部宽度限制了导航的数量和文本长度。
-
-
-
-
- 一级类目
-
-
-
-
-
- 适用于导航较少,页面篇幅较长的网站;
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/examples/nav.config.json b/examples/nav.config.json
index acf1d7964..840fcd556 100644
--- a/examples/nav.config.json
+++ b/examples/nav.config.json
@@ -1,31 +1,4 @@
[
- {
- "group": "使用说明",
- "list": [
- {
- "path": "/quickstart",
- "name": "快速上手"
- },
- {
- "path": "/development",
- "name": "开发指南"
- },
- {
- "path": "/changelog",
- "name": "更新日志"
- }
- ]
- },
- {
- "group": "设计指南",
- "list": [
- {
- "path": "/menu",
- "name": "导航",
- "description": "导航(Navigation) 可以解决用户在访问页面时:在哪里,去哪里,怎么去的问题。一般导航会有「侧栏导航」和「顶部导航」2种类型。"
- }
- ]
- },
{
"group": "Basic",
"list": [
@@ -247,5 +220,18 @@
"description": "出现在按钮、图标旁的数字或状态标记"
}
]
+ },
+ {
+ "group": "使用说明",
+ "list": [
+ {
+ "path": "/quickstart",
+ "name": "快速上手"
+ },
+ {
+ "path": "/development",
+ "name": "开发指南"
+ }
+ ]
}
]
diff --git a/examples/pages/changelog.vue b/examples/pages/changelog.vue
new file mode 100644
index 000000000..660c7d6e2
--- /dev/null
+++ b/examples/pages/changelog.vue
@@ -0,0 +1,3 @@
+
+ changelog
+
\ No newline at end of file
diff --git a/examples/pages/component.vue b/examples/pages/component.vue
new file mode 100644
index 000000000..ba32c22ce
--- /dev/null
+++ b/examples/pages/component.vue
@@ -0,0 +1,3 @@
+
+
+
\ No newline at end of file
diff --git a/examples/pages/design.vue b/examples/pages/design.vue
new file mode 100644
index 000000000..2cd156d6e
--- /dev/null
+++ b/examples/pages/design.vue
@@ -0,0 +1,3 @@
+
+ design
+
\ No newline at end of file
diff --git a/examples/pages/guide.vue b/examples/pages/guide.vue
new file mode 100644
index 000000000..ba32c22ce
--- /dev/null
+++ b/examples/pages/guide.vue
@@ -0,0 +1,3 @@
+
+
+
\ No newline at end of file
diff --git a/examples/pages/nav.vue b/examples/pages/nav.vue
new file mode 100644
index 000000000..c51234892
--- /dev/null
+++ b/examples/pages/nav.vue
@@ -0,0 +1,3 @@
+
+ nav
+
\ No newline at end of file
diff --git a/examples/pages/resource.vue b/examples/pages/resource.vue
new file mode 100644
index 000000000..d59cdd2c9
--- /dev/null
+++ b/examples/pages/resource.vue
@@ -0,0 +1,3 @@
+
+ resource
+
\ No newline at end of file
diff --git a/examples/route.config.js b/examples/route.config.js
index 04f2b87a6..c12868857 100644
--- a/examples/route.config.js
+++ b/examples/route.config.js
@@ -1,15 +1,18 @@
import navConfig from './nav.config.json';
const registerRoute = (config) => {
- let route = [];
+ let route = [{
+ path: '/component',
+ component: require('./pages/component.vue'),
+ children: []
+ }];
config
.map(nav =>
nav.list.map(page => {
- if (page.path === '/changelog') return;
const component = require(`./docs${page.path}.md`);
- route.push({
- path: page.path,
+ route[0].children.push({
+ path: page.path.slice(1),
meta: {
title: page.title || page.name,
description: page.description
@@ -24,10 +27,33 @@ const registerRoute = (config) => {
const route = registerRoute(navConfig);
-route.route.push({
+let guideRoute = {
+ path: '/guide',
+ name: '指南',
+ component: require('./pages/guide.vue'),
+ children: [{
+ path: 'design',
+ name: '设计原则',
+ component: require('./pages/design.vue')
+ }, {
+ path: 'nav',
+ name: '导航',
+ component: require('./pages/nav.vue')
+ }]
+};
+
+let resourceRoute = {
+ path: '/resource',
+ name: '资源',
+ component: require('./pages/resource.vue')
+};
+
+let changeLogRoute = {
path: '/changelog',
- component: require('../CHANGELOG.md')
-});
+ component: require('./pages/changelog.vue')
+};
+
+route.route = route.route.concat([guideRoute, resourceRoute, changeLogRoute]);
route.route.push({
path: '*',
diff --git a/src/index.js b/src/index.js
index 7a3f3d135..9e2595432 100644
--- a/src/index.js
+++ b/src/index.js
@@ -43,7 +43,7 @@ import Loading from '../packages/loading/index.js';
import Icon from '../packages/icon/index.js';
import Row from '../packages/row/index.js';
import Col from '../packages/col/index.js';
-// import Upload from '../packages/upload/index.js';
+import Upload from '../packages/upload/index.js';
import Progress from '../packages/progress/index.js';
import Spinner from '../packages/spinner/index.js';
import Message from '../packages/message/index.js';
@@ -98,7 +98,7 @@ const install = function(Vue) {
Vue.component(Icon.name, Icon);
Vue.component(Row.name, Row);
Vue.component(Col.name, Col);
- // Vue.component(Upload.name, Upload);
+ Vue.component(Upload.name, Upload);
Vue.component(Progress.name, Progress);
Vue.component(Spinner.name, Spinner);
Vue.component(Message.name, Message);
@@ -170,7 +170,7 @@ module.exports = {
Icon,
Row,
Col,
- // Upload,
+ Upload,
Progress,
Spinner,
Message,