hjq/PixelAI-admin
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
package.json
View File

@ -28,23 +28,23 @@
"vue-router": "^4.0.2", "vue-router": "^4.0.2",
"vue-web-screen-shot": "^1.2.0", "vue-web-screen-shot": "^1.2.0",
"vuex": "^4.0.0-rc.2", "vuex": "^4.0.0-rc.2",
"wangeditor": "^4.7.0" "wangeditor": "^4.7.1"
}, },
"devDependencies": { "devDependencies": {
"@types/axios": "^0.14.0", "@types/axios": "^0.14.0",
"@types/clipboard": "^2.0.1", "@types/clipboard": "^2.0.1",
"@types/node": "^15.3.1", "@types/node": "^15.6.0",
"@types/nprogress": "^0.2.0", "@types/nprogress": "^0.2.0",
"@types/sortablejs": "^1.10.6", "@types/sortablejs": "^1.10.6",
"@typescript-eslint/eslint-plugin": "^4.24.0", "@typescript-eslint/eslint-plugin": "^4.24.0",
"@typescript-eslint/parser": "^4.24.0", "@typescript-eslint/parser": "^4.24.0",
"@vitejs/plugin-vue": "^1.2.2", "@vitejs/plugin-vue": "^1.2.2",
"@vue/compiler-sfc": "^3.0.11", "@vue/compiler-sfc": "^3.0.11",
"dotenv": "^9.0.2", "dotenv": "^10.0.0",
"eslint": "^7.26.0", "eslint": "^7.27.0",
"eslint-plugin-vue": "^7.9.0", "eslint-plugin-vue": "^7.9.0",
"prettier": "^2.3.0", "prettier": "^2.3.0",
"sass": "^1.32.13", "sass": "^1.34.0",
"sass-loader": "^11.1.1", "sass-loader": "^11.1.1",
"typescript": "^4.2.4", "typescript": "^4.2.4",
"vite": "^2.3.3", "vite": "^2.3.3",

2
src/views/layout/index.vue
View File

@ -35,7 +35,7 @@ export default {
}); });
} else { } else {
proxy.mittBus.emit('layoutMobileResize', { proxy.mittBus.emit('layoutMobileResize', {
layout: getLocal('oldLayout') ? getLocal('oldLayout') : 'defaults', layout: getLocal('oldLayout') ? getLocal('oldLayout') : getThemeConfig.value.layout,
clientWidth, clientWidth,
}); });
} }

4
src/views/layout/navBars/breadcrumb/setings.vue
View File

@ -618,12 +618,16 @@ export default defineComponent({
}; };
onMounted(() => { onMounted(() => {
nextTick(() => { nextTick(() => {
// 判断当前布局是否不相同，不相同则初始化当前布局的样式，防止监听窗口大小改变时，布局配置logo、菜单背景等部分布局失效问题
if (!getLocal('frequency')) initSetLayoutChange();
setLocal('frequency', 1);
// 监听菜单点击，菜单字体背景高亮 // 监听菜单点击，菜单字体背景高亮
proxy.mittBus.on('onMenuClick', () => { proxy.mittBus.on('onMenuClick', () => {
onMenuBarHighlightChange(); onMenuBarHighlightChange();
}); });
// 监听窗口大小改变，非默认布局，设置成默认布局（适配移动端） // 监听窗口大小改变，非默认布局，设置成默认布局（适配移动端）
proxy.mittBus.on('layoutMobileResize', (res: any) => { proxy.mittBus.on('layoutMobileResize', (res: any) => {
if (getThemeConfig.value.layout === res.layout) return false;
getThemeConfig.value.layout = res.layout; getThemeConfig.value.layout = res.layout;
getThemeConfig.value.isDrawer = false; getThemeConfig.value.isDrawer = false;
initSetLayoutChange(); initSetLayoutChange();