mirror of https://github.com/apache/cloudstack.git
Merge remote-tracking branch 'origin/4.17'
This commit is contained in:
commit
9a381db956
|
|
@ -772,7 +772,10 @@ export default {
|
|||
}
|
||||
},
|
||||
watch: {
|
||||
'$route.fullPath': function () {
|
||||
'$route.fullPath': function (path) {
|
||||
if (path === '/user/login') {
|
||||
return
|
||||
}
|
||||
this.getIcons()
|
||||
},
|
||||
resource: {
|
||||
|
|
|
|||
|
|
@ -80,7 +80,6 @@
|
|||
<a-pagination
|
||||
class="row-element pagination"
|
||||
size="small"
|
||||
style="overflow-y: auto"
|
||||
:current="page"
|
||||
:pageSize="pageSize"
|
||||
:total="total"
|
||||
|
|
|
|||
|
|
@ -53,7 +53,6 @@
|
|||
<a-pagination
|
||||
class="row-element pagination"
|
||||
size="small"
|
||||
style="overflow-y: auto"
|
||||
:current="page"
|
||||
:pageSize="pageSize"
|
||||
:total="total"
|
||||
|
|
|
|||
|
|
@ -91,7 +91,6 @@
|
|||
<a-pagination
|
||||
class="row-element pagination"
|
||||
size="small"
|
||||
style="overflow-y: auto"
|
||||
:current="page"
|
||||
:pageSize="pageSize"
|
||||
:total="total"
|
||||
|
|
|
|||
|
|
@ -50,7 +50,6 @@
|
|||
<a-pagination
|
||||
class="row-element pagination"
|
||||
size="small"
|
||||
style="overflow-y: auto"
|
||||
:current="page"
|
||||
:pageSize="pageSize"
|
||||
:total="total"
|
||||
|
|
|
|||
Loading…
Reference in New Issue