") - 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| @@ -16,12 +16,12 @@ class ModifyKeContentsForMarkdown < ActiveRecord::Migration[5.2] # end #试卷的标题 - ExerciseQuestion.where(:exercise_id => 1890).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/editormd/lib/marked.min.js b/public/editormd/lib/marked.min.js index 636c21b01..519296797 100644 --- a/public/editormd/lib/marked.min.js +++ b/public/editormd/lib/marked.min.js @@ -2,6 +2,10 @@ * marked v0.3.3 - a markdown parser * Copyright (c) 2011-2014, Christopher Jeffrey. (MIT Licensed) * https://github.com/chjj/marked + + 备注，这个改动没启用，只是做个记录： + br不转成br + 加了个 if (cap[0] != '' && cap[0] != '
') { out+=this.options.sanitize?escape(cap[0]):cap[0]; } */ (function(){var block={newline:/^\n+/,code:/^( {4}[^\n]+\n*)+/,fences:noop,hr:/^( *[-*_]){3,} *(?:\n+|$)/,heading:/^ *(#{1,6}) *([^\n]+?) *#* *(?:\n+|$)/,nptable:noop,lheading:/^([^\n]+)\n *(=|-){2,} *(?:\n+|$)/,blockquote:/^( *>[^\n]+(\n(?!def)[^\n]+)*\n*)+/,list:/^( *)(bull) [\s\S]+?(?:hr|def|\n{2,}(?! )(?!\1bull )\n*|\s*$)/,html:/^ *(?:comment *(?:\n|\s*$)|closed *(?:\n{2,}|\s*$)|closing *(?:\n{2,}|\s*$))/,def:/^ *\[([^\]]+)\]: *]+)>?(?: +["(]([^\n]+)[")])? *(?:\n+|$)/,table:noop,paragraph:/^((?:[^\n]+\n?(?!hr|heading|lheading|blockquote|tag|def))+)\n*/,text:/^[^\n]+/};block.bullet=/(?:[*+-]|\d+\.)/;block.item=/^( *)(bull) [^\n]*(?:\n(?!\1bull )[^\n]*)*/;block.item=replace(block.item,"gm")(/bull/g,block.bullet)();block.list=replace(block.list)(/bull/g,block.bullet)("hr","\\n+(?=\\1?(?:[-*_] *){3,}(?:\\n+|$))")("def","\\n+(?="+block.def.source+")")();block.blockquote=replace(block.blockquote)("def",block.def)();block._tag="(?!(?:"+"a|em|strong|small|s|cite|q|dfn|abbr|data|time|code"+"|var|samp|kbd|sub|sup|i|b|u|mark|ruby|rt|rp|bdi|bdo"+"|span|br|wbr|ins|del|img)\\b)\\w+(?!:/|[^\\w\\s@]*@)\\b";block.html=replace(block.html)("comment",//)("closed",/<(tag)[\s\S]+?<\/\1>/)("closing",/
![高校智能化教学与实训平台]({getImageUrl("images/educoder/headNavLogo.png?1526520218")})
diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js
index 0361b090f..0b4f312e4 100644
--- a/public/react/src/modules/tpm/TPMIndexHOC.js
+++ b/public/react/src/modules/tpm/TPMIndexHOC.js
@@ -10,6 +10,8 @@ import axios from 'axios';
import './TPMIndex.css'
import LoginDialog from '../login/LoginDialog';
+import AccountProfile from '../user/AccountProfile';
+
import Trialapplication from "../login/Trialapplication";
// import "antd/dist/antd.css";
// import '../../css/educoder/edu-common.css'
@@ -76,7 +78,8 @@ export function TPMIndexHOC(WrappedComponent) {
Footerdown:undefined,
coursedata: {},
- isRender: false
+ isRender: false,
+ AccountProfiletype: false
}
}
@@ -300,11 +303,26 @@ export function TPMIndexHOC(WrappedComponent) {
isRender: true
})
}
+
checkIfLogin = () => {
return this.state.current_user && this.state.current_user.login != ''
}
+
+ hideAccountProfile = () => {
+ this.setState({
+ hideAccountProfile: false
+ })
+ }
+ showProfileCompleteDialog = () => {
+ this.setState({
+ hideAccountProfile: true
+ })
+ }
+ checkIfProfileCompleted = () => {
+ return this.state.current_user && this.state.current_user.profile_completed
+ }
render() {
- let{Headertop,Footerdown, isRender}=this.state;
+ let{Headertop,Footerdown, isRender, AccountProfiletype}=this.state;
const common = {
isSuperAdmin:this.isSuperAdmin,
isAdminOrCreator:this.isAdminOrCreator,
@@ -319,6 +337,8 @@ export function TPMIndexHOC(WrappedComponent) {
showLoginDialog: this.showLoginDialog,
checkIfLogin: this.checkIfLogin,
+ showProfileCompleteDialog: this.showProfileCompleteDialog,
+ checkIfProfileCompleted: this.checkIfProfileCompleted,
}
return (
@@ -327,6 +347,11 @@ export function TPMIndexHOC(WrappedComponent) {
{...this.state}
{...this.props}
/> : ""}
+ {AccountProfiletype===true ? this.hideAccountProfile()}
+ {...this.state}
+ {...this.props}
+ />:""}
{/* 注释掉了1440 影响到了手机屏幕的展示 */}