github
/
element
mirror of https://github.com/ElemeFE/element
1
0
Fork 0
Code Issues Releases Wiki Activity

Pagination: add key in pager (#9604)

pull/9605/merge
杨奕 2018-02-01 15:16:21 +08:00 committed by GitHub
parent 41a191b721
commit b68f18aa94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/bin/version.js
View File

@ -1,6 +1,6 @@
var fs = require('fs'); var fs = require('fs');
var path = require('path'); var path = require('path');
var version = process.env.VERSION || require('../../package.json').version; var version = process.env.VERSION || require('../../package.json').version;
var content = { '1.4.13': '1.4' }; var content = { '1.4.13': '1.4', '2.0.11': '2.0' };
if (!content[version]) content[version] = '2.1'; if (!content[version]) content[version] = '2.1';
fs.writeFileSync(path.resolve(__dirname, '../../examples/versions.json'), JSON.stringify(content)); fs.writeFileSync(path.resolve(__dirname, '../../examples/versions.json'), JSON.stringify(content));

2
examples/components/header.vue
View File

@ -431,7 +431,7 @@
xhr.onreadystatechange = _ => { xhr.onreadystatechange = _ => {
if (xhr.readyState === 4 && xhr.status === 200) { if (xhr.readyState === 4 && xhr.status === 200) {
const versions = JSON.parse(xhr.responseText); const versions = JSON.parse(xhr.responseText);
this.versions = Object.keys(versions).slice(-2).reduce((prev, next) => { this.versions = Object.keys(versions).reduce((prev, next) => {
prev[next] = versions[next]; prev[next] = versions[next];
return prev; return prev;
}, {}); }, {});

2
examples/versions.json
View File

@ -1 +1 @@
{"1.4.13":"1.4","2.1.0":"2.1"} {"1.4.13":"1.4","2.0.11":"2.0","2.1.0":"2.1"}

1
packages/pagination/src/pager.vue
View File

@ -13,6 +13,7 @@
</li> </li>
<li <li
v-for="pager in pagers" v-for="pager in pagers"
:key="pager"
:class="{ active: currentPage === pager }" :class="{ active: currentPage === pager }"
class="number">{{ pager }}</li> class="number">{{ pager }}</li>
<li <li