调整

app/controllers/admins/import_course_members_controller.rb

@@ -0,0 +1,10 @@
+class Admins::ImportCourseMembersController < Admins::BaseController
+  def create
+    return render_error('请上传正确的文件') if params[:file].blank? || !params[:file].is_a?(ActionDispatch::Http::UploadedFile)
+
+    result = Admins::ImportCourseMemberService.call(params[:file].to_io)
+    render_ok(result)
+  rescue Admins::ImportCourseMemberService::Error => ex
+    render_error(ex)
+  end
+end

app/controllers/wechats/js_sdk_signatures_controller.rb

@@ -0,0 +1,8 @@
+class Wechats::JsSdkSignaturesController < ApplicationController
+  def create
+    signature = Util::Wechat.js_sdk_signature(params[:url], params[:noncestr], params[:timestamp])
+    render_ok(signature: signature)
+  rescue Util::Wechat::Error => ex
+    render_error(ex.message)
+  end
+end

app/imports/admins/import_course_member_excel.rb

@@ -0,0 +1,20 @@
+class Admins::ImportCourseMemberExcel < BaseImportXlsx
+  Data = Struct.new(:student_id, :name, :course_id, :role, :course_group_name, :school_id)
+
+  def read_each(&block)
+    sheet.each_row_streaming(pad_cells: true, offset: 1) do |row|
+      data = row.map(&method(:cell_value))[0..5]
+      block.call Data.new(*data)
+    end
+  end
+
+  private
+
+  def check_sheet_valid!
+    raise_import_error('请按照模板格式导入') if sheet.row(1).size != 6
+  end
+
+  def cell_value(obj)
+    obj&.cell_value&.to_s&.strip
+  end
+end

app/libs/util/wechat.rb

@@ -0,0 +1,74 @@
+module Util::Wechat
+  BASE_SITE = 'https://api.weixin.qq.com'.freeze
+
+  Error = Class.new(StandardError)
+
+  class << self
+    attr_accessor :appid, :secret
+
+    def js_sdk_signature(url, noncestr, timestamp)
+      str = { jsapi_ticket: jsapi_ticket, noncestr: noncestr, timestamp: timestamp, url: url }.to_query
+      Digest::SHA1.hexdigest(str)
+    end
+
+    def access_token
+      # 7200s 有效时间
+      Rails.cache.fetch(access_token_cache_key, expires_in: 100.minutes) do
+        result = request(:get, '/cgi-bin/token', appid: appid, secret: secret, grant_type: 'client_credential')
+        result['access_token']
+      end
+    end
+
+    def refresh_access_token
+      Rails.cache.delete(access_token_cache_key)
+      access_token
+    end
+
+    def jsapi_ticket
+      # 7200s 有效时间
+      Rails.cache.fetch(jsapi_ticket_cache_key, expires_in: 100.minutes) do
+        result = request(:get, '/cgi-bin/ticket/getticket', access_token: access_token, type: 'jsapi')
+        result['ticket']
+      end
+    end
+
+    def refresh_jsapi_ticket
+      Rails.cache.delete(jsapi_ticket_cache_key)
+      jsapi_ticket
+    end
+
+    def access_token_cache_key
+      "#{base_cache_key}/access_token"
+    end
+
+    def jsapi_ticket_cache_key
+      "#{base_cache_key}/jsapi_ticket"
+    end
+
+    def base_cache_key
+      "wechat/#{appid}"
+    end
+
+    private
+
+    def request(method, url, **params)
+      Rails.logger.error("[wechat] request: #{method} #{url} #{params.inspect}")
+
+      client = Faraday.new(url: BASE_SITE)
+      response = client.public_send(method, url, params)
+      result = JSON.parse(response.body)
+
+      Rails.logger.error("[wechat] response:#{response.status} #{result.inspect}")
+
+      if response.status != 200
+        raise Error, result.inspect
+      end
+
+      if result['errcode'].present? && result['errcode'].to_i.nonzero?
+        raise Error, result.inspect
+      end
+
+      result
+    end
+  end
+end

app/services/admins/import_course_member_service.rb

@@ -0,0 +1,63 @@
+class Admins::ImportCourseMemberService < ApplicationService
+  Error = Class.new(StandardError)
+
+  attr_reader :file, :result
+
+  def initialize(file)
+    @file   = file
+    @result = { success: 0, fail: [] }
+  end
+
+  def call
+    raise Error, '文件不存在' if file.blank?
+
+    excel = Admins::ImportCourseMemberExcel.new(file)
+    excel.read_each(&method(:create_course_member))
+
+    result
+  rescue ApplicationImport::Error => ex
+    raise Error, ex.message
+  end
+
+  private
+
+  def create_course_member(data)
+    raise '课堂角色必须为 2、3、4' unless [2, 3, 4].include?(data.role.to_i)
+
+    user = User.joins(:user_extension).where(user_extensions: { student_id: data.student_id, school_id: data.school_id }).first
+    raise '该学号的用户不存在' if user.blank?
+    course = Course.find_by(id: data.course_id)
+    raise '该课堂不存在' if course.blank?
+
+    course_group = nil
+    if data.course_group_name.present?
+      course_group = course.course_groups.find_or_create_by!(name: data.course_group_name)
+    end
+
+    member = course.course_members.find_by(user_id: user.id, role: data.role.to_i)
+    # 如果已是课堂成员且是学生身份and不在指定的分班则移动到该分班
+    if member.present? && member.role == :STUDENT && course_group && member.course_group_id != course_group&.id
+      member.update!(course_group_id: course_group&.id)
+    elsif member.blank?
+      course.course_members.create!(user_id: user.id, role: data.role.to_i, course_group_id: course_group&.id)
+      extra =
+        case data.role.to_i
+        when 2 then 9
+        when 3 then 7
+        else 10
+        end
+
+      Tiding.create!(user_id: user.id, trigger_user_id: course.tea_id, container_id: course.id,
+                     container_type: 'TeacherJoinCourse', belong_container_id: course.id,
+                     belong_container_type: 'Course', tiding_type: 'System', extra: extra)
+    end
+
+    result[:success] += 1
+  rescue Exception => ex
+    fail_data = data.as_json
+    fail_data[:data] = fail_data.values.join(',')
+    fail_data[:message] = ex.message
+
+    result[:fail] << fail_data
+  end
+end

config/configuration.yml.example

@@ -6,6 +6,9 @@ defaults: &defaults
     cate_id: '-1'
     callback_url: 'http://47.96.87.25:48080/api/callbacks/aliyun_vod.json'
     signature_key: 'test12345678'
+  wechat:
+    appid: 'test'
+    secret: 'test'
 
 development:
   <<: *defaults

config/initializers/aliyun_vod_init.rb

@@ -4,7 +4,7 @@ aliyun_vod_config = {}
 begin
   config = Rails.application.config_for(:configuration)
   aliyun_vod_config = config['aliyun_vod']
-  raise 'oauth wechat config missing' if aliyun_vod_config.blank?
+  raise 'aliyun vod config missing' if aliyun_vod_config.blank?
 rescue => ex
   raise ex if Rails.env.production?
 

config/initializers/util_wechat_init.rb

