m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
dev_hjm
jingquan huang 6 years ago
parent 128394bc5d 639a8cef53
commit 822253cf2a
10 changed files with 136 additions and 124 deletions
Show Stats Download Patch File Download Diff File

6
app/views/shixuns/index.json.jbuilder
Unescape View File

@ -8,3 +8,9 @@ json.search_tags @search_tags
json.shixuns do json.shixuns do
json.partial! 'shixun', locals: {shixuns: @shixuns} json.partial! 'shixun', locals: {shixuns: @shixuns}
end 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 />")

48
db/migrate/20190805010546_modify_ke_contents_for_markdown.rb
Unescape View File

@ -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

48
db/migrate/20190805010549_modify_ke_contents_for_markdown.rb
Unescape View File

@ -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

115
db/migrate/20190806062209_second_mofidy_ke_contents_for_md.rb
Unescape View File

@ -1,63 +1,64 @@
class SecondMofidyKeContentsForMd < ActiveRecord::Migration[5.2] class SecondMofidyKeContentsForMd < ActiveRecord::Migration[5.2]
include ActionView::Helpers::SanitizeHelper include ActionView::Helpers::SanitizeHelper
def change def change
# def ke_transform_to_md content def ke_transform_to_md content
# return content if content.blank? 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 = 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)/, "") s_contents.gsub(">\n<", "><").gsub(/^\n/, "").gsub("    ", "").gsub(/(\n)+/, "<br />")
# .gsub(/(\n)+/, "<br>").gsub("\t", " ") .gsub("\t", " ").gsub("\n", "").gsub(" ", " ").gsub(/(<br\s?\/?>)+/, "<br />")
# end
# end
# # 作业
# HomeworkCommon.find_each do |hc| # 作业
# description = ke_transform_to_md hc.description HomeworkCommon.find_each do |hc|
# reference_answer = ke_transform_to_md hc.reference_answer description = ke_transform_to_md hc.description
# explanation = ke_transform_to_md hc.explanation reference_answer = ke_transform_to_md hc.reference_answer
# hc.update_attributes(description: description, reference_answer: reference_answer, explanation: explanation) explanation = ke_transform_to_md hc.explanation
# end hc.update_attributes(description: description, reference_answer: reference_answer, explanation: explanation)
# end
# # 作业题库
# HomeworkBank.find_each do |hb| # 作业题库
# description = ke_transform_to_md hb.description HomeworkBank.find_each do |hb|
# reference_answer = ke_transform_to_md hb.reference_answer description = ke_transform_to_md hb.description
# hb.update_attributes(description: description, reference_answer: reference_answer) reference_answer = ke_transform_to_md hb.reference_answer
# end hb.update_attributes(description: description, reference_answer: reference_answer)
# end
# # 毕业任务
# GraduationTask.find_each do |gt| # 毕业任务
# description = ke_transform_to_md gt.description GraduationTask.find_each do |gt|
# gt.update_column(:description, description) description = ke_transform_to_md gt.description
# end gt.update_column(:description, description)
# end
# # 毕设选题
# GraduationTopic.find_each do |gt| # 毕设选题
# description = ke_transform_to_md gt.description GraduationTopic.find_each do |gt|
# gt.update_column(:description, description) description = ke_transform_to_md gt.description
# end gt.update_column(:description, description)
# end
# # 毕设作品
# GraduationWork.find_each do |gw| # 毕设作品
# description = ke_transform_to_md gw.description GraduationWork.find_each do |gw|
# gw.update_column(:description, description) description = ke_transform_to_md gw.description
# end gw.update_column(:description, description)
# end
# # 毕设任务题库
# GtaskBank.find_each do |gb| # 毕设任务题库
# description = ke_transform_to_md gb.description GtaskBank.find_each do |gb|
# gb.update_column(:description, description) description = ke_transform_to_md gb.description
# end gb.update_column(:description, description)
# end
# # 毕设选题题库
# GtopicBank.find_each do |gb| # 毕设选题题库
# description = ke_transform_to_md gb.description GtopicBank.find_each do |gb|
# gb.update_column(:description, description) description = ke_transform_to_md gb.description
# end gb.update_column(:description, description)
# end
# # 交流问答
# Memo.find_each do |m| # 交流问答
# content = ke_transform_to_md m.content Memo.find_each do |m|
# m.update_column(:content, content) content = ke_transform_to_md m.content
# end m.update_column(:content, content)
end
end end
end end

24
db/migrate/20190806063903_third_modify_ke_for_student_work.rb
Unescape View File

@ -1,17 +1,17 @@
class ThirdModifyKeForStudentWork < ActiveRecord::Migration[5.2] class ThirdModifyKeForStudentWork < ActiveRecord::Migration[5.2]
include ActionView::Helpers::SanitizeHelper include ActionView::Helpers::SanitizeHelper
def change def change
# def ke_transform_to_md content def ke_transform_to_md content
# return content if content.blank? 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 = 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)/, "") s_contents.gsub(">\n<", "><").gsub(/^\n/, "").gsub(" ", "").gsub(/(\n)+/, "<br />")
# .gsub(/(\n)+/, "<br>").gsub("\t", " ") .gsub("\t", " ").gsub("\n", "").gsub(" ", " ").gsub(/(<br\s?\/?>)+/, "<br />")
# end end
#
# # 学生的作品 过滤掉一些描述的ke图片的作品 # 学生的作品 过滤掉一些描述的ke图片的作品
# StudentWork.where("description is not null and LENGTH(description) < 1000000").find_each do |sw| StudentWork.where("description is not null and LENGTH(description) < 1000000").find_each do |sw|
# description = ke_transform_to_md sw.description description = ke_transform_to_md sw.description
# sw.update_column(:description, description) sw.update_column(:description, description)
# end end
end end
end end

2
public/react/src/modules/forums/MemoDetail.js
Unescape View File

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

5
public/react/src/modules/home/shixunsHome.js
Unescape View File

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

2
public/react/src/modules/tpm/NewHeader.js
Unescape View File

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

7
public/react/src/modules/tpm/challengesnew/TPMMDEditor.js
Unescape View File

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

3
public/react/src/modules/tpm/challengesnew/TPMquestion.js
Unescape View File

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

Write Preview
Loading…
Cancel
Save