diff --git a/package.json b/package.json index 7e32c3f..4fb432b 100644 --- a/package.json +++ b/package.json @@ -28,23 +28,23 @@ "vue-router": "^4.0.2", "vue-web-screen-shot": "^1.2.0", "vuex": "^4.0.0-rc.2", - "wangeditor": "^4.7.0" + "wangeditor": "^4.7.1" }, "devDependencies": { "@types/axios": "^0.14.0", "@types/clipboard": "^2.0.1", - "@types/node": "^15.3.1", + "@types/node": "^15.6.0", "@types/nprogress": "^0.2.0", "@types/sortablejs": "^1.10.6", "@typescript-eslint/eslint-plugin": "^4.24.0", "@typescript-eslint/parser": "^4.24.0", "@vitejs/plugin-vue": "^1.2.2", "@vue/compiler-sfc": "^3.0.11", - "dotenv": "^9.0.2", - "eslint": "^7.26.0", + "dotenv": "^10.0.0", + "eslint": "^7.27.0", "eslint-plugin-vue": "^7.9.0", "prettier": "^2.3.0", - "sass": "^1.32.13", + "sass": "^1.34.0", "sass-loader": "^11.1.1", "typescript": "^4.2.4", "vite": "^2.3.3", diff --git a/src/views/layout/index.vue b/src/views/layout/index.vue index db413fa..876e666 100644 --- a/src/views/layout/index.vue +++ b/src/views/layout/index.vue @@ -35,7 +35,7 @@ export default { }); } else { proxy.mittBus.emit('layoutMobileResize', { - layout: getLocal('oldLayout') ? getLocal('oldLayout') : 'defaults', + layout: getLocal('oldLayout') ? getLocal('oldLayout') : getThemeConfig.value.layout, clientWidth, }); } diff --git a/src/views/layout/navBars/breadcrumb/setings.vue b/src/views/layout/navBars/breadcrumb/setings.vue index afef1ca..a50d9ba 100644 --- a/src/views/layout/navBars/breadcrumb/setings.vue +++ b/src/views/layout/navBars/breadcrumb/setings.vue @@ -618,12 +618,16 @@ export default defineComponent({ }; onMounted(() => { nextTick(() => { + // 判断当前布局是否不相同,不相同则初始化当前布局的样式,防止监听窗口大小改变时,布局配置logo、菜单背景等部分布局失效问题 + if (!getLocal('frequency')) initSetLayoutChange(); + setLocal('frequency', 1); // 监听菜单点击,菜单字体背景高亮 proxy.mittBus.on('onMenuClick', () => { onMenuBarHighlightChange(); }); // 监听窗口大小改变,非默认布局,设置成默认布局(适配移动端) proxy.mittBus.on('layoutMobileResize', (res: any) => { + if (getThemeConfig.value.layout === res.layout) return false; getThemeConfig.value.layout = res.layout; getThemeConfig.value.isDrawer = false; initSetLayoutChange();