Merge branch 'dev_aliyun' into develop

.merge_file_a17580

@@ -0,0 +1,529 @@
+import React, {Component} from 'react';
+import logo from './logo.svg';
+import './App.css';
+import {LocaleProvider} from 'antd'
+import zhCN from 'antd/lib/locale-provider/zh_CN';
+import {
+	BrowserRouter as Router,
+	Route,
+	Switch
+} from 'react-router-dom';
+import axios from 'axios';
+import '@icedesign/base/dist/ICEDesignBase.css';
+
+import '@icedesign/base/index.scss';
+
+import LoginDialog from './modules/login/LoginDialog';
+import Notcompletedysl from './modules/user/Notcompletedysl';
+import Trialapplicationysl from './modules/login/Trialapplicationysl';
+import Trialapplicationreview from './modules/user/Trialapplicationreview';
+import Addcourses from "./modules/courses/coursesPublic/Addcourses";
+import AccountProfile from"./modules/user/AccountProfile";
+
+
+import Trialapplication from './modules/login/Trialapplication'
+
+import NotFoundPage from './NotFoundPage'
+
+import Loading from './Loading'
+
+import Loadable from 'react-loadable';
+
+
+import moment from 'moment'
+
+import {MuiThemeProvider, createMuiTheme} from 'material-ui/styles';
+
+// import './AppConfig'
+
+import history from './history';
+
+import {SnackbarHOC} from 'educoder'
+import {initAxiosInterceptors} from './AppConfig'
+
+
+// ！！！tpi需要这个来加载css
+import {TPMIndexHOC} from './modules/tpm/TPMIndexHOC';
+
+
+const theme = createMuiTheme({
+	palette: {
+		primary: {
+			main: '#4CACFF',
+			contrastText: 'rgba(255, 255, 255, 0.87)'
+		},
+		secondary: {main: '#4CACFF'}, // #11cb5f This is just green.A700 as hex.
+	},
+});
+//
+// const Trialapplication= Loadable({
+//     loader: () =>import('./modules/login/Trialapplication'),
+//     loading:Loading,
+// })
+//登入
+const EducoderLogin = Loadable({
+	loader: () => import('./modules/login/EducoderLogin'),
+	loading: Loading,
+})
+const TestIndex = Loadable({
+	loader: () => import('./modules/test'),
+	loading: Loading,
+})
+
+const IndexWrapperComponent = Loadable({
+	loader: () => import('./modules/page/IndexWrapper'),
+	loading: Loading,
+})
+
+const CommentComponent = Loadable({
+	loader: () => import('./modules/comment/CommentContainer'),
+	loading: Loading,
+})
+
+const TestMaterialDesignComponent = Loadable({
+	loader: () => import('./modules/test/md/TestMaterialDesign'),
+	loading: Loading,
+})
+const TestCodeMirrorComponent = Loadable({
+	loader: () => import('./modules/test/codemirror/TestCodeMirror'),
+	loading: Loading,
+})
+
+const TestComponent = Loadable({
+	loader: () => import('./modules/test/TestRC'),
+	loading: Loading,
+})
+const TestUrlQueryComponent = Loadable({
+	loader: () => import('./modules/test/urlquery/TestUrlQuery'),
+	loading: Loading,
+})
+
+const TPMIndexComponent = Loadable({
+	loader: () => import('./modules/tpm/TPMIndex'),
+	loading: Loading,
+})
+const TPMShixunsIndexComponent = Loadable({
+	loader: () => import('./modules/tpm/shixuns/ShixunsIndex'),
+	loading: Loading,
+})
+
+//实训课程（原实训路径）
+const ShixunPaths = Loadable({
+	loader: () => import('./modules/paths/Index'),
+	loading: Loading,
+})
+
+//在线课堂
+const CoursesIndex = Loadable({
+	loader: () => import('./modules/courses/Index'),
+	loading: Loading,
+})
+const SearchPage = Loadable({
+	loader: () => import('./search/SearchPage'),
+	loading: Loading,
+})
+
+//教学案例
+const MoopCases = Loadable({
+	loader: () => import('./modules/moop_cases/index'),
+	loading: Loading,
+})
+
+// 课堂讨论
+// const BoardIndex = Loadable({
+//   loader: () => import('./modules/courses/boards/BoardIndex'),
+//   loading:Loading,
+// })
+
+// //课堂普通作业&分组作业
+// const CoursesWorkIndex = Loadable({
+//   loader: () => import('./modules/courses/busyWork/Index'),
+//   loading:Loading,
+// })
+//
+
+// const TPMShixunchildIndexComponent = Loadable({
+//     loader: () => import('./modules/tpm/shixunchild/ShixunChildIndex'),
+//     loading: Loading,
+//   })
+
+
+// const TPMshixunfork_listIndexComponent = Loadable({
+//     loader: () => import('./modules/tpm/shixunchild/Shixunfork_list'),
+//     loading: Loading,
+//   })
+
+
+const ForumsIndexComponent = Loadable({
+	loader: () => import('./modules/forums/ForumsIndex'),
+	loading: Loading,
+})
+
+// trustie plus forum
+// const TPForumsIndexComponent = Loadable({
+//   loader: () => import('./modules/tp-forums/TPForumsIndex'),
+//   loading: Loading,
+// })
+
+
+// const TestPageComponent = Loadable({
+//   loader: () => import('./modules/page/Index'),
+//   loading: Loading,
+// })
+
+
+//新建实训
+const Newshixuns = Loadable({
+	loader: () => import('./modules/tpm/newshixuns/Newshixuns'),
+	loading: Loading,
+})
+
+
+//实训首页
+const ShixunsHome = Loadable({
+	loader: () => import('./modules/home/shixunsHome'),
+	loading: Loading,
+})
+
+
+const CompatibilityPageLoadable = Loadable({
+	loader: () => import('./modules/common/CompatibilityPage'),
+	loading: Loading,
+})
+
+//403页面
+const Shixunauthority = Loadable({
+	loader: () => import('./modules/403/Shixunauthority'),
+	loading: Loading,
+})
+
+
+//404页面
+const Shixunnopage = Loadable({
+	loader: () => import('./modules/404/Shixunnopage'),
+	loading: Loading,
+})
+
+//500页面
+const http500 = Loadable({
+	loader: () => import('./modules/500/http500'),
+	loading: Loading,
+})
+
+// 登录注册
+const LoginRegisterPage = Loadable({
+	loader: () => import('./modules/user/LoginRegisterPage'),
+	loading: Loading,
+})
+const AccountPage = Loadable({
+	loader: () => import('./modules/user/AccountPage'),
+	loading: Loading,
+})
+
+// 个人主页
+const UsersInfo = Loadable({
+	loader: () => import('./modules/user/usersInfo/Infos'),
+	loading: Loading,
+})
+
+// 兴趣页面
+const Interestpage = Loadable({
+	loader: () => import('./modules/login/EducoderInteresse'),
+	loading: Loading,
+})
+
+//众包创新
+const ProjectPackages=Loadable({
+	loader: () => import('./modules/projectPackages/ProjectPackageIndex'),
+	loading: Loading,
+})
+
+class App extends Component {
+	constructor(props) {
+		super(props)
+		// this.state = {
+		// 	isRenders:false,
+		// }
+
+	}
+
+	componentDidMount() {
+		// force an update if the URL changes
+		history.listen(() => {
+			this.forceUpdate()
+			const $ = window.$
+			// https://www.trustie.net/issues/21919 可能会有问题
+			$("html").animate({ scrollTop: $('html').scrollTop() - 0 })
+		});
+
+		initAxiosInterceptors(this.props)
+
+		//
+		// axios.interceptors.response.use((response) => {
+		// 	// console.log("response"+response);
+		// 	if(response!=undefined)
+		// 		// console.log("response"+response.data.statu);
+		// 	if (response&&response.data.status === 407) {
+		// 		this.setState({
+		// 			isRenders: true,
+		// 		})
+		// 	}
+		// 	return response;
+		// }, (error) => {
+		// 	//TODO 这里如果样式变了会出现css不加载的情况
+		// });
+	}
+	//修改登录方法
+	Modifyloginvalue=()=>{
+		this.setState({
+			isRender:false,
+		})
+	}
+
+	render() {
+
+
+		return (
+			<LocaleProvider locale={zhCN}>
+
+
+				<MuiThemeProvider theme={theme}>
+					<LoginDialog {...this.props} {...this.state}  Modifyloginvalue={()=>this.Modifyloginvalue()}></LoginDialog>
+					<Notcompletedysl {...this.props} {...this.state}></Notcompletedysl>
+					<Trialapplicationysl  {...this.props} {...this.state}></Trialapplicationysl>
+					<Trialapplicationreview  {...this.props} {...this.state}></Trialapplicationreview>
+				  <Addcourses {...this.props} {...this.state}/>
+				  <AccountProfile {...this.props} {...this.state}/>
+					{/*{*/}
+					{/*	isRender === true?*/}
+					{/*		<LoginDialog></LoginDialog> : ""*/}
+					{/*}*/}
+
+					{/*{*/}
+					{/*	isRenders === true?*/}
+					{/*<Trialapplication></Trialapplication>*/}
+					{/*:""*/}
+					{/*}*/}
+
+					<Router>
+						<Switch>
+							{/*<Route path="/login" component={LoginRegisterPage}/>*/}
+
+							{/*众包创新*/}
+							<Route path={"/crowdsourcings"} component={ProjectPackages}/>
+							{/*认证*/}
+							<Route path="/account" component={AccountPage}/>
+
+							{/*403*/}
+							<Route path="/403" component={Shixunauthority}/>
+
+							<Route path="/500" component={http500}/>
+
+							{/*404*/}
+							<Route path="/nopage" component={Shixunnopage}/>
+
+							<Route path="/compatibility" component={CompatibilityPageLoadable}/>
+							<Route
+								path="/login" component={EducoderLogin}
+							/>
+							<Route
+								path="/register" component={EducoderLogin}
+							/>
+							<Route path="/users/:username"
+								render={
+									(props) => (<UsersInfo {...this.props} {...props} {...this.state} />)
+							}></Route>
+							{/*<Route*/}
+							{/*  path="/trialapplication" component={Trialapplication}*/}
+							{/*/>*/}
+							<Route
+								path="/changepassword" component={EducoderLogin}
+							/>
+              <Route
+							  path="/interesse" component={Interestpage}
+
+							/>
+
+							<Route path="/shixuns/new" component={Newshixuns}>
+							</Route>
+
+							<Route path="/tasks/:stageId" component={IndexWrapperComponent}/>
+
+							<Route path="/shixuns/:shixunId" component={TPMIndexComponent}>
+							</Route>
+
+							{/*列表页*/}
+							<Route path="/shixuns" component={TPMShixunsIndexComponent}/>
+
+							{/* <Route path="/shixunchild" component={TPMShixunchildIndexComponent}>
+          </Route>
+          <Route path="/fork_list" component={TPMshixunfork_listIndexComponent}>
+          </Route> */}
+
+							{/*<Route path="/forums" component={ForumsIndexComponent}>*/}
+							{/*</Route>*/}
+
+
+							{/*实训课程（原实训路径）*/}
+							<Route path="/paths" component={ShixunPaths}></Route>
+
+							<Route path="/search"
+										 render={
+											 (props)=>(<SearchPage {...this.props} {...props} {...this.state}></SearchPage>)
+										 }
+							></Route>
+
+							{/*课堂*/}
+							<Route path="/courses" component={CoursesIndex} {...this.props}></Route>
+
+							{/* 课堂讨论 */}
+							{/* <Route path="/board" component = {BoardIndex} {...this.props}></Route> */}
+
+							{/* <Route path="/tpforums" component={TPForumsIndexComponent}>
+          </Route> */}
+
+							{/* <Route path="/myshixuns/:shixunId/stages/:stageId" component={Index}/> */}
+              {/* 兴趣页面*/}
+              {/*<Route path="/interest" component={Interestpage}/>*/}
+
+							<Route path="/comment" component={CommentComponent}/>
+							<Route path="/testMaterial" component={TestMaterialDesignComponent}/>
+							<Route path="/test" component={TestIndex}/>
+							<Route path="/testCodeMirror" component={TestCodeMirrorComponent}/>
+							<Route path="/testRCComponent" component={TestComponent}/>
+							<Route path="/testUrlQuery" component={TestUrlQueryComponent}/>
+
+							{/* 教学案例 */}
+							<Route path="/moop_cases"render={
+									(props) => (<MoopCases {...this.props} {...props} {...this.state} />)
+							}/>
+
+							{/* <Route component={NotFoundPage}/> */}
+							{/*列表页*/}
+							{/*<Route component={TPMShixunsIndexComponent}/>*/}
+							{/*首页*/}
+							<Route exact path="/" component={ShixunsHome}/>
+							<Route component={Shixunnopage}/>
+							
+							{/*<Route component={ShixunsHome}/>*/}
+
+						</Switch>
+					</Router>
+				</MuiThemeProvider>
+			</LocaleProvider>
+		);
+	}
+}
+
+// moment国际化，设置为中文
+moment.defineLocale('zh-cn', {
+	months: '一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月'.split('_'),
+	monthsShort: '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'),
+	weekdays: '星期日_星期一_星期二_星期三_星期四_星期五_星期六'.split('_'),
+	weekdaysShort: '周日_周一_周二_周三_周四_周五_周六'.split('_'),
+	weekdaysMin: '日_一_二_三_四_五_六'.split('_'),
+	longDateFormat: {
+		LT: 'Ah点mm分',
+		LTS: 'Ah点m分s秒',
+		L: 'YYYY-MM-DD',
+		LL: 'YYYY年MMMD日',
+		LLL: 'YYYY年MMMD日Ah点mm分',
+		LLLL: 'YYYY年MMMD日ddddAh点mm分',
+		l: 'YYYY-MM-DD',
+		ll: 'YYYY年MMMD日',
+		lll: 'YYYY年MMMD日Ah点mm分',
+		llll: 'YYYY年MMMD日ddddAh点mm分'
+	},
+	meridiemParse: /凌晨|早上|上午|中午|下午|晚上/,
+	meridiemHour: function (hour, meridiem) {
+		if (hour === 12) {
+			hour = 0;
+		}
+		if (meridiem === '凌晨' || meridiem === '早上' ||
+			meridiem === '上午') {
+			return hour;
+		} else if (meridiem === '下午' || meridiem === '晚上') {
+			return hour + 12;
+		} else {
+			// '中午'
+			return hour >= 11 ? hour : hour + 12;
+		}
+	},
+	meridiem: function (hour, minute, isLower) {
+		var hm = hour * 100 + minute;
+		if (hm < 600) {
+			return '凌晨';
+		} else if (hm < 900) {
+			return '早上';
+		} else if (hm < 1130) {
+			return '上午';
+		} else if (hm < 1230) {
+			return '中午';
+		} else if (hm < 1800) {
+			return '下午';
+		} else {
+			return '晚上';
+		}
+	},
+	calendar: {
+		sameDay: function () {
+			return this.minutes() === 0 ? '[今天]Ah[点整]' : '[今天]LT';
+		},
+		nextDay: function () {
+			return this.minutes() === 0 ? '[明天]Ah[点整]' : '[明天]LT';
+		},
+		lastDay: function () {
+			return this.minutes() === 0 ? '[昨天]Ah[点整]' : '[昨天]LT';
+		},
+		nextWeek: function () {
+			var startOfWeek, prefix;
+			startOfWeek = moment().startOf('week');
+			prefix = this.unix() - startOfWeek.unix() >= 7 * 24 * 3600 ? '[下]' : '[本]';
+			return this.minutes() === 0 ? prefix + 'dddAh点整' : prefix + 'dddAh点mm';
+		},
+		lastWeek: function () {
+			var startOfWeek, prefix;
+			startOfWeek = moment().startOf('week');
+			prefix = this.unix() < startOfWeek.unix() ? '[上]' : '[本]';
+			return this.minutes() === 0 ? prefix + 'dddAh点整' : prefix + 'dddAh点mm';
+		},
+		sameElse: 'LL'
+	},
+	ordinalParse: /\d{1,2}(日|月|周)/,
+	ordinal: function (number, period) {
+		switch (period) {
+			case 'd':
+			case 'D':
+			case 'DDD':
+				return number + '日';
+			case 'M':
+				return number + '月';
+			case 'w':
+			case 'W':
+				return number + '周';
+			default:
+				return number;
+		}
+	},
+	relativeTime: {
+		future: '%s内',
+		past: '%s前',
+		s: '几秒',
+		m: '1分钟',
+		mm: '%d分钟',
+		h: '1小时',
+		hh: '%d小时',
+		d: '1天',
+		dd: '%d天',
+		M: '1个月',
+		MM: '%d个月',
+		y: '1年',
+		yy: '%d年'
+	},
+	week: {
+		// GB/T 7408-1994《数据元和交换格式·信息交换·日期和时间表示法》与ISO 8601:1988等效
+		dow: 1, // Monday is the first day of the week.
+		doy: 4  // The week that contains Jan 4th is the first week of the year.
+	}
+});
+export default SnackbarHOC()(App);