@@ -0,0 +1,16 @@
+wechat_config = {}
+
+begin
+  config = Rails.application.config_for(:configuration)
+  wechat_config = config['wechat']
+  raise 'wechat config missing' if wechat_config.blank?
+rescue => ex
+  raise ex if Rails.env.production?
+
+  puts %Q{\033[33m [warning] wechat config or configuration.yml missing,
+           please add it or execute 'cp config/configuration.yml.example config/configuration.yml' \033[0m}
+  wechat_config = {}
+end
+
+Util::Wechat.appid  = wechat_config['appid']
+Util::Wechat.secret = wechat_config['secret']

config/routes.rb

@@ -804,6 +804,7 @@ Rails.application.routes.draw do
       end
     end
     resource :import_users, only: [:create]
+    resource :import_course_members, only: [:create]
 
     resources :library_applies, only: [:index] do
       member do
@@ -879,6 +880,10 @@ Rails.application.routes.draw do
     end
   end
 
+  namespace :wechats do
+    resource :js_sdk_signature, only: [:create]
+  end
+
   #git 认证回调
   match 'gitauth/*url', to: 'gits#auth', via: :all
 

public/react/src/modules/courses/Index.js

@@ -1,6 +1,7 @@
 import React, { Component } from 'react';
 import { SnackbarHOC } from 'educoder';
 import {BrowserRouter as Router,Route,Switch} from 'react-router-dom';
+import { withRouter } from 'react-router'
 import Loadable from 'react-loadable';
 import Loading from '../../Loading';
 import axios from 'axios';
@@ -264,6 +265,12 @@ const GraduationTasksSubmiteditApp=Loadable({
     loading: Loading,
 })
 
+//排序
+const Ordering=Loadable({
+	loader: () => import('../../modules/courses/ordering/Ordering'),
+	loading: Loading,
+});
+
 class CoursesIndex extends Component{
     constructor(props) {
         super(props)
@@ -290,6 +297,13 @@ class CoursesIndex extends Component{
 
     componentDidMount(){
         // this.updataleftNav()
+        this.historyArray = []
+        this.props.history.listen( location =>  {
+			console.log(location)
+            this.historyArray.unshift(location.pathname)
+            this.historyArray.length = 2;
+			//Do your stuff here
+		});
     }
 
     updataleftNav=()=>{
@@ -424,6 +438,7 @@ class CoursesIndex extends Component{
 
     render() {
         const common = {
+            previousPathName: this.historyArray && this.historyArray[1]
             // isAdmin: this.isAdmin,
             // isStudent: this.isStudent,
             // isAdminOrStudent: this.isAdminOrStudent,
@@ -442,27 +457,32 @@ class CoursesIndex extends Component{
         // console.log(commons)
         return (
             <Switch {...this.props}>
-
+								{/*排序*/}
+								<Route path="/courses/:coursesId/ordering/:ordering_type/:main_id"
+											 render={
+												 (props) => (<Ordering {...this.props} {...props} {...this.state} />)
+											 }
+								></Route>
                 {/* 资源列表页  */}
                 <Route path="/courses/:coursesId/file/:Id" exact
                        render={
-                           (props) => (<ListPageIndex {...this.props} {...props} {...this.state} />)
+                           (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
                 <Route path="/courses/:coursesId/files/:main_id"
                        render={
-                         (props) => (<ListPageIndex {...this.props} {...props} {...this.state} />)
+                         (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
                 <Route exact path="/courses/:coursesId/boards/:boardId"
                     render={
-                        (props) => (<ListPageIndex {...this.props} {...props} {...this.state} />)
+                        (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>)
                     }
                 ></Route>
                 {/*课堂讨论*/}
                 <Route path="/courses/:coursesId/boards/:boardId"
                        render={
-                           (props) => (<BoardIndex {...this.props} {...props} {...this.state} />)
+                           (props) => (<BoardIndex {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
 
@@ -470,19 +490,19 @@ class CoursesIndex extends Component{
                 {/* 毕设问答 */}
                 <Route path="/courses/:coursesId/graduation_topics/postwork/new"
                        render={
-                           (props) => (<GraduateTopicPostWorksNew {...this.props} {...props} {...this.state} />)
+                           (props) => (<GraduateTopicPostWorksNew {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
 
                 {/* 毕设选题新建页 */}
                 <Route path="/courses/:coursesId/graduation_topics/new"
                        render={
-                           (props) => (<GraduateTopicNew {...this.props} {...props} {...this.state} />)
+                           (props) => (<GraduateTopicNew {...this.props} {...props} {...this.state} {...common}/>)
                        }></Route>
                 {/* 毕设选题编辑页*/}
                 <Route path="/courses/:coursesId/graduation_topics/:topicId/edit"
                        render={
-                           (props) => (<GraduateTopicNew {...this.props} {...props} {...this.state} />)
+                           (props) => (<GraduateTopicNew {...this.props} {...props} {...this.state} {...common}/>)
                        }></Route>
 
                 {/* 毕设选题详情页 */}
@@ -495,7 +515,7 @@ class CoursesIndex extends Component{
                 {/* 毕设选题列表 */}
                 <Route path="/courses/:coursesId/graduation_topics/:Id" exact
                        render={
-                           (props) => (<ListPageIndex {...this.props} {...props} {...this.state} />)
+                           (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>)
                        }></Route>
 
 
@@ -503,21 +523,21 @@ class CoursesIndex extends Component{
                 {/* 作品评阅 https://www.trustie.net/issues/19981 */}
                 <Route path="/courses/:coursesId/graduation_tasks/:category_id/appraise"
                        render={
-                           (props) => (<GraduationTasksappraise {...this.props} {...props} {...this.state} />)
+                           (props) => (<GraduationTasksappraise {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
 
                 {/* 新建作品 */}
                 <Route path="/courses/:coursesId/graduation_tasks/:category_id/:task_Id/works/new"
                        render={
-                           (props) => (<GraduationTasksSubmitnewApp {...this.props} {...props} {...this.state} />)
+                           (props) => (<GraduationTasksSubmitnewApp {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
 
                 {/* 修改作品  */}
                 <Route path="/courses/:coursesId/graduation_tasks/:category_id/:work_Id/works/edit"
                        render={
-                           (props) => (<GraduationTasksSubmiteditApp {...this.props} {...props} {...this.state} />)
+                           (props) => (<GraduationTasksSubmiteditApp {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
 
@@ -525,20 +545,20 @@ class CoursesIndex extends Component{
 
                 <Route path="/courses/:coursesId/graduation_tasks/:category_id/:task_Id/setting"
                        render={
-                           (props) => (<GraduationTaskssetting {...this.props} {...props} {...this.state} />)
+                           (props) => (<GraduationTaskssetting {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
 
 
                 <Route path="/courses/:coursesId/graduation_tasks/:category_id/:task_Id/questions"
                        render={
-                           (props) => (<GraduationTasksquestions {...this.props} {...props} {...this.state} />)
+                           (props) => (<GraduationTasksquestions {...this.props} {...props} {...this.state} {...common}/>)
                        }></Route>
 
 
                 <Route path="/courses/:coursesId/graduation_tasks/:category_id/:task_Id/list"
                        render={
-                           (props) => (<GraduationTaskssettinglist {...this.props} {...props} {...this.state} />)
+                           (props) => (<GraduationTaskssettinglist {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
 
@@ -547,7 +567,7 @@ class CoursesIndex extends Component{
                 {/* 修改毕设任务 https://www.trustie.net/issues/19981 */}
                 <Route path="/courses/:coursesId/graduation_tasks/:category_id/edit"
                        render={
-                           (props) => (<GraduationTaskseditApp {...this.props} {...props} {...this.state} />)
+                           (props) => (<GraduationTaskseditApp {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
 
@@ -555,7 +575,7 @@ class CoursesIndex extends Component{
                 {/* 新建毕设任务 https://www.trustie.net/issues/19981 */}
                 <Route path="/courses/:coursesId/graduation_tasks/:category_id/new"
                        render={
-                           (props) => (<GraduationTasksnewApp {...this.props} {...props} {...this.state} />)
+                           (props) => (<GraduationTasksnewApp {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
 
@@ -563,87 +583,87 @@ class CoursesIndex extends Component{
                 {/* 毕设任务列表 https://www.trustie.net/issues/19981 */}
                 <Route path="/courses/:coursesId/graduation_tasks/:Id" exact
                        render={
-                           (props) => (<ListPageIndex {...this.props} {...props} {...this.state} />)
+                           (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
 
                 {/*/!* 毕业设计主 https://www.trustie.net/issues/19981 *!/*/}
                 {/*<Route path="/courses/:coursesId/graduation"*/}
                        {/*render={*/}
-                           {/*(props) => (<GraduationTopics {...this.props} {...props} {...this.state} />)*/}
+                           {/*(props) => (<GraduationTopics {...this.props} {...props} {...this.state} {...common}/>)*/}
                        {/*}*/}
                 {/*></Route>*/}
 
                 {/*/!* 资源子目录 https://www.trustie.net/issues/19917 *!/*/}
                 {/*<Route path="/courses/:coursesId/attachment/attachment/:attachmentId"*/}
                 {/*render={*/}
-                {/*(props) => (<Files {...this.props} {...props} {...this.state} />)*/}
+                {/*(props) => (<Files {...this.props} {...props} {...this.state} {...common}/>)*/}
                 {/*}*/}
                 {/*></Route>*/}
                 {/* 教师列表*/}
                 <Route path="/courses/:coursesId/teachers"
                        render={
-                           (props) => (<ListPageIndex {...this.props} {...props} {...this.state} />)
+                           (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
                 {/* 学生列表*/}
                 <Route path="/courses/:coursesId/students"
                        render={
-                           (props) => (<ListPageIndex {...this.props} {...props} {...this.state} />)
+                           (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
                 {/* 分班列表 */}
                 <Route path="/courses/:coursesId/course_groups/:course_group_id"
                        render={
-                           (props) => (<ListPageIndex {...this.props} {...props} {...this.state} />)
+                           (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
                 
                 {/* 普通作业 */}
                 <Route path="/courses/:coursesId/common_homeworks/:category_id" exact 
                 render={
-                    (props) => (<ListPageIndex {...this.props} {...props} {...this.state} />)
+                    (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>)
                 }
                 ></Route>
                 {/* 分组作业 */}
                 <Route path="/courses/:coursesId/group_homeworks/:category_id" exact 
                        render={
-                           (props) => (<ListPageIndex {...this.props} {...props} {...this.state} />)
+                           (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
 
                 {/* 普通作业 */}
                 <Route path="/courses/:coursesId/common_homeworks/" strict
                        render={
-                           (props) => (<CommonWork {...this.props} {...props} {...this.state} />)
+                           (props) => (<CommonWork {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
 
                 {/* 分组作业 */}
                 <Route path="/courses/:coursesId/group_homeworks/" strict
                        render={
-                           (props) => (<GroupWork {...this.props} {...props} {...this.state} />)
+                           (props) => (<GroupWork {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
 
                 {/* 问卷答题 */}
                 <Route path="/courses/:coursesId/polls/:pollId/users/:login"
                        render={
-                           (props) => (<PollInfo {...this.props} {...props} {...this.state} />)
+                           (props) => (<PollInfo {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
 
                 {/* 问卷详情  */}
                 <Route path="/courses/:coursesId/polls/:pollId/detail"
                        render={
-                           (props) => (<PollDetail {...this.props} {...props} {...this.state} />)
+                           (props) => (<PollDetail {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
 
                 {/* 问卷新建 */}
                 <Route path="/courses/:coursesId/polls/:pollid/:news"
                        render={
-                           (props) => (<PollNew {...this.props} {...props} {...this.state} />)
+                           (props) => (<PollNew {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
                 {/*/!* 问卷编辑 *!/*/}
@@ -655,7 +675,7 @@ class CoursesIndex extends Component{
                 {/* 问卷  */}
                 <Route path="/courses/:coursesId/polls/:Id"
                        render={
-                           (props) => (<ListPageIndex {...this.props} {...props} {...this.state} />)
+                           (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
 
@@ -663,20 +683,20 @@ class CoursesIndex extends Component{
                 {/* 试卷查看/评阅 */}
                 <Route exact path="/courses/:coursesId/exercises/:Id/users/:userId"
                     render={
-                    (props)=>(<ExerciseReviewAndAnswer {...this.props} {...props} {...this.state} />)
+                    (props)=>(<ExerciseReviewAndAnswer {...this.props} {...props} {...this.state} {...common}/>)
                     }
                 ></Route>
 
                 {/*试卷新建  */}
                 <Route exact path="/courses/:coursesId/exercises/new"
                     render={
-                    (props) => (<ExerciseNew {...this.props} {...props} {...this.state} />)
+                    (props) => (<ExerciseNew {...this.props} {...props} {...this.state} {...common}/>)
                     }
                 ></Route>
                 {/*试卷新建  */}
                 <Route exact path="/courses/:coursesId/exercises/:Id/edit"
                     render={
-                    (props) => (<ExerciseNew {...this.props} {...props} {...this.state} />)
+                    (props) => (<ExerciseNew {...this.props} {...props} {...this.state} {...common}/>)
                     }
                 ></Route>
 
@@ -684,7 +704,7 @@ class CoursesIndex extends Component{
 
                 <Route path="/courses/:coursesId/exercises/:Id/student_exercise_list"
                        render={
-                           (props) => (<Testpapersettinghomepage {...this.props} {...props} {...this.state} />)
+                           (props) => (<Testpapersettinghomepage {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
 
@@ -693,14 +713,14 @@ class CoursesIndex extends Component{
                 <Route
                     path="/courses/:coursesId/exercises/:Id/Studentshavecompletedthelist"
                     render={
-                        (props) => (<Studentshavecompletedthelist {...this.props} {...props} {...this.state} />)
+                        (props) => (<Studentshavecompletedthelist {...this.props} {...props} {...this.state} {...common}/>)
                     }
                 >
                 </Route>
                 {/* 试卷  */}
                 <Route path="/courses/:coursesId/exercises/:Id"
                        render={
-                           (props) => (<ListPageIndex {...this.props} {...props} {...this.state} />)
+                           (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
 
@@ -708,65 +728,65 @@ class CoursesIndex extends Component{
                 {/*实训查重详情*/}
                 <Route path="/courses/:coursesId/shixun_homeworks/:homeworkid/review_detail/:userid"
                        render={
-                           (props) => (<ShixunWorkDetails {...this.props} {...props}  {...this.state} />)
+                           (props) => (<ShixunWorkDetails {...this.props} {...props}  {...this.state} {...common}/>)
                        }
                 ></Route>
               <Route path="/courses/:coursesId/shixun_homework/:homeworkid/review_detail/:userid"
                      render={
-                       (props) => (<ShixunWorkDetails {...this.props} {...props}  {...this.state} />)
+                       (props) => (<ShixunWorkDetails {...this.props} {...props}  {...this.state} {...common}/>)
                      }
               ></Route>
 
                 {/*实训查重列表*/}
                 <Route path="/courses/:coursesId/shixun_homeworks/:homeworkid/student_work"
                        render={
-                           (props) => (<ShixunHomeworkPage {...this.props} {...props}  {...this.state} />)
+                           (props) => (<ShixunHomeworkPage {...this.props} {...props}  {...this.state} {...common}/>)
                        }
                 ></Route>
               <Route path="/courses/:coursesId/shixun_homework/:homeworkid/student_work"
                      render={
-                       (props) => (<ShixunHomeworkPage {...this.props} {...props}  {...this.state} />)
+                       (props) => (<ShixunHomeworkPage {...this.props} {...props}  {...this.state} {...common}/>)
                      }
               ></Route>
 
                 {/*实训报告*/}
                 <Route path="/courses/:coursesId/shixun_homeworks/:homeworkid/shixun_work_report"
                        render={
-                           (props) => (<ShixunWorkReport {...this.props} {...props}  {...this.state} />)
+                           (props) => (<ShixunWorkReport {...this.props} {...props}  {...this.state} {...common}/>)
                        }
                 ></Route>
               <Route path="/courses/:coursesId/shixun_homework/:homeworkid/shixun_work_report"
                      render={
-                       (props) => (<ShixunWorkReport {...this.props} {...props}  {...this.state} />)
+                       (props) => (<ShixunWorkReport {...this.props} {...props}  {...this.state} {...common}/>)
                      }
               ></Route>
 
                 {/*教师列表*/}
                 <Route path="/courses/:coursesId/shixun_homeworks/:homeworkid/list"
                        render={
-                           (props) => (<ShixunHomeworkPage {...this.props} {...props}  {...this.state} />)
+                           (props) => (<ShixunHomeworkPage {...this.props} {...props}  {...this.state} {...common}/>)
                        }
                 ></Route>
               <Route path="/courses/:coursesId/shixun_homework/:homeworkid/list"
                      render={
-                       (props) => (<ShixunHomeworkPage {...this.props} {...props}  {...this.state} />)
+                       (props) => (<ShixunHomeworkPage {...this.props} {...props}  {...this.state} {...common}/>)
                      }
               ></Route>
                {/*实训作业page*/}
               <Route path="/courses/:coursesId/shixun_homeworks/:homeworkid/Page"
                      render={
-                       (props) => (<ShixunHomeworkPage {...this.props} {...props}  {...this.state} />)
+                       (props) => (<ShixunHomeworkPage {...this.props} {...props}  {...this.state} {...common}/>)
                      }
               ></Route>
                 {/*实训作业设置*/}
                 <Route path="/courses/:coursesId/shixun_homeworks/:homeworkid/settings"
                        render={
-                           (props) => (<ShixunHomeworkPage {...this.props} {...props}  {...this.state} />)
+                           (props) => (<ShixunHomeworkPage {...this.props} {...props}  {...this.state} {...common}/>)
                        }
                 ></Route>
               <Route path="/courses/:coursesId/shixun_homework/:homeworkid/settings"
                      render={
-                       (props) => (<ShixunHomeworkPage {...this.props} {...props}  {...this.state} />)
+                       (props) => (<ShixunHomeworkPage {...this.props} {...props}  {...this.state} {...common}/>)
                      }
               ></Route>
                 {/*/!*实训作品列表教师*!/*/}
@@ -805,21 +825,21 @@ class CoursesIndex extends Component{
               {/*实训作业问答主目录*/}
                 <Route path="/courses/:coursesId/shixun_homeworks/:homeworkid/questions"
                        render={
-                           (props) => (<ShixunHomeworkPage {...this.props} {...props}  {...this.state} />)
+                           (props) => (<ShixunHomeworkPage {...this.props} {...props}  {...this.state} {...common}/>)
                        }
                 ></Route>
 
               {/*实训作业问答子目录*/}
               <Route path="/courses/:coursesId/shixun_homework/:homeworkid/questions"
                      render={
-                       (props) => (<ShixunHomeworkPage {...this.props} {...props}  {...this.state} />)
+                       (props) => (<ShixunHomeworkPage {...this.props} {...props}  {...this.state} {...common}/>)
                      }
               ></Route>
 
                 {/*新建课堂*/}
                 <Route path="/courses/new"
                        render={
-                           (props) => (<WrappedCoursesNewApp {...this.props} {...props} {...this.state} />)
+                           (props) => (<WrappedCoursesNewApp {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
               {/*新建精品课堂*/}
@@ -827,47 +847,47 @@ class CoursesIndex extends Component{
               {/*id 是否是私有或者公有*/}
               <Route path="/courses/news/:subjectid/newgold/:id"
                      render={
-                       (props) => (<WrappedCoursesNewAppGoldclass {...this.props} {...props} {...this.state} />)
+                       (props) => (<WrappedCoursesNewAppGoldclass {...this.props} {...props} {...this.state} {...common}/>)
                      }
               ></Route>
               {/*修改精品课堂*/}
               <Route path="/courses/:coursesId/newgolds/settings"
                      render={
-                       (props) => (<WrappedCoursesNewAppGoldclass {...this.props} {...props} {...this.state} />)
+                       (props) => (<WrappedCoursesNewAppGoldclass {...this.props} {...props} {...this.state} {...common}/>)
                      }
               ></Route>
                 {/*修改课堂*/}
                 <Route path="/courses/:coursesId/settings"
                        render={
-                           (props) => (<WrappedCoursesNewApp {...this.props} {...props} {...this.state} />)
+                           (props) => (<WrappedCoursesNewApp {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
 
                 {/* 实训作业子页面*/}
                 <Route path="/courses/:coursesId/shixun_homework/:category_id"
                        render={
-                           (props) => (<ListPageIndex {...this.props} {...props} {...this.state} />)
+                           (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
 
                 {/* 实训作业页面*/}
                 <Route path="/courses/:coursesId/shixun_homeworks/:main_id"
                        render={
-                         (props) => (<ListPageIndex {...this.props} {...props} {...this.state} />)
+                         (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
 
                 {/*/!*实训作业and课堂详情页*!/*/}
                 <Route path="/courses/:coursesId"
                         render={
-                           (props) => (<ListPageIndex {...this.props} {...props} {...this.state} />)
+                           (props) => (<ListPageIndex {...this.props} {...props} {...this.state} {...common}/>)
                         }
                 ></Route>
 
                 {/*课堂首页*/}
                 <Route path="/courses"
                        render={
-                           (props) => (<CoursesHome {...this.props} {...props} {...this.state} />)
+                           (props) => (<CoursesHome {...this.props} {...props} {...this.state} {...common}/>)
                        }
                 ></Route>
                 {/*<Route exact path="/courses" component={CoursesHome}  {...this.props}  {...props}  {...this.state} ></Route>*/}
@@ -877,4 +897,4 @@ class CoursesIndex extends Component{
     }
 }
 
-export default ImageLayerOfCommentHOC({imgSelector: '.imageLayerParent img, .imageLayerParent .imageTarget', parentSelector: '.newMain'}) (CNotificationHOC() ( SnackbarHOC() ( TPMIndexHOC(CoursesIndex) )));
+export default withRouter(ImageLayerOfCommentHOC({imgSelector: '.imageLayerParent img, .imageLayerParent .imageTarget', parentSelector: '.newMain'}) (CNotificationHOC() ( SnackbarHOC() ( TPMIndexHOC(CoursesIndex) ))));

public/react/src/modules/courses/boards/BoardsNew.js

@@ -181,15 +181,16 @@ class BoardsNew extends Component{
   }
   // 附件相关 START
   handleChange = (info) => {
+    if (info.file.status === 'uploading' || info.file.status === 'done' || info.file.status === 'removed') {
       let fileList = info.fileList;
-    this.setState({ fileList: appendFileSizeToUploadFileAll(fileList)
-    });
+      this.setState({ fileList: appendFileSizeToUploadFileAll(fileList) });
+    }
   }
   onAttachmentRemove = (file) => {
-		if(file.response!=undefined){
-			confirm({
+		if(!file.percent || file.percent == 100){
+			this.props.confirm({
 				// title: '确定要删除这个附件吗?',
-				title: '是否确认删除?',
+				content: '是否确认删除?',
 
 				okText: '确定',
 				cancelText: '取消',

public/react/src/modules/courses/busyWork/CommonWorkAppraise.js

@@ -218,7 +218,8 @@ class CommonWorkAppraise extends Component{
                   </a>
                   <span className="color656565 mt2 color-grey-6 font-12 mr8">{item.filesize}</span>
                   {/*{item.delete===true?<i className="font-14 iconfont  icon-guanbi " id={item.id} aria-hidden="true" onClick={()=>this.onAttachmentRemove(item.id)}></i>:""}*/}
-                  {item.delete===true?<i className="font-14 iconfont  icon-guanbi " style={{display: 'none'}} id={item.id} aria-hidden="true" onClick={()=>this.onAttachmentRemove(item.id)}></i>:""}
+                  {item.delete===true?<i className="font-14 iconfont  icon-guanbi " id={item.id} aria-hidden="true" onClick={()=>this.onAttachmentRemove(item.id)}></i>:""}
+                  {/* style={{display: 'none'}}  */}
                 </div>
               )
             })}

public/react/src/modules/courses/busyWork/CommonWorkPost.js

@@ -291,7 +291,7 @@ class CommonWorkPost extends Component{
   }
   // 附件相关 START
   handleChange = (info) => {
-    if (info.file.status === 'uploading' || info.file.status === 'done') {
+    if (info.file.status === 'uploading' || info.file.status === 'done' || info.file.status === 'removed') {
       let fileList = info.fileList;
 
       this.setState({ fileList: appendFileSizeToUploadFileAll(fileList) });
@@ -320,11 +320,19 @@ class CommonWorkPost extends Component{
     //   ModalSave: ()=>this.deleteAttachment(file),
     //   ModalCancel:this.cancelAttachment
     // })
-		if(file.response!=undefined){
+
+    if(!file.percent || file.percent == 100){
+			this.props.confirm({
+				content: '是否确认删除?',
+				onOk: () => {
 					this.deleteAttachment(file)
+				},
+				onCancel() {
+					console.log('Cancel');
+				},
+			});
 			return false;
 		}
-
   }
 
   cancelAttachment=()=>{

public/react/src/modules/courses/busyWork/NewWork.js

@@ -3,7 +3,8 @@ import { Input, InputNumber, Form, Button, Checkbox, Upload, Icon, message, Moda
 import axios from 'axios'
 import '../css/busyWork.css'
 import '../css/Courses.css'
-import { WordsBtn, getUrl, ConditionToolTip, appendFileSizeToUploadFile, appendFileSizeToUploadFileAll } from 'educoder'
+import { WordsBtn, getUrl, ConditionToolTip, appendFileSizeToUploadFile, appendFileSizeToUploadFileAll
+    , getUploadActionUrl } from 'educoder'
 import TPMMDEditor from '../../tpm/challengesnew/TPMMDEditor';
 import CBreadcrumb from '../common/CBreadcrumb'
 
@@ -234,16 +235,20 @@ class NewWork extends Component{
   }
 
   handleContentUploadChange = (info) => {
+    if (info.file.status === 'uploading' || info.file.status === 'done' || info.file.status === 'removed') {
       let contentFileList = info.fileList;
       this.setState({ contentFileList: appendFileSizeToUploadFileAll(contentFileList) });
     }
+  }
   handleAnswerUploadChange = (info) => {
+    if (info.file.status === 'uploading' || info.file.status === 'done' || info.file.status === 'removed') {
       let answerFileList = info.fileList;
       this.setState({ answerFileList: appendFileSizeToUploadFileAll(answerFileList) });
     }
+  }
   
   onAttachmentRemove = (file, stateName) => {
-		if(file.response!=undefined){
+		if(!file.percent || file.percent == 100){
 			this.props.confirm({
 				content: '是否确认删除?',
 
@@ -331,7 +336,7 @@ class NewWork extends Component{
       // https://github.com/ant-design/ant-design/issues/15505
       // showUploadList={false}，然后外部拿到 fileList 数组自行渲染列表。
       // showUploadList: false,
-      action: `${getUrl()}/api/attachments.json`,
+      action: `${getUploadActionUrl()}`,
       onChange: this.handleContentUploadChange,
       onRemove: (file) => this.onAttachmentRemove(file, 'contentFileList'),
       beforeUpload: (file) => {

public/react/src/modules/courses/completetaskdetails/Completetaskdetails.js

@@ -1,5 +1,5 @@
 import React, {Component} from "react";
-import { WordsBtn,on, off, trigger,markdownToHTML,getImageUrl} from 'educoder';
+import { WordsBtn,on, off, trigger,MarkdownToHtml,getImageUrl} from 'educoder';
 import {
 	Button,
 	Checkbox,
@@ -73,7 +73,8 @@ class Groupjobbandetails extends Component {
 									datas.description===""?
 										<NoneData></NoneData>
 										:
-									<div id="MakedownHTML"className="markdown-body   yslquesHeigth yslquesmarkdowntext"  dangerouslySetInnerHTML={{__html: markdownToHTML(datas.description).replace(/▁/g, "▁▁▁")}}/>
+										<MarkdownToHtml content={datas.description} selector="work_content" className="mb10"></MarkdownToHtml>
+										// <div id="MakedownHTML"className="markdown-body   yslquesHeigth yslquesmarkdowntext"  dangerouslySetInnerHTML={{__html: markdownToHTML(datas.description).replace(/▁/g, "▁▁▁")}}/>
 						)
 					}
 					{/*<div id="MakedownHTML"className="markdown-body   yslquesHeigth yslquesmarkdowntext"  dangerouslySetInnerHTML={{__html: markdownToHTML(datas&&datas.description).replace(/▁/g, "▁▁▁")}}/>*/}

public/react/src/modules/courses/completetaskdetails/Completetaskpage.js

@@ -1,6 +1,6 @@
 import React, {Component} from "react";
 import {Link, NavLink} from 'react-router-dom';
-import {WordsBtn, ActionBtn} from 'educoder';
+import {WordsBtn, ActionBtn,MarkdownToHtml} from 'educoder';
 import axios from 'axios';
 import {
 	notification

public/react/src/modules/courses/comtopicdetails/Completetopicdetails.js

@@ -1,5 +1,5 @@
 import React, {Component} from "react";
-import { WordsBtn,on, off, trigger,markdownToHTML,getImageUrl} from 'educoder';
+import { WordsBtn,on, off, trigger,MarkdownToHtml,getImageUrl} from 'educoder';
 import {
 	Button,
 	Checkbox,
@@ -72,7 +72,9 @@ class Completetopicdetails extends Component {
 									datas.description===""?
 										<NoneData></NoneData>
 										:
-									<div id="MakedownHTML"className="markdown-body   yslquesHeigth yslquesmarkdowntext"  dangerouslySetInnerHTML={{__html: markdownToHTML(datas.description).replace(/▁/g, "▁▁▁")}}/>
+										<MarkdownToHtml content={datas.description} selector="work_content" className="mb10"></MarkdownToHtml>
+
+										// <div id="MakedownHTML"className="markdown-body   yslquesHeigth yslquesmarkdowntext"  dangerouslySetInnerHTML={{__html: markdownToHTML(datas.description).replace(/▁/g, "▁▁▁")}}/>
 						)
 					}
 					{/*<div id="MakedownHTML"className="markdown-body   yslquesHeigth yslquesmarkdowntext"  dangerouslySetInnerHTML={{__html: markdownToHTML(datas&&datas.description).replace(/▁/g, "▁▁▁")}}/>*/}

public/react/src/modules/courses/coursesPublic/AccessoryModal.js

@@ -73,7 +73,7 @@ class AccessoryModal extends Component{
     //   ModalCancel:this.cancelAttachment
     // })
     // return false;
-		if(file.response!=undefined){
+		if(!file.percent || file.percent == 100){
 			this.deleteAttachment(file);
 		}
   }

public/react/src/modules/courses/coursesPublic/AccessoryModal2.js

@@ -64,7 +64,7 @@ class AccessoryModal2 extends Component{
     //   ModalCancel:this.cancelAttachment
     // })
     // return false;
-		if(file.response!=undefined){
+		if(!file.percent || file.percent == 100){
 			this.deleteAttachment(file);
 		}
 

public/react/src/modules/courses/coursesPublic/SelectSetting.js

@@ -296,7 +296,7 @@ class Selectsetting extends Component{
 
 
 	onAttachmentRemove = (file) => {
-		if(file.response!=undefined){
+		if(!file.percent || file.percent == 100){
 			const url = `/attachments/${file.response ? file.response.id : file.uid}.json`
 			axios.delete(url, {
 				})

public/react/src/modules/courses/coursesPublic/sendResource.js

@@ -132,7 +132,7 @@ class Sendresource extends Component{
 
 
 	onAttachmentRemove = (file) => {
-	 if(file.response!=undefined){
+	 if(!file.percent || file.percent == 100){
 		 const url = `/attachments/${file.response ? file.response.id : file.uid}.json`
 		 axios.delete(url, {
 			 })

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

@@ -78,3 +78,4 @@ p span{
 .sourceTag a.active{
   color: #FFFFFF;background-color:#4CACFF; 
 }
+

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

@@ -53,11 +53,15 @@ class ExerciseDisplay extends Component{
   componentDidMount = () => {
     const Id = this.props.match.params.Id    
     if (Id) {
-      const url = `/exercises/${Id}.json`
+      const url = `/${this.props.urlPath || 'exercises'}/${Id}.json`
       axios.get(url)
         .then((response) => {
-          if (response.data.status == 0) {
+          if (response.data.exercise) {
+            response.data.exercise.exercise_description = response.data.exercise.exercise_description || response.data.exercise.description
+            response.data.exercise.exercise_name = response.data.exercise.exercise_name || response.data.exercise.name
+            response.data.exercise.exercise_status = response.data.exercise.exercise_status == undefined ? 1 : response.data.exercise.exercise_status
             this.setState({...response.data})
+            this.props.detailFetchCallback && this.props.detailFetchCallback(response);
           }
         })
         .catch(function (error) {

public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js

@@ -116,7 +116,7 @@ class GraduationTasksSubmitedit extends Component{
 			this.setState({ fileList:appendFileSizeToUploadFileAll(fileList) });
 		}
 
-		if (info.file.status === 'done') {
+		if (info.file.status === 'done' || info.file.status === 'removed') {
 			let fileList = info.fileList;
 			this.setState({ fileList:appendFileSizeToUploadFileAll(fileList) });
 		}
@@ -157,7 +157,7 @@ class GraduationTasksSubmitedit extends Component{
   }
 
 	onAttachmentRemove = (file) => {
-		if(file.response!=undefined){
+		if(!file.percent || file.percent == 100){
 			let {attachments,fileList}=this.state;
 			const url = `/attachments/${file}.json`
 			axios.delete(url, {

public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js

@@ -125,7 +125,7 @@ class GraduationTasksSubmitnew extends Component{
 			this.setState({ fileList:appendFileSizeToUploadFileAll(fileList) });
 		}
 
-		if (info.file.status === 'done') {
+		if (info.file.status === 'done' || info.file.status === 'removed') {
 			let fileList = info.fileList;
 			this.setState({ fileList:appendFileSizeToUploadFileAll(fileList) });
 		}
@@ -146,7 +146,7 @@ class GraduationTasksSubmitnew extends Component{
     //   },
     // });
     // return false;
-		if(file.response!=undefined){
+		if(!file.percent || file.percent == 100){
 			this.setState({
 				Modalstype:true,
 				Modalstopval:'确定要删除这个附件吗?',

public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseMainEditor.js

@@ -88,7 +88,7 @@ class GraduationTasksappraiseMainEditor extends Component{
     this.setState({ fileList });
   }
   onAttachmentRemove = (file, stateName) => {
-		if(file.response!=undefined){
+		if(!file.percent || file.percent == 100){
 			this.props.confirm({
 				content: '确定要删除这个附件吗?',
 				okText: '确定',

public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js

@@ -150,7 +150,7 @@ class GraduationTasksedit extends Component{
   }
 
 	onAttachmentRemove = (file) => {
-		if(file.response!=undefined){
+		if(!file.percent || file.percent == 100){
 			// debugger
 			this.cancelAttachment();
 			const url = `/attachments/${file.response ? file.response.id : file.uid}.json`

public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js

@@ -173,7 +173,7 @@ class GraduationTasksnew extends Component {
 	}
 
 	onAttachmentRemove = (file) => {
-		if(file.response!=undefined){
+		if(!file.percent || file.percent == 100){
 			const url = `/attachments/${file.response ? file.response.id : file.uid}.json`
 			// const url = `/attachments/${file}.json`
 			axios.delete(url, {})

public/react/src/modules/courses/graduation/topics/GraduateTopicNew.js

@@ -216,7 +216,7 @@ class GraduateTopicNew extends Component{
   }
   onAttachmentRemove = (file) => {
 
-		if(file.response!=undefined){
+		if(!file.percent || file.percent == 100){
 			confirm({
 				title: '确定要删除这个附件吗?',
 				okText: '确定',

public/react/src/modules/courses/graduation/topics/GraduateTopicPostWorksNew.js

@@ -163,7 +163,7 @@ class GraduateTopicPostWorksNew extends Component{
     this.setState({ fileList });
   }
   onAttachmentRemove = (file) => {
-		if(file.response!=undefined){
+		if(!file.percent || file.percent == 100){
 			confirm({
 				title: '确定要删除这个附件吗?',
 				okText: '确定',

public/react/src/modules/courses/groupjobbank/Groupjobbandetails.js

@@ -1,5 +1,5 @@
 import React, {Component} from "react";
-import { WordsBtn,on, off, trigger,markdownToHTML,getImageUrl} from 'educoder';
+import { WordsBtn,on, off, trigger,MarkdownToHtml,getImageUrl} from 'educoder';
 import {
 	Button,
 	Checkbox,
@@ -74,7 +74,8 @@ class Groupjobbandetails extends Component {
 									datas.description===""?
 										<NoneData></NoneData>
 										:
-									<div id="MakedownHTML"className="markdown-body   yslquesHeigth yslquesmarkdowntext"  dangerouslySetInnerHTML={{__html: markdownToHTML(datas.description).replace(/▁/g, "▁▁▁")}}/>
+										<MarkdownToHtml content={datas.description} selector="work_content" className="mb10"></MarkdownToHtml>
+									// <div id="MakedownHTML"className="markdown-body   yslquesHeigth yslquesmarkdowntext"  dangerouslySetInnerHTML={{__html: markdownToHTML(datas.description).replace(/▁/g, "▁▁▁")}}/>
 						)
 					}
 					{/*<div id="MakedownHTML"className="markdown-body   yslquesHeigth yslquesmarkdowntext"  dangerouslySetInnerHTML={{__html: markdownToHTML(datas&&(datas.description===null?"无":datas.description==="null"?"无":datas.description)).replace(/▁/g, "▁▁▁")}}/>*/}

public/react/src/modules/courses/groupjobbank/Groupjobquesanswer.js

@@ -1,5 +1,5 @@
 import React, {Component} from "react";
-import { WordsBtn,on, off, trigger,markdownToHTML,getImageUrl} from 'educoder';
+import { WordsBtn,on, off, trigger,MarkdownToHtml,getImageUrl} from 'educoder';
 import {
 	Button,
 	Checkbox,
@@ -71,7 +71,8 @@ class Groupjobquesanswer extends Component {
 									datas.reference_answer===""?
 										<NoneData></NoneData>
 										:
-									<div id="MakedownHTML"className="markdown-body   yslquesHeigth yslquesmarkdowntext"  dangerouslySetInnerHTML={{__html: markdownToHTML(datas.reference_answer).replace(/▁/g, "▁▁▁")}}/>
+										<MarkdownToHtml content={datas.reference_answer} selector="work_content" className="mb10"></MarkdownToHtml>
+										// <div id="MakedownHTML"className="markdown-body   yslquesHeigth yslquesmarkdowntext"  dangerouslySetInnerHTML={{__html: markdownToHTML(datas.reference_answer).replace(/▁/g, "▁▁▁")}}/>
 						)
 					}
 					{/*<div id="MakedownHTML"className="markdown-body   yslquesHeigth yslquesmarkdowntext"  dangerouslySetInnerHTML={{__html: markdownToHTML(datas&&(datas.description===null?"无":datas.description==="null"?"无":datas.description)).replace(/▁/g, "▁▁▁")}}/>*/}

public/react/src/modules/courses/members/modal/CreateGroupByImportModal.js

@@ -73,7 +73,7 @@ class CreateGroupByImportModal extends Component{
   }
 
   onAttachmentRemove = (file) => {
-		if(file.response!=undefined){
+		if(!file.percent || file.percent == 100){
 			this.props.confirm({
 				content: '是否确认删除?',
 

public/react/src/modules/courses/ordering/Ordering.css

@@ -0,0 +1,109 @@
+.color4CACFF{
+    color: #4CACFF !important;
+}
+
+.orderingbox{
+    width:1200px;
+    height:80px;
+    background:rgba(255,255,255,1);
+    box-shadow:3px 3px 3px rgba(237,237,237,1);
+    opacity:1;
+    border-radius:2px 2px 0px 0px;
+    padding: 24px;
+    box-sizing: border-box;
+    line-height: 34px;
+}
+
+.orderingbtnright{
+    width: 90px;
+    height: 38px;
+    background: rgba(255,255,255,1);
+    border: 1px solid rgba(228,228,228,1);
+    box-shadow: 0px 1px 1px rgba(0,0,0,0.16);
+    opacity: 1;
+    border-radius: 4px;
+}
+
+.orderingbtnleft{
+    width: 90px;
+    height: 38px;
+    background: rgba(76,172,255,1);
+    box-shadow: 0px 1px 1px rgba(0,0,0,0.16);
+    opacity: 1;
+    border-radius: 4px;
+}
+.pd1323s{
+    padding: 10px 6px 25px 40px;
+    cursor: pointer;
+}
+
+
+.orderSection{
+    height: 80px;
+    padding-top: 16px;
+}
+
+.ordermidbox{
+    width: 960px;
+    height: 120px;
+    background: rgba(255,255,255,1);
+    /* border: 1px solid rgba(205,205,205,1); */
+    opacity: 1;
+    margin-left:142px;
+}
+
+.orderfonttop{
+    font-size: 16px !important;
+    font-family: Microsoft YaHei;
+    font-weight: bold;
+    line-height: 28px;
+    color: rgba(5,16,26,1);
+    opacity: 1;
+}
+
+.orderfontbom{
+    font-size:14px;
+    font-family:Microsoft YaHei;
+    font-weight:400;
+    line-height:25px;
+    color:rgba(153,153,153,1);
+    opacity:1;
+}
+
+.ordermidbox:hover {
+    box-shadow: 0px 2px 6px rgba(51,51,51,0.09);
+    opacity: 1;
+}
+
+.mb200{
+    margin-bottom: 200px;
+}
+
+.maxwidth865s{
+    max-width: 865px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
+.maxwidth795 {
+    max-width:795px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    display: inline-block;
+}
+
+.ordermidbox:active{
+    background:rgba(248,247,255,1);
+    border:1px solid rgba(76,172,255,1);
+}
+
+.ordermidbox:focus{
+    background:rgba(248,247,255,1);
+    border:1px solid rgba(76,172,255,1);
+}
+
+.ordermiddiv{
+    min-height: 500px;
+}

public/react/src/modules/courses/ordering/Ordering.js

@@ -0,0 +1,296 @@
+import React,{ Component } from "react";
+import { Input,Checkbox,Table, Pagination, Modal,Menu, Tooltip,Spin,Breadcrumb,Button } from "antd";
+import { WordsBtn,on, off, trigger } from 'educoder';
+import { DragDropContext,Draggable, Droppable} from 'react-beautiful-dnd';
+import axios from'axios';
+import Modals from '../../modals/Modals';
+import '../css/members.css';
+import '../css/busyWork.css';
+import './Ordering.css';
+import NoneData from "../coursesPublic/NoneData";
+
+const reorder = (list, startIndex, endIndex) => {
+	const result = Array.from(list);
+	const [removed] = result.splice(startIndex, 1);
+	result.splice(endIndex, 0, removed);
+
+	return result;
+};
+
+class Ordering extends Component{
+	constructor(props){
+		super(props);
+		this.state={
+			isSpin:false,
+			antIcon:false,
+			datas:undefined,
+			windowsscrollTop:false,
+			newtask_ids:[]
+		}
+	}
+
+	componentDidMount() {
+		this.setState({
+			isSpin:true
+		})
+
+    let coursesId=this.props.match.params.coursesId;
+		let ordering_type=this.props.match.params.ordering_type;
+		let url=`/courses/${coursesId}/tasks_list.json`;
+		axios.get((url),{params:{
+				container_type:ordering_type
+			}}).then((result)=>{
+			if(result){
+				this.setState({
+					datas:result.data.tasks,
+					isSpin:false
+				})
+			}
+		}).catch((error)=>{
+			console.log(error);
+			this.setState({
+				isSpin:false
+			})
+		})
+
+		window.addEventListener('scroll', this.handleScroll.bind(this)) //监听滚动
+		// window.addEventListener('resize', this.handleResize.bind(this)) //监听窗口大小改变
+	}
+
+
+	// componentWillUnmount() { //一定要最后移除监听器，以防多个组件之间导致this的指向紊乱
+	// 	window.removeEventListener('scroll', this.handleScroll.bind(this))
+	// 	window.removeEventListener('resize', this.handleResize.bind(this))
+	// }
+
+	handleScroll=(e)=>{
+		// console.log(
+		// 	'浏览器滚动事件',
+		// 	e.srcElement.scrollingElement.scrollTop,
+		// 	e.srcElement.scrollingElement.scrollHeight
+		// )
+		//e.srcElement.scrollingElement.scrollTop为距离滚动条顶部高度
+		// e.srcElement.scrollingElement.scrollHeight为整个文档高度
+
+		if(e.srcElement.scrollingElement.scrollTop>60){
+			this.setState({
+					windowsscrollTop:true,
+			})
+	   }
+
+	   if(e.srcElement.scrollingElement.scrollTop===0){
+			 this.setState({
+				 windowsscrollTop:false
+			 })
+		 }
+	}
+	//
+	// handleResize = e => {
+	// 	console.log('浏览器窗口大小改变事件', e.target.innerWidth)
+	// }
+
+
+
+	onDragEnd=(result)=>{
+
+		if(result.destination!=null&&result.destination!=undefined){
+			let {datas}=this.state;
+			if (!result.destination) {
+				console.log('dropped outside the list')
+				return;
+			}
+			if (result.destination.index === result.source.index) {
+				console.log('the same')
+				return;
+			}
+			const shixuns_list = reorder(
+				datas,
+				result.source.index,
+				result.destination.index
+			);
+
+			let newtask_ids=[]
+			shixuns_list.map((item,key)=>{
+				newtask_ids.push(item.task_id)
+			})
+
+			this.setState({
+				datas:shixuns_list,
+				newtask_ids:newtask_ids
+			})
+		}
+
+	}
+
+	updatalist=()=>{
+
+		let {datas,newtask_ids,isSpin}=this.state;
+		if(newtask_ids.length===0){
+			this.props.showNotification("请先移动需要排序的实训作业任务");
+			return
+		}
+
+		if(isSpin===true){
+			return
+		}
+
+		this.setState({
+			isSpin:true
+		})
+		let coursesId=this.props.match.params.coursesId;
+		let ordering_type=this.props.match.params.ordering_type;
+		let url=`/courses/${coursesId}/update_task_position.json`;
+		axios.post(url,{
+			container_type:ordering_type,
+			task_ids:newtask_ids
+		}).then((result)=>{
+			if(result.data.status===0){
+				this.props.showNotification(result.data.message);
+				this.setState({
+					isSpin:false,
+					datas:datas,
+					newtask_ids:[]
+				});
+			}else{
+				this.setState({
+					isSpin:false,
+				});
+			}
+
+		}).catch((error)=>{
+			this.setState({
+				isSpin:false,
+			});
+		})
+
+	}
+
+	goback=()=>{
+		 window.location.href=`/courses/${this.props.match.params.coursesId}/shixun_homeworks/${this.props.match.params.main_id}`
+	}
+
+
+	render(){
+		let {
+			datas,
+			Modalstype,
+			windowsscrollTop,
+		}=this.state;
+
+		let main_id=this.props.match.params.main_id;
+		let category_id=this.props.match.params.category_id;
+
+		console.log(this.props)
+		console.log(window)
+
+		let positiontype=null;
+
+		if(windowsscrollTop===true){
+			positiontype={position:'fixed',zIndex:'9000',left:'20%',top: '0px'}
+		}else{
+			positiontype={}
+		}
+		return(
+
+				<div className={"mb200"}>
+					{/*提示*/}
+					{Modalstype&&Modalstype===true?<Modals
+						modalsType={this.state.Modalstype}
+						modalsTopval={this.state.Modalstopval}
+						modalCancel={this.state.ModalCancel}
+						modalSave={this.state.ModalSave}
+						modalsBottomval={this.state.ModalsBottomval}
+						loadtype={this.state.Loadtype}
+						antIcon={this.state.antIcon}
+					/>:""}
+
+
+					<div className="educontent clearfix">
+
+						{windowsscrollTop===false?<div className={"mt20 mb20"}>
+
+								<Breadcrumb separator=">">
+									<Breadcrumb.Item href={this.props.current_user&&this.props.current_user.first_category_url}>{this.props.current_user&&this.props.current_user.course_name}</Breadcrumb.Item>
+									<Breadcrumb.Item href={`/courses/${this.props.match.params.coursesId}/shixun_homeworks/${this.props.match.params.main_id}`}>实训作业</Breadcrumb.Item>
+									<Breadcrumb.Item>调整排序</Breadcrumb.Item>
+								</Breadcrumb>
+
+						</div>:""}
+
+
+						<p className="clearfix bor-bottom-greyE edu-back-white orderingbox"
+						   style={positiontype}
+						>
+							   <span>温馨提示：请在列表中长按鼠标左键，进行拖放排序。完成排序后请点击“保存”</span>
+									<Button className="fr orderingbtnleft" type="primary" onClick={()=>this.updatalist()}>保存</Button>
+									<Button className="fr mr30 orderingbtnright" onClick={()=>this.goback()}>取消</Button>
+						</p>
+
+
+					</div>
+
+					<Spin size="large" spinning={this.state.isSpin} >
+						<DragDropContext onDragEnd={this.onDragEnd} >
+							<Droppable droppableId={this.props.match.params.ordering_type}>
+								{(provided, snapshot) => (
+									<div
+										ref={provided.innerRef}
+										{...provided.droppableProps}
+										className={"educontent mb50 mt40 droppableul ordermiddiv"}
+										onScroll={this.contentViewScrolledit}
+									>
+										{datas===undefined?"":
+											 datas.map((item, index) => {
+												return (
+													<Draggable
+														key={item.task_id}
+														draggableId={item.task_id}
+														index={index}
+														className={"TabsWarps"}
+													>
+														{(provided, snapshot) => (
+															<div className={"mt30 edu-back-white pd1323s relativef ordermidbox"}
+																	 key={index}
+																	 ref={provided.innerRef}
+																	 {...provided.draggableProps}
+																	 {...provided.dragHandleProps}
+															>
+																<div className={"clearfix"}>
+																	<div className={"item-body"}>
+																		<div className={"clearfix ds pr orderSection"}>
+																			<p title={item.task_name} className="font-16  color-dark maxwidth865s orderfonttop"
+																				 href={`/courses/${this.props.match.params.coursesId}/shixun_homeworks/${item.task_id}/list?tab=0`}>{item.task_name}</p>
+																			<p className={"color-grey panel-lightgrey mt16  "}>
+																			<span className="topicswidth400">
+																				<span className="topsics100 color-grey9 orderfontbom mr20 maxwidth795">{item.user_name}</span>
+																				<span className="mr50 color-grey9 orderfontbom maxwidth795">{item.category}</span>
+																			</span>
+																			</p>
+																		</div>
+																	</div>
+																</div>
+															</div>
+														)}
+													</Draggable>
+												)
+											})
+
+										}
+									</div>
+								)}
+							</Droppable>
+						</DragDropContext>
+
+
+
+						{
+							datas===undefined?"":datas.length===0? <NoneData></NoneData>:""
+						}
+
+					</Spin>
+
+				</div>
+		)
+	}
+}
+export default Ordering;

public/react/src/modules/courses/poll/PollNewQuestbank.js

@@ -1014,6 +1014,7 @@ class PollNewQuestbank extends Component {
 
 					return;
 				}
+
 				if(object.question.max_choices){
 					if(object.question.max_choices>0){
 						if(object.question.min_choices){
@@ -1244,6 +1245,7 @@ class PollNewQuestbank extends Component {
 
 					return;
 				}
+
 				if(object.question.max_choices){
 					if(object.question.max_choices>0){
 						if(object.question.min_choices){
@@ -1563,6 +1565,8 @@ class PollNewQuestbank extends Component {
 
 					return;
 				}
+
+
 				if(object.question.max_choices){
 					if(object.question.max_choices>0){
 						if(object.question.min_choices){
@@ -1594,6 +1598,7 @@ class PollNewQuestbank extends Component {
 					}
 
 				}
+
 				var questiontwo = {};
 				var other = [];
 				var option = [];
@@ -1764,6 +1769,8 @@ class PollNewQuestbank extends Component {
 
 					return;
 				}
+
+
 				if(object.question.max_choices){
 					if(object.question.max_choices>0){
 						if(object.question.min_choices){
@@ -1958,8 +1965,8 @@ class PollNewQuestbank extends Component {
 					question_title: object.question.question_title,
 					question_type: number,
 					is_necessary: object.question.is_necessary,
-					max_choices: max_choicess===undefined?length:max_choicess===null?length:max_choicess===0?length:max_choicess,
-					min_choices: min_choicess===undefined?2:min_choicess===null?2:min_choicess===0?2:min_choicess,
+					max_choices: max_choicess===undefined||max_choicess===null||max_choicess===0||max_choicess==="0"?null:max_choicess,
+					min_choices: min_choicess===undefined||min_choicess===null||min_choicess===0||min_choicess==="0"?null:min_choicess,
 					question_answers: option,
 					question_other_answer: null,
 					insert_id: insert_id
@@ -2030,8 +2037,8 @@ class PollNewQuestbank extends Component {
 					question_title: object.question.question_title,
 					question_type: number,
 					is_necessary: object.question.is_necessary,
-					max_choices: max_choicess===undefined?length:max_choicess===null?length:max_choicess===0?length:max_choicess,
-					min_choices: min_choicess===undefined?2:min_choicess===null?2:min_choicess===0?2:min_choicess,
+					max_choices: max_choicess===undefined||max_choicess===null||max_choicess===0||max_choicess==="0"?null:max_choicess,
+					min_choices: min_choicess===undefined||min_choicess===null||min_choicess===0||min_choicess==="0"?null:min_choicess,
 					question_answers: option,
 					question_other_answer: null,
 				};
@@ -2401,7 +2408,6 @@ class PollNewQuestbank extends Component {
 		})
 		// }
 
-
 	}
 
 	//最大值
@@ -2439,6 +2445,7 @@ class PollNewQuestbank extends Component {
 		this.setState({
 			adddom: arr
 		})
+		// console.log(this.state.adddom);
 	}
 
 	//提交题目//没有就创建新的题库，新建问newz题和保存题目不一样不能同时保存 这里只是新建 和编辑 标题和须知
@@ -2968,13 +2975,8 @@ class PollNewQuestbank extends Component {
 										className="color-grey-9 fl">{item.question.question_type === 1 ? "单选题" : item.question.question_type === 2 ? "多选题" : "主观题"}</span>
 									<span
 										className=" ml10">{item.question.is_necessary === 1 ? "(必答)" : item.question.question_type === 2 ? "(选答)" : "(选答)"}</span>
-									{
-										item.question.question_type === 2?
 									<span style={{color: "#4B4B4B"}}
 												className="font-16 mt10 ml10">{(item.question.min_choices === undefined && item.question.max_choices === undefined ? "不限制" : item.question.min_choices === null && item.question.max_choices === null ? "不限制" : item.question.min_choices === 0 && item.question.max_choices === 0 ? "": item.question.min_choices === "null" && item.question.max_choices === "null" ? "不限制" : item.question.min_choices === item.question.max_choices && item.question.max_choices ===  item.question.min_choices  ? "可选"+(item.question.max_choices)+"项" : "可选" +(item.question.min_choices===undefined||item.question.min_choices===null||item.question.min_choices===""||item.question.min_choices==="null"?2:item.question.min_choices) + "-" + (item.question.max_choices===undefined||item.question.max_choices===null||item.question.max_choices===""||item.question.max_choices==="null"?item.question.answers.length:item.question.max_choices) + "项")}</span>
-											: ""
-									}
-
 									{
 										polls_status === undefined || polls_status === 1 ?
 											<span className="fr">
@@ -3168,12 +3170,12 @@ class PollNewQuestbank extends Component {
 																								{
 																									itemo.question.answers[itemo.question.answers.length - 1].answer_text === "其他" && itemo.question.answers.length - 2 === indext ?
 
-																										<a className="lineh-40 ml10"
+																										<a className="lineh-40"
 																											 onClick={() => this.Ewoption(itemo.question.id, itemo)}><Tooltip
 																											title="新增" placement={"bottom"}><i
 																											className="color-green font-18 iconfont icon-roundaddfill"></i></Tooltip></a>
 																										: itemo.question.answers.length - 1 === indext ?
-																										<a className="lineh-40 ml10"
+																										<a className="lineh-40"
 																											 onClick={() => this.Ewoption(itemo.question.id, itemo)}><Tooltip
 																											title="新增" placement={"bottom"}><i
 																											className="color-green font-18 iconfont icon-roundaddfill"></i></Tooltip></a>
@@ -3182,7 +3184,7 @@ class PollNewQuestbank extends Component {
 																								}
 																									</span>
 																							: indext === 1 && itemo.question.answers.length === 2 || indext === 1 && itemo.question.answers.length === 3 ?
-																							<a className="lineh-40 ml10"
+																							<a className="lineh-40"
 																								 onClick={() => this.Ewoption(itemo.question.id, itemo)}><Tooltip
 																								title="新增" placement={"bottom"}><i
 																								className="color-green font-18 iconfont icon-roundaddfill"></i></Tooltip></a> : ""
@@ -3231,7 +3233,7 @@ class PollNewQuestbank extends Component {
                                                         <span
 																													className="color-grey-6 mr20 font-16 lineh-40 fl">可选</span>
 																								<div className="mr40 flex1 ">
-																									{/*可选最小*/}
+																									{/*可选最小1*/}
 																									<style>
 																										{
 																											`
@@ -3250,7 +3252,6 @@ class PollNewQuestbank extends Component {
 																									<Select className="fl  w100"
 																													onChange={(value) => this.HandleGradationGroupChangee(value, indexo, itemo.question.max_choices, itemo.question.answers.length)}
 																													value={itemo.question.min_choices === null || itemo.question.min_choices === undefined ||itemo.question.min_choices === "null"|| itemo.question.min_choices === 0 || itemo.question.min_choices === "0"?"0": itemo.question.min_choices}
-
 																									>
 																										<Option value={String("0")}>--</Option>
 																										{itemo.question.answers === undefined ? "" : itemo.question.answers.map((itemt, indext) => {
@@ -3262,7 +3263,7 @@ class PollNewQuestbank extends Component {
 																									</Select>
 																									<span
 																										className="ml10 mr10 color-grey-6 lineh-40 fl">~</span>
-																									{/*可选最大*/}
+																									{/*可选最大1*/}
 																									<Select className="fl w100"
 																													onChange={(value) => this.HandleGradationGroupChangeee(value, indexo, itemo.question.min_choices,itemo.question.answers.length)}
 																													value={itemo.question.max_choices === null || itemo.question.max_choices === undefined ||itemo.question.max_choices === "null"|| itemo.question.max_choices === 0 || itemo.question.max_choices === "0"?"0": itemo.question.max_choices}
@@ -3477,12 +3478,12 @@ class PollNewQuestbank extends Component {
 																								className="iconfont icon-htmal5icon19 font-22 color-grey-c"></i></Tooltip></a>
 																								{
 																									itemo.question.answers[itemo.question.answers.length - 1].answer_text === "其他" && itemo.question.answers.length - 2 === indext ?
-																										<a className="lineh-40 ml10"
+																										<a className="lineh-40"
 																											 onClick={() => this.Ewoption(itemo.question.id, itemo)}><Tooltip
 																											title="新增" placement={"bottom"}><i
 																											className="color-green font-18 iconfont icon-roundaddfill"></i></Tooltip></a>
 																										: itemo.question.answers.length - 1 === indext ?
-																										<a className="lineh-40 ml10"
+																										<a className="lineh-40"
 																											 onClick={() => this.Ewoption(itemo.question.id, itemo)}><Tooltip
 																											title="新增" placement={"bottom"}><i
 																											className="color-green font-18 iconfont icon-roundaddfill"></i></Tooltip></a>
@@ -3492,7 +3493,7 @@ class PollNewQuestbank extends Component {
 																								}
 																									</span>
 																							: indext === 1 && itemo.question.answers.length === 2 || indext === 1 && itemo.question.answers.length === 3 ?
-																							<a className="lineh-40 ml10"
+																							<a className="lineh-40 "
 																								 onClick={() => this.Ewoption(itemo.question.id, itemo)}><Tooltip
 																								title="新增" placement={"bottom"}><i
 																								className="color-green font-18 iconfont icon-roundaddfill"></i></Tooltip></a> : ""
@@ -3541,7 +3542,7 @@ class PollNewQuestbank extends Component {
                                                         <span
 																													className="color-grey-6 mr20 font-16 lineh-40 fl">可选</span>
 																								<div className="mr40 flex1 ">
-																									{/*可选最小*/}
+																									{/*可选最小2*/}
 																									<style>
 																										{
 																											`
@@ -3571,7 +3572,7 @@ class PollNewQuestbank extends Component {
 																									</Select>
 																									<span
 																										className="ml10 mr10 color-grey-6 lineh-40 fl">~</span>
-																									{/*可选最大*/}
+																									{/*可选最大2*/}
 																									<Select className="fl w100"
 																													onChange={(value) => this.HandleGradationGroupChangeee(value, indexo, itemo.question.min_choices,itemo.question.answers.length)}
 																													value={itemo.question.max_choices === null || itemo.question.max_choices === undefined ||itemo.question.max_choices === "null"|| itemo.question.max_choices === 0 || itemo.question.max_choices === "0"?"0": itemo.question.max_choices}
@@ -3790,14 +3791,14 @@ class PollNewQuestbank extends Component {
 																				 className="iconfont icon-htmal5icon19 font-22 color-grey-c "></i></Tooltip></a>
 																				{
 																					itemo.question.answers[itemo.question.answers.length - 1].answer_text === "其他" && itemo.question.answers.length - 2 === indext ?
-																						<a className="lineh-40 ml10"
+																						<a className="lineh-40"
 																							 onClick={() => this.Ewoption(itemo.question.id, itemo)}><Tooltip
 																							title="新增"
 																							placement={"bottom"}><i
 																							className="color-green font-18 iconfont icon-roundaddfill"></i></Tooltip></a>
 																						:
 																						itemo.question.answers.length - 1 === indext ?
-																							<a className="lineh-40 ml10"
+																							<a className="lineh-40"
 																								 onClick={() => this.Ewoption(itemo.question.id, itemo)}><Tooltip
 																								title="新增"
 																								placement={"bottom"}><i
@@ -3809,7 +3810,7 @@ class PollNewQuestbank extends Component {
 																				}
 																					 </span>
 																			: indext === 1 && itemo.question.answers.length === 2 || indext === 1 && itemo.question.answers.length === 3 ?
-																				<a className="lineh-40 ml10"
+																				<a className="lineh-40"
 																					 onClick={() => this.Ewoption(itemo.question.id, itemo)}><Tooltip
 																					title="新增"
 																					placement={"bottom"}><i
@@ -3860,7 +3861,7 @@ class PollNewQuestbank extends Component {
                                                         <span
 																													className="color-grey-6 mr20 font-16 lineh-40 fl">可选</span>
 																				<div className="mr40 flex1 ">
-																					{/*可选最小*/}
+																					{/*可选最小3*/}
 																					<style>
 																						{
 																							`
@@ -3879,7 +3880,6 @@ class PollNewQuestbank extends Component {
 																					<Select className="fl  w100"
 																									onChange={(value) => this.HandleGradationGroupChangee(value, indexo, itemo.question.max_choices, itemo.question.answers.length)}
 																									value={itemo.question.min_choices === null || itemo.question.min_choices === undefined ||itemo.question.min_choices === "null"|| itemo.question.min_choices === 0 || itemo.question.min_choices === "0"?"0": itemo.question.min_choices}
-
 																					>
 																						<Option value={String("0")}>--</Option>
 																						{itemo.question.answers === undefined ? "" : itemo.question.answers.map((itemt, indext) => {
@@ -3891,7 +3891,7 @@ class PollNewQuestbank extends Component {
 																					</Select>
 																					<span
 																						className="ml10 mr10 color-grey-6 lineh-40 fl">~</span>
-																					{/*可选最大*/}
+																					{/*可选最大3*/}
 																					<Select className="fl w100"
 																									onChange={(value) => this.HandleGradationGroupChangeee(value, indexo, itemo.question.min_choices,itemo.question.answers.length)}
 																									value={itemo.question.max_choices === null || itemo.question.max_choices === undefined ||itemo.question.max_choices === "null"|| itemo.question.max_choices === 0 || itemo.question.max_choices === "0"?"0": itemo.question.max_choices}

public/react/src/modules/courses/questionbank/Generaljobanswer.js

@@ -1,5 +1,5 @@
 import React, {Component} from "react";
-import { WordsBtn,on, off, trigger,markdownToHTML,getImageUrl} from 'educoder';
+import { WordsBtn,on, off, trigger,MarkdownToHtml,getImageUrl} from 'educoder';
 import {
 	Button,
 	Checkbox,
@@ -30,7 +30,7 @@ class Generaljobanswer extends Component {
 		console.log("componentDidMount");
 		// let query = this.props.location.pathname;
 		// const type = query.split('/');
-		// this.setState({
+		// this.setState({n
 		// 	shixuntypes:type[3]
 		// })
 		// this.props.triggerRef(this);
@@ -70,7 +70,9 @@ class Generaljobanswer extends Component {
 									datas.reference_answer===""?
 										<NoneData></NoneData>
 									:
-									<div id="MakedownHTML"className="markdown-body   yslquesHeigth yslquesmarkdowntext"  dangerouslySetInnerHTML={{__html: markdownToHTML(datas.reference_answer).replace(/▁/g, "▁▁▁")}}/>
+										<MarkdownToHtml content={datas.reference_answer} selector="work_content" className="mb10"></MarkdownToHtml>
+
+										// <div id="MakedownHTML"className="markdown-body   yslquesHeigth yslquesmarkdowntext"  dangerouslySetInnerHTML={{__html: markdownToHTML(datas.reference_answer).replace(/▁/g, "▁▁▁")}}/>
 						)
 					}
 					{/*<div id="MakedownHTML"className="markdown-body   yslquesHeigth yslquesmarkdowntext"  dangerouslySetInnerHTML={{__html: markdownToHTML(datas&&(datas.reference_answer===null?"无":datas.reference_answer==="null"?"无":datas.reference_answer)).replace(/▁/g, "▁▁▁")}}/>*/}

public/react/src/modules/courses/questionbank/Generaljobdetails.js

@@ -1,5 +1,5 @@
 import React, {Component} from "react";
-import { WordsBtn,on, off, trigger,markdownToHTML,getImageUrl} from 'educoder';
+import { WordsBtn,on, off, trigger,markdownToHTML, MarkdownToHtml ,getImageUrl} from 'educoder';
 import {
 	Button,
 	Checkbox,
@@ -67,7 +67,8 @@ class Generaljobdetails extends Component {
 									<NoneData></NoneData>
 									:datas&&datas.description===""?
 										<NoneData></NoneData>:
-							<div id="MakedownHTML"className="markdown-body   yslquesHeigth yslquesmarkdowntext"  dangerouslySetInnerHTML={{__html: markdownToHTML(datas.description).replace(/▁/g, "▁▁▁")}}/>
+									<MarkdownToHtml content={datas.description} selector="work_content" className="mb10"></MarkdownToHtml>
+							// <div id="MakedownHTML "className="markdown-body   yslquesHeigth yslquesmarkdowntext"  dangerouslySetInnerHTML={{__html: markdownToHTML(datas.description).replace(/▁/g, "▁▁▁")}}/>
 							)
 					}
 					<div className="mt16px">

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

@@ -26,4 +26,5 @@
 }
 .mt16px{
     margin-top: 16px;
+    padding-bottom: 30px;
 }

public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js

@@ -2499,6 +2499,8 @@ class Listofworksstudentone extends Component {
 		// console.log(data);
 		// console.log(datas);
 		// console.log(this.props.isAdmin());
+		console.log("学生老师列表");
+
 		return (
 			this.props.isAdmin() === true ?
 				(

public/react/src/modules/courses/shixunHomework/shixunHomework.js

@@ -1,7 +1,7 @@
 import React,{ Component } from "react";
 import { Input,Checkbox,Table, Pagination, Modal,Menu, Tooltip,Spin } from "antd";
 import { WordsBtn,on, off, trigger } from 'educoder';
-import CourseLayoutcomponent from '../common/CourseLayoutComponent';
+import {BrowserRouter as Router,Route,Switch,Link} from 'react-router-dom';
 import axios from'axios';
 import HomeworkModal from "../coursesPublic/HomeworkModal";
 import ShixunModal from "../coursesPublic/ShixunModal";
@@ -936,6 +936,7 @@ class ShixunHomework extends Component{
 
 		let main_id=this.props.match.params.main_id;
 		let category_id=this.props.match.params.category_id;
+
     return(
       <React.Fragment  >
       <div>
@@ -1038,6 +1039,13 @@ class ShixunHomework extends Component{
               <li className="fr">
 								{this.props.isAdmin()===true?datas&&datas.category_name===undefined||datas&&datas.category_name===null?
 									<span>
+                    <WordsBtn style="blue" className={"mr30 font-16"}>
+											<Link className="color4CACFF" to={`/courses/${this.props.match.params.coursesId}/ordering/shixun_homework/${main_id&&main_id}`}>调整排序</Link>
+                    </WordsBtn>
+                  </span>:"":""}
+
+              {this.props.isAdmin()===true?datas&&datas.category_name===undefined||datas&&datas.category_name===null?
+                  <span>
                     <WordsBtn style="blue" onClick={()=>this.addDir()} className={"mr30 font-16"}>添加目录</WordsBtn>
                     {/*<WordsBtn style="blue" onClick={()=>this.editname(datas&&datas.main_category_name)} className={"mr30"}>目录重命名</WordsBtn>*/}
                   </span>:

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

@@ -553,7 +553,7 @@ class MemoNew extends Component {
       return attachments;
     }
     handleChange = (info) => {
-      if (info.file.status === 'uploading' || info.file.status === 'done') {
+      if (info.file.status === 'uploading' || info.file.status === 'done' || info.file.status === 'removed') {
         let fileList = info.fileList;
         this.setState({ 
           fileList: appendFileSizeToUploadFileAll(fileList)
@@ -561,7 +561,7 @@ class MemoNew extends Component {
       }
     }
     onAttachmentRemove = (file) => {
-			if(file.response!=undefined){
+			if(!file.percent || file.percent == 100){
 				this.props.confirm({
 					// title: '确定要删除这个附件吗?',
 					content: '是否确认删除?',

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

@@ -47,7 +47,7 @@ class CaseNew extends Component{
 
   // 上传附件-删除确认框
   onAttachmentRemove = (file, stateName) => {
-    if(file.response!=undefined){
+    if(!file.percent || file.percent == 100){
       this.props.confirm({
         content: '是否确认删除?',
         onOk: () => {
@@ -92,7 +92,7 @@ class CaseNew extends Component{
   }
   // 上传附件-change
   handleContentUploadChange = (info) => {
-    if (info.file.status === 'done' || info.file.status === 'uploading') {
+    if (info.file.status === 'done' || info.file.status === 'uploading' || info.file.status === 'removed') {
       let contentFileList = info.fileList;
       this.setState({ contentFileList: appendFileSizeToUploadFileAll(contentFileList)});
       let list = appendFileSizeToUploadFileAll(contentFileList);

public/react/src/modules/topic_bank/Topic_bank.js

@@ -30,8 +30,6 @@ class Topic_bank extends Component {
 			<div className="newMain clearfix">
 
 				<Switch>
-					{/*众包首页*/}
-
 					<Route path="/topicbank/:username/:topicstype"
 								 render={
 									 (props) => (<PackageIndex {...this.props} {...props} {...this.state} />)

public/react/src/modules/tpm/TPMsettings/TPMsettings.js

@@ -1384,7 +1384,7 @@ export default class TPMsettings extends Component {
 	}
 
 	onAttachmentRemove = (file) => {
-		if(file.response!=undefined){
+		if(!file.percent || file.percent == 100){
 			confirm({
 				title: '确定要删除这个附件吗?',
 				okText: '确定',

public/react/src/modules/tpm/newshixuns/Newshixuns.js

@@ -772,7 +772,7 @@ class Newshixuns extends Component {
 
     }
     onAttachmentRemove = (file) => {
-			if(file.response!=undefined){
+			if(!file.percent || file.percent == 100){
 				confirm({
 					title: '确定要删除这个附件吗?',
 					okText: '确定',

public/react/src/modules/user/usersInfo/InfosBanner.js

@@ -118,7 +118,7 @@ class InfosBanner extends Component{
                 to={`/users/${username}/videos`}>视频</Link>
             </li>}
 
-            自己的主页且不是学生显示题库按钮
+            {/*自己的主页且不是学生显示题库按钮*/}
 						{ user_id===targetuserid&&user_type!="学生"?<li className={`${moduleName == 'topics' ? 'active' : '' }`}>
 							<Link
 								onClick={() => this.setState({moduleName: 'topics'})}

public/react/src/modules/user/usersInfo/InfosTopics.js

@@ -79,7 +79,8 @@ class InfosTopics extends Component{
 				}
 			}).then((response) => {
 				this.setState({
-					data:response.data
+					data:response.data,
+					checkBoxValues:[]
 				})
 			}).catch((error) => {
 
@@ -90,12 +91,13 @@ class InfosTopics extends Component{
 
 	searchCategory=(type)=>{
 		this.setState({
-			category:type
+			category:type,
+			course_list_id:undefined,
 		})
 
 		let types=this.props.match.params.topicstype;
 		let { category,course_list_id,sort_by,sort_direction,page}=this.state;
-		this.searchAlldata(types,type,course_list_id,sort_by,sort_direction,page)
+		this.searchAlldata(types,type,undefined,sort_by,sort_direction,page)
 	}
 
 	searchCourselistid=(id)=>{
@@ -333,15 +335,28 @@ class InfosTopics extends Component{
 
 					{
 						`
+						  ::-webkit-scrollbar-thumb {
+									background-color: #cde5fe;
+
+									box-shadow: 0px 0px black;
+							}
+
+
+							::-webkit-scrollbar-track {
+									-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0);
+									background-color: #fff;
+							}
+
 							.shaiContent li.shaiItem {
-									padding: 3px 15px;
+					    padding: 0px 15px;
 							float: left;
 							border-radius: 4px;
 							color: #4C4C4C;
 							cursor: pointer;
 							margin-right: 20px;
 							display: block;
-									margin-bottom: 5px;
+							margin-bottom: 0px;
+					    color: #666;
 							}
 
 							.mr38{
@@ -371,7 +386,7 @@ class InfosTopics extends Component{
 					<div className="clearfix topicsbox">
 						{types==="publicly"?<div className={"topcschild"}>
 							<a className={types==="personal"?"topicstopfont fr topcsactive":"topicstopfont fr"}
-								 href={`/users/${username}/topics/personal`}>个人题库</a>
+								 href={`/users/${username}/topics/personal`}>我的题库</a>
 							<a className={types==="publicly"?"topicstopfont fl topcsactive":"topicstopfont fl"}
 							>公共题库</a>
 						</div>:<div className={"topcschild"}>
@@ -394,9 +409,9 @@ class InfosTopics extends Component{
 
 							</div>
 
-								<div className={"shaiContent"}>
-									<div className="fl pr topicsItem pagetype mb20">
-										<li className={course_list_id===undefined?"shaiItem shixun_repertoire active":"shaiItem shixun_repertoire"}  onClick={()=>this.searchCourselistid(undefined)}>全部</li>
+								<div className={data===undefined?"":data.course_list===undefined||data.course_list.length===0?"shaiContent mb45":"shaiContent"}>
+									<li className={course_list_id===undefined?"shaiItem shixun_repertoire active fl":"shaiItem shixun_repertoire fl"}  onClick={()=>this.searchCourselistid(undefined)}>全部</li>
+									<div className="fl pr topicsItem mb20">
 										{data===undefined?"":data.course_list===undefined||data.course_list.length===0?"":data.course_list.map((item,key)=>{
 											return(
 												<li key={key} className={course_list_id===item.id?"shaiItem shixun_repertoire active":"shaiItem shixun_repertoire"} onClick={()=>this.searchCourselistid(item.id)}>{item.name}</li>
@@ -471,18 +486,20 @@ class InfosTopics extends Component{
 
 										{item.is_public===true?<span className="edu-filter-btn ml15 fl typestyle mt3 topiscfilterbtn">公开</span>:""}
 
-										{types==="personal"&&item.is_public===false?user_id===targetuserid&&user_type!="学生"?<a className="btn colorblue mr25 fr font-16" onClick={()=>this.openTopics(item.id)}>设为公开</a>:"":""}
+
 
 										<div className="cl"></div>
 
 										<p className="color-grey panel-lightgrey mt16 fl">
-											<span className={types==="personal"?"topicswidth300":"topicswidth400"}>
-												 {types==="publicly"?<span className="topsics100 color-grey9">{item.creator_name}</span>:""}
+											<span className={"topicswidth600"}>
+												 {types==="publicly"?<span className="topsics135 color-grey9 mr50">{item.creator_name}</span>:""}
 												 <span className="mr50 color-grey9">{item.quotes_count}  次引用</span>
 												 <span className="mr50 color-grey9">{item.solve_count}  次答题</span>
 											   <span className="mr50 color-grey9">{moment(item.updated_at).fromNow()}</span>
 											</span>
-											<span className="topicsbtn">{item.course_list_name}</span>
+											{item.course_list_name===null?"":<span className={"topsicrelative topsicinline"} title={item.course_list_name}>
+												<div className={types==="personal"?"topicsbtn topsicsmax550":"topsicsmax550 topicsbtn"}>{item.course_list_name}</div>
+											</span>}
 										</p>
 
 										<div className="homepagePostSetting homepagePostSettingname topscisright">
@@ -497,6 +514,8 @@ class InfosTopics extends Component{
 													 }
 												>编辑</a>
 												:"":""}
+											{types==="personal"&&item.is_public===false?user_id===targetuserid&&user_type!="学生"?<a className="btn colorblue mr25 fr font-16" onClick={()=>this.openTopics(item.id)}>设为公开</a>:"":""}
+
 										</div>
 									</div>
 								</div>

public/react/src/modules/user/usersInfo/banks/BanksIndex.js

@@ -93,7 +93,7 @@ class BanksIndex extends Component{
           {
             crumbData &&
             <Breadcrumb separator=">" className="breadcrumb mt22">
-              <Breadcrumb.Item href="/users/innov/topics/personal">题库</Breadcrumb.Item>
+              <Breadcrumb.Item href="/users/innov/topics/personal">{ crumbData && crumbData.is_public == true ? '公共' : '我的' }题库</Breadcrumb.Item>
               {
                 crumbData.crumbArray && crumbData.crumbArray.map((item,key)=>{
                   return(
@@ -107,7 +107,11 @@ class BanksIndex extends Component{
 					{
 						crumbData &&<p className="clearfix mt10 mb10 ">
             <span className="fl font-24 color-grey-3 task-hide lineh-30" style={{maxWidth:'800px'}}>{crumbData && crumbData.title}</span>
-             <span className="bank_is_public">{crumbData.is_public == true ? '公开':'私有'}</span>
+            { crumbData.is_public == true ? 
+              <span className="bank_is_public">公开</span>
+              :
+              <span className="bank_is_private">私有</span>
+            }
 
           </p> }
 
@@ -145,6 +149,13 @@ class BanksIndex extends Component{
                   />)
                 }
             }></Route>
+            <Route path='/banks/exercise/:Id'
+              render={
+                (props) => {
+                  return (<BanksTabIndex {...this.props} {...props} {...this.state} {...common}
+                  />)
+                }
+            }></Route>            
 
             <Route path='/banks/gtopic/:bankId/edit' 
               render={

public/react/src/modules/user/usersInfo/banks/BanksTabIndex.js

@@ -17,6 +17,11 @@ const PollBanks = Loadable({
 	loader: () => import('./PollBanksContent'),
 	loading: Loading,
 })
+// 试卷详情
+const ExerciseBanksDetail = Loadable({
+	loader: () => import('./ExerciseBanksDetail'),
+	loading: Loading,
+});
 
 class BanksTabIndex extends Component{
   constructor(props){
@@ -53,7 +58,13 @@ class BanksTabIndex extends Component{
           ></BanksMenu>
         }
         <Switch {...this.props}>
-
+          <Route path='/banks/exercise/:Id'
+            render={
+              (props) => {
+                return (<ExerciseBanksDetail {...this.props} {...props} {...this.state} {...common}
+                />)
+              }
+          }></Route>  
 
           <Route path='/banks/gtopic/:bankId' 
             render={

public/react/src/modules/user/usersInfo/banks/ExerciseBanksDetail.js

@@ -0,0 +1,54 @@
+import React, { Component } from 'react';
+import axios from 'axios'
+
+import ExerciseDisplay from '../../../courses/exercise/ExerciseDisplay'
+
+class ExerciseBanksDetail extends Component{
+  constructor(props){
+    super(props);
+    this.state={
+        
+    }
+  }
+
+  componentDidMount = () =>{
+      
+  }
+  detailFetchCallback = (result) => {
+    let Id=this.props.match.params.Id;
+
+    const crumbData={
+        title: result.data.exercise && result.data.exercise.name,
+        is_public: result.data.exercise && result.data.exercise.is_public,
+        crumbArray:[
+            {content:'详情'},
+        ]
+    }
+    const menuData={
+        tab:'0',//tab选中的index
+        menuArray:[//tab以及tab路由
+            {to:`/banks/exercise/${Id}`,content:'内容详情'}
+        ],
+        category:'exercise',//
+        tos: `/banks/exercise/${Id}/edit`,
+        id: Id,
+
+    }
+    this.props.initPublic(crumbData,menuData);
+  }
+
+  render(){
+    let { pollDetail } = this.state
+    
+    return(
+      <div>
+        <ExerciseDisplay {...this.props} {...this.state} 
+            urlPath = {'exercise_banks'}
+            detailFetchCallback={this.detailFetchCallback}
+        >
+        </ExerciseDisplay>
+      </div>
+    )
+  }
+}
+export default ExerciseBanksDetail

public/react/src/modules/user/usersInfo/banks/banksMenu.js

@@ -126,7 +126,7 @@ class BanksMenu extends Component{
         
         <span className="fr mt18">
           <WordsBtn onClick={()=>this.deletecheckBoxValues(banksMenu&&banksMenu.id,banksMenu&&banksMenu.category)}style="blue" className="ml20 font-16">删除</WordsBtn>
-          <WordsBtn to={banksMenu&&banksMenu.category==='poll'?banksMenu.tos:""} style="blue" className="ml20 font-16">编辑</WordsBtn>
+          <WordsBtn to={ banksMenu.tos ? banksMenu.tos:""} style="blue" className="ml20 font-16">编辑</WordsBtn>
           <WordsBtn onClick={()=>this.sendTopics()} style="blue" className="ml20 font-16">发送</WordsBtn>
         </span>
       </div>

public/react/src/modules/user/usersInfo/usersInfo.css

@@ -241,14 +241,28 @@
   cursor: default;
 }
 .bank_is_public{
-  background: #E4F2FE;
+  background: #84B6EB;
   float: left;
-  height: 30px;
-  line-height: 30px;
+  height: 24px;
+  line-height: 24px;
   padding:0px 20px;
-  color: #4CACFF;
+  color: #fff;
   font-size: 16px;
   margin-left: 10px;
+  border-radius:20px;
+  margin-top:3px;
+}
+.bank_is_private{
+  background: #56B998;
+  float: left;
+  height: 24px;
+  line-height: 24px;
+  padding:0px 20px;
+  color: #fff;
+  font-size: 16px;
+  margin-left: 10px;
+  border-radius:20px;
+  margin-top:3px;
 }
 .topicsbox{
     width: 1200px;
@@ -292,6 +306,7 @@
     font-weight: 400;
     cursor: pointer;
     line-height: 55px;
+    color: #666;
 }
 
 .alltopisc{
@@ -333,8 +348,8 @@
     opacity: 1;
     border-radius: 2px;
 }
-.topicswidth400{
-    width: 400px;
+.topicswidth600{
+    mac-width: 600px;
     display: inline-block;
 }
 .topicswidth300{
@@ -351,13 +366,13 @@
 
 .topscisright{
     right: 0px;
-    top: 50px;
+    top: 64px;
     display: block;
     position: absolute;
 }
 
-.topsics100{
-    width: 100px;
+.topsics135{
+    max-width: 135px;
     display: inline-block;
 }
 
@@ -381,3 +396,30 @@
     color: rgba(51,51,51,1);
     line-height: 35px;
 }
+
+.topicsItem{
+    max-width: 1050px;
+    max-height: 115px;
+    overflow-y: auto;
+}
+
+.mb45{
+    margin-bottom: 45px!important;
+}
+
+.topsicsmax550{
+    max-width: 550px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    position: absolute;
+    top: -16px;
+}
+
+.topsicrelative{
+    position: relative;
+}
+
+.topsicinline{
+    display: inline-block;
+}

public/stylesheets/educoder/edu-all.css

@@ -3761,8 +3761,3 @@ a.singlepublishtwo{
     /*width: auto !important;*/
     /*max-width: 600px !important;*/
 /*}*/
-.topicsItem{
-    max-width: 1138px;
-    max-height: 110px;
-    overflow-y: auto;
-}