From c755733a9ca3bbcf4514e948bbbb5e0accd13e6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= Date: Wed, 1 Mar 2017 14:28:44 +0800 Subject: [PATCH] support Grid support Grid --- README.md | 2 +- src/components/{layout => grid}/col.vue | 0 src/components/{layout => grid}/index.js | 0 src/components/{layout => grid}/row.vue | 2 +- src/index.js | 6 ++--- test/app.vue | 32 +++--------------------- test/main.js | 4 +++ test/routers/affix.vue | 11 ++++++++ test/routers/grid.vue | 26 +++++++++++++++++++ 9 files changed, 49 insertions(+), 34 deletions(-) rename src/components/{layout => grid}/col.vue (100%) rename src/components/{layout => grid}/index.js (100%) rename src/components/{layout => grid}/row.vue (99%) create mode 100644 test/routers/grid.vue diff --git a/README.md b/README.md index 09df6a5d..818c31c8 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ ### English (Coming soon) ## Programming -- [ ] Grid +- [x] Grid - [ ] Layout - [ ] Button - [ ] Icon diff --git a/src/components/layout/col.vue b/src/components/grid/col.vue similarity index 100% rename from src/components/layout/col.vue rename to src/components/grid/col.vue diff --git a/src/components/layout/index.js b/src/components/grid/index.js similarity index 100% rename from src/components/layout/index.js rename to src/components/grid/index.js diff --git a/src/components/layout/row.vue b/src/components/grid/row.vue similarity index 99% rename from src/components/layout/row.vue rename to src/components/grid/row.vue index 7b076efd..8554d7b2 100644 --- a/src/components/layout/row.vue +++ b/src/components/grid/row.vue @@ -69,7 +69,7 @@ this.updateGutter(val); } }, - ready () { + mounted () { this.updateGutter(this.gutter); } }; diff --git a/src/index.js b/src/index.js index d8cb4c4e..77e8f7af 100644 --- a/src/index.js +++ b/src/index.js @@ -42,7 +42,7 @@ import Affix from './components/affix'; // import Transfer from './components/transfer'; // import Tree from './components/tree'; // import Upload from './components/upload'; -// import { Row, Col } from './components/layout'; +import { Row, Col } from './components/grid'; // import { Select, Option, OptionGroup } from './components/select'; import locale from './locale'; @@ -68,7 +68,7 @@ const iview = { // DropdownMenu: Dropdown.Menu, // iForm: Form, // FormItem: Form.Item, - // iCol: Col, + iCol: Col, // Collapse, // Icon, // iInput: Input, @@ -90,7 +90,7 @@ const iview = { // Radio, // RadioGroup: Radio.Group, // Rate, - // Row, + Row, // iSelect: Select, // Slider, // Spin, diff --git a/test/app.vue b/test/app.vue index bad53324..c0a4ee68 100644 --- a/test/app.vue +++ b/test/app.vue @@ -24,34 +24,8 @@ li + li {
@@ -64,7 +38,7 @@ li + li { } }, - ready: function() { + mounted: function() { }, beforeDestroy: function() { diff --git a/test/main.js b/test/main.js index c78429e4..c1fbd330 100644 --- a/test/main.js +++ b/test/main.js @@ -20,6 +20,10 @@ const router = new VueRouter({ { path: '/affix', component: require('./routers/affix.vue') + }, + { + path: '/grid', + component: require('./routers/grid.vue') } ] }); diff --git a/test/routers/affix.vue b/test/routers/affix.vue index 299f0840..fe38a9cb 100644 --- a/test/routers/affix.vue +++ b/test/routers/affix.vue @@ -1,3 +1,14 @@ +