添加目录

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

@@ -0,0 +1,78 @@
+import React,{ Component } from "react";
+import {Tooltip, Modal, Input } from 'antd'
+import moment from 'moment'
+import { getUrl, WordsBtn } from 'educoder'
+import axios from 'axios'
+class AddDirModal extends Component{
+  constructor(props){
+    super(props);
+    this.state = {
+
+    }
+  }
+  onInput = (e) => {
+    this.setState({
+      inputValue: e.target.value
+    })
+  }
+  open = () => {
+    this.setState({ visible: true, inputValue: '' })
+  }
+  onSave = () => {
+    let coursesId = this.props.match.params.coursesId;
+    const url = `/courses/${coursesId}/boards.json`
+    let { inputValue } = this.state;
+
+    axios.post(url,{
+        name: inputValue
+      }).then((response)=>{
+      if (response.data.status == 0) {
+        this.onCancel()
+        this.props.showNotification('添加成功')
+        this.props.addSuccess && this.props.addSuccess()
+      }
+    }).catch((error)=>{
+      console.log(error)
+    })
+  }
+  onCancel = () => {
+    this.setState({ visible: false, inputValue: '' })
+  }
+  render(){
+    let { inputValue, visible } = this.state;
+    const { title } = this.props;
+    return(
+        <Modal
+             keyboard={false}
+             title={title}
+             visible={visible}
+             className={"Navmodal"}
+             closable={false}
+             footer={null}
+             destroyOnClose={true}
+             centered={true}
+           >
+             <div className="df">
+                <div className={"fl mt5"}>{this.props.label}：</div>
+                <Input placeholder={this.props.inputPlaceholder || '示例：讨论小组A'}
+                    className={"input-flex-35 greyInput fl"}
+                    maxLength="60"
+                    value={inputValue}
+                    onInput={this.onInput}
+                />
+             </div>
+             
+             {/* {this.state.NavmodalValuetype===true?<span className={"color-red"}>
+                 {this.state.NavmodalValues}
+             </span>:""} */}
+
+             {/* this.state.NavmodalValuetype===true?"clearfix mt20 edu-txt-center": */}
+             <div className={"clearfix mt50 edu-txt-center"}>
+               <a  className="task-btn mr30" onClick={this.onCancel}>取消</a>
+               <a className="task-btn task-btn-orange" onClick={this.onSave}>确定</a>
+             </div>
+           </Modal>
+      )
+    }
+}
+export default AddDirModal;

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

@@ -3,13 +3,13 @@ import React,{ Component } from "react";
 import {
   Form, Input, InputNumber, Switch, Radio,
   Slider, Button, Upload, Icon, Rate, Checkbox, message,
-  Row, Col, Select, Modal
+  Row, Col, Select, Modal, Divider
 } from 'antd';
 import TPMMDEditor from '../../tpm/challengesnew/TPMMDEditor';
 import axios from 'axios'
 import './board.css'
 import "../common/formCommon.css"
-
+import AddDirModal from './AddDirModal'
 import { RouteHOC } from './common.js'
 import CBreadcrumb from '../common/CBreadcrumb'
 import {getUploadActionUrl, bytesToSize, uploadNameSizeSeperator, appendFileSizeToUploadFile, appendFileSizeToUploadFileAll} from 'educoder';
@@ -29,14 +29,14 @@ class BoardsNew extends Component{
       boards: []
     }
   }
-  componentDidMount = () => {
-    
-    const topicId = this.props.match.params.topicId
-
+  addSuccess = () => {
+    this.fetchBoards()
+  }
+  fetchBoards = () => {
+    const isEdit = this.isEdit
     const boardId = this.props.match.params.boardId
-    const boardsUrl = `/courses/board_list.json?board_id=${boardId}`
-    const isEdit = !!topicId
 
+    const boardsUrl = `/courses/board_list.json?board_id=${boardId}`
     axios.get(boardsUrl, { })
     .then((response) => {
       if (response.data.status == 0) {
@@ -57,8 +57,17 @@ class BoardsNew extends Component{
     .catch(function (error) {
       console.log(error);
     });
-
+  }
+  componentDidMount = () => {
+    
+    const topicId = this.props.match.params.topicId
+    const isEdit = !!topicId
     this.isEdit = isEdit
+
+    const boardId = this.props.match.params.boardId
+    
+    this.fetchBoards()
+
     if (isEdit) {
       const url = `/messages/${topicId}.json`
       axios.get(url, {
@@ -260,6 +269,12 @@ class BoardsNew extends Component{
 
     return(
         <div className="newMain ">
+          <AddDirModal {...this.props}
+            title="添加目录"
+            label="目录名称"
+            ref="addDirModal"
+            addSuccess={this.addSuccess}
+          ></AddDirModal>
           <style>{`
             .courseForm .ant-form {
             }
@@ -312,7 +327,17 @@ class BoardsNew extends Component{
                   {getFieldDecorator('select_board_id', {
                     // initialValue: '3779',
                   })(
-                    <Select style={{ width: 230 }}>
+                    <Select style={{ width: 230 }}
+                      dropdownRender={menu => (
+                        <div>
+                          {menu}
+                          <Divider style={{ margin: '4px 0' }} />
+                          <div style={{ padding: '8px', cursor: 'pointer' }} onMouseDown={() => this.refs['addDirModal'].open()}>
+                            <Icon type="plus" /> 添加目录
+                          </div>
+                        </div>
+                      )}
+                    >
                       {this.state.boards.map(item => {
                         return (
                           <Option value={item.id}>{item.name}</Option>

public/react/src/modules/courses/members/teacherList.js

@@ -33,6 +33,7 @@ function buildColumns(that) {
   const { course_groups } = that.state
   const columns = [{
     title: '序号',
+    width: 28,
     // dataIndex: 'name',
     key: 'index',
     render: (content, item, index) => {
@@ -40,12 +41,13 @@ function buildColumns(that) {
     }
   },{
     title: '用户ID',
+    width: 82,
     dataIndex: 'login',
     key: 'login'
   }, {
     title: '姓名',
     dataIndex: 'name',
-    width: 160,
+    width: 140,
     key: 'name',
     render: (name, record) => {
       return <a href={`/login/${record.login}`} target="_blank">{name}</a>
@@ -57,7 +59,7 @@ function buildColumns(that) {
   }] 
   that.state.course_groups && that.state.course_groups.length && columns.push({
     title: <Tooltip title="仅能批阅指定分班的作品">管理权限</Tooltip>,
-    width: 230,
+    // width: 230,
     key: 'course_groups',
     dataIndex: 'course_groups',
     // onClick={() => that.joinCourseGroup(item.id)}
@@ -113,6 +115,7 @@ function buildColumns(that) {
   if (hasGraduationModule) {
     columns.push({
       title: '答辩组',
+      width: 74,
       key: 'graduation_group',
       dataIndex: 'graduation_group',
       render: text => (
@@ -126,6 +129,7 @@ function buildColumns(that) {
     columns.push({
       title: '操作',
       key: 'action',
+      width: 150,
       align:'center',
       render: (text, record) => {
         if (record.application_id) {