Merge branch 'feature/maolipeng/20210610/zuhuyouhua' into dev

# Conflicts:
#	src/modules/teach-tool/paper-manage/OperatePaper.jsx
#	src/modules/teach-tool/paper-manage/OperatePaper.less

src/core/page.less

@@ -12,6 +12,7 @@
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
   min-height: 100%;
+  overflow: hidden;
   .page {
     position: fixed;
     top: 60px;
@@ -21,6 +22,7 @@
     z-index: 102;
     overflow: auto;
     margin: 0 16px;
+    
     .box {
       &:first-child {
         margin-bottom: 8px;

src/modules/teach-tool/paper-manage/OperatePaper.jsx

@@ -936,7 +936,6 @@ class OperatePaper extends Component {
                 )}
                 <XMTable
                   className='table-style'
-                  scroll={{ y: 350 }}
                   columns={this.parseColumns()}
                   dataSource={selectQuestionList}
                   pagination={false}

src/modules/teach-tool/paper-manage/OperatePaper.less

@@ -7,6 +7,8 @@
     .table-style {
       border: 1px solid #f0f0f0 !important;
       margin-bottom: 70px;
+      max-height: calc(~'100vh - 465px');
+      overflow: scroll;
     }
     .ant-tabs {
       color: #666666;