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

app/views/shixuns/index.json.jbuilder

@@ -8,3 +8,9 @@ json.search_tags @search_tags
 json.shixuns do
   json.partial! 'shixun', locals: {shixuns: @shixuns}
 end
+
+s_s = ''
+
+json.html_contents sanitize(s_s, tags: %w(img a table tr td tbody pre), attributes: %w(src href target style)).gsub(">\n<", "><")
+                       .gsub(/^\n/, "").gsub("    ", "").gsub(/(\n)+/, "<br />").gsub("\t", "  ").gsub("\n", "").gsub("    ", "  ")
+                       .gsub(/(<br\s?\/?>)+/, "<br />")

db/migrate/20190805010546_modify_ke_contents_for_markdown.rb

@@ -1,48 +0,0 @@
-class ModifyKeContentsForMarkdown < ActiveRecord::Migration[5.2]
-  include ActionView::Helpers::SanitizeHelper
-  def change
-    # def ke_transform_to_md content
-    #   return content if content.blank?
-    #   s_contents = sanitize(content, tags: %w(img a span table td tr tbody pre), attributes: %w(src href target style))
-    #   s_contents.gsub(/^(\n)/, "").gsub(/(\n)+/, "<br>").gsub(/$(\n)/, "")
-    #       .gsub(/(\n)+/, "<br>").gsub("\t", "  ")
-    # end
-    #
-    # # 课程讨论区
-    # MessageDetail.find_each do |m|
-    #   content = ke_transform_to_md m.content
-    #   m.update_column(:content, content)
-    # end
-    #
-    # # 试卷的标题
-    # ExerciseQuestion.find_each do |eq|
-    #   question_title = ke_transform_to_md eq.question_title
-    #   eq.update_column(:question_title, question_title)
-    # end
-    #
-    # # 试卷的答案
-    # ExerciseStandardAnswer.find_each do |esa|
-    #   answer_text = ke_transform_to_md esa.answer_text
-    #   esa.update_column(:answer_text, answer_text)
-    # end
-    #
-    # # 试卷题库的问题标题
-    # ExerciseBankQuestion.find_each do |ebq|
-    #   question_title = ke_transform_to_md ebq.question_title
-    #   ebq.update_column(:question_title, question_title)
-    # end
-    #
-    # # 试卷答案
-    # ExerciseBankStandardAnswer.find_each do |ebsa|
-    #   answer_text = ke_transform_to_md ebsa.answer_text
-    #   ebsa.update_column(:answer_text, answer_text)
-    # end
-    #
-    # # 问卷的标题
-    # PollQuestion.find_each do |pq|
-    #   question_title = ke_transform_to_md pq.question_title
-    #   pq.update_column(:question_title, question_title)
-    # end
-
-  end
-end

db/migrate/20190805010549_modify_ke_contents_for_markdown.rb

@@ -0,0 +1,48 @@
+class ModifyKeContentsForMarkdown < ActiveRecord::Migration[5.2]
+  include ActionView::Helpers::SanitizeHelper
+  def change
+    def ke_transform_to_md content
+      return content if content.blank?
+      s_contents = sanitize(content, tags: %w(img a span table td tr tbody pre), attributes: %w(src href target style))
+      s_contents.gsub(">\n<", "><").gsub(/^\n/, "").gsub("    ", "").gsub(/(\n)+/, "<br />")
+          .gsub("\t", "  ").gsub("\n", "").gsub("    ", "  ").gsub(/(<br\s?\/?>)+/, "<br />")
+    end
+
+    # 课程讨论区
+    MessageDetail.find_each do |m|
+      content = ke_transform_to_md m.content
+      m.update_column(:content, content)
+    end
+
+    # 试卷的标题
+    ExerciseQuestion.find_each do |eq|
+      question_title = ke_transform_to_md eq.question_title
+      eq.update_column(:question_title, question_title)
+    end
+
+    # 试卷的答案
+    ExerciseStandardAnswer.find_each do |esa|
+      answer_text = ke_transform_to_md esa.answer_text
+      esa.update_column(:answer_text, answer_text)
+    end
+
+    # 试卷题库的问题标题
+    ExerciseBankQuestion.find_each do |ebq|
+      question_title = ke_transform_to_md ebq.question_title
+      ebq.update_column(:question_title, question_title)
+    end
+
+    # 试卷答案
+    ExerciseBankStandardAnswer.find_each do |ebsa|
+      answer_text = ke_transform_to_md ebsa.answer_text
+      ebsa.update_column(:answer_text, answer_text)
+    end
+
+    # 问卷的标题
+    PollQuestion.find_each do |pq|
+      question_title = ke_transform_to_md pq.question_title
+      pq.update_column(:question_title, question_title)
+    end
+
+  end
+end

