mirror of
https://gitee.com/lyt-top/vue-next-admin
synced 2026-07-04 13:02:39 +08:00
'admin-21.05.23:修复改变浏览器窗口时,部分布局配置失效问题'
This commit is contained in:
80
package.json
80
package.json
@ -1,42 +1,42 @@
|
||||
{
|
||||
"name": "vue-prev-admin",
|
||||
"version": "1.0.0",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"dev": "vue-cli-service serve",
|
||||
"build": "vue-cli-service build",
|
||||
"lint": "vue-cli-service lint",
|
||||
"webpack": "webpack --version"
|
||||
},
|
||||
"dependencies": {
|
||||
"axios": "^0.21.1",
|
||||
"clipboard": "^2.0.8",
|
||||
"core-js": "^3.12.1",
|
||||
"countup.js": "^2.0.7",
|
||||
"echarts": "^5.1.1",
|
||||
"element-ui": "^2.15.1",
|
||||
"nprogress": "^0.2.0",
|
||||
"screenfull": "^5.1.0",
|
||||
"sign-canvas": "^1.1.4",
|
||||
"vue": "^2.6.12",
|
||||
"vue-i18n": "^8.24.4",
|
||||
"vue-particles": "^1.0.9",
|
||||
"vue-router": "^3.5.1",
|
||||
"vue-seamless-scroll": "^1.1.23",
|
||||
"vuex": "^3.6.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@eslint/eslintrc": "^0.4.1",
|
||||
"@vue/cli-plugin-babel": "~4.5.13",
|
||||
"@vue/cli-plugin-eslint": "~4.5.13",
|
||||
"@vue/cli-plugin-router": "~4.5.13",
|
||||
"@vue/cli-plugin-vuex": "~4.5.13",
|
||||
"@vue/cli-service": "~4.5.13",
|
||||
"babel-eslint": "^10.1.0",
|
||||
"eslint": "^7.26.0",
|
||||
"eslint-plugin-vue": "^7.9.0",
|
||||
"sass": "^1.32.13",
|
||||
"sass-loader": "^10.1.1",
|
||||
"vue-template-compiler": "^2.6.12"
|
||||
}
|
||||
"name": "vue-prev-admin",
|
||||
"version": "1.0.0",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"dev": "vue-cli-service serve",
|
||||
"build": "vue-cli-service build",
|
||||
"lint": "vue-cli-service lint",
|
||||
"webpack": "webpack --version"
|
||||
},
|
||||
"dependencies": {
|
||||
"axios": "^0.21.1",
|
||||
"clipboard": "^2.0.8",
|
||||
"core-js": "^3.12.1",
|
||||
"countup.js": "^2.0.7",
|
||||
"echarts": "^5.1.1",
|
||||
"element-ui": "^2.15.1",
|
||||
"nprogress": "^0.2.0",
|
||||
"screenfull": "^5.1.0",
|
||||
"sign-canvas": "^1.1.4",
|
||||
"vue": "^2.6.12",
|
||||
"vue-i18n": "^8.24.4",
|
||||
"vue-particles": "^1.0.9",
|
||||
"vue-router": "^3.5.1",
|
||||
"vue-seamless-scroll": "^1.1.23",
|
||||
"vuex": "^3.6.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@eslint/eslintrc": "^0.4.1",
|
||||
"@vue/cli-plugin-babel": "~4.5.13",
|
||||
"@vue/cli-plugin-eslint": "~4.5.13",
|
||||
"@vue/cli-plugin-router": "~4.5.13",
|
||||
"@vue/cli-plugin-vuex": "~4.5.13",
|
||||
"@vue/cli-service": "~4.5.13",
|
||||
"babel-eslint": "^10.1.0",
|
||||
"eslint": "^7.27.0",
|
||||
"eslint-plugin-vue": "^7.9.0",
|
||||
"sass": "^1.34.0",
|
||||
"sass-loader": "^10.1.1",
|
||||
"vue-template-compiler": "^2.6.12"
|
||||
}
|
||||
}
|
||||
|
||||
@ -38,7 +38,7 @@ export default {
|
||||
});
|
||||
} else {
|
||||
this.bus.$emit('layoutMobileResize', {
|
||||
layout: getLocal('oldLayout') ? getLocal('oldLayout') : 'defaults',
|
||||
layout: getLocal('oldLayout') ? getLocal('oldLayout') : this.$store.state.themeConfig.themeConfig.layout,
|
||||
clientWidth,
|
||||
});
|
||||
}
|
||||
|
||||
@ -194,8 +194,12 @@ export default {
|
||||
},
|
||||
},
|
||||
created() {
|
||||
// 判断当前布局是否不相同,不相同则初始化当前布局的样式,防止监听窗口大小改变时,布局配置logo、菜单背景等部分布局失效问题
|
||||
if (!getLocal('frequency')) this.initSetLayoutChange();
|
||||
setLocal('frequency', 1);
|
||||
// 监听窗口大小改变,非默认布局,设置成默认布局(适配移动端)
|
||||
this.bus.$on('layoutMobileResize', (res) => {
|
||||
if (this.$store.state.themeConfig.themeConfig.layout === res.layout) return false;
|
||||
this.$store.state.themeConfig.themeConfig.layout = res.layout;
|
||||
this.$store.state.themeConfig.themeConfig.isDrawer = false;
|
||||
this.$store.state.themeConfig.themeConfig.isCollapse = false;
|
||||
|
||||
Reference in New Issue
Block a user