|
@@ -54,9 +54,10 @@
|
|
</a-drawer>
|
|
</a-drawer>
|
|
</template>
|
|
</template>
|
|
|
|
|
|
|
|
+ <!-- 改变框架 -->
|
|
<a-layout
|
|
<a-layout
|
|
:class="[layoutMode, `content-width-${contentWidth}`]"
|
|
:class="[layoutMode, `content-width-${contentWidth}`]"
|
|
- :style="{ paddingLeft: fixSiderbar && isDesktop() ? `${sidebarOpened ? 200 : 80}px` : '0' }">
|
|
|
|
|
|
+ :style="{ paddingLeft: fixSiderbar && isDesktop() ? `${sidebarOpened ? 200 : 80}px` : '0', height: '100vh', overflow: 'auto', display: 'block', }">
|
|
<!-- layout header -->
|
|
<!-- layout header -->
|
|
<global-header
|
|
<global-header
|
|
:mode="layoutMode"
|
|
:mode="layoutMode"
|
|
@@ -69,7 +70,9 @@
|
|
/>
|
|
/>
|
|
|
|
|
|
<!-- layout content -->
|
|
<!-- layout content -->
|
|
- <a-layout-content :style="{ height: '100%', paddingTop: fixedHeader ? '59px' : '0' }">
|
|
|
|
|
|
+ <!-- 改变框架 -->
|
|
|
|
+ <a-layout-content :style="{ minHeight: '90%', paddingTop: fixedHeader ? '59px' : '0' }">
|
|
|
|
+ <!-- <a-layout-content :style="{ height: '100%', paddingTop: fixedHeader ? '59px' : '0' }"> -->
|
|
<slot></slot>
|
|
<slot></slot>
|
|
</a-layout-content>
|
|
</a-layout-content>
|
|
|
|
|
|
@@ -206,7 +209,7 @@
|
|
&.mobile {
|
|
&.mobile {
|
|
|
|
|
|
.ant-layout-content {
|
|
.ant-layout-content {
|
|
-
|
|
|
|
|
|
+
|
|
.content {
|
|
.content {
|
|
margin: 24px 0 0;
|
|
margin: 24px 0 0;
|
|
}
|
|
}
|
|
@@ -227,6 +230,9 @@
|
|
}
|
|
}
|
|
}
|
|
}
|
|
.sidemenu {
|
|
.sidemenu {
|
|
|
|
+ /* 改变框架 */
|
|
|
|
+ height: 100%;
|
|
|
|
+ overflow: auto;
|
|
.ant-header-fixedHeader {
|
|
.ant-header-fixedHeader {
|
|
|
|
|
|
&.ant-header-side-opened, &.ant-header-side-closed {
|
|
&.ant-header-side-opened, &.ant-header-side-closed {
|
|
@@ -298,6 +304,10 @@
|
|
}
|
|
}
|
|
|
|
|
|
.sidemenu {
|
|
.sidemenu {
|
|
|
|
+ /* 改变框架 */
|
|
|
|
+ // height: calc(100vh - 59px);
|
|
|
|
+ // height: 100vh;
|
|
|
|
+ overflow: auto;
|
|
.ant-header-fixedHeader {
|
|
.ant-header-fixedHeader {
|
|
position: fixed;
|
|
position: fixed;
|
|
top: 0;
|
|
top: 0;
|