diff --git a/components/checkbox/demo/layout.vue b/components/checkbox/demo/layout.vue
index c4e4708d0..9da57ce8e 100644
--- a/components/checkbox/demo/layout.vue
+++ b/components/checkbox/demo/layout.vue
@@ -1,12 +1,12 @@
-
- A
- B
- C
- D
- E
-
+
+ A
+ B
+ C
+ D
+ E
+
+
diff --git a/components/grid/demo/basic.vue b/components/grid/demo/basic.vue
new file mode 100644
index 000000000..dd6b80617
--- /dev/null
+++ b/components/grid/demo/basic.vue
@@ -0,0 +1,48 @@
+
+
+
+ 100%
+
+
+ 25%
+ 25%
+
+
+ 33.33%
+ 33.33%
+
+
+ 50%
+
+
+ 66.66%
+
+
+
+
+
diff --git a/components/grid/demo/complex.vue b/components/grid/demo/complex.vue
new file mode 100644
index 000000000..490bbb4c7
--- /dev/null
+++ b/components/grid/demo/complex.vue
@@ -0,0 +1,34 @@
+
+
+
+
+
diff --git a/components/grid/demo/flex-order.vue b/components/grid/demo/flex-order.vue
new file mode 100644
index 000000000..2f680b396
--- /dev/null
+++ b/components/grid/demo/flex-order.vue
@@ -0,0 +1,35 @@
+
+
+
+ 1 col-order-4
+ 2 col-order-3
+ 3 col-order-2
+ 4 col-order-1
+
+
+
+
+
diff --git a/components/grid/demo/flex.vue b/components/grid/demo/flex.vue
new file mode 100644
index 000000000..d7deb1566
--- /dev/null
+++ b/components/grid/demo/flex.vue
@@ -0,0 +1,68 @@
+
+
+
sub-element align left
+
+ col-4
+ col-4
+ col-4
+ col-4
+
+
+
sub-element align center
+
+ col-4
+ col-4
+ col-4
+ col-4
+
+
+
sub-element align right
+
+ col-4
+ col-4
+ col-4
+ col-4
+
+
+
sub-element monospaced arrangement
+
+ col-4
+ col-4
+ col-4
+ col-4
+
+
+
sub-element align full
+
+ col-4
+ col-4
+ col-4
+ col-4
+
+
+
+
+
diff --git a/components/grid/demo/flexible.vue b/components/grid/demo/flexible.vue
new file mode 100644
index 000000000..96a5c6a01
--- /dev/null
+++ b/components/grid/demo/flexible.vue
@@ -0,0 +1,34 @@
+
+
+
+
+
diff --git a/components/grid/demo/gutter.vue b/components/grid/demo/gutter.vue
new file mode 100644
index 000000000..b9ce3d289
--- /dev/null
+++ b/components/grid/demo/gutter.vue
@@ -0,0 +1,35 @@
+
+
+
+ col-6
+ col-6
+ col-6
+ col-6
+
+
+
+
+
diff --git a/components/grid/demo/index.vue b/components/grid/demo/index.vue
new file mode 100644
index 000000000..9d25299d3
--- /dev/null
+++ b/components/grid/demo/index.vue
@@ -0,0 +1,75 @@
+
+
+
基础布局
+
+
恩。基础
+
+
区块间隔
+
+
偏移
+
+
栅格排序
+
+
FLEX
+
+
对齐
+
+
Flex排序
+
+
响应式设计
+
+
复杂一点
+
+
+
+
+
diff --git a/components/grid/demo/layout.vue b/components/grid/demo/layout.vue
new file mode 100644
index 000000000..58ca44de9
--- /dev/null
+++ b/components/grid/demo/layout.vue
@@ -0,0 +1,44 @@
+
+
+
+ col-12
+ col-12
+
+
+ col-8
+ col-8
+ col-8
+
+
+ col-6
+ col-6
+ col-6
+ col-6
+
+
+
+
+
diff --git a/components/grid/demo/offset.vue b/components/grid/demo/offset.vue
new file mode 100644
index 000000000..293141411
--- /dev/null
+++ b/components/grid/demo/offset.vue
@@ -0,0 +1,40 @@
+
+
+
+ col-8
+ col-8
+
+
+ col-6 col-offset-6
+ col-6 col-offset-6
+
+
+ col-12 col-offset-6
+
+
+
+
+
diff --git a/components/grid/demo/pull.vue b/components/grid/demo/pull.vue
new file mode 100644
index 000000000..1b249d074
--- /dev/null
+++ b/components/grid/demo/pull.vue
@@ -0,0 +1,33 @@
+
+
+
+ col-18 col-push-6
+ col-6 col-pull-18
+
+
+
+
+
diff --git a/components/grid/index.js b/components/grid/index.js
index 352a384d8..cd65231b0 100644
--- a/components/grid/index.js
+++ b/components/grid/index.js
@@ -1,7 +1,6 @@
-import Row from './row.vue'
-import Col from './col.vue'
+import Row from './Row.vue'
+import Col from './Col.vue'
export default {
Col, Row,
}
-
diff --git a/components/index.js b/components/index.js
index cf558bf16..eb40554f5 100644
--- a/components/index.js
+++ b/components/index.js
@@ -14,6 +14,6 @@ export { default as ToolTip } from './tooltip'
export { default as Pagination } from './pagination'
-export { default as Row } from './grid/row'
+export { default as Row } from './grid/Row'
-export { default as Col } from './grid/col'
+export { default as Col } from './grid/Col'
diff --git a/components/pagination/demo/pagination.vue b/components/pagination/demo/pagination.vue
index 882548b64..2787d175d 100644
--- a/components/pagination/demo/pagination.vue
+++ b/components/pagination/demo/pagination.vue
@@ -8,7 +8,7 @@
改值
@@ -22,7 +22,7 @@ export default {
return {
simple: true,
current: 1,
- total: 500,
+ total: 483,
}
},
methods: {
@@ -32,6 +32,9 @@ export default {
getValue () {
alert(this.current)
},
+ showTotal (total) {
+ return `共 ${total} 条`
+ },
},
components: {
Pagination,
diff --git a/components/pagination/pagination.vue b/components/pagination/pagination.vue
index fe2ea60a5..361bab746 100644
--- a/components/pagination/pagination.vue
+++ b/components/pagination/pagination.vue
@@ -52,6 +52,7 @@ export default {
type: Boolean,
default: true,
},
+ showTotal: Function,
},
model: {
prop: 'current',
diff --git a/examples/grid.vue b/examples/grid.vue
deleted file mode 100644
index a721853b9..000000000
--- a/examples/grid.vue
+++ /dev/null
@@ -1,98 +0,0 @@
-
-
-
-
-
- 1
-
-
- 2
-
-
- 3
-
-
- 4
-
-
-
-
-
-
- offset = 2
-
-
- offset = 2
-
-
-
-
-
-
- F
-
-
- L
-
-
- E
-
-
- X
-
-
-
-
-
-
-