合并

public/react/src/common/educoder.js

@@ -3,22 +3,22 @@
 // export { default as OrderStateUtil } from          '../routes/Order/components/OrderStateUtil';
 
 export { getImageUrl as getImageUrl, getRandomNumber as getRandomNumber,getUrl as getUrl, publicSearchs as publicSearchs,getRandomcode as getRandomcode,getUrlmys as getUrlmys, getUrl2 as getUrl2, setImagesUrl as setImagesUrl
-	, getUploadActionUrl as getUploadActionUrl,getUploadActionUrltwo as getUploadActionUrltwo ,getUploadActionUrlthree as getUploadActionUrlthree, getUploadActionUrlOfAuth as getUploadActionUrlOfAuth
+        , getUploadActionUrl as getUploadActionUrl,getUploadActionUrltwo as getUploadActionUrltwo ,getUploadActionUrlthree as getUploadActionUrlthree, getUploadActionUrlOfAuth as getUploadActionUrlOfAuth
-	, getTaskUrlById as getTaskUrlById, TEST_HOST ,htmlEncode as htmlEncode ,getupload_git_file as getupload_git_file} from                './UrlTool';
+        , getTaskUrlById as getTaskUrlById, TEST_HOST ,htmlEncode as htmlEncode ,getupload_git_file as getupload_git_file} from                './UrlTool';
 export {setmiyah as setmiyah} from './Component';
 export { default as queryString } from                './UrlTool2';
 
 export { SnackbarHOC as SnackbarHOC } from                './SnackbarHOC';
 
 export { trigger as trigger, on as on, off as off
-	, broadcastChannelPostMessage, broadcastChannelOnmessage } from                './EventUtil';
+    , broadcastChannelPostMessage, broadcastChannelOnmessage } from                './EventUtil';
 
 export { updatePageParams as updatePageParams } from                './RouterUtil';
 
 export { bytesToSize as bytesToSize } from                './UnitUtil';
 
 export { markdownToHTML, uploadNameSizeSeperator, appendFileSizeToUploadFile, appendFileSizeToUploadFileAll, isImageExtension,
-	downloadFile, sortDirections } from 	'./TextUtil'
+        downloadFile, sortDirections } from 	'./TextUtil'
 export { handleDateString, getNextHalfHourOfMoment,formatDuring } from 	'./DateUtil'
 
 export { configShareForIndex, configShareForPaths, configShareForShixuns, configShareForCourses, configShareForCustom } from 	'./util/ShareUtil'
@@ -30,7 +30,7 @@ export { toStore as toStore, fromStore as fromStore } from 	'./Store'
 export { trace_collapse, trace, debug, info, warn, error, trace_c, debug_c, info_c, warn_c, error_c } from 	'./LogUtil'
 
 export { EDU_ADMIN, EDU_BUSINESS, EDU_SHIXUN_MANAGER, EDU_SHIXUN_MEMBER, EDU_CERTIFICATION_TEACHER
-	, EDU_GAME_MANAGER, EDU_TEACHER, EDU_NORMAL} from 	'./Const'
+    , EDU_GAME_MANAGER, EDU_TEACHER, EDU_NORMAL} from 	'./Const'
 
 
 export { default as AttachmentList } from './components/attachment/AttachmentList'

public/react/src/modules/courses/boards/TopicDetail.js

@@ -682,6 +682,7 @@ class TopicDetail extends Component {
                     </div>
 
                       {!isCourseEnd && <MemoDetailMDEditor ref="editor" memo={memo} usingMockInput={true} placeholder="说点什么"
+                                                           {...this.props}
                           height={160} showError={true} buttonText={'发表'} className={comments && comments.length && 'borderBottom'}></MemoDetailMDEditor>}
 
                   {/*  onClick={ this.createNewComment }

public/react/src/modules/courses/common/comments/CommonReply.js

@@ -252,6 +252,7 @@ class CommonReply extends Component{
         <MemoDetailMDEditor ref="editor" memo={memo} usingMockInput={true} placeholder="说点什么"
             height={160} showError={true} imageExpand={true}
             replyComment={this.replyComment}
+             {...this.props}
             commentsLength={comments ? comments.length : 0}
         ></MemoDetailMDEditor>
         {/* bor-bottom-greyE */}

public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingReply.js

@@ -235,7 +235,7 @@ class GraduationTaskssettingReply extends Component{
         <style>{`
         
         `}</style>
-        <MemoDetailMDEditor ref="editor" memo={memo} usingMockInput={true} placeholder="请在此输入对本作品的评语，最大限制2000个字符"
+        <MemoDetailMDEditor  {...this.props} ref="editor" memo={memo} usingMockInput={true} placeholder="请在此输入对本作品的评语，最大限制2000个字符"
             height={160} showError={true}></MemoDetailMDEditor>
 
         <div className="padding40 bor-bottom-greyE memoReplies commentsDelegateParent"

public/react/src/modules/courses/graduation/topics/GraduateTopicReply.js

@@ -226,7 +226,7 @@ class GraduateTopicReply extends Component{
 
     return(
       <React.Fragment>
-        <MemoDetailMDEditor ref="editor" memo={memo} usingMockInput={true} placeholder="说点什么"
+        <MemoDetailMDEditor  {...this.props} ref="editor" memo={memo} usingMockInput={true} placeholder="说点什么"
             height={160} showError={true}></MemoDetailMDEditor>
 
         <div className="padding40 bor-bottom-greyE memoReplies commentsDelegateParent"

public/react/src/modules/forums/MemoDetail.js

@@ -816,9 +816,9 @@ class MemoDetail extends Component {
                         }
                     </div>
                     { window.__useKindEditor === true ?
-                      <MemoDetailKEEditor ref="editor" memo={memo}></MemoDetailKEEditor>
+                      <MemoDetailKEEditor ref="editor" memo={memo}  {...this.props}></MemoDetailKEEditor>
                       :
-                      <MemoDetailMDEditor ref="editor" memo={memo}></MemoDetailMDEditor>
+                      <MemoDetailMDEditor ref="editor" memo={memo}  {...this.props}></MemoDetailMDEditor>
 
                     }
                   {/*  onClick={ this.createNewComment } */}