Merge remote-tracking branch 'origin/4.17'

This commit is contained in:
Rohit Yadav 2022-10-08 12:21:04 +05:30
commit 9a381db956
5 changed files with 4 additions and 5 deletions

View File

@ -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: {

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"