db/migrate/20190806062209_second_mofidy_ke_contents_for_md.rb

@@ -1,63 +1,64 @@
 class SecondMofidyKeContentsForMd < ActiveRecord::Migration[5.2]
   include ActionView::Helpers::SanitizeHelper
   def change
-    # def ke_transform_to_md content
-    #   return content if content.blank?
-    #   s_contents = sanitize(content, tags: %w(img a span table td tr tbody pre), attributes: %w(src href target style))
-    #   s_contents.gsub(/^(\n)/, "").gsub(/(\n)+/, "<br>").gsub(/$(\n)/, "")
-    #       .gsub(/(\n)+/, "<br>").gsub("\t", "  ")
-    # end
-    #
-    # # 作业
-    # HomeworkCommon.find_each do |hc|
-    #   description = ke_transform_to_md hc.description
-    #   reference_answer = ke_transform_to_md hc.reference_answer
-    #   explanation = ke_transform_to_md hc.explanation
-    #   hc.update_attributes(description: description, reference_answer: reference_answer, explanation: explanation)
-    # end
-    #
-    # # 作业题库
-    # HomeworkBank.find_each do |hb|
-    #   description = ke_transform_to_md hb.description
-    #   reference_answer = ke_transform_to_md hb.reference_answer
-    #   hb.update_attributes(description: description, reference_answer: reference_answer)
-    # end
-    #
-    # # 毕业任务
-    # GraduationTask.find_each do |gt|
-    #   description = ke_transform_to_md gt.description
-    #   gt.update_column(:description, description)
-    # end
-    #
-    # # 毕设选题
-    # GraduationTopic.find_each do |gt|
-    #   description = ke_transform_to_md gt.description
-    #   gt.update_column(:description, description)
-    # end
-    #
-    # # 毕设作品
-    # GraduationWork.find_each do |gw|
-    #   description = ke_transform_to_md gw.description
-    #   gw.update_column(:description, description)
-    # end
-    #
-    # # 毕设任务题库
-    # GtaskBank.find_each do |gb|
-    #   description = ke_transform_to_md gb.description
-    #   gb.update_column(:description, description)
-    # end
-    #
-    # # 毕设选题题库
-    # GtopicBank.find_each do |gb|
-    #   description = ke_transform_to_md gb.description
-    #   gb.update_column(:description, description)
-    # end
-    #
-    # # 交流问答
-    # Memo.find_each do |m|
-    #   content = ke_transform_to_md m.content
-    #   m.update_column(:content, content)
-    # end
+    def ke_transform_to_md content
+      return content if content.blank?
+      s_contents = sanitize(content, tags: %w(img a span table td tr tbody pre), attributes: %w(src href target style))
+      s_contents.gsub(">\n<", "><").gsub(/^\n/, "").gsub("    ", "").gsub(/(\n)+/, "<br />")
+          .gsub("\t", "  ").gsub("\n", "").gsub("    ", "  ").gsub(/(<br\s?\/?>)+/, "<br />")
+
+    end
+
+    # 作业
+    HomeworkCommon.find_each do |hc|
+      description = ke_transform_to_md hc.description
+      reference_answer = ke_transform_to_md hc.reference_answer
+      explanation = ke_transform_to_md hc.explanation
+      hc.update_attributes(description: description, reference_answer: reference_answer, explanation: explanation)
+    end
+
+    # 作业题库
+    HomeworkBank.find_each do |hb|
+      description = ke_transform_to_md hb.description
+      reference_answer = ke_transform_to_md hb.reference_answer
+      hb.update_attributes(description: description, reference_answer: reference_answer)
+    end
+
+    # 毕业任务
+    GraduationTask.find_each do |gt|
+      description = ke_transform_to_md gt.description
+      gt.update_column(:description, description)
+    end
+
+    # 毕设选题
+    GraduationTopic.find_each do |gt|
+      description = ke_transform_to_md gt.description
+      gt.update_column(:description, description)
+    end
+
+    # 毕设作品
+    GraduationWork.find_each do |gw|
+      description = ke_transform_to_md gw.description
+      gw.update_column(:description, description)
+    end
+
+    # 毕设任务题库
+    GtaskBank.find_each do |gb|
+      description = ke_transform_to_md gb.description
+      gb.update_column(:description, description)
+    end
+
+    # 毕设选题题库
+    GtopicBank.find_each do |gb|
+      description = ke_transform_to_md gb.description
+      gb.update_column(:description, description)
+    end
+
+    # 交流问答
+    Memo.find_each do |m|
+      content = ke_transform_to_md m.content
+      m.update_column(:content, content)
+    end
 
   end
 end

