diff --git a/vue-admin-wonderful-next/src/store/index.ts b/vue-admin-wonderful-next/src/store/index.ts index 59561a4..be2f2c4 100644 --- a/vue-admin-wonderful-next/src/store/index.ts +++ b/vue-admin-wonderful-next/src/store/index.ts @@ -19,9 +19,11 @@ export interface RootStateTypes { isCollapse: boolean, isUniqueOpened: boolean, isFixedHeader: boolean, + isFixedHeaderChange: boolean, isCollapse1: boolean, menuWidth1: number, - isShowLogo: boolean + isShowLogo: boolean, + isShowLogoChange: boolean } } diff --git a/vue-admin-wonderful-next/src/theme/app.scss b/vue-admin-wonderful-next/src/theme/app.scss index 9e31d23..676724a 100644 --- a/vue-admin-wonderful-next/src/theme/app.scss +++ b/vue-admin-wonderful-next/src/theme/app.scss @@ -36,6 +36,7 @@ body, z-index: 1; display: flex; flex-direction: column; + overflow-x: hidden !important; } .el-header { box-shadow: 0 1px 4px rgb(0 21 41 / 8%); diff --git a/vue-admin-wonderful-next/src/utils/themeConfig.ts b/vue-admin-wonderful-next/src/utils/themeConfig.ts index 11b9cdd..ade84df 100644 --- a/vue-admin-wonderful-next/src/utils/themeConfig.ts +++ b/vue-admin-wonderful-next/src/utils/themeConfig.ts @@ -16,7 +16,9 @@ export default { isCollapse: false, isUniqueOpened: false, isFixedHeader: false, + isFixedHeaderChange: false, isCollapse1: false, menuWidth1: 200, - isShowLogo: false + isShowLogo: false, + isShowLogoChange: false } \ No newline at end of file diff --git a/vue-admin-wonderful-next/src/views/layout/component/aside.vue b/vue-admin-wonderful-next/src/views/layout/component/aside.vue index 809327e..1e13109 100644 --- a/vue-admin-wonderful-next/src/views/layout/component/aside.vue +++ b/vue-admin-wonderful-next/src/views/layout/component/aside.vue @@ -71,7 +71,9 @@ export default { return store.state.themeConfig; }); watch(store.state.themeConfig, (val) => { - proxy.$refs.layoutAsideScrollbarRef.update(); + if (val.isShowLogoChange !== val.isShowLogo) { + proxy.$refs.layoutAsideScrollbarRef.update(); + } }); return { getThemeConfig, diff --git a/vue-admin-wonderful-next/src/views/layout/component/main.vue b/vue-admin-wonderful-next/src/views/layout/component/main.vue index 746d2a1..87dc4a4 100644 --- a/vue-admin-wonderful-next/src/views/layout/component/main.vue +++ b/vue-admin-wonderful-next/src/views/layout/component/main.vue @@ -43,7 +43,9 @@ export default defineComponent({ to.meta.index > from.meta.index ? "slide-right" : "slide-left"; }); watch(store.state.themeConfig, (val) => { - proxy.$refs.layoutScrollbarRef.update(); + if (val.isFixedHeaderChange !== val.isFixedHeader) { + proxy.$refs.layoutScrollbarRef.update(); + } }); return { getThemeConfig, diff --git a/vue-admin-wonderful-next/src/views/layout/navBars/breadcrumb/setings.vue b/vue-admin-wonderful-next/src/views/layout/navBars/breadcrumb/setings.vue index 322183b..5ab6d6f 100644 --- a/vue-admin-wonderful-next/src/views/layout/navBars/breadcrumb/setings.vue +++ b/vue-admin-wonderful-next/src/views/layout/navBars/breadcrumb/setings.vue @@ -1,6 +1,7 @@