增加设置面板‘流式’、‘定宽’切换界面随之修改。

This commit is contained in:
samulle
2020-08-28 16:25:04 +08:00
parent 2436182baf
commit b2b62914ef
6 changed files with 16 additions and 16 deletions

View File

@@ -13,7 +13,7 @@
</div>
<slot v-if="this.$slots.extra" slot="extra" name="extra"></slot>
</page-header>
<div ref="page" :class="['page-content', layout == 'head' ? (fixedWidth == 2 ? layout : '') : '']" >
<div ref="page" :class="['page-content', layout == 'head' ? (pageWidth == 'fixed' ? layout : '') : '']" >
<slot></slot>
</div>
</div>
@@ -60,7 +60,7 @@ export default {
this.updatePageHeight(0)
},
computed: {
...mapState('setting', ['layout', 'multiPage', 'pageMinHeight', 'fixedWidth']),
...mapState('setting', ['layout', 'multiPage', 'pageMinHeight', 'pageWidth']),
pageTitle() {
let pageTitle = this.page && this.page.title
return pageTitle === undefined ? (this.title || this.routeName) : this.$t(pageTitle)

View File

@@ -1,6 +1,6 @@
<template>
<a-layout-header :class="[headerTheme, 'admin-header']">
<div :class="['admin-header-wide', layout == 'side' ? layout : (fixedWidth == 2 ? layout : '')]">
<div :class="['admin-header-wide', layout == 'side' ? layout : (pageWidth == 'fixed' ? layout : '')]">
<router-link v-if="isMobile || layout === 'head'" to="/" :class="['logo', isMobile ? null : 'pc', headerTheme]">
<img width="32" src="@/assets/img/logo.png" />
<h1 v-if="!isMobile">{{systemName}}</h1>
@@ -53,7 +53,7 @@ export default {
}
},
computed: {
...mapState('setting', ['theme', 'isMobile', 'layout', 'systemName', 'lang', 'fixedWidth']),
...mapState('setting', ['theme', 'isMobile', 'layout', 'systemName', 'lang', 'pageWidth']),
headerTheme () {
if (this.layout == 'side' && this.theme.mode == 'dark' && !this.isMobile) {
return 'light'

View File

@@ -5,7 +5,7 @@
v-if="multiPage"
type="editable-card"
:active-key="activePage"
:style="`margin: -16px auto 8px; ${layout == 'head' && fixedWidth == 2 ? 'max-width: 1400px;' : ''}`"
:style="`margin: -16px auto 8px; ${layout == 'head' && pageWidth == 'fixed' ? 'max-width: 1400px;' : ''}`"
:hide-add="true"
@change="changePage"
@edit="editPage"
@@ -48,7 +48,7 @@ export default {
}
},
computed: {
...mapState('setting', ['multiPage', 'animate', 'layout', 'fixedWidth']),
...mapState('setting', ['multiPage', 'animate', 'layout', 'pageWidth']),
menuItemList() {
return [
{ key: '1', icon: 'vertical-right', text: this.$t('closeLeft') },