db/migrate/20190806063903_third_modify_ke_for_student_work.rb

@@ -1,17 +1,17 @@
 class ThirdModifyKeForStudentWork < ActiveRecord::Migration[5.2]
   include ActionView::Helpers::SanitizeHelper
   def change
-    # def ke_transform_to_md content
-    #   return content if content.blank?
-    #   s_contents = sanitize(content, tags: %w(img a span table td tr tbody pre), attributes: %w(src href target style))
-    #   s_contents.gsub(/^(\n)/, "").gsub(/(\n)+/, "<br>").gsub(/$(\n)/, "")
-    #       .gsub(/(\n)+/, "<br>").gsub("\t", "  ")
-    # end
-    #
-    # # 学生的作品 过滤掉一些描述的ke图片的作品
-    # StudentWork.where("description is not null and LENGTH(description) < 1000000").find_each do |sw|
-    #     description  = ke_transform_to_md sw.description
-    #     sw.update_column(:description, description)
-    # end
+    def ke_transform_to_md content
+      return content if content.blank?
+      s_contents = sanitize(content, tags: %w(img a span table td tr tbody pre), attributes: %w(src href target style))
+      s_contents.gsub(">\n<", "><").gsub(/^\n/, "").gsub(" ", "").gsub(/(\n)+/, "<br />")
+          .gsub("\t", "  ").gsub("\n", "").gsub("    ", "  ").gsub(/(<br\s?\/?>)+/, "<br />")
+    end
+
+    # 学生的作品 过滤掉一些描述的ke图片的作品
+    StudentWork.where("description is not null and LENGTH(description) < 1000000").find_each do |sw|
+        description  = ke_transform_to_md sw.description
+        sw.update_column(:description, description)
+    end
   end
 end

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

@@ -189,7 +189,7 @@ class MemoDetail extends Component {
         let filesize = item.filesize
         
         attachments.push(
-          <div className="color-grey df" key={index}>
+          <div className="color-grey df" key={index} style={{ lineHeight: '17px'}}>
             <a className="color-grey ">
               <i className="font-14 color-green iconfont icon-fujian mr8" aria-hidden="true"></i>
             </a>

public/react/src/modules/home/shixunsHome.js

@@ -116,7 +116,7 @@ class ShixunsHome extends Component {
          }
 
         return (
-            <div className="newMain clearfix   backFAFAFA">
+            <div className="newMain clearfix   backFAFAFA shixunsHome">
 							{this.state.updata===undefined?"":<UpgradeModals
 								{...this.state}
 							/>}
@@ -128,6 +128,9 @@ class ShixunsHome extends Component {
 													<style>
 														{
 															`
+                                                            .shixunsHome .educontent {
+                                                                width: 1223px;
+                                                            }
 															.banners{
 															overflow: hidden;
 															}

public/react/src/modules/tpm/NewHeader.js

@@ -650,8 +650,8 @@ submittojoinclass=(value)=>{
 
 				{isRender===true?<LoginDialog
                Modifyloginvalue={()=>this.Modifyloginvalue()}
-                  {...this.state}
                   {...this.props}
+                  {...this.state}
               />:""}
 
 				{AccountProfiletype===true?<AccountProfile

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

@@ -101,7 +101,7 @@ function md_elocalStorage(editor,mdu,id){
 
 
 function create_editorMD(id, width, high, placeholder, imageUrl, callback, initValue, 
-        onchange, watch, { noStorage, showNullButton }, that) {
+        onchange, watch, { noStorage, showNullButton, emoji }, that) {
     // 还是出现了setting只有一份，被共用的问题
     
     var editorName = window.editormd(id, {
@@ -115,7 +115,7 @@ function create_editorMD(id, width, high, placeholder, imageUrl, callback, initV
         syncScrolling: "single",
         tex: true,
         tocm: true,
-        emoji: true,
+        emoji: !!emoji ,
         taskList: true,
         codeFold: true,
         searchReplace: true,
@@ -266,7 +266,8 @@ export default class TPMMDEditor extends Component {
             window[__editorName.id+'_'] = __editorName;
         }, initValue, this.onEditorChange,this.props.watch, {
             noStorage: this.props.noStorage,
-            showNullButton: this.props.showNullButton
+            showNullButton: this.props.showNullButton,
+            emoji: this.props.emoji
         }, this);
         
     }

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

@@ -194,7 +194,8 @@ export default class TPMquestion extends Component {
 												})
 										  	// this.contentMdRef.current.setValue(response.data.task_pass || '')
                         if(response.data.chooses.length===0){
-                            this.questionadd()
+                            // 新建选择题时，没法切回 ‘本关任务’ tab
+                            // this.questionadd()
                         }
 
                         this.shixunsautoHeight()