Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
Element
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
CI / CD Analytics
Repository Analytics
Value Stream Analytics
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
林焕东
Element
Commits
9fc1f9e3
Commit
9fc1f9e3
authored
Apr 18, 2018
by
John
Committed by
杨奕
Apr 18, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Pagination: add pagerCount prop (#10493)
parent
95e168f7
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
45 additions
and
8 deletions
+45
-8
examples/docs/zh-CN/pagination.md
examples/docs/zh-CN/pagination.md
+17
-2
packages/pagination/src/pager.vue
packages/pagination/src/pager.vue
+9
-5
packages/pagination/src/pagination.js
packages/pagination/src/pagination.js
+9
-1
test/unit/specs/pagination.spec.js
test/unit/specs/pagination.spec.js
+10
-0
No files found.
examples/docs/zh-CN/pagination.md
View file @
9fc1f9e3
...
@@ -103,6 +103,18 @@
...
@@ -103,6 +103,18 @@
:total=
"400"
>
:total=
"400"
>
</el-pagination>
</el-pagination>
</div>
</div>
<div
class=
"block"
>
<span
class=
"demonstration"
>
Pager 页码数(默认 7 个)
</span>
<el-pagination
@
size-change=
"handleSizeChange"
@
current-change=
"handleCurrentChange"
:current-page.sync=
"currentPage5"
:page-size=
"20"
:pager-count=
"9"
layout=
"sizes, prev, pager, next"
:total=
"1000"
>
</el-pagination>
</div>
</template>
</template>
<script>
<script>
export
default
{
export
default
{
...
@@ -119,7 +131,8 @@
...
@@ -119,7 +131,8 @@
currentPage1
:
5
,
currentPage1
:
5
,
currentPage2
:
5
,
currentPage2
:
5
,
currentPage3
:
5
,
currentPage3
:
5
,
currentPage4
:
4
currentPage4
:
4
,
currentPage5
:
15
};
};
}
}
}
}
...
@@ -142,7 +155,8 @@
...
@@ -142,7 +155,8 @@
currentPage1: 5,
currentPage1: 5,
currentPage2: 5,
currentPage2: 5,
currentPage3: 5,
currentPage3: 5,
currentPage4: 4
currentPage4: 4,
currentPage5: 15
};
};
},
},
mounted() {
mounted() {
...
@@ -215,6 +229,7 @@
...
@@ -215,6 +229,7 @@
| page-size | 每页显示条目个数 | Number | — | 10 |
| page-size | 每页显示条目个数 | Number | — | 10 |
| total | 总条目数 | Number | — | — |
| total | 总条目数 | Number | — | — |
| page-count | 总页数,total 和 page-count 设置任意一个就可以达到显示页码的功能;如果要支持 page-sizes 的更改,则需要使用 total 属性 | Number | — | — |
| page-count | 总页数,total 和 page-count 设置任意一个就可以达到显示页码的功能;如果要支持 page-sizes 的更改,则需要使用 total 属性 | Number | — | — |
| pager-count | 显示页码按钮的最大数(不包括prev和next) | Number | 大于等于 5 且小于等于 21 的奇数 | 7 |
| current-page | 当前页数,支持 .sync 修饰符 | Number | — | 1 |
| current-page | 当前页数,支持 .sync 修饰符 | Number | — | 1 |
| layout | 组件布局,子组件名用逗号分隔| String |
`sizes`
,
`prev`
,
`pager`
,
`next`
,
`jumper`
,
`->`
,
`total`
,
`slot`
| 'prev, pager, next, jumper, ->, total' |
| layout | 组件布局,子组件名用逗号分隔| String |
`sizes`
,
`prev`
,
`pager`
,
`next`
,
`jumper`
,
`->`
,
`total`
,
`slot`
| 'prev, pager, next, jumper, ->, total' |
| page-sizes | 每页显示个数选择器的选项设置 | Number
[]
| — |
[
10, 20, 30, 40, 50, 100
]
|
| page-sizes | 每页显示个数选择器的选项设置 | Number
[]
| — |
[
10, 20, 30, 40, 50, 100
]
|
...
...
packages/pagination/src/pager.vue
View file @
9fc1f9e3
...
@@ -39,6 +39,8 @@
...
@@ -39,6 +39,8 @@
pageCount
:
Number
,
pageCount
:
Number
,
pagerCount
:
Number
,
disabled
:
Boolean
disabled
:
Boolean
},
},
...
@@ -62,12 +64,13 @@
...
@@ -62,12 +64,13 @@
let
newPage
=
Number
(
event
.
target
.
textContent
);
let
newPage
=
Number
(
event
.
target
.
textContent
);
const
pageCount
=
this
.
pageCount
;
const
pageCount
=
this
.
pageCount
;
const
currentPage
=
this
.
currentPage
;
const
currentPage
=
this
.
currentPage
;
const
pagerCountOffset
=
this
.
pagerCount
-
2
;
if
(
target
.
className
.
indexOf
(
'
more
'
)
!==
-
1
)
{
if
(
target
.
className
.
indexOf
(
'
more
'
)
!==
-
1
)
{
if
(
target
.
className
.
indexOf
(
'
quickprev
'
)
!==
-
1
)
{
if
(
target
.
className
.
indexOf
(
'
quickprev
'
)
!==
-
1
)
{
newPage
=
currentPage
-
5
;
newPage
=
currentPage
-
pagerCountOffset
;
}
else
if
(
target
.
className
.
indexOf
(
'
quicknext
'
)
!==
-
1
)
{
}
else
if
(
target
.
className
.
indexOf
(
'
quicknext
'
)
!==
-
1
)
{
newPage
=
currentPage
+
5
;
newPage
=
currentPage
+
pagerCountOffset
;
}
}
}
}
...
@@ -99,7 +102,8 @@
...
@@ -99,7 +102,8 @@
computed
:
{
computed
:
{
pagers
()
{
pagers
()
{
const
pagerCount
=
7
;
const
pagerCount
=
this
.
pagerCount
;
const
halfPagerCount
=
(
pagerCount
-
1
)
/
2
;
const
currentPage
=
Number
(
this
.
currentPage
);
const
currentPage
=
Number
(
this
.
currentPage
);
const
pageCount
=
Number
(
this
.
pageCount
);
const
pageCount
=
Number
(
this
.
pageCount
);
...
@@ -108,11 +112,11 @@
...
@@ -108,11 +112,11 @@
let
showNextMore
=
false
;
let
showNextMore
=
false
;
if
(
pageCount
>
pagerCount
)
{
if
(
pageCount
>
pagerCount
)
{
if
(
currentPage
>
pagerCount
-
3
)
{
if
(
currentPage
>
pagerCount
-
halfPagerCount
)
{
showPrevMore
=
true
;
showPrevMore
=
true
;
}
}
if
(
currentPage
<
pageCount
-
3
)
{
if
(
currentPage
<
pageCount
-
halfPagerCount
)
{
showNextMore
=
true
;
showNextMore
=
true
;
}
}
}
}
...
...
packages/pagination/src/pagination.js
View file @
9fc1f9e3
...
@@ -20,6 +20,14 @@ export default {
...
@@ -20,6 +20,14 @@ export default {
pageCount
:
Number
,
pageCount
:
Number
,
pagerCount
:
{
type
:
Number
,
validator
(
value
)
{
return
value
>
4
&&
value
<
22
&&
(
value
|
0
)
===
value
&&
(
value
%
2
)
===
1
;
},
default
:
7
},
currentPage
:
{
currentPage
:
{
type
:
Number
,
type
:
Number
,
default
:
1
default
:
1
...
@@ -66,7 +74,7 @@ export default {
...
@@ -66,7 +74,7 @@ export default {
const
TEMPLATE_MAP
=
{
const
TEMPLATE_MAP
=
{
prev
:
<
prev
><
/prev>
,
prev
:
<
prev
><
/prev>
,
jumper
:
<
jumper
><
/jumper>
,
jumper
:
<
jumper
><
/jumper>
,
pager
:
<
pager
currentPage
=
{
this
.
internalCurrentPage
}
pageCount
=
{
this
.
internalPageCount
}
on
-
change
=
{
this
.
handleCurrentChange
}
disabled
=
{
this
.
disabled
}
><
/pager>
,
pager
:
<
pager
currentPage
=
{
this
.
internalCurrentPage
}
pageCount
=
{
this
.
internalPageCount
}
pagerCount
=
{
this
.
pagerCount
}
on
-
change
=
{
this
.
handleCurrentChange
}
disabled
=
{
this
.
disabled
}
><
/pager>
,
next
:
<
next
><
/next>
,
next
:
<
next
><
/next>
,
sizes
:
<
sizes
pageSizes
=
{
this
.
pageSizes
}
><
/sizes>
,
sizes
:
<
sizes
pageSizes
=
{
this
.
pageSizes
}
><
/sizes>
,
slot
:
<
my
-
slot
><
/my-slot>
,
slot
:
<
my
-
slot
><
/my-slot>
,
...
...
test/unit/specs/pagination.spec.js
View file @
9fc1f9e3
...
@@ -101,6 +101,16 @@ describe('Pagination', () => {
...
@@ -101,6 +101,16 @@ describe('Pagination', () => {
expect
(
vm
.
$el
.
querySelectorAll
(
'
li.number
'
)).
to
.
length
(
4
);
expect
(
vm
.
$el
.
querySelectorAll
(
'
li.number
'
)).
to
.
length
(
4
);
});
});
it
(
'
pagerCount
'
,
()
=>
{
const
vm
=
createTest
(
Pagination
,
{
pageSize
:
25
,
total
:
1000
,
pagerCount
:
21
});
expect
(
vm
.
$el
.
querySelectorAll
(
'
li.number
'
)).
to
.
length
(
21
);
});
it
(
'
will work without total & page-count
'
,
(
done
)
=>
{
it
(
'
will work without total & page-count
'
,
(
done
)
=>
{
const
vm
=
createTest
(
Pagination
,
{
const
vm
=
createTest
(
Pagination
,
{
pageSize
:
25
,
pageSize
:
25
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment