diff --git a/components/page/options.vue b/components/page/options.vue index 51716e5..0d5e441 100644 --- a/components/page/options.vue +++ b/components/page/options.vue @@ -1,7 +1,7 @@ <template> <div v-if="showSizer || showElevator" :class="optsClasses"> <div v-if="showSizer" :class="sizerClasses"> - <i-select :model.sync="pageSize" @on-change="changeSize"> + <i-select :model.sync="pageSize" :size="size" @on-change="changeSize"> <i-option v-for="item in pageSizeOpts" :value="item" style="text-align:center;">{{ item }} 条/页</i-option> </i-select> </div> @@ -31,9 +31,13 @@ current: Number, _current: Number, pageSize: Number, - allPages: Number + allPages: Number, + isSmall: Boolean }, computed: { + size () { + return this.isSmall ? 'small' : 'default'; + }, optsClasses () { return [ `${prefixCls}-options` diff --git a/components/page/page.vue b/components/page/page.vue index 5fdfbd0..470b518 100644 --- a/components/page/page.vue +++ b/components/page/page.vue @@ -56,6 +56,7 @@ :_current.once="current" :current.sync="current" :all-pages="allPages" + :is-small="isSmall" @on-size="onSize" @on-page="onPage"> </Options> @@ -116,6 +117,9 @@ } }, computed: { + isSmall () { + return !!this.size; + }, allPages () { const allPage = Math.ceil(this.total / this.pageSize); return (allPage === 0) ? 1 : allPage; diff --git a/components/select/select.vue b/components/select/select.vue index 21bbb3e..b09b02d 100644 --- a/components/select/select.vue +++ b/components/select/select.vue @@ -71,7 +71,7 @@ }, size: { validator (value) { - return oneOf(value, ['small', 'large']); + return oneOf(value, ['small', 'large', 'default']); } }, labelInValue: { diff --git a/local/routers/index.vue b/local/routers/index.vue index 28fcae6..6e69d39 100644 --- a/local/routers/index.vue +++ b/local/routers/index.vue @@ -2,7 +2,9 @@ </style> <template> - <Page :total="100" show-sizer></Page> + <Page :total="40" size="small"></Page> + <Page :total="40" size="small" show-elevator show-sizer></Page> + <Page :total="40" size="small" show-total></Page> </template> <script> import { Modal, Button, Message, Page } from 'iview'; diff --git a/local/routers/select.vue b/local/routers/select.vue index 1bd88d1..130b058 100644 --- a/local/routers/select.vue +++ b/local/routers/select.vue @@ -1,6 +1,6 @@ <template> <div> - <!--<br><br><br><br><br><br><br><br><br><br><br>--> + <br><br><br><br><br><br><br><br><br><br><br> {{ city | json }}<br> <Button @click="city = 'hangzhou'">切换城市</Button> <br> diff --git a/package.json b/package.json index 4b22082..5691432 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "iview", - "version": "0.9.4rc-3", + "version": "0.9.4rc-4", "title": "iView", "description": "A high quality UI components Library with Vue.js", "homepage": "http://www.iviewui.com", -- libgit2 0.21.4