diff --git a/CHANGE.md b/CHANGE.md index a1a85e1f..ebf1cace 100644 --- a/CHANGE.md +++ b/CHANGE.md @@ -42,4 +42,6 @@ Menu 的 activeKey 改为 activeName,openKeys 改为 openNames ### Cascader Caspanel 的 sublist 从 prop -> data ### Select -model 改为 value,支持 v-model \ No newline at end of file +model 改为 value,支持 v-model +### Page +class 改为 className \ No newline at end of file diff --git a/README.md b/README.md index 8ecece9b..942732d5 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,7 @@ - [x] Menu - [x] Tabs - [x] Dropdown -- [ ] Page +- [x] Page - [x] Breadcrumb - [x] Steps - [ ] LoadingBar diff --git a/examples/app.vue b/examples/app.vue index 5065d717..7863722d 100644 --- a/examples/app.vue +++ b/examples/app.vue @@ -45,6 +45,7 @@ li + li { border-left: solid 1px #bbb; padding-left: 10px; margin-left: 10px; }
  • Cascader
  • Select
  • Backtop
  • +
  • Page
  • diff --git a/examples/main.js b/examples/main.js index b0135b4f..58b5d752 100644 --- a/examples/main.js +++ b/examples/main.js @@ -144,6 +144,10 @@ const router = new VueRouter({ { path: '/backtop', component: require('./routers/back-top.vue') + }, + { + path: '/page', + component: require('./routers/page.vue') } ] }); diff --git a/examples/routers/page.vue b/examples/routers/page.vue index bde2fa94..52df29c8 100644 --- a/examples/routers/page.vue +++ b/examples/routers/page.vue @@ -1,9 +1,11 @@ + \ No newline at end of file diff --git a/src/components/page/page.vue b/src/components/page/page.vue index 9f09a80d..b2d419f4 100644 --- a/src/components/page/page.vue +++ b/src/components/page/page.vue @@ -6,10 +6,10 @@ @click="prev"> -
    +
    @@ -34,13 +34,13 @@
  • 1
  • -
  • -
  • {{ current - 2 }}
  • -
  • {{ current - 1 }}
  • -
  • {{ current }}
  • -
  • {{ current + 1 }}
  • -
  • {{ current + 2 }}
  • -
  • +
  • +
  • {{ currentPage - 2 }}
  • +
  • {{ currentPage - 1 }}
  • +
  • {{ currentPage }}
  • +
  • {{ currentPage + 1 }}
  • +
  • {{ currentPage + 2 }}
  • +
  • {{ allPages }}
  • = this.allPages) { return false; } this.changePage(current + 1); }, fastPrev () { - const page = this.current - 5; + const page = this.currentPage - 5; if (page > 0) { this.changePage(page); } else { @@ -216,7 +227,7 @@ } }, fastNext () { - const page = this.current + 5; + const page = this.currentPage + 5; if (page > this.allPages) { this.changePage(this.allPages); } else { @@ -224,7 +235,7 @@ } }, onSize (pageSize) { - this.pageSize = pageSize; + this.currentPageSize = pageSize; this.changePage(1); this.$emit('on-page-size-change', pageSize); }, diff --git a/src/index.js b/src/index.js index e86e8d4b..b553fa89 100644 --- a/src/index.js +++ b/src/index.js @@ -24,7 +24,7 @@ import Menu from './components/menu'; // import Message from './components/message'; // import Modal from './components/modal'; // import Notice from './components/notice'; -// import Page from './components/page'; +import Page from './components/page'; import Poptip from './components/poptip'; import Progress from './components/progress'; import Radio from './components/radio'; @@ -85,7 +85,7 @@ const iview = { // Notice, iOption: Option, OptionGroup, - // Page, + Page, Panel: Collapse.Panel, Poptip, Progress,