Merge branch 'feature/wufan/20210715/combine-chapter' into rc

src/modules/prepare-lesson/modal/SelectPrepareFileModal.jsx

@@ -290,7 +290,7 @@ class SelectPrepareFileModal extends React.Component {
 
 
     const { fileListRef } = this.refs;
     const { fileListRef } = this.refs;
     // const hasReachBottom = fileListRef.scrollTop + fileListRef.clientHeight === fileListRef.scrollHeight;
     // const hasReachBottom = fileListRef.scrollTop + fileListRef.clientHeight === fileListRef.scrollHeight;
-    const hasReachBottom = fileListRef.scrollTop + fileListRef.clientHeight > fileListRef.scrollHeight - 1;
+    const hasReachBottom = fileListRef.scrollTop + fileListRef.clientHeight > fileListRef.scrollHeight - 10;
     console.log("fileListRef.scrollTop + fileListRef.clientHeight",hasReachBottom,fileListRef.scrollTop , fileListRef.clientHeight,fileListRef.scrollHeight)
     console.log("fileListRef.scrollTop + fileListRef.clientHeight",hasReachBottom,fileListRef.scrollTop , fileListRef.clientHeight,fileListRef.scrollHeight)
     if (!hasReachBottom || !hasMore) return;
     if (!hasReachBottom || !hasMore) return;
     
     
@@ -344,10 +344,11 @@ class SelectPrepareFileModal extends React.Component {
         nonCompliantFileList.push(file);
         nonCompliantFileList.push(file);
         _fileList.splice(index, 1);
         _fileList.splice(index, 1);
       }
       }
+      console.log('type',type);
       //mac的企业微信环境下加accept不起作用，所以需要我们在选择完成后做一层限制
       //mac的企业微信环境下加accept不起作用，所以需要我们在选择完成后做一层限制
-      if(accept && _accept.indexOf("."+_.last(name.split('.')).toLowerCase()) === -1){
-        _fileList.splice(index, 1);
-      }
+      // if(accept && _accept.indexOf("."+_.last(name.split('.')).toLowerCase()) === -1){
+      //   _fileList.splice(index, 1);
+      // }
       file.key = count++;
       file.key = count++;
     });
     });
     console.log("nonCompliantFileList",nonCompliantFileList);
     console.log("nonCompliantFileList",nonCompliantFileList);