'admin-21.05.23:修复改变浏览器窗口时,部分布局配置失效问题'

This commit is contained in:
lyt-Top 2021-05-23 16:30:14 +08:00
parent e51acd0cc1
commit 806ef38eea
3 changed files with 10 additions and 6 deletions

View File

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

View File

@ -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,
});
}

View File

@ -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();