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

app/views/shixuns/index.json.jbuilder

@@ -8,60 +8,3 @@ json.search_tags @search_tags
 json.shixuns do
   json.partial! 'shixun', locals: {shixuns: @shixuns}
 end
-
-s_s = '<br />有下列程序：
-<br />
-<br />
-<br />void sort(int a[ ],int n)
-<br />
-<br />
-<br />{
-<br />
-<br />
-<br />int i,j,t; for(i=0;i＜n-1;i+
-<br />+)
-<br />
-<br />
-<br />for(j=i+1;j＜n;j+
-<br />+)
-<br />
-<br />
-<br />if(a[i]＜a[j])
-<br />
-<br />
-<br /> {
-<br />
-<br />
-<br />t=a[i]; a[i]=a[j]; a[j]=t;
-<br />
-<br />
-<br /> }
-<br />
-<br />
-<br />}
-<br />
-<br />
-<br />int main( )
-<br />
-<br />
-<br />{
-<br />
-<br />
-<br />int
-<br />aa[10]={1,2,3,4,5,6,7,8,9,10},i;
-<br />
-<br />
-<br />sort(aa+2,5);
-<br />
-<br />
-<br />for(i=0;i&lt;10;i+ +)
-<br />
-<br />
-<br />printf("%d,",aa[i]);
-<br />printf("\n"); return 0;
-<br />
-<br />
-<br />} 程序运行后的输出结果是( )
-<br />'
-
-json.html_content s_s.gsub(/(<br\s?\/?>)+/, "<br />")

db/migrate/20190805010562_modify_ke_contents_for_markdown.rb

@@ -1,12 +1,13 @@
 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 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("    ", "&nbsp;&nbsp;&nbsp;&nbsp;").gsub(/(<br\s?\/?>)+/, "<br />")
-    end
+    # def ke_transform_to_md content
+    #   return content if content.blank?
+    #   s_contents = sanitize(content, tags: %w(img a 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("    ", "&nbsp;&nbsp;&nbsp;&nbsp;").gsub(/(<br\s?\/?>)+/, "<br />")
+    #   s_contents.gsub("\n", "<br />").gsub(/(<br\s?\/?>)+/, "<br />")
+    # end
     #
     # # 课程讨论区
     # MessageDetail.find_each do |m|
@@ -15,12 +16,12 @@ class ModifyKeContentsForMarkdown < ActiveRecord::Migration[5.2]
     # end
 
     #试卷的标题
-    ExerciseQuestion.where(:id => 25599).find_each do |eq|
-      puts("#eq.question_title: #{eq.question_title}")
-      question_title = ke_transform_to_md eq.question_title
-      puts("#question_title: #{question_title}")
-      #eq.update_column(:question_title, question_title)
-    end
+    # ExerciseQuestion.where(:exercise_id => 1892).find_each do |eq|
+    #   puts("#eq.question_title: #{eq.question_title}")
+    #   question_title = ke_transform_to_md eq.question_title
+    #   puts("#question_title: #{question_title}")
+    #   eq.update_column(:question_title, question_title)
+    # end
 
     # # 试卷的答案
     # ExerciseStandardAnswer.find_each do |esa|

public/react/src/common/TextUtil.js

@@ -12,6 +12,7 @@ export function markdownToHTML(oldContent, selector) {
         window.$('#' + selector).html(oldContent)
     } else {
         try {    
+        $("#"+selector).html('')
             // selector || 
         var markdwonParser = window.editormd.markdownToHTML(selector || "md_div", {
             markdown: oldContent, // .replace(/▁/g,"▁▁▁"),

public/react/src/modules/moop_cases/CaseDetail.js

@@ -134,7 +134,7 @@ class CaseDetail extends Component{
               `}
             </style>
             <div class="mt20 setMDStyle">
-              { CaseDetail && CaseDetail.content && <MarkdownToHtml content={CaseDetail.content} selector="casesDetail" style={{width:"100%!important"}}></MarkdownToHtml>}
+              { CaseDetail && CaseDetail.content && <MarkdownToHtml content={CaseDetail.content} id="casesDetail" selector="casesDetail" style={{width:"100%!important"}}></MarkdownToHtml>}
             </div>
             { attachments && 
               <div className="mt10">

public/react/src/modules/moop_cases/CaseList.js

@@ -93,9 +93,7 @@ class CaseList extends Component{
 
   render(){
     let { type , search ,libraries , totalCount ,pageSize ,page } = this.state;
-    let { current_user } = this.props;
-    console.log(current_user);
-    console.log(this.props);
+    let { checkIfLogin } = this.props;
     return(
       <React.Fragment>
         <img src={mainImg} width="100%" />
@@ -112,7 +110,7 @@ class CaseList extends Component{
                   <a href="javascript:void(0)">全部</a>
                 </li>
                 {
-                  current_user && 
+                  checkIfLogin() && 
                   <li className={type == 1 ? "active" :""} onClick={()=>this.changeType(1)}>
                     <a href="javascript:void(0)">我的</a>
                   </li>

public/react/src/modules/moop_cases/CaseNew.js

@@ -74,8 +74,11 @@ class CaseNew extends Component{
             const index = state[stateName].indexOf(file);
             const newFileList = state[stateName].slice();
             newFileList.splice(index, 1);
+            console.log("newFileList");
+            console.log(newFileList.map(item =>{ return( item.id )}));
             return {
               [stateName]: newFileList,
+              filesID:newFileList.map(item =>{ return( item.id )})
             };
           });
         }