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