app/controllers/application_controller.rb

@@ -190,7 +190,7 @@ class ApplicationController < ActionController::Base
 	def check_account
 		if !current_user.profile_completed?
 			info_url = '/account/profile'
-			tip_exception(402, info_url)
+			tip_exception(402, '')
 		end
 	end
 

app/controllers/libraries_controller.rb

@@ -38,7 +38,7 @@ class LibrariesController < ApplicationController
   def create
     library = current_user.libraries.new
     Libraries::SaveService.call(library, current_user, save_params)
-    render_ok
+    render_ok({id: library.id})
   rescue Libraries::SaveService::Error => ex
     render_error(ex.message)
   end
@@ -47,7 +47,7 @@ class LibrariesController < ApplicationController
     return render_forbidden unless library_manageable?(current_library)
 
     Libraries::SaveService.call(current_library, current_user, save_params)
-    render_ok
+    render_ok({id: current_library.id})
   rescue Libraries::SaveService::Error => ex
     render_error(ex.message)
   end

app/controllers/memos_controller.rb

@@ -155,7 +155,7 @@ class MemosController < ApplicationController
         @reply.root_id = memo.root_id || memo.id
         memo.children << @reply
         m = Memo.find_by!(id: @reply.root_id)
-        m.increment!(:all_replies_count)
+        m.update_attributes!(all_replies_count: m.all_replies_count + 1)
       rescue Exception => e
         tip_exception("回复失败，原因：#{e}")
         raise ActiveRecord::Rollback

app/controllers/myshixuns_controller.rb

@@ -265,10 +265,10 @@ class MyshixunsController < ApplicationController
       # params[:evaluate] 实训评测时更新必须给的参数，需要依据该参数做性能统计，其它类型的更新可以跳过
       # 自动保存的时候evaluate为0；点评测的时候为1
       if params[:evaluate] == 1
-        #exec_time = game.challenge.try(:exec_time)
+        exec_time = game.challenge.try(:exec_time)
         @sec_key = generate_identifier(EvaluateRecord, 12)
         record = EvaluateRecord.create!(:user_id => current_user.id, :shixun_id => @myshixun.shixun_id, :game_id => game_id,
-                                        :identifier => @sec_key)
+                                        :identifier => @sec_key, :exec_time => exec_time)
         uid_logger("-- game build: file update #{@sec_key}, record id is #{record.id}, time is **** #{Time.now.strftime("%Y-%m-%d %H:%M:%S.%L")}")
       end
       unless @hide_code

app/controllers/shixuns_controller.rb

@@ -782,8 +782,8 @@ class ShixunsController < ApplicationController
 		school_name = "%#{params[:school_name].to_s.strip}%"
 		if user_name.present? || school_name.present?
 			@users = User.joins(user_extension: :school).where("users.id not in #{member_ids} AND users.status = 1 AND
-																								 (LOWER(users.lastname) LIKE ? or users.phone like ?) AND LOWER(schools.name) LIKE
+																								 (LOWER(concat(users.lastname, users.firstname)) LIKE ? or users.phone like ?)
-																								 ?", user_name, user_name, school_name)
+																									AND LOWER(schools.name) LIKE ?", user_name, user_name, school_name)
 		else
 			@users = User.none
 		end

app/controllers/student_works_controller.rb

@@ -360,7 +360,7 @@ class StudentWorksController < ApplicationController
           Tiding.create(user_id: @work.user_id, trigger_user_id: User.current.id, container_id: new_score.id,
                         container_type: "StudentWorksScore", parent_container_id: @work.id,
                         parent_container_type: "HomeworkCommon", belong_container_id: @homework.course_id,
-                        belong_container_type: "Course", viewed: 0, tiding_type: "HomeworkCommon", extra: new_score.reviewer_role)
+                        belong_container_type: "Course", viewed: 0, tiding_type: new_score.reviewer_role == 3 ? "System" : "HomeworkCommon", extra: new_score.reviewer_role)
 
           case new_score.reviewer_role
           when 1 #教师评分：最后一个教师评分为最终评分

app/jobs/student_work_score_appeal_notify_job.rb

@@ -19,11 +19,20 @@ class StudentWorkScoreAppealNotifyJob < ApplicationJob
       belong_container_id: course.id, belong_container_type: 'Course',
       tiding_type: 'HomeworkCommon', viewed: 0, status: 0
     }
+
+    student_same_attrs = {
+      trigger_user_id: 0,
+      container_id: appeal.id, container_type: 'StudentWorksScoresAppeal',
+      parent_container_id: score.student_work_id, parent_container_type: 'StudentWork',
+      belong_container_id: course.id, belong_container_type: 'Course',
+      tiding_type: 'System', viewed: 0, status: 0
+    }
+
     Tiding.bulk_insert(*attrs) do |worker|
       course.course_member(user).member_teachers.each do |teacher|
         worker.add same_attrs.merge(user_id: teacher.user_id)
       end
-      worker.add same_attrs.merge(user_id: score.user_id)
+      worker.add student_same_attrs.merge(user_id: score.user_id)
     end
   end
 end

app/models/searchable/subject.rb

@@ -43,7 +43,8 @@ module Searchable::Subject
       author_school_name: user.school_name,
       visits_count: visits,
       stage_count: stages_count,
-      stage_shixuns_count: stage_shixuns_count
+      stage_shixuns_count: stage_shixuns_count,
+      shixuns_count: shixuns_count
     }
   end
 

app/models/user.rb

@@ -132,6 +132,10 @@ class User < ApplicationRecord
   # 项目
   has_many :applied_projects, dependent: :destroy
 
+  # 教学案例
+  has_many :libraries, dependent: :destroy
+
+
   # Groups and active users
   scope :active, lambda { where(status: STATUS_ACTIVE) }
 

app/services/libraries/save_service.rb

@@ -56,7 +56,7 @@ class Libraries::SaveService < ApplicationService
     destroy_ids = old_attachment_id - attachment_ids
     library.attachments.where(id: destroy_ids).delete_all
 
-    Attachment.where(id: attachment_ids, author_id: user.id).update_all(container: library)
+    Attachment.where(id: attachment_ids, author_id: user.id).update_all(container_type: library.class.to_s, container_id: library.id)
   end
 
   def library_params

app/views/subjects/show.json.jbuilder

@@ -1,4 +1,4 @@
-json.(@subject, :id, :name, :description, :learning_notes, :stages_count, :stage_shixuns_count)
+json.(@subject, :id, :name, :description, :learning_notes, :stages_count, :stage_shixuns_count, :shixuns_count)
 
 json.challenge_choose_count @subject.subject_challenge_choose_count
 json.challenges_count @subject.subject_challenge_count

app/views/tidings/_tiding.json.jbuilder

@@ -18,7 +18,14 @@ json.time tiding.how_long_time
 json.new_tiding tiding.unread?(@onclick_time)
 
 json.trigger_user do
-  json.partial! 'users/user_simple', user: tiding.trigger_user_id.zero? ? User.find(1) : tiding.trigger_user
+  if tiding.trigger_user_id.zero?
+    json.id 0
+    json.name "系统"
+    json.login ""
+    json.image_url "educoder/systemLogo.png"
+  else
+    json.partial! 'users/user_simple', user: tiding.trigger_user
+  end
 end
 
 json.attachments tiding.attachments, partial: 'attachments/attachment_small', as: :attachment

