diff --git a/src/layout/components/Navbar/index.vue b/src/layout/components/Navbar/index.vue
index 29f8cba..5da3745 100644
--- a/src/layout/components/Navbar/index.vue
+++ b/src/layout/components/Navbar/index.vue
@@ -18,7 +18,7 @@
-
+
-
+
@@ -222,7 +222,7 @@ export default {
const container = document.querySelector('#navbar-menu')
this.isMenuScroll = container.scrollWidth > container.clientWidth
this.scrollMaxWidth = container.scrollWidth - container.clientWidth
- if (this.isMenuScroll) {
+ if (this.isMenuScroll && this.device === 'desktop') {
container.addEventListener('scroll', e => this.menuScrollListener(e))
}
}
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index ce2ca7e..7df84b2 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -67,7 +67,7 @@ export default {
computed: {},
created() {
this.$store.dispatch('app/getLayout').then(res => {
- this.layoutList = res?.map(item => {
+ this.layoutList = res?.filter(item => layout.find(lay => lay.i === item.i)).map(item => {
layout.forEach(lay => {
lay.i === item.i ? item.component = lay.component : ''
})
diff --git a/src/views/system/DashboardComponents/quickMenu.vue b/src/views/system/DashboardComponents/quickMenu.vue
index fbbc224..6b8b13b 100644
--- a/src/views/system/DashboardComponents/quickMenu.vue
+++ b/src/views/system/DashboardComponents/quickMenu.vue
@@ -26,8 +26,8 @@
+
+
+
@@ -82,12 +99,13 @@