Merge branch 'feature/wufan/20210701/course-B-reform' into dev

src/components/ContactWidget.less

-.ant-popover .ant-popover-content .ant-popover-inner {
+.contact-widget-popover .ant-popover-content .ant-popover-inner {
     box-shadow: 0px 2px 20px 0px rgba(0, 0, 0, 0.06);
     box-shadow: 0px 2px 20px 0px rgba(0, 0, 0, 0.06);
     .ant-popover-inner-content {
     .ant-popover-inner-content {
       padding: 0;
       padding: 0;

src/components/ContactWidget.tsx

@@ -27,6 +27,7 @@ function Content() {
 export default function ContactWidget(props:ContactWidgetProps) {
 export default function ContactWidget(props:ContactWidgetProps) {
 
 
     return <Popover 
     return <Popover 
+            className="contact-widget-popover"
             placement={props.placement} 
             placement={props.placement} 
             arrowPointAtCenter 
             arrowPointAtCenter 
             content={Content}
             content={Content}

src/modules/course-manage/video-course/AddVideoCourse.jsx

@@ -87,6 +87,7 @@ class AddVideoCourse extends React.Component {
       ], // 课节列表
       ], // 课节列表
       videoType: "MP4",
       videoType: "MP4",
       mediaNameAlias: '', // 任一视频重命名的名称（气泡框）
       mediaNameAlias: '', // 任一视频重命名的名称（气泡框）
+      popConfirmVisible: false
     }
     }
   }
   }
 
 
@@ -544,6 +545,7 @@ class AddVideoCourse extends React.Component {
         chapterNameValidateStatus: '',
         chapterNameValidateStatus: '',
         chapterNameHelpMsg: '',
         chapterNameHelpMsg: '',
         mediaNameAlias: '',
         mediaNameAlias: '',
+        popConfirmVisible: false
       })
       })
     });
     });
 
 
@@ -643,7 +645,8 @@ class AddVideoCourse extends React.Component {
       loadintroduce,
       loadintroduce,
       id,
       id,
       courseChapterList,
       courseChapterList,
-      imageFile
+      imageFile,
+      popConfirmVisible
     } = this.state
     } = this.state
 
 
     const courseWareIcon = FileVerifyMap[videoType] ? FileTypeIcon[FileVerifyMap[videoType].type] : FileTypeIcon[videoType]
     const courseWareIcon = FileVerifyMap[videoType] ? FileTypeIcon[FileVerifyMap[videoType].type] : FileTypeIcon[videoType]
@@ -722,6 +725,7 @@ class AddVideoCourse extends React.Component {
                                     onConfirm={() => this.handleRenameCourseChapter(item.resourceId)}
                                     onConfirm={() => this.handleRenameCourseChapter(item.resourceId)}
                                     destroyTooltipOnHide={true}
                                     destroyTooltipOnHide={true}
                                     icon={null}
                                     icon={null}
+                                    visible={popConfirmVisible}
                                     onVisibleChange={(visible)=>{
                                     onVisibleChange={(visible)=>{
                                       !visible && this.setState({
                                       !visible && this.setState({
                                         chapterNameValidateStatus: '',
                                         chapterNameValidateStatus: '',
@@ -729,8 +733,13 @@ class AddVideoCourse extends React.Component {
                                         mediaNameAlias: '',
                                         mediaNameAlias: '',
                                       })
                                       })
                                     }}
                                     }}
+                                    onCancel={()=>{
+                                      this.setState({
+                                        popConfirmVisible: false
+                                      })
+                                    }}
                                     >
                                     >
-                                  <div className="rename" onClick={()=> {this.setState({mediaNameAlias: item.mediaName})}}>重命名</div>
+                                  <div className="rename" onClick={()=> {this.setState({mediaNameAlias: item.mediaName, popConfirmVisible: true})}}>重命名</div>
                                     </Popconfirm>
                                     </Popconfirm>
                                 <div className="line">|</div>
                                 <div className="line">|</div>
                                 <div className="delete" onClick={()=>this.handleDeleteCourseChapter(item.resourceId)}>移除</div>
                                 <div className="delete" onClick={()=>this.handleDeleteCourseChapter(item.resourceId)}>移除</div>