config/locales/tidings/zh-CN.yml

@@ -202,7 +202,7 @@
         2_end: "别人对你的匿评发起的申诉申请：%s，审核未通过"
       StudentWork:
         Apply_end: "发起了匿评申诉申请：%s"
-        HomeworkCommon_end: "有人对你的匿评发起了申诉：%s"
+        System_end: "有人对你的匿评发起了申诉：%s"
     Department_end: "你选填的二级单位：%s（%s）因不符合规范,已被系统删除.请重新选择"
     Library:
       Apply_end: "申请发布教学案例：%s"

db/migrate/20190730024112_add_index_to_user.rb

@@ -1,7 +0,0 @@
-class AddIndexToUser < ActiveRecord::Migration[5.2]
-  def change
-    # add_index :users, :login, unique: true
-    # add_index :users, :mail, unique: true
-    # add_index :users, :phone, unique: true
-  end
-end

db/migrate/20190805004505_sync_index_to_users.rb

@@ -0,0 +1,7 @@
+class SyncIndexToUsers < ActiveRecord::Migration[5.2]
+  def change
+    add_index :users, :login, unique: true
+    add_index :users, :mail, unique: true
+    add_index :users, :phone, unique: true
+  end
+end

db/migrate/20190805010545_modify_ke_contents_for_markdown.rb

@@ -0,0 +1,124 @@
+class ModifyKeContentsForMarkdown < ActiveRecord::Migration[5.2]
+  include ActionView::Helpers::SanitizeHelper
+  def change
+    # def ke_transform_to_md content
+    #   sanitize(content, tags: %w(img a span), attributes: %w(src href target style))
+    #       .gsub(/^(\n)/, "").gsub(/(\n)+/, "<br />").gsub(/$(\n)/, "")
+    #       .gsub(/(\n)+/, "<br />").gsub("\t", "&nbsp;&nbsp;&nbsp;&nbsp;")
+    # end
+    #
+    # # 课程讨论区
+    # MessageDetail.find_each do |m|
+    #   content = ke_transform_to_md m.content
+    #   puts("content:#{content}")
+    #   m.update_column(:content, content)
+    # end
+    #
+    # # 试卷的标题
+    # ExerciseQuestion.find_each do |eq|
+    #   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|
+    #   answer_text = ke_transform_to_md esa.answer_text
+    #   puts("answer_text: #{answer_text}")
+    #   esa.update_column(:answer_text, answer_text)
+    # end
+    #
+    # # 试卷题库的问题标题
+    # ExerciseBankQuestion.find_each do |ebq|
+    #   question_title = ke_transform_to_md ebq.question_title
+    #   puts("#question_title: #{question_title}")
+    #   ebq.update_column(:question_title, question_title)
+    # end
+    #
+    # # 试卷答案
+    # ExerciseBankStandardAnswer.find_each do |ebsa|
+    #   answer_text = ke_transform_to_md ebsa.answer_text
+    #   puts("#answer_text: #{answer_text}")
+    #   ebsa.update_column(:answer_text, answer_text)
+    # end
+    #
+    # # 问卷的标题
+    # PollQuestion.find_each do |pq|
+    #   question_title = ke_transform_to_md pq.question_title
+    #   puts("question_title:#{question_title}")
+    #   pq.update_column(:question_title, question_title)
+    # end
+    #
+    # # 学生的作品
+    # StudentWork.find_each do |sw|
+    #   description  = ke_transform_to_md sw.description
+    #   puts("#description: #{description}")
+    #   sw.update_column(:description, description)
+    # 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
+    #
+    # # 课堂评论
+    # JournalsForMessage.find_each do |jfm|
+    #   notes = ke_transform_to_md jfm.notes
+    #   puts("#notes: #{notes}")
+    #   jfm.update_column(:notes, notes)
+    # end
+    #
+    # # 毕业任务
+    # GraduationTask.find_each do |gt|
+    #   description = ke_transform_to_md gt.description
+    #   puts("#description: #{description}")
+    #   gt.update_column(:description, description)
+    # end
+    #
+    # # 毕设选题
+    # GraduationTopic.find_each do |gt|
+    #   description = ke_transform_to_md gt.description
+    #   puts("#description: #{description}")
+    #   gt.update_column(:description, description)
+    # end
+    #
+    # # 毕设作品
+    # GraduationWork.find_each do |gw|
+    #   description = ke_transform_to_md gw.description
+    #   puts("#description: #{description}")
+    #   gw.update_column(:description, description)
+    # end
+    #
+    # # 毕设任务题库
+    # GtaskBank.find_each do |gb|
+    #   description = ke_transform_to_md gb.description
+    #   puts("#description: #{description}")
+    #   gb.update_column(:description, description)
+    # end
+    #
+    # # 毕设选题题库
+    # GtopicBank.find_each do |gb|
+    #   description = ke_transform_to_md gb.description
+    #   puts("#description: #{description}")
+    #   gb.update_column(:description, description)
+    # end
+    #
+    # # 交流问答
+    # Memo.find_each do |m|
+    #   content = ke_transform_to_md m.content
+    #   puts("#description: #{content}")
+    #   m.update_column(:content, content)
+    # end
+
+  end
+end

db/migrate/20190805014624_migrate_anonymous_tiding_type.rb

@@ -0,0 +1,6 @@
+class MigrateAnonymousTidingType < ActiveRecord::Migration[5.2]
+  def change
+    Tiding.where(container_type: "StudentWorksScore", extra: "3").update_all(tiding_type: "System", trigger_user_id: 0)
+    Tiding.where(container_type: "StudentWorksScoresAppeal", parent_container_type: "StudentWork", tiding_type: "HomeworkCommon").update_all(tiding_type: "System", trigger_user_id: 0)
+  end
+end

db/migrate/20190805061306_add_exec_time_to_evaluate_records.rb

@@ -0,0 +1,7 @@
+class AddExecTimeToEvaluateRecords < ActiveRecord::Migration[5.2]
+  def change
+    remove_columns :evaluate_records, :exec_time if User.first.attributes.include?("exec_time")
+
+    add_column :evaluate_records, :exec_time, :integer
+  end
+end

public/react/config/webpack.config.dev.js

