diff --git a/app/views/shixuns/index.json.jbuilder b/app/views/shixuns/index.json.jbuilder index e3fbdaca4..8e5d49a34 100644 --- a/app/views/shixuns/index.json.jbuilder +++ b/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 = '
有下列程序： -
-
-
void sort(int a[ ],int n) -
-
-
{ -
-
-
int i,j,t; for(i=0;i＜n-1;i+ -
+) -
-
-
for(j=i+1;j＜n;j+ -
+) -
-
-
if(a[i]＜a[j]) -
-
-
{ -
-
-
t=a[i]; a[i]=a[j]; a[j]=t; -
-
-
} -
-
-
} -
-
-
int main( ) -
-
-
{ -
-
-
int -
aa[10]={1,2,3,4,5,6,7,8,9,10},i; -
-
-
sort(aa+2,5); -
-
-
for(i=0;i<10;i+ +) -
-
-
printf("%d,",aa[i]); -
printf("\n"); return 0; -
-
-
} 程序运行后的输出结果是( ) -
' - -json.html_content s_s.gsub(/()+/, "
") \ No newline at end of file diff --git a/db/migrate/20190805010557_modify_ke_contents_for_markdown.rb b/db/migrate/20190805010562_modify_ke_contents_for_markdown.rb similarity index 58% rename from db/migrate/20190805010557_modify_ke_contents_for_markdown.rb rename to db/migrate/20190805010562_modify_ke_contents_for_markdown.rb index cf6e6ad36..958b70448 100644 --- a/db/migrate/20190805010557_modify_ke_contents_for_markdown.rb +++ b/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)+/, "
") - .gsub("\t", "").gsub("\n", "").gsub(" ", "    ").gsub(/()+/, "
") - 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)+/, "
") + # .gsub("\t", "").gsub("\n", "").gsub(" ", "    ").gsub(/()+/, "
") + # s_contents.gsub("\n", "
").gsub(/()+/, "
") + # 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| diff --git a/public/react/src/common/TextUtil.js b/public/react/src/common/TextUtil.js index 2dab5c4aa..4482f8607 100644 --- a/public/react/src/common/TextUtil.js +++ b/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,"▁▁▁"), diff --git a/public/react/src/modules/moop_cases/CaseDetail.js b/public/react/src/modules/moop_cases/CaseDetail.js index 1a48f6898..f3ade34d9 100644 --- a/public/react/src/modules/moop_cases/CaseDetail.js +++ b/public/react/src/modules/moop_cases/CaseDetail.js @@ -134,7 +134,7 @@ class CaseDetail extends Component{ `}
- { CaseDetail && CaseDetail.content && } + { CaseDetail && CaseDetail.content && }
{ attachments &&
diff --git a/public/react/src/modules/moop_cases/CaseList.js b/public/react/src/modules/moop_cases/CaseList.js index dd4fb4c71..9bbafe98c 100644 --- a/public/react/src/modules/moop_cases/CaseList.js +++ b/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( @@ -112,7 +110,7 @@ class CaseList extends Component{ 全部 { - current_user && + checkIfLogin() &&
  • this.changeType(1)}> 我的
    • diff --git a/public/react/src/modules/moop_cases/CaseNew.js b/public/react/src/modules/moop_cases/CaseNew.js index 8f9be3861..da6ccd28e 100644 --- a/public/react/src/modules/moop_cases/CaseNew.js +++ b/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 )}) }; }); }