Merge branch 'feature/zhangleyuan/20201124/cloud-class_third-stage' into dev

src/modules/course-manage/components/AddLiveBasic.jsx

@@ -35,6 +35,7 @@ class AddLiveBasic extends React.Component {
     }
     }
   }
   }
   componentWillUnmount() {
   componentWillUnmount() {
+    
   }
   }
  
  
   componentDidMount(){
   componentDidMount(){
@@ -281,19 +282,21 @@ class AddLiveBasic extends React.Component {
           onClose={() => this.setState({ showCutModal: false })}
           onClose={() => this.setState({ showCutModal: false })}
           reUpload={() => { this.state.currentInputFile.click() }}
           reUpload={() => { this.state.currentInputFile.click() }}
         />
         />
-
-        <SelectPrepareFileModal
-          operateType="select"
-          multiple={false}
-          accept="image/jpeg,image/png,image/jpg"
-          selectTypeList={['JPG', 'JPEG', 'PNG']}
-          tooltip='支持文件类型：jpg、jpeg、png'
-          isOpen={showSelectFileModal}
-          onClose={() => {
-            this.setState({ showSelectFileModal: false })
-          }}
-          onSelect={this.handleSelectCover}
-        />
+          {showSelectFileModal && 
+            <SelectPrepareFileModal
+              key="basic"
+              operateType="select"
+              multiple={false}
+              accept="image/jpeg,image/png,image/jpg"
+              selectTypeList={['JPG', 'JPEG', 'PNG']}
+              tooltip='支持文件类型：jpg、jpeg、png'
+              isOpen={showSelectFileModal}
+              onClose={() => {
+                this.setState({ showSelectFileModal: false })
+              }}
+              onSelect={this.handleSelectCover}
+            />
+          }
         <Modal
         <Modal
           title="设置图片"
           title="设置图片"
           width={1080}
           width={1080}

src/modules/course-manage/components/AddLiveIntro.jsx

@@ -391,17 +391,21 @@ class AddLiveIntro extends React.Component {
           </div>
           </div>
         </div>
         </div>
         {/* 选择暖场图文件弹窗 */}
         {/* 选择暖场图文件弹窗 */}
-        <SelectPrepareFileModal
-          operateType="select"
-          accept={selectType==="INTRO"?"image/jpeg,image/png,image/jpg":"video/mp4,image/jpeg,image/png,image/jpg"}
-          selectTypeList={ selectType==="INTRO" ? ['JPG', 'JPEG', 'PNG']: ['MP4', 'JPG', 'JPEG', 'PNG'] }
-          tooltip={ selectType==="INTRO"?'支持文件类型：jpg、jpeg、png':'支持文件类型：jpg、jpeg、png、mp4'}
-          isOpen={showSelectFileModal}
-          onClose={() => {
-            this.setState({ showSelectFileModal: false })
-          }}
-          onSelect={this.handleSelectVideo}
-        />
+        { showSelectFileModal && 
+           <SelectPrepareFileModal
+           key="instro"
+           operateType="select"
+           accept={selectType==="INTRO"?"image/jpeg,image/png,image/jpg":"video/mp4,image/jpeg,image/png,image/jpg"}
+           selectTypeList={ selectType==="INTRO" ? ['JPG', 'JPEG', 'PNG']: ['MP4', 'JPG', 'JPEG', 'PNG'] }
+           tooltip={ selectType==="INTRO"?'支持文件类型：jpg、jpeg、png':'支持文件类型：jpg、jpeg、png、mp4'}
+           isOpen={showSelectFileModal}
+           onClose={() => {
+             this.setState({ showSelectFileModal: false })
+           }}
+           onSelect={this.handleSelectVideo}
+         />
+        }
+       
         
         
       </div>
       </div>
     )
     )

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

@@ -76,7 +76,17 @@ class SelectPrepareFileModal extends React.Component {
       showNonCompliantFileModal: false,
       showNonCompliantFileModal: false,
     }
     }
   }
   }
-
+  componentDidMount() {
+    const { diskList = [],  currentRootDisk} = this.props;
+    const _currentRootDisk = diskList[0] || currentRootDisk || defaultRootDisk;
+    this.setState({
+      query: defaultQuery,
+      currentRootDisk: _currentRootDisk,
+      folderPathList: [_currentRootDisk],
+    }, () => {
+      this.handleFetchFolderList();
+    });
+  }
   componentWillReceiveProps(nextProps) {
   componentWillReceiveProps(nextProps) {
     const { diskList = [],  currentRootDisk} = nextProps;
     const { diskList = [],  currentRootDisk} = nextProps;
     if (nextProps.isOpen) {
     if (nextProps.isOpen) {