@@ -29,7 +29,7 @@ const env = getClientEnvironment(publicUrl);
 module.exports = {
   // You may want 'eval' instead if you prefer to see the compiled output in DevTools.
   // See the discussion in https://github.com/facebookincubator/create-react-app/issues/343.s
-	devtool: "eval", // 开启调试
+	devtool: "source-map",  // 开启调试
   // These are the "entry points" to our application.
   // This means they will be the "root" imports that are included in JS bundle.
   // The first two entry points enable "hot" CSS and auto-refreshes for JS.

public/react/src/App.css

@@ -54,5 +54,8 @@ html, body {
 /* md多空格 */
 .markdown-body p {
   white-space: pre-wrap;
-  margin-bottom: 0px !important;
+}
+/* resize */
+.editormd .CodeMirror {
+  border-right: none !important;
 }

public/react/src/App.js

@@ -218,6 +218,12 @@ const UsersInfo = Loadable({
 	loading: Loading,
 })
 
+// 教学案例
+const MoopCases =  Loadable({
+	loader: () => import('./modules/moop_cases/index'),
+	loading: Loading,
+})
+
 // 兴趣页面
 const Interestpage = Loadable({
 	loader: () => import('./modules/login/EducoderInteresse'),
@@ -351,14 +357,19 @@ class App extends Component {
 							{/*课堂*/}
 							<Route path="/courses" component={CoursesIndex} {...this.props}></Route>
 
-
+							{/* <Route path="/forums" component={ForumsIndexComponent}>
+							</Route> */}
+							{/* 教学案例 */}
+							<Route path="/moop_cases"render={
+									(props) => (<MoopCases {...this.props} {...props} {...this.state} />)
+							}/>
+							
 							<Route path="/forums" 
 								render={
 									(props)=>(<ForumsIndexComponent {...this.props} {...props} {...this.state}></ForumsIndexComponent>)
 								}
 							>
 							</Route>
-							
 							<Route path="/comment" component={CommentComponent}/>
 							<Route path="/testMaterial" component={TestMaterialDesignComponent}/>
 							<Route path="/test" component={TestIndex}/>

public/react/src/common/course/ActionBtn.js

@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import {Link} from 'react-router-dom'
 
-const map={"blue":"blueFull","greyBack":"greyBack","grey":"greyWidthFixed","green":"greenBack",
+const map={"blue":"blueFull","greyBack":"greyBack","grey":"greyWidthFixed","green":"greenBack",'greyLine':"greyLine",
   'colorBlue': 'colorBlue',   // 蓝字白底
 }
 class ActionBtn extends Component {

public/react/src/modules/comment/Comments.js

@@ -23,6 +23,7 @@ import CommentItemMDEditor from './CommentItemMDEditor';
 
 import './Comment.css'
 import Modals from '../modals/Modals'
+import {  InputNumber } from 'antd'
 
 /*
 	-------------------------- 样式相关
@@ -470,7 +471,8 @@ class Comments extends Component {
 	onGoldRewardDialogOkBtnClick() {
 		console.log('onGoldRewardDialogOkBtnClick')
 		const { goldRewardInput } = this.state;
-		if (!goldRewardInput || goldRewardInput === '0' || goldRewardInput.indexOf('-') !== -1) {
+		// || goldRewardInput.indexOf('-') !== -1
+		if (!goldRewardInput || goldRewardInput === '0' ) {
 			this.setState({ goldRewardInputError: true})
 			return;
 		} else {
@@ -478,8 +480,13 @@ class Comments extends Component {
 			this.props.rewardCode(this.comment, this.childComment, goldRewardInput)
 		}
 	}
-	onGoldRewardInputChange(event) {
+	onGoldRewardInputChange(value) {
-		 this.setState({ goldRewardInput: event.target.value, goldRewardInputError: false });
+		// e.target.value
+		const number = parseInt(value || 0, 10);
+		if (Number.isNaN(number)) {
+			return;
+		}
+		this.setState({ goldRewardInput: number, goldRewardInputError: false });
 	}
 	render() {
 		const { deleteComment, onPaginationChange, comment_count_without_reply, currentPage, comments, usingAntdModal } = this.props;
@@ -538,11 +545,14 @@ class Comments extends Component {
 			       	<DialogTitle id="alert-dialog-title">{"奖励设置"}</DialogTitle>
 		          	<DialogContent>
 			            
-			            	<FormControl { ...goldRewardInputErrorObj } aria-describedby="name-error-text">
+						<InputNumber placeholder="请输入奖励的金币数量" id="goldReward"  type="number" value={this.state.goldRewardInput} 
+								onChange={(e) => this.onGoldRewardInputChange(e)} width={228} style={{ width: '228px'}} />
+
+			            	{/* <FormControl { ...goldRewardInputErrorObj } aria-describedby="name-error-text">
 					          	<InputLabel htmlFor="goldReward">请输入奖励的金币数量</InputLabel>
 					          	<Input id="goldReward"  type="number" value={this.state.goldRewardInput} onChange={(e) => this.onGoldRewardInputChange(e)} />
 					          	{ goldRewardInputError ? <FormHelperText id="name-error-text">奖励金币不能为空或负数</FormHelperText> : ''}
-					        </FormControl>
+					        </FormControl> */}
 
 				        {/*<DialogContentText id="alert-dialog-description" style={{textAlign: 'center'}}>    </DialogContentText>*/}
 		          	</DialogContent>

public/react/src/modules/common/RewardDialog.js

@@ -9,6 +9,7 @@ import Dialog, {
 import Button from 'material-ui/Button';
 import { FormControl, FormHelperText } from 'material-ui/Form';
 import Input, { InputLabel } from 'material-ui/Input';
+import {  InputNumber } from 'antd'
 
 
 
@@ -38,16 +39,22 @@ class RewardDialog extends Component {
 	onGoldRewardDialogOkBtnClick() {
 		console.log('onGoldRewardDialogOkBtnClick')
 		const { goldRewardInput } = this.state;
-		if (!goldRewardInput || goldRewardInput === '0' || goldRewardInput.indexOf('-') !== -1) {
+		if (!goldRewardInput || goldRewardInput === '0' || goldRewardInput < 0) {
-			this.setState({ goldRewardInputError: true})
+			this.props.showNotification('奖励金币不能为空或负数')
+			// this.setState({ goldRewardInputError: true})
 			return;
 		} else {
 			this.props.setRewardDialogVisible( false )
 			this.props.rewardCode(goldRewardInput)
 		}
 	}
-	onGoldRewardInputChange(event) {
+	onGoldRewardInputChange(value) {
-		 this.setState({ goldRewardInput: event.target.value, goldRewardInputError: false });
+		// || event.target.value
+		const number = parseInt(value || 0, 10);
+		if (Number.isNaN(number)) {
+			return;
+		}
+		this.setState({ goldRewardInput: number , goldRewardInputError: false });
 	}
 
   	render() {
@@ -58,17 +65,26 @@ class RewardDialog extends Component {
 	    return (
 	      	 <Dialog
 	          	open={goldRewardDialogOpen}
-							disableEscapeKeyDown={true}
+				disableEscapeKeyDown={true}
 	          	onClose={this.handleGoldRewardDialogClose}
+				className={'rewardDialog'}
 	        >	
+				<style>{`
+					.rewardDialog>div:last-child {
+						width: 280px;
+					} 
+				`}</style>
 		       	<DialogTitle id="alert-dialog-title">{"奖励设置"}</DialogTitle>
 	          	<DialogContent>
 		            
-		            	<FormControl { ...goldRewardInputErrorObj } aria-describedby="name-error-text">
+		            	{/* <FormControl { ...goldRewardInputErrorObj } aria-describedby="name-error-text"> */}
-				          	<InputLabel htmlFor="goldReward">请输入奖励的金币数量</InputLabel>
+				          	{/* <InputLabel htmlFor="goldReward">请输入奖励的金币数量</InputLabel>
 				          	<Input id="goldReward"  type="number" value={this.state.goldRewardInput} onChange={(e) => this.onGoldRewardInputChange(e)} />
-				          	{ goldRewardInputError ? <FormHelperText id="name-error-text">奖励金币不能为空或负数</FormHelperText> : ''}
+				          	{ goldRewardInputError ? <FormHelperText id="name-error-text">奖励金币不能为空或负数</FormHelperText> : ''} */}
-				        </FormControl>
+							
+							<InputNumber placeholder="请输入奖励的金币数量" id="goldReward"  type="number" value={this.state.goldRewardInput} 
+								onChange={(e) => this.onGoldRewardInputChange(e)} width={228} style={{ width: '228px'}} />
+				        {/* </FormControl> */}
 
 			        {/*<DialogContentText id="alert-dialog-description" style={{textAlign: 'center'}}>    </DialogContentText>*/}
 	          	</DialogContent>

public/react/src/modules/courses/css/Courses.css

@@ -683,8 +683,9 @@ a.white-btn.use_scope-btn:hover{
 }
 
 .colorBlue {
+    padding: 0px 7px;
     background-color: #fff;
-    color: #4CACFF;
+    color: #4CACFF!important;
     border: 1px solid #4CACFF;
 }   
 .greyBack{
@@ -701,6 +702,12 @@ a.white-btn.use_scope-btn:hover{
 .Actionbtn.middle {
     padding: 0px 18px;
 }
+.greyLine{
+    background: #fff;
+    border:1px solid #eaeaea;
+    color: #999!important;
+    padding:0px 10px;
+}
 
 
 .colorFF6800{

public/react/src/modules/courses/css/members.css

@@ -41,7 +41,7 @@
 }
 
 .stu_table table{
-  line-height: 1;
+  line-height: 1.2;
 }
 .stu_table .classesName{
   display: block;

public/react/src/modules/courses/exercise/Exercisestatisticalresult.js

@@ -124,7 +124,7 @@ class Exercisestatisticalresult extends Component {
 					 }
 					`}
 				</style>
-				<div className={"educontent mb20" } >
+				<div className={"educontent mb30" } >
 
 					{data&&data.course_groups.length===0?"":<div className="stud-class-set">
 						<div className="clearfix edu-back-white">
@@ -154,7 +154,7 @@ class Exercisestatisticalresult extends Component {
 					</div>}
 
 					<div className="stud-class-set">
-						<div className="clearfix edu-back-white poll_list">
+						<div className="clearfix edu-back-white exerciseTable ">
                <Exercisestatisticalresulttabel
 	               data={data}
                />
@@ -198,16 +198,73 @@ class Exercisestatisticalresult extends Component {
 						.padtop24{
 						    padding-top: 24px;
 						}
-
+						.exerciseTable .shixunreporttitle{
+							padding:0px!important;
+						}
+						.exerciseTable .ant-table-thead > tr > th,.exerciseTable .ant-table-tbody > tr > td{
+							padding:16px 20px!important;
+						}
+						.exerciseTable .editormd-html-preview{
+							width:100%!important;
+						}
 					 `}
 				 </style>
-
+					{/* 从子组件将样式提出来，不然会循环多次 */}
+				 <style>{`
+				// .ant-table-thead > tr > th{
+				//     text-align: center;
+				// 	}
+				.tasknamebox{
+			    width: 50px;
+			    height: 24px;
+			    border: 1px solid rgba(221,23,23,1);
+			    border-radius: 12px;
+			    color: rgba(221,23,23,1);
+			    display: inline-block;
+					line-height: 24px;
+					text-align: center;
+					}
+
+					.tasknameboxs{
+					   color: #666666 !important;
+					   background:rgba(237,237,237,1) !important;
+					}
+
+				  .ant-table-tbody > tr > td{
+            font-size:14px;
+					}
+					.task-hide{
+					    max-width: 345px;
+					    overflow: hidden;
+					    white-space: nowrap;
+					    text-overflow: ellipsis;
+					}
+					// .ant-table-tbody > tr{
+					//    height:64px;
+					//    text-align: center;
+					// }
+          .ant-progress-success-bg, .ant-progress-bg{
+             background-color: #29BD8B !important;
+          }
+          .ant-table-thead > tr > th:nth-child(1){
+     				text-align: left;
+          }
+          .ant-table-tbody > tr > td:nth-child(1){
+          		text-align: left;
+          }
+          .Exermubu .ant-table-tbody > tr:nth-last-child(1) > td{
+					  border:1px solid transparent;
+          }
+		  .Exermubu .editormd-html-preview, .Exermubu .editormd-preview-container {
+			  background: transparent;
+		  }
+			`}
+				</style>
 					{data&&data.commit_results.map((item,key)=>{
-
 							 return(
-								<div className="stud-class-set mb20" key={key}>
+								<div className="stud-class-set mb20 exerciseTable" key={key}>
 									<div className="clearfix edu-back-white poll_list"  style={{padding: '20px'}}>
-										<div className="font-16 shixunreporttitle  fl" >
+										<div className="font-16 shixunreporttitle fl" style={{width:"1050px"}}>
 										<span className="CACFF">{item.ques_position+"."}{item.ques_type===0?"单选":item.ques_type===1?"多选":item.ques_type===2?"判断":item.ques_type===3?"填空":item.ques_type===4?"主观":item.ques_type===5?"实训":""}题</span>
 										<div>
 											{/*Q{item.ques_position}：*/}
@@ -224,14 +281,15 @@ class Exercisestatisticalresult extends Component {
 
 									item.ques_details.map((ite,k)=>{
 										return(
-											<div className={"mt20"}>
+											<div>
-												<div className="clearfix edu-back-white poll_list"  style={{padding: '0px 20px'}}>
+												<div className="clearfix edu-back-white poll_list mb10"  style={{padding: '0px 20px'}}>
-													<div className="font-16 shixunreporttitle fl padding20">
+													<div className="font-16 shixunreporttitle fl pt20 pb20">
 														<span>{ite.challenge_position}：{ite.challenge_name}</span>
 													</div>
-													<div className="fr shixunreporttitles padtop24">正确率<span style={{color:'#FF6800'}}>{ite.challenge_percent}%</span></div>
+													<div className="fr shixunreporttitles">正确率<span style={{color:'#FF6800'}}> {ite.challenge_percent}%</span></div>
 												</div>
 												<Exercisetablesmubu
+													tableNum={`${key}${k}`}
 													data={ite.challenge_details}
 													type={item.ques_type}
 													effictive_counts={item.effictive_counts}
@@ -241,7 +299,7 @@ class Exercisestatisticalresult extends Component {
 										)
 									}):
 							    <Exercisetablesmubu
-									tableNum={key}
+										tableNum={key}
 								    data={item.ques_details}
 								    type={item.ques_type}
 								    effictive_counts={item.effictive_counts}
@@ -252,24 +310,20 @@ class Exercisestatisticalresult extends Component {
 						 })}
 
 				</div>
-
+				{
-				<div className="mb40 edu-txt-center padding20-30"
+					data && data.questions_count > 10 && 
-				     style={
+					<div className="mb40 edu-txt-center padding20-30">
-					     {
+						<Pagination
-						     display: data&&data===undefined?1:data&&data.questions_count.length< 10 ? 'none' : 'block'
+							showQuickJumper
-					     }
+							defaultCurrent={1}
-				     }>
+							pageSize={limit}
-
+							total={ data && data.questions_count }
-					<Pagination
+							current={page}
-						showQuickJumper
+							onChange={this.PaginationCourse}
-						defaultCurrent={1}
+						/>
-						pageSize={limit}
+					</div>
-						total={data&&data.questions_count}
+				}
-						current={page}
+				
-						onChange={this.PaginationCourse}
-					/>
-
-				</div>
 			</div>
 
 

public/react/src/modules/courses/exercise/Exercisetablesmubu.js

@@ -110,53 +110,7 @@ class Exercisetablesmubus extends Component {
 		return (
 			<div>
 
-				<style>{`
+				
-				// .ant-table-thead > tr > th{
-				//     text-align: center;
-				// 	}
-				.tasknamebox{
-			    width: 50px;
-			    height: 24px;
-			    border: 1px solid rgba(221,23,23,1);
-			    border-radius: 12px;
-			    color: rgba(221,23,23,1);
-			    display: inline-block;
-					line-height: 24px;
-					text-align: center;
-					}
-
-					.tasknameboxs{
-					   color: #666666 !important;
-					   background:rgba(237,237,237,1) !important;
-					}
-
-				  .ant-table-tbody > tr > td{
-            font-size:14px;
-					}
-					.task-hide{
-					    max-width: 345px;
-					    overflow: hidden;
-					    white-space: nowrap;
-					    text-overflow: ellipsis;
-					}
-					// .ant-table-tbody > tr{
-					//    height:64px;
-					//    text-align: center;
-					// }
-          .ant-progress-success-bg, .ant-progress-bg{
-             background-color: #29BD8B !important;
-          }
-          .ant-table-thead > tr > th:nth-child(1){
-     				text-align: left;
-          }
-          .ant-table-tbody > tr > td:nth-child(1){
-          		text-align: left;
-          }
-          .Exermubu .ant-table-tbody > tr:nth-last-child(1) > td{
-					  border:1px solid transparent;
-          }
-			`}
-				</style>
 				{datas===undefined?"":<Table
 					className={"Exermubu"}
 					dataSource={datas}

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

@@ -105,7 +105,7 @@ class ForumsIndex extends Component {
 
 
     componentDidMount() {
-      window.document.title = '讨论区'
+      window.document.title = '交流问答'
       
     }
 

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

@@ -14,7 +14,7 @@ import moment from 'moment'
 import Comments from '../comment/Comments'
 
 import update from 'immutability-helper'
-import Tooltip from 'material-ui/Tooltip';
+// import Tooltip from 'material-ui/Tooltip';
 import RewardDialog from '../common/RewardDialog';
 
 import {ImageLayerOfCommentHOC} from '../page/layers/ImageLayerOfCommentHOC'
@@ -23,6 +23,7 @@ import MemoDetailKEEditor from './MemoDetailKEEditor'
 import MemoDetailMDEditor from './MemoDetailMDEditor'
 
 import { bytesToSize } from 'educoder'
+import { Tooltip } from 'antd'
 const $ = window.$
 function urlStringify(params) {
   let noParams = true;
@@ -685,19 +686,29 @@ class MemoDetail extends Component {
           <RewardDialog goldRewardDialogOpen={goldRewardDialogOpen} 
             setRewardDialogVisible={this.setRewardDialogVisible}
             rewardCode={this.rewardCodeMemo}
+            {...this.props}
           ></RewardDialog>
           <div className="clearfix">
         		<div id="forum_list" className="forum_table mh650">
     	        	<div className="padding40-30 bor-bottom-greyE">
                         <div className="font-16 mb5 cdefault clearfix pr pr35" style={{display: 'flex', alignItems: 'center'}}>
-                            <span className="noteDetailTitle">{memo.subject}</span>
+                            {/* overflowHidden1   */}
-                            { memo.sticky && <span className="btn-cir btn-cir-red ml10 " style={{ height: '20px' }}>置顶</span>}
+                            <span className="noteDetailTitle " style={{maxWidth: '634px'}}>{memo.subject + memo.subject}</span>
-                            { !!memo.reward && <span className="color-orange font-14 ml15"
+                            { memo.sticky && <span className="btn-cir btn-cir-red ml10 " 
-                              data-tip-down={`获得平台奖励金币：${memo.reward}`} >
+                                style={{ height: '20px', alignSelf: 'flex-start', marginTop: '10px' }}
-                              <i className="iconfont icon-gift mr5"></i>{memo.reward}
+                            >置顶</span>}
-                            </span> }
+                            { !!memo.reward && 
-
+                            <Tooltip title={`获得平台奖励金币：${memo.reward}`}>
-                            <div style={{ flex: 1 }}>
+                              <span className="color-orange font-14 ml15" 
+                                  style={{ height: '20px', alignSelf: 'flex-start', marginTop: '1px' }}
+                              >
+                                <i className="iconfont icon-gift mr5"></i>
+                                <span style={{ 'vertical-align': 'sub' }}>{memo.reward}</span>
+                              </span>
+                            </Tooltip>
+                             }
+
+                            <div style={{ flex: 1, alignSelf: 'flex-start' }}>
                               { _current_user && (_current_user.admin === true || _current_user.user_id === author_info.user_id) &&
                                   <div className="edu-position-hidebox" style={{position: 'absolute', right: '12px',top:'4px'}}>
                                       <a href="javascript:void(0);"><i className="fa fa-bars font-16"></i></a>

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

@@ -17,16 +17,22 @@ import PostItem from './PostItem'
 
 import ForumsNavTab from './ForumsNavTab'
 
-import { queryString }  from 'educoder'
+import { queryString, ThemeContext }  from 'educoder'
 
 class MemoList extends Component {
 
   render() {
     const { match, history, currentPage, memo_count ,memo_list, renderMemoList, onPaginationChange } = this.props
+    let theme = this.context;
 
     return (
       <React.Fragment>
         <div id="forum_list" className="forum_table">
+          <style>{`
+            .forum_table_item .item_name:hover {
+              color: ${theme.foreground_select}
+            }
+          `}</style>
           <div className="mh650 edu-back-white">
             {!memo_list || memo_list.length === 0 ?
               <div className="edu-tab-con-box clearfix edu-txt-center">
@@ -49,5 +55,6 @@ class MemoList extends Component {
     );
   }
 }
+MemoList.contextType = ThemeContext;
 
 export default ( MemoList );

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

@@ -7,10 +7,12 @@ import PropTypes from 'prop-types';
 
 import classNames from 'classnames';
 
-import { getImageUrl, toPath } from 'educoder';
+import { getImageUrl, toPath, ThemeContext } from 'educoder';
 
 import moment from 'moment';
 
+import { Tooltip } from 'antd'
+
 
 class PostItem extends Component {
     _toTenThousand(num) {
@@ -31,17 +33,19 @@ class PostItem extends Component {
                     <div className="fl pr" style={{flex: 1}}>
                         <p className="font-16 clearfix" style={{ lineHeight: 2 }}>
                         {/* target="_blank" */}
-                            <a href={`/forums/${memo.id}`} target="_blank" title={memo.subject}
+                            <a href={`/forums/${memo.id}`} target="_blank" title={memo.subject && memo.subject.length > 46 ? memo.subject : ''}
-                                className="clearfix task-hide item_name fl" style={{maxWidth: '750px'}} >
+                                className="clearfix task-hide item_name fl" style={{maxWidth: '600px'}} >
                                 {memo.subject}
                             </a>
 
                           { memo.sticky && <span className="btn-top btn-cir-orange mt6 ml5 fl">置顶</span> }
 
                           { memo.reward &&
-                          <span className=" ml10 fl color-orange03 fl" data-tip-down={`获得平台奖励金币：${memo.reward}`}>
+                          <Tooltip title={`获得平台奖励金币：${memo.reward}`}>
-                            <i className="iconfont icon-gift font-16 mr5 fl"></i><span className="fl mt3 font-14">{memo.reward}</span>
+                            <span className=" ml10 fl color-orange03 fl" >
-                          </span>
+                              <i className="iconfont icon-gift font-16 mr5 fl"></i><span className="fl mt3 font-14">{memo.reward}</span>
+                            </span>
+                          </Tooltip>
                           }
                         </p>
 
@@ -101,4 +105,6 @@ class PostItem extends Component {
 	    );
   	}
 }
+PostItem.contextType = ThemeContext;
+
 export default PostItem

public/react/src/modules/forums/shixun/MemoShixun.js

@@ -68,7 +68,7 @@ class MemoShixun extends Component {
       let currentPage = parseInt( arg_currentPage ? arg_currentPage : (parsed.page || 1) )
 
       const paramsObject = {
-          page: currentPage - 1
+          page: currentPage  // - 1   从1开始
       }
      
       let searchValue = arg_searchValue != undefined ? arg_searchValue : this.props.searchValue

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

@@ -0,0 +1,165 @@
+import React,{ Component } from "react";
+import './css/moopCases.css'
+import '../courses/css/Courses.css'
+
+import { getImageUrl , MarkdownToHtml , ActionBtn } from 'educoder';
+
+import Tags from './CaseTags'
+
+import axios from 'axios';
+import Modals from '../modals/Modals'
+
+class CaseDetail extends Component{
+  constructor(props){
+    super(props);
+    this.state={
+      modalsType:"",
+      modalsTopval:"",
+      modalsBottomval:"",
+      modalCancel:"",
+    }
+  }
+
+  componentDidMount =()=>{
+    let caseID = this.props.match.params.caseID;
+    this.props.getDetail(caseID);
+  }
+  // 是否删除
+  delCases=()=>{
+    this.setState({
+      modalsType:true,
+      modalsTopval:"是否确认删除?",
+      modalsBottomval:""
+    })    
+  }
+
+  // 取消删除
+  cancelDelClasses=()=>{
+    this.setState({
+      modalsType:false,
+      modalsTopval:"",
+      modalsBottomval:""
+    })
+  }
+  // 确定删除
+  sureDelClasses=()=>{
+    let caseID = this.props.match.params.caseID;
+    let url =`/libraries/${caseID}.json`;
+    axios.delete(url).then((result)=>{
+      if(result){
+        this.props.showNotification("删除成功");
+        this.props.history.push("/moop_cases");
+      }
+    }).catch((error)=>{
+      console.log(error);
+    })
+  }
+
+
+  render(){
+    let { CaseDetail , praise_count , creator , operation , user_praised , tags , attachments }=this.props
+    let {
+      modalsType,
+      modalsTopval,
+      modalsBottomval,
+    } = this.state;
+    return(
+      <div className="educontent mt10 mb50">
+        <Modals
+          modalsType={modalsType}
+          modalsTopval={modalsTopval}
+          modalsBottomval={modalsBottomval}
+          modalCancel={this.cancelDelClasses}
+          modalSave={this.sureDelClasses}
+        >
+        </Modals>
+        <p className="mt10 mb20 clearfix lineh-20">
+          <a href="/moop_cases" className="color-grey-9">教学案例</a> &gt; <span className="color-grey-3">{ CaseDetail && CaseDetail.title}</span>
+        </p>
+        <p className="lineh-25 mb20 clearfix">
+          <span className="font-22 fl mr10 task-hide" style={{maxWidth:"800px"}}>
+            { CaseDetail && CaseDetail.title}
+          </span>
+          <span className="mt5 fl">
+            <Tags tags={tags}></Tags>
+            {
+              CaseDetail && CaseDetail.status == "pending" && <span class="edu-filter-btn fl cdefault edu-activity-green ml10">草稿</span>
+            }
+          </span> 
+          <a href="/moop_cases" className="fr color-grey-9 mt5">返回</a>
+        </p>
+        <div className="edu-back-white">
+          <div className="padding30">
+            <div className="df">
+              <a href="/users/moop"><img alt="82274?1563067098" className="radius mr15 mt3" height="50" src={getImageUrl(`images/${creator && creator.image_url}`)} width="50" /></a>
+              <div className="flex1">
+                <li className="clearfix mb5">
+                  <span className="font-16 fl">{creator && creator.name}</span>
+                  {
+                    operation && operation.can_deletable ? <ActionBtn style="greyLine" onClick={this.delCases} className="fr">删除</ActionBtn>:""
+                  }
+                  
+                  {
+                    operation && operation.can_editable ? <ActionBtn style="colorBlue" to={`/moop_cases/${this.props.match.params.caseID}/edit`} className="fr mr20">编辑</ActionBtn>:""
+                  }
+                </li>
+                <li className="clearfix">
+                  <span className="fl color-grey-9 mr20">{creator && creator.school_name}</span>
+                  <span className="fr">
+                    <span className="fl color-grey-9 mr30">编码：<span className="color-grey-6">{CaseDetail && CaseDetail.uuid}</span></span>
+                      <span className="fl color-grey-9">发布时间：<span className="color-grey-6">{CaseDetail && CaseDetail.published_at}</span></span>
+                  </span>
+                </li>
+              </div>
+            </div>
+            <div>
+              <span className="fl color-grey-9">作者：</span>{CaseDetail && CaseDetail.author_name}/{CaseDetail && CaseDetail.author_school_name}
+            </div>
+            <style>
+              {`
+                .setMDStyle .editormd-html-preview{
+                  width:100%!important;
+                }
+              `}
+            </style>
+            <div class="mt20 setMDStyle">
+              { CaseDetail && CaseDetail.content && <MarkdownToHtml content={CaseDetail.content} selector="casesDetail" style={{width:"100%!important"}}></MarkdownToHtml>}
+            </div>
+            { attachments && 
+              <div className="mt10">
+                {
+                  attachments.map((item,key)=>{
+                    return(
+                      <p>
+                        <a className="color-grey">
+                          <i className="font-14 color-green iconfont icon-fujian mr8"></i>
+                        </a>
+                        <a href={item.url} className="mr12" length="58">{item.title}</a>
+                        <span className="color-grey mt2 color-grey-6 font-12">{item.filesize}</span>
+                      </p>
+                    )
+                  })
+                }
+              </div>
+            }     
+            <div class="mt40">
+              {
+                user_praised ?
+                <p className="pointsBtn pointedBtn">
+                  <span>已赞</span>
+                  <span>{praise_count}</span>
+                </p>
+                :
+                <p onClick = {()=>this.props.praisePoint(this.props.match.params.caseID)} className="pointsBtn">
+                  <span><i class="iconfont icon-dianzan"></i></span>
+                  <span>{praise_count}</span>
+                </p>
+              }              
+            </div>
+          </div>
+        </div>
+      </div>
+    )
+  }
+}
+export default CaseDetail;

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

@@ -0,0 +1,48 @@
+import React,{ Component } from "react";
+import './css/moopCases.css'
+import '../courses/css/Courses.css'
+
+import { getUrl } from 'educoder';
+
+import Tags from './CaseTags'
+
+class CaseItem extends Component{
+  constructor(props){
+    super(props);
+  }
+
+  render(){
+    let { libraries } = this.props;
+    console.log(libraries)
+    return(
+      <div className="library-list-container">
+        {
+          libraries && libraries.map((item,key)=>{
+            return(
+              <li className="library_list_item">
+                <img alt={item.id} className="mr15 mt3 radius4" height="90" src={getUrl(`${item.cover_url}`)} width="120" />
+                <div className="flex1">
+                  <p className="clearfix mb25 lineh-40">
+                    <a href={`/moop_cases/${item.id}`} className="task-hide font-22 library_l_name">{item.title}</a>
+                    <span className="fl mt10"><Tags tags={item.tags}></Tags></span>
+                  </p>
+                  <p className="clearfix lineh-20">
+                    <span className="color-grey-3 mr10">{item.author_name}</span>
+                    <span className="color-grey-3 mr20">{item.author_school_name}</span>
+                    <span className="color-grey-c fr">
+                      <span className="color-grey-c mr20"><span className=" item-group-icon mr5"><i className="fa fa-eye"></i></span>{item.visited_count} 浏览</span>
+                      <span className="color-grey-c mr20"><span className=" item-group-icon mr5"><i className="fa fa-thumbs-o-up"></i></span>{item.praise_count} 赞</span>
+                      <span className="color-grey-c"><span className=" item-group-icon mr5"><i className="fa fa-download"></i></span>{item.download_count} 下载</span>
+                    </span>
+                  </p>
+                </div>
+              </li>
+            )
+          })
+        }
+        
+      </div>
+    )
+  }
+}
+export default CaseItem;

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

@@ -0,0 +1,134 @@
+import React,{ Component } from "react";
+import { Input , Spin , Pagination } from "antd";
+import './css/moopCases.css'
+import '../courses/css/Courses.css'
+
+import {  ActionBtn } from 'educoder';
+
+import axios from 'axios'
+
+import NoneData from '../courses/coursesPublic/NoneData'
+
+import mainImg from '../../images/moop_cases/teach_ex.jpg'
+import CaseItem from './CaseItem'
+
+
+const Search = Input.Search;
+class CaseList extends Component{
+  constructor(props){
+    super(props);
+    this.state={
+      type:0,
+      search:undefined,
+      page:1,
+      pageSize:20,
+      libraries:undefined,
+      totalCount:undefined
+    }
+  }
+
+  componentDidMount = () =>{
+    let { type , search , page , pageSize } = this.state;
+    this.InitList(type,search,page,pageSize);
+  }
+
+  // 列表
+  InitList = (type,search,page,pageSize) =>{
+    let url = `/libraries.json`;
+    axios.get(url,{params:{
+      type:type == 0 ? undefined : "mine",
+      keyword:search,
+      page,
+      per_page:pageSize
+    }}).then((result)=>{
+      if(result){
+        this.setState({
+          libraries:result.data.libraries,
+          totalCount:result.data.count
+        })
+      }
+    }).catch((error)=>{
+      console.log(error);
+    })
+  }
+
+  // tab切换
+  changeType = (type) =>{
+    this.setState({
+      type,
+      page:1
+    })
+    let { search , page , pageSize } = this.state;
+    this.InitList(type,search,page,pageSize);
+  }
+
+  // 输入搜索内容
+  inputStudent=(e)=>{
+    this.setState({
+      search:e.target.value
+    })
+  }
+
+  // 搜索
+  searchInfo = () =>{
+    let { type , search , pageSize } = this.state;
+    this.InitList( type , search , 1 , pageSize );
+  }
+
+  // 切换分页
+  onChangePage =(pageNumber)=>{
+    this.setState({
+      page:pageNumber
+    })
+    let { type , search , pageSize } = this.state;
+    this.InitList( type , search , pageNumber , pageSize );
+  }
+
+  render(){
+    let { type , search ,libraries , totalCount ,pageSize ,page } = this.state;
+    return(
+      <React.Fragment>
+        <img src={mainImg} width="100%" />
+        <div className="educontent">
+          <div className="edu-back-white mb30 mt30">
+            <p className="padding20-30 clearfix bor-bottom-greyE">
+              <span className="font-18 fl color-grey-3">教学案例</span>
+              <ActionBtn style="colorBlue" className="fr" onClick={() => this.addQuestion(null, Q_TYPE_SINGLE)}>发布案例</ActionBtn>
+            </p>
+            <div className="clearfix pl30 pr30">
+              <ul className="fl library_nav mt25">
+                <li className={type == 0 ? "active" :""} onClick={()=>this.changeType(0)}>
+                  <a href="javascript:void(0)">全部</a>
+                </li>
+                <li className={type == 1 ? "active" :""} onClick={()=>this.changeType(1)}>
+                  <a href="javascript:void(0)">我的</a>
+                </li>
+              </ul>
+              <div className="fr mt16 mb16 searchView"style={{width:"300px"}}>
+                <Search
+                  value={search}
+                  placeholder="输入教学案例标题、作者、单位进行检索"
+                  onInput={this.inputStudent}
+                  onSearch={this.searchInfo}
+                ></Search>
+              </div>
+            </div>
+          </div>
+          {
+            libraries && libraries.length > 0 &&  <CaseItem {...this.props} {...this.state} libraries={libraries}></CaseItem>
+          }
+          {
+            libraries && libraries.length == 0 && <div className="mb50"><NoneData></NoneData></div>
+          }
+          {
+            totalCount && totalCount > pageSize &&
+            <div className="mb50 edu-txt-center clearfix">
+              <Pagination defaultCurrent={page} current={page} pageSize={pageSize} showQuickJumper onChange={this.onChangePage} total={totalCount}></Pagination>
+            </div>
+          }
+        </div>
+      </React.Fragment>
+    )
+  }
+}
+export default CaseList

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

@@ -0,0 +1,433 @@
+import React,{ Component } from "react";
+import './css/moopCases.css'
+import '../courses/css/Courses.css'
+import { Form , Input , Upload , Button , Icon , message , Tooltip } from "antd";
+
+import { getImageUrl , MarkdownToHtml , ActionBtn , appendFileSizeToUploadFile , appendFileSizeToUploadFileAll , getUrl , getUploadActionUrl } from 'educoder';
+
+import Tags from './CaseTags'
+
+import axios from 'axios';
+import TPMMDEditor from '../tpm/challengesnew/TPMMDEditor';
+import _ from 'lodash'
+const { Dragger } = Upload;
+function beforeUpload(file) {
+  const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png';
+  if (!isJpgOrPng) {
+    message.error('You can only upload JPG/PNG file!');
+  }
+  const isLt2M = file.size / 1024 / 1024 < 2;
+  if (!isLt2M) {
+    message.error('Image must smaller than 2MB!');
+  }
+  return isJpgOrPng && isLt2M;
+}
+function getBase64(img, callback) {
+  const reader = new FileReader();
+  reader.addEventListener('load', () => callback(reader.result));
+  reader.readAsDataURL(img);
+}
+ const $ = window.$;
+class CaseNew extends Component{
+  constructor(props){
+    super(props);
+    this.DescMdRef = React.createRef();
+
+    this.state={
+      casesTags:[],
+      contentFileList:[],
+      filesID:[],
+      imageUrl:undefined,
+      loading: false,
+      checkTag:false,
+      checkFile:false,
+      coverID:undefined
+    }
+  }
+
+  // 上传附件-删除确认框
+  onAttachmentRemove = (file, stateName) => {
+    this.props.confirm({
+      content: '是否确认删除?',
+      onOk: () => {
+        this.deleteAttachment(file, stateName)
+      },
+      onCancel() {
+        console.log('Cancel');
+      },
+    });
+    return false;
+  }
+
+  // 上传附件-确认删除
+  deleteAttachment = (file, stateName) => {
+    // 初次上传不能直接取uid
+    const url = `/attachments/${file.response ? file.response.id : file.uid}.json`
+    axios.delete(url, {
+    }).then((response) => {
+      if (response.data) {
+        const { status } = response.data;
+        if (status == 0) {
+          console.log('--- success')
+          
+          this.setState((state) => {
+            const index = state[stateName].indexOf(file);
+            const newFileList = state[stateName].slice();
+            newFileList.splice(index, 1);
+            return {
+              [stateName]: newFileList,
+            };
+          });
+        }
+      }
+    })
+    .catch(function (error) {
+      console.log(error);
+    });
+  }
+  // 上传附件-change
+  handleContentUploadChange = (info) => {
+    let contentFileList = info.fileList;
+    this.setState({ contentFileList: appendFileSizeToUploadFileAll(contentFileList)});
+    let list = appendFileSizeToUploadFileAll(contentFileList);
+    let arr = list.map(item=>{
+      return ( item.response && item.response.id )
+    })
+    this.setState({
+      filesID:arr,
+      checkFile:arr.length > 0 ? false : true
+    })
+    console.log("fujian");
+    console.log(list.map(item=>{
+      return ( item.response && item.response.id )
+    }));
+  }
+
+  // 上传封面图-change
+  handleChange = (info) => {
+    if (info.file.status === 'uploading') {
+      this.setState({ loading: true });
+      return;
+    }
+    if (info.file.status === 'done') {
+      // Get this url from response in real world.
+      getBase64(info.file.originFileObj, imageUrl =>
+        this.setState({
+          imageUrl,
+          loading: false
+        }),
+      );
+      console.log(info.file);
+      this.setState({
+        coverID:info.file.response && info.file.response.id
+      })
+    }
+  };
+
+  // 编辑时加载数据
+  componentDidMount=()=>{
+    if(this.props.match.params.caseID){
+      this.InitEditData();
+    }
+  }
+
+  componentDidUpdate=(prevState)=>{
+    if(this.props.CaseDetail && prevState.CaseDetail != this.props.CaseDetail){
+      this.props.form.setFieldsValue({
+        caseTitle:this.props.CaseDetail.title,
+        userName:this.props.CaseDetail.author_name,
+        userUnit:this.props.CaseDetail.author_school_name,
+      })
+      this.setState({
+        contentFileList:this.props.CaseDetail.attachments.map(item => {
+          return {
+            id: item.id,
+            uid: item.id,
+            name: appendFileSizeToUploadFile(item),
+            url: item.url,
+            filesize: item.filesize,
+            status: 'done'
+          }
+        }),
+        coverID:this.props.cover && this.props.cover.id,
+        imageUrl:this.props.CaseDetail.cover && getImageUrl(this.props.CaseDetail.cover.url),
+        casesTags:this.props.tags.map(item=>{
+          return (item.id);
+        })
+      })
+    }
+  }
+
+  InitEditData=()=>{
+    let caseID = this.props.match.params.caseID;
+    this.props.getDetail(caseID);
+  }
+
+  // 申请提交和保存
+  handleSubmit = (type) => {
+    let caseID = this.props.match.params.caseID;
+    console.log(type);    
+    this.props.form.validateFieldsAndScroll((err, values) => {
+      let { casesTags , filesID } = this.state;
+      if(casesTags.length == 0){
+        $("html").animate({ scrollTop: $("#tagFormItem").offset().top - 100 });
+        this.setState({
+          checkTag:true
+        })
+        return;
+      }
+      if(filesID.length == 0){
+        $("html").animate({ scrollTop: $("#fileFormItem").offset().top - 100 });
+        this.setState({
+          checkFile:true
+        })
+        return;
+      }
+      //const mdContnet = this.DescMdRef.current.getValue().trim();
+      console.log(values);
+      let url = caseID ? `/libraries/${caseID}.json`: `/libraries.json`;
+      if(caseID){
+        axios.put((url),{
+          title:values.caseTitle,
+          author_name:values.userName,
+          author_school_name:values.userUnit,
+          content:values.description,
+          attachment_ids:this.state.filesID,
+          tag_ids:this.state.casesTags,
+          cover_id:this.state.coverID,
+          publish:type == 'save' ? false : true 
+        }).then((result)=>{
+          if(result){
+            this.props.showNotification(type == 'save' ? `案例保存成功！`: `提交成功！`);
+            this.props.history.push(type == 'save' ? `/moop_cases/${result.data.id}` : `/moop_cases/${result.data.id}/publish_success`);
+          }
+        }).catch((error)=>{
+          console.log(error);
+        })
+      }else{
+        axios.post((url),{
+          title:values.caseTitle,
+          author_name:values.userName,
+          author_school_name:values.userUnit,
+          content:values.description,
+          attachment_ids:this.state.filesID,
+          tag_ids:this.state.casesTags,
+          cover_id:this.state.coverID,
+          publish:type == 'save' ? false : true 
+        }).then((result)=>{
+          if(result){
+            this.props.showNotification(type == 'save' ? `案例保存成功！`: `提交成功！`);
+            this.props.history.push(type == 'save' ? `/moop_cases/${result.data.id}` : `/moop_cases/${result.data.id}/publish_success`);
+          }
+        }).catch((error)=>{
+          console.log(error);
+        })
+      }
+      
+    })
+  }
+
+  // 选择标签
+  changeType=(type)=>{
+    let tags = [];
+    if(this.state.casesTags.indexOf(type) > -1){
+      tags = this.state.casesTags.filter(item => item != type);
+    }else{
+      tags = this.state.casesTags.concat(type);
+    }
+    const tagUniqed = _.uniq(tags);
+    this.setState({
+      casesTags: tagUniqed,
+      checkTag:tags.length > 0 ? false : true
+    })
+  }
+
+  render(){
+    let { caseID } = this.props.match.params;
+    let { CaseDetail } = this.props;
+    let { casesTags , contentFileList , imageUrl , checkTag , checkFile } = this.state;
+    const {getFieldDecorator} = this.props.form;
+
+
+    // 上传附件点击事件
+    const uploadProps = {
+      width: 600,
+      multiple: true,
+      fileList:contentFileList,
+      action: `${getUploadActionUrl()}`,
+      onChange: this.handleContentUploadChange,
+      onRemove: (file) => this.onAttachmentRemove(file, 'contentFileList'),
+      beforeUpload: (file) => {
+        const isLt150M = file.size / 1024 / 1024 < 150;
+        if (!isLt150M) {
+          message.error('文件大小必须小于150MB!');
+        }
+        return isLt150M;
+      }
+    };
+    // 上传封面图-html
+    const uploadButton = (
+      <div>
+        <Icon className='font-36 color-grey-c' type={this.state.loading ? 'loading' : 'plus'} />
+      </div>
+    );
+    // 上传封面图点击事件
+    const uploadCover = {
+      listType:"picture-card",
+      className:"avatar-uploader",
+      showUploadList:false,
+      action:`${getUploadActionUrl()}`,
+      onChange:this.handleChange,
+    }
+    return(
+      <div className="educontent mt10 mb50">
+        <style>
+          {
+            `
+            .newCases .ant-col.ant-form-item-label{
+              float:left;
+              margin-right:20px;
+              height:35px;
+              line-height:35px;
+            }
+
+            .newCaseUpload{
+              width: 100%;
+              background: #F2F9FF;
+              justify-content: center;
+              align-items: center;
+              display: -webkit-flex;
+              text-align: center;
+              height: 120px;
+              border-radius: 4px;
+              border: 1px dashed #4cacff;
+            }
+            .newCases .ant-form-item{
+              margin-bottom:20px!important ;
+            }
+            .newCases .ant-col.ant-form-item-control-wrapper{
+              position:relative;
+            }
+            .newCases .ant-form-explain{
+              position:absolute;
+              bottom:-18px;
+              left:76px;
+              padding-left: 7px;
+            }
+            .newCases .resetLeft .ant-form-explain{
+              left:0px;
+            }
+            .newCases .resetBottom .ant-form-explain{
+              bottom:2px;
+            }
+            `
+          }
+        </style>
+        <p className="mt10 mb20 clearfix lineh-20">
+          <a href="/moop_cases" className="color-grey-9">教学案例</a> &gt; <span className="color-grey-3">{ caseID ? "编辑" : "新建" }</span>
+        </p>
+        <p class="lineh-25 font-22 mb20">上传教学案例</p>
+          <Form onSubmit={this.handleSubmit} className={"newCases"}>            
+            <div className="padding30 edu-back-white">
+              <Form.Item label="标题">
+                {getFieldDecorator('caseTitle', {
+                  rules: [{required: true, message: "案例标题不能为空"}],
+                })(
+                  <Input placeholder="例如：软件工程教学案例" className="greyInput winput-300-35 mr20 fl"/>
+                )}
+                <span className="color-grey-c font-12 fl">简明扼要介绍文档/视频所包含的主要的内容</span>
+              </Form.Item>
+              <div className="clearfix">
+                <Form.Item label="作者" className="fl with22">
+                  {getFieldDecorator('userName', {
+                    rules: [{required: true, message: "请输入作者姓名"}],
+                  })(
+                    <Input placeholder="请输入姓名" className="greyInput winput-120-35 mr20 fl winput150"/>
+                  )}
+                </Form.Item>
+                <Form.Item className="fl resetLeft">
+                  {getFieldDecorator('userUnit', {
+                    rules: [{required: true, message: "请输入作者单位名称"}],
+                  })(
+                    <Input placeholder="请输入作者单位名称" className="greyInput winput-300-35 mr20 fl"/>
+                  )}
+                </Form.Item>
+              </div>
+              <div className={checkTag==true ? "clearfix mb20 pr has-error" : "clearfix mb20"} id="tagFormItem">
+                <span className="upload_Title must">标签</span>
+                <ul className="fl libraries_tab">
+                    <li className={ casesTags.indexOf(1) > -1 ? "active" :"" } onClick={()=>this.changeType(1)}>获奖案例</li>
+                    <li className={ casesTags.indexOf(2) > -1 ? "active" :"" } onClick={()=>this.changeType(2)}>入库案例</li>
+                </ul>
+                {
+                  checkTag && <div class="ant-form-explain">请选择标签</div>
+                }
+              </div>
+              <Form.Item label="描述" className="resetBottom" style={{marginBottom:"0px"}}> 
+                {getFieldDecorator('description', {
+                  rules: [{
+                    required: true, message: '请输入描述内容'
+                  }],
+                })(
+                  <TPMMDEditor ref={this.DescMdRef} placeholder="请添加描述" mdID={'caseContentMD'} refreshTimeout={1500} 
+                    watch={true} className="caseMessageMD" initValue={CaseDetail && CaseDetail.content}></TPMMDEditor>
+                )}
+              </Form.Item>
+              <div className={checkFile == true ? "clearfix mb20 pr has-error" : "clearfix mb20"}  id="fileFormItem" style={{marginLeft:"76px"}}>
+                <Dragger {...uploadProps} className="librariesField upload_1">
+                  <p className="ant-upload-text color-blue font-18 mb20">上传附件</p>
+                  <p className="ant-upload-text color-grey-c">从我的电脑选择要上传的文档：按住CTRL可以上传多份文档。单个文件最大限制：150MB</p>
+                </Dragger>
+                {
+                  checkFile && <div style={{left:"0px",bottom:"-21px"}} class="ant-form-explain">请先上传附件</div>
+                }
+              </div>
+              <p className="lineh-25 mt20 mb10 clearfix">
+                <span className="upload_Title" style={{marginRight:"12px"}}>封面图</span><span class="color-grey-c fl lineh-35">（上传尺寸：120*90 px）</span>
+              </p>
+              <div style={{marginLeft:"76px"}} className="uploadImage">
+                <Upload {...uploadCover}>
+                  { imageUrl ? 
+                    <Tooltip title="重新上传">
+                      <img src={imageUrl} alt="avatar" style={{ width: '100%' }} /> 
+                    </Tooltip>
+                    : 
+                    <Tooltip title="上传图片">
+                      {uploadButton}
+                    </Tooltip>
+                  }
+                </Upload>
+              </div>
+            </div>
+            <div className="padding30 bor-top-greyE edu-back-white">
+              <li className="lineh-25 color-grey-6 font-18 mb20">审核说明</li>
+              <ul className="font-16">
+                <li>平台管理员将对每天新上传的文档进行审核，审核通过的文档将公开显示，否则将私有化或移除</li>
+              </ul>
+            </div>
+            <div className="padding30 bor-top-greyE edu-back-white">
+              <li className="lineh-25 color-grey-6 font-18 mb20">温馨提示</li>
+              <ul className="font-16 lineh-30">
+                <li>1.请勿上传已设置加密口令的文档资源；</li>
+                <li>2.可以上传符合教学案例标准的文档资料，如
+                  <a className="color-blue" target="_blank" href="https://www.educoder.net/courses/1309/boards/5909/messages/34799">案例入库标准</a>、
+                  <a target="_blank" className="color-blue" href="https://www.educoder.net/courses/1309/boards/5909/messages/34798">案例使用说明书</a>以及其他资料等，上传支持的文件最大容量：100MB；</li>
+                <li>3.请确保上传内容无侵权或违反国家关于互联网政策的不良行为；</li>
+                <li>4.请使用Chrome，Firefox，Safari，IE11（及以上版本）浏览器；</li>
+              </ul>
+            </div>
+            <Form.Item>
+              <div className="clearfix mt30 mb30">
+                {
+                  !caseID && <Button type="primary" onClick={()=>this.handleSubmit("submit")} className="defalutSubmitbtn fl mr20">申请发布</Button>
+                }
+                <a className="defalutCancelbtn fl" onClick={()=>this.handleSubmit("save")}>保存</ a>
+              </div>
+            </Form.Item>
+          </Form>
+      </div>
+    )
+  }
+}
+const WrappedCoursesNewApp = Form.create({name: 'CaseNew'})(CaseNew);
+export default WrappedCoursesNewApp;

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

@@ -0,0 +1,26 @@
+import React,{ Component } from "react";
+import './css/moopCases.css'
+import '../courses/css/Courses.css'
+
+class CaseTags extends Component{
+  constructor(props){
+    super(props);
+  }
+
+  render(){
+    let { tags } = this.props;
+    return(
+      <React.Fragment>
+        {
+          tags && tags.map((item,key)=>{
+            return(
+              <span key={key} className={item.name == "获奖案例" ? "edu-filter-btn fl cdefault edu-activity-red ml10" : "edu-filter-btn fl cdefault edu-activity-blue ml10"}>{item.name}</span>
+            )
+          })
+        }
+      </React.Fragment>
+      
+    )
+  }
+}
+export default CaseTags;

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

@@ -0,0 +1,28 @@
+import React,{ Component } from "react";
+import './css/moopCases.css'
+import '../courses/css/Courses.css'
+import { getImageUrl } from 'educoder';
+import success from '../../images/moop_cases/success.png'
+
+class Success extends Component{
+  constructor(props){
+    super(props);
+  }
+  render(){
+    return(
+      <div className="educontent edu-back-white mt20 successPage">
+        <div>
+          <img src={success} width="100" className="mb30" />
+          <p className="lineh-30 ed-txt-center font-24 color-grey-3 font-bd">恭喜!</p>
+          <p className="lineh-30 ed-txt-center font-24 color-grey-3 font-bd mb20">提交成功</p>
+          <p className="lineh-30 ed-txt-center font-16 color-grey-9 font-bd mb20">平台正在审核您的申请，审核结果将以平台消息的形式通知您</p>
+          <li className="inline">
+            <a href={`/moop_cases/${this.props.match.params.caseID}`} className="white-btn edu-blueline-btn changebtn mr20 fl">查看已上传文档</a>
+            <a href="/moop_cases/new" className="white-btn edu-blueback-btn changebtn fl">继续上传</a>
+          </li>
+        </div>
+      </div>
+    )
+  }
+}
+export default Success;

public/react/src/modules/moop_cases/css/moopCases.css

@@ -0,0 +1,155 @@
+.winput-300-35{
+  width: 300px;
+  height: 35px;
+  padding: 5px;
+  box-sizing: border-box;
+}
+.library_nav li {
+  float: left;
+  cursor: pointer;
+  margin-right: 30px;
+  position: relative;
+  color: #05101A;
+  height: 40px;
+  line-height: 20px;
+  font-size: 16px;
+}
+.library_nav li.active a, .library_nav li:hover a{
+  color: #4cacff!important;
+}
+.library_list {
+  margin-bottom: 30px;
+}
+.library_list_item:hover {
+  box-shadow: 0px 4px 8px rgba(158,158,158,0.16);
+}
+.library_list_item {
+  background: #fff;
+  padding: 20px 30px;
+  margin-bottom: 30px;
+  display: flex;
+}
+.library_list_item .library_l_name {
+  max-width: 600px;
+  float: left;
+}
+
+.edu-activity-red {
+  background-color: #FC2B6A;
+  color: #fff!important;
+  cursor: pointer;
+  border: 1px solid #FC2B6A;
+  line-height: 17px;
+}
+.edu-activity-green {
+  background-color: green;
+  color: #fff!important;
+  cursor: pointer;
+  border: 1px solid green;
+  line-height: 17px;
+}
+.edu-activity-blue {
+  background-color: #4CACFF;
+  color: #fff!important;
+  cursor: pointer;
+  border: 1px solid #4CACFF;
+  line-height: 17px;
+}
+
+.pointsBtn {
+  width: 70px;
+  height: 70px;
+  background-color: #4cacff;
+  border-radius: 50%;
+  color: #fff;
+  text-align: center;
+  margin: 0 auto;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  padding: 2px 0;
+  cursor: pointer;
+  line-height: 22px;
+  padding-top: 12px;
+}
+.pointedBtn{
+  background: #BCD1E3;
+  cursor: default
+}
+.pointsBtn span{
+  display: block;
+}
+.upload_Title {
+  position: relative;
+  margin-right: 20px;
+  float: left;
+  line-height: 35px;
+  font-size: 16px;
+  width: 56px;
+  color:rgba(0, 0, 0, 0.85);
+  text-align: center
+}
+.upload_Title.must:before {
+  display: inline-block;
+  margin-right: 4px;
+  color: #f5222d;
+  font-size: 14px;
+  font-family: SimSun, sans-serif;
+  line-height: 1;
+  content: '*';
+}
+.upload_Title:after{
+  content: ':';
+  position: relative;
+  top: -0.5px;
+  margin: 0 8px 0 2px;
+}
+.libraries_tab li {
+  width: 120px;
+  height: 35px;
+  line-height: 33px;
+  border-radius: 18px;
+  border: 1px solid #4C98FF;
+  color: #4C98FF;
+  cursor: pointer;
+  margin-right: 30px;
+  float: left;
+  text-align: center;
+}
+.libraries_tab li.active {
+  background: #4C98FF;
+  color: #fff;
+}
+.librariesField .ant-upload{
+  width: 100%;
+  background: #F2F9FF;
+  justify-content: center;
+  align-items: center;
+  display: -webkit-flex;
+  text-align: center;
+  height: 120px!important;
+  border-radius: 4px;
+  border: 1px dashed #4cacff!important;
+  display: block;
+  cursor: pointer;
+}
+.uploadImage .ant-upload.ant-upload-select-picture-card{
+  width:120px;
+  height: 90px;
+}
+.uploadImage .ant-upload.ant-upload-select-picture-card > .ant-upload{
+  padding:0px!important;
+}
+.successPage {
+  justify-content: center;
+  align-items: center;
+  display: -webkit-flex;
+  height: 570px;
+  text-align: center;
+  margin-bottom: 50px;
+}
+.changebtn {
+  width:166px;
+  font-size: 16px;
+  height: 45px;
+  line-height: 45px;
+}

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

@@ -0,0 +1,130 @@
+import React,{ Component } from "react";
+import './css/moopCases.css'
+import '../courses/css/Courses.css'
+
+import { SnackbarHOC } from 'educoder';
+
+import { TPMIndexHOC } from '../tpm/TPMIndexHOC';
+import { CNotificationHOC } from '../courses/common/CNotificationHOC'
+
+import {BrowserRouter as Router,Route,Switch} from 'react-router-dom';
+import Loading from '../../Loading';
+import Loadable from 'react-loadable';
+
+import axios from 'axios';
+
+const CaseList = Loadable({
+	loader: () => import('./CaseList'),
+	loading:Loading,
+})
+const CaseDetail = Loadable({
+	loader: () => import('./CaseDetail'),
+	loading:Loading,
+})
+const CaseNew = Loadable({
+	loader: () => import('./CaseNew'),
+	loading:Loading,
+})
+const CaseSuccess = Loadable({
+	loader: () => import('./Success'),
+	loading:Loading,
+})
+
+
+
+class Index extends Component{
+  constructor(props){
+    super(props);
+    this.state={
+      praise_count:0,
+      CaseDetail:undefined,
+      cover:undefined,
+      creator:undefined,
+      operation:undefined,
+      tags:undefined,
+      attachments:undefined,
+      user_praised:true,
+    }
+  }
+  // 获取案例详情
+  getDetail = (caseID) =>{
+    let url=`/libraries/${caseID}.json`
+    axios.get(url).then((result)=>{
+      if(result){
+        this.setState({
+          CaseDetail:result.data,
+          praise_count:result.data.praise_count,
+          cover:result.data.cover,
+          creator:result.data.creator,
+          operation:result.data.operation,
+          user_praised:result.data.operation.user_praised,
+          tags:result.data.tags,
+          attachments:result.data.attachments
+        })
+      }
+    }).catch((error)=>{
+      console.log(error);
+    })
+  }
+  // 点赞
+  praisePoint=(caseID)=>{
+    let { praise_count }=this.state;
+    let url =`/praise_tread/like.json`;
+    axios.post(url,{
+      object_id:caseID,
+      object_type:"library"
+    }).then((result)=>{
+      if(result){
+        this.setState({
+          praise_count: parseInt(praise_count)+1,
+          user_praised:true
+        })
+      }
+    }).catch((error)=>{
+      console.log(error);
+    })    
+  }
+
+  render(){
+    
+    return(
+      <div className="newMain">
+        <Switch {...this.props}>
+
+          <Route exact path="/moop_cases"
+            render={
+              (props) => (<CaseList {...this.props} {...props} {...this.state} />)
+            }
+          ></Route>
+          
+          <Route exact path="/moop_cases/new"
+            render={
+              (props) => (<CaseNew {...this.props} {...props} {...this.state} />)
+            }
+          ></Route>
+        
+          <Route exact path="/moop_cases/:caseID"
+            render={
+              (props) => (<CaseDetail {...this.props} {...props} {...this.state} getDetail={this.getDetail} praisePoint ={this.praisePoint}/>)
+            }
+          ></Route>
+
+
+          <Route exact path="/moop_cases/:caseID/edit"
+            render={
+              (props) => (<CaseNew {...this.props} {...props} {...this.state} getDetail={this.getDetail}  />)
+            }
+          ></Route>
+
+          <Route exact path="/moop_cases/:caseID/publish_success"
+            render={
+              (props) => (<CaseSuccess {...this.props} {...props} {...this.state} getDetail={this.getDetail}  />)
+            }
+          ></Route>
+
+        </Switch>
+      </div>
+    )
+  }
+}
+export default CNotificationHOC() ( SnackbarHOC() ( TPMIndexHOC(Index) ));

public/react/src/modules/paths/PathDetail/DetailTop.js

@@ -195,7 +195,7 @@ class DetailTop extends Component{
                 detailInfoList && 
                 <ul className="fl color-grey-eb pathInfo">
                   { detailInfoList.stages_count!=0 ? <li><span>章节</span><span className="ml5">{detailInfoList.stages_count}</span></li> : ""}
-                  { detailInfoList.stage_shixuns_count!=0 ? <li><span>实训</span><span className="ml5">{ detailInfoList.stage_shixuns_count}</span></li> : ""}
+                  { detailInfoList.shixuns_count!=0 ? <li><span>实训</span><span className="ml5">{ detailInfoList.shixuns_count}</span></li> : ""}
                   { detailInfoList.challenge_choose_count!=0 ? <li><span>选择题任务</span><span>{detailInfoList.challenge_choose_count}</span></li> : ""}
                   { detailInfoList.challenges_count!=0 ? <li><span>实践任务</span><span>{detailInfoList.challenges_count}</span></li> : ""}
                   { detailInfoList.subject_score!=0 ? <li><span>经验值</span><span>{detailInfoList.subject_score}</span></li> : ""}

public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js

@@ -323,7 +323,7 @@ class Challenges extends Component {
 							</Tooltip>
             </p>
 
-            <div className="justify break_full_word new_li markdown-body"
+            <div className="justify break_full_word new_li "
                  id="challenge_editorMd_description">
               <p id="ReactMarkdown" style={{overflow:'hidden'}}>
                 {ChallengesDataList === undefined ? "" :ChallengesDataList&&ChallengesDataList.description===null?"":

public/react/src/modules/user/account/AccountBasicEdit.js

@@ -126,7 +126,7 @@ class AccountBasic extends Component {
 
   // 输入昵称时change剩余的字数
   changeNickName=(e)=>{
-    let num= 10 - parseInt(e.target.value.length);
+    let num= 20 - parseInt(e.target.value.length);
     this.setState({
       nameLength:num < 0 ? 0 : num
     })
@@ -393,6 +393,13 @@ class AccountBasic extends Component {
       this.props.showNotification("请先选择正确的单位或者学校！");
     }
   }
+  checkNameLength = (rule, value, callback) => {
+    if (value && value.length <= 10) {
+      callback();
+      return;
+    }
+    callback('请输入您的姓名，最大限制10个字符');
+  }
   
   render() {
     let{ 
@@ -491,8 +498,8 @@ class AccountBasic extends Component {
                   message: '请输入您的昵称',
                 }],
               })(
-                <Input placeholder="请输入您的昵称，10个字以内" onInput={this.changeNickName} maxLength="10" suffix ={
+                <Input placeholder="请输入您的昵称，最大限制20个字符" onInput={this.changeNickName} maxLength="20" suffix ={
-                  <span className="color-grey-6 font-13">{String(nameLength)}/10</span>
+                  <span className="color-grey-6 font-13">{String(nameLength)}/20</span>
                 }></Input>
               )}
             </Form.Item>
@@ -505,10 +512,11 @@ class AccountBasic extends Component {
                   rules: [{
                     // initialValue: this.state.cityDefaultValue,
                     required: true, 
-                    message: '请输入您的姓名',
+                    message: '请输入您的姓名，最大限制10个字符',
+                    validator: this.checkNameLength
                   }],
                 })(
-                  <Input placeholder="请输入您的姓名" disabled={!showRealName && this.state.forDisable == true } suffix={
+                  <Input placeholder="请输入您的姓名，最大限制10个字符" disabled={!showRealName && this.state.forDisable == true } suffix={
                     <i className={showRealName?"iconfont icon-xianshi font-18 color-blue":"iconfont icon-yincang font-18 color-blue"}
                           onClick={()=>this.showOrHide(showRealName)}></i>
                   }></Input>

public/react/src/modules/user/account/AccountNav.js

@@ -13,7 +13,7 @@ class AccountNav extends Component {
     this.props.history.push(`/account/secure`)
   }
     render() {
-      let { basicInfo } = this.props
+      let { basicInfo, current_user } = this.props
       // console.log(this.props);
       const path = window.location.pathname
       const isBasic = path.indexOf('profile') != -1 || path == "/account"
@@ -78,7 +78,7 @@ class AccountNav extends Component {
               <React.Fragment>
                 <div className="accountInfo">
                   <AccountImg src={basicInfo.avatar_url} {...this.props}></AccountImg>
-                  <span className="name">{basicInfo.name}</span>
+                  <span className="name">{basicInfo.name || (current_user ? current_user.login : '')}</span>
                   <span className="role">{basicInfo.technical_title}</span>
                 </div>
 

public/react/src/search/SearchPage.js

@@ -286,10 +286,10 @@ class SearchPage extends Component{
 															</span>
 														</span>}
 
-														{!!item.stage_shixuns_count && <span className="ml20 ziticor">
+														{!!item.shixuns_count && <span className="ml20 ziticor">
 															{/* <i className="iconfont icon-shixunguanqia ziticor"></i> */}
 															<span>实训数:
-																<span className="ml10 ziticor">{item.stage_shixuns_count}</span>
+																<span className="ml10 ziticor">{item.shixuns_count}</span>
 															</span>
 														</span>}
 														{type == 'subject' && !!item.visits_count && <span className="ml20 ziticor">