From c63298e268375bfab6dc4ad7c06a856920fd9cf5 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Tue, 24 Sep 2019 10:58:56 +0800
Subject: [PATCH] Revert "            if (this.props.noSetValue) {"

This reverts commit 4ceff1f77acc579c61ea81446ba8aae9a086a052.
---
 .../modules/courses/busyWork/NewWorkForm.js   | 44 ++++++-------------
 .../modules/tpm/challengesnew/TPMMDEditor.js  | 17 +++----
 2 files changed, 20 insertions(+), 41 deletions(-)

diff --git a/public/react/src/modules/courses/busyWork/NewWorkForm.js b/public/react/src/modules/courses/busyWork/NewWorkForm.js
index e97822df8..bc74576d3 100644
--- a/public/react/src/modules/courses/busyWork/NewWorkForm.js
+++ b/public/react/src/modules/courses/busyWork/NewWorkForm.js
@@ -70,23 +70,10 @@ class NewWorkForm extends Component{
           contentFileList,
           answerFileList,
         }, () => {
-          // setTimeout(() => {
-          //   this._scrollToTop()
-            // 阻止setValue的滚动
-            // $(window).scroll( function() { 
-            //   $("html").scrollTop(0)
-            //   $(window).unbind("scroll");
-            // });
-            /**
-              setValue会调用到 codemirror的 o.scrollIntoView(i),  会导致滚动条跳动
-             */
-            // $('.editormd').parent().css('position', 'fixed').css('left', '-1000px')
-            // this.contentMdRef.current.setValue(data.description || '')
-            // this.answerMdRef.current.setValue(data.reference_answer || '')
-            // setTimeout(() => {
-            //     $('.editormd').parent().css('position', '').css('left', 'auto')
-            // }, 100);
-          // }, 500)
+          setTimeout(() => {
+            this.contentMdRef.current.setValue(data.description || '')
+            this.answerMdRef.current.setValue(data.reference_answer || '')
+          }, 2000)
           
           this.props.form.setFieldsValue({
             title: data.name,
@@ -98,13 +85,12 @@ class NewWorkForm extends Component{
       } else { // new
 
       }
-    // this._scrollToTop()
+    this._scrollToTop()
   }
   _scrollToTop = () => {
-    // setTimeout(() => {
-      $("html").scrollTop(0)
-      // $("html").animate({ scrollTop: 0 })
-    // }, 1000)
+    setTimeout(() => {
+      $("html").animate({ scrollTop: 0 })
+    }, 1500)
   }
 
   // 输入title
@@ -306,8 +292,6 @@ class NewWorkForm extends Component{
     this.setState({ base_on_project: !this.state.base_on_project })
   }
   componentDidMount() {
-    this.isEdit = this.props.match.url.indexOf('/edit')
-
     window.$('.groupSetting .ant-form-item-label > label').addClass('ant-form-item-required')
     this._scrollToTop()
   }
@@ -319,13 +303,15 @@ class NewWorkForm extends Component{
     let{
       title_value, contentFileList, answerFileList, max_num, min_num, base_on_project,
       init_max_num, init_min_num, 
-      title_num, course_name, category, has_commit, has_project
+      title_num, course_name, category, has_commit, has_project,
+
+      isEdit
     }=this.state
     const { current_user } = this.props
 
     const courseId = this.state.course_id || this.props.match.params.coursesId ;    
     
-    if ((this.isEdit) && !this.state.description) {
+    if ((isEdit) && !this.state.workLoaded) {
       return ''
     } 
     const uploadProps = {
@@ -453,8 +439,7 @@ class NewWorkForm extends Component{
                   }],
                 })(
                   <TPMMDEditor ref={this.contentMdRef} placeholder="请在此输入作业内容和要求,最大限制5000个字符" mdID={'courseContentMD'} refreshTimeout={1500} 
-                    initValue={this.state.description} noSetValue={true}
-                    className="courseMessageMD" ></TPMMDEditor>
+                    className="courseMessageMD" initValue={this.state.description}></TPMMDEditor>
                 )}
               </Form.Item> }
               <Upload {...uploadProps} className="upload_1 newWorkUpload">
@@ -522,8 +507,7 @@ class NewWorkForm extends Component{
                     }],
                   })(
                     <TPMMDEditor ref={this.answerMdRef} placeholder="请在此输入作业的参考答案,最大限制5000个字符" mdID={'workAnswerMD'} 
-                        initValue={this.state.reference_answer || ''} noSetValue={true}
-                        className="courseMessageMD" refreshTimeout={1500} ></TPMMDEditor>
+                        className="courseMessageMD" refreshTimeout={1500} initValue={this.state.reference_answer || ''}></TPMMDEditor>
                   )}
                 </Form.Item>
                 <Upload {...answerUploadProps} className="upload_1 newWorkUpload resetNewWorkUpload">
diff --git a/public/react/src/modules/tpm/challengesnew/TPMMDEditor.js b/public/react/src/modules/tpm/challengesnew/TPMMDEditor.js
index 1d2d12ea6..91cb34954 100644
--- a/public/react/src/modules/tpm/challengesnew/TPMMDEditor.js
+++ b/public/react/src/modules/tpm/challengesnew/TPMMDEditor.js
@@ -236,24 +236,19 @@ export default class TPMMDEditor extends Component {
 
             setTimeout(() => {
                 if (that.props.needRecreate == true) {
-                    __editorName.recreate() // 注意 必须在setValue之前触发，不然会清空
+                    __editorName.recreate()
                 } else {
                     __editorName.resize()
                 }
                 console.log('timeout', __editorName.id)
                 __editorName.cm && __editorName.cm.refresh()
             }, that.props.refreshTimeout || 500)
-            if (this.props.noSetValue) {
-
-            } else {
-                if (that.props.initValue != undefined && that.props.initValue != '') {
-                    __editorName.setValue(that.props.initValue)
-                }
-                if (that.state.initValue) {
-                    __editorName.setValue(that.state.initValue)
-                }
+            if (that.props.initValue != undefined && that.props.initValue != '') {
+                __editorName.setValue(that.props.initValue)
+            }
+            if (that.state.initValue) {
+                __editorName.setValue(that.state.initValue)
             }
-            
             __editorName.cm.on("change", (_cm, changeObj) => {
                 that.contentChanged = true;
                 if (that.state.showError) {