Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into onigin/ysl_a

app/helpers/application_helper.rb

@@ -126,10 +126,11 @@ module ApplicationHelper
   # 用户图像url，如果不存在的话，source为匿名用户，即默认使用匿名用户图像
   def url_to_avatar(source)
     if File.exist?(disk_filename(source.class, source.id))
+      ctime = File.ctime(disk_filename(source.class, source.id)).to_i
       if source.class.to_s == 'User'
-        File.join(relative_path, ["#{source.class}", "#{source.id}"])
+        File.join(relative_path, ["#{source.class}", "#{source.id}"]) + "?t=#{ctime}"
       else
-        File.join("images/avatars", ["#{source.class}", "#{source.id}"])
+        File.join("images/avatars", ["#{source.class}", "#{source.id}"]) + "?t=#{ctime}"
       end
     elsif source.class.to_s == 'User'
       str = source.user_extension.try(:gender).to_i == 0 ? "b" : "g"

public/react/src/modules/courses/busyWork/NewWorkForm.js

@@ -306,8 +306,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()
   }
@@ -324,7 +322,7 @@ class NewWorkForm extends Component{
     const { current_user } = this.props
 
     const courseId = this.state.course_id || this.props.match.params.coursesId ;    
-    
+    this.isEdit = this.isEdit || this.props.match.url.indexOf('/edit') != -1
     if ((this.isEdit) && !this.state.description) {
       return ''
     } 
@@ -453,7 +451,7 @@ class NewWorkForm extends Component{
                   }],
                 })(
                   <TPMMDEditor ref={this.contentMdRef} placeholder="请在此输入作业内容和要求,最大限制5000个字符" mdID={'courseContentMD'} refreshTimeout={1500} 
-                    initValue={this.state.description} noSetValue={true}
+                    initValue={this.state.description} noSetValueOnInit={!!this.isEdit}
                     className="courseMessageMD" ></TPMMDEditor>
                 )}
               </Form.Item> }
@@ -522,7 +520,7 @@ class NewWorkForm extends Component{
                     }],
                   })(
                     <TPMMDEditor ref={this.answerMdRef} placeholder="请在此输入作业的参考答案,最大限制5000个字符" mdID={'workAnswerMD'} 
-                        initValue={this.state.reference_answer || ''} noSetValue={true}
+                        initValue={this.state.reference_answer || ''} noSetValueOnInit={!!this.isEdit}
                         className="courseMessageMD" refreshTimeout={1500} ></TPMMDEditor>
                   )}
                 </Form.Item>

public/react/src/modules/courses/common/CBreadcrumb.js

@@ -16,7 +16,7 @@ class CBreadcrumb extends Component{
             return ''
           }
           if (item.to) {
-            return <React.Fragment>
+            return <React.Fragment key={index}>
               <WordsBtn style="grey" className="fl hovercolorblue" to={item.to}>{item.name}</WordsBtn>
               {separator ? 
                 <span className="color-grey-9 fl ml3 mr3">{separator}</span> :
@@ -24,7 +24,7 @@ class CBreadcrumb extends Component{
               }
             </React.Fragment>
           } else {
-            return <span>{item.name}</span>
+            return <span key={index}>{item.name}</span>
           }
         })}
       </p>

public/react/src/modules/tpm/challengesnew/TPMMDEditor.js

@@ -243,8 +243,8 @@ export default class TPMMDEditor extends Component {
                 console.log('timeout', __editorName.id)
                 __editorName.cm && __editorName.cm.refresh()
             }, that.props.refreshTimeout || 500)
-            if (this.props.noSetValue) {
-
+            if (this.props.noSetValueOnInit) {
+                that.onEditorChange()
             } else {
                 if (that.props.initValue != undefined && that.props.initValue != '') {
                     __editorName.setValue(that.props.initValue)
@@ -282,6 +282,7 @@ export default class TPMMDEditor extends Component {
     onEditorChange = () => {
         if (!this.answers_editormd) return;
         const val = this.answers_editormd.getValue();
+        //console.log('onEditorChange', this.props.id, val)
         try {
             this.props.onChange && this.props.onChange(val)
         } catch(e) {