Merge branches 'dev_Ysl' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl

# Conflicts:
#	public/react/src/modules/courses/busyWork/NewWork.js
#	public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js
#	public/react/src/modules/courses/poll/PollNew.js
#	public/react/src/modules/moop_cases/CaseNew.js

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

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

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

@@ -278,7 +278,7 @@ class BoardsNew extends Component{
         console.log('beforeUpload', file.name);
         const isLt150M = file.size / 1024 / 1024 < 150;
         if (!isLt150M) {
-          message.error('文件大小必须小于150MB!');
+          this.props.showNotification('文件大小必须小于150MB!');
         }
         return isLt150M;
       },

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

@@ -597,7 +597,7 @@ render(){
       console.log('beforeUpload', file.name);
       const isLt150M = file.size / 1024 / 1024 < 150;
       if (!isLt150M) {
-        message.error('文件大小必须小于150MB!');
+        this.props.showNotification('文件大小必须小于150MB!');
       }
       return isLt150M;
     },

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

@@ -3,11 +3,11 @@ 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 } from 'educoder'
-
+import { WordsBtn, getUrl, ConditionToolTip, appendFileSizeToUploadFile, appendFileSizeToUploadFileAll } from 'educoder'
+import TPMMDEditor from '../../tpm/challengesnew/TPMMDEditor';
 import CBreadcrumb from '../common/CBreadcrumb'
-import NewWorkForm from './NewWorkForm'
 
+const confirm = Modal.confirm;
 const $ = window.$
 const MAX_TITLE_LENGTH = 60;
 class NewWork extends Component{
@@ -17,6 +17,15 @@ class NewWork extends Component{
     this.answerMdRef = React.createRef();
     
     this.state={
+      title_value:"",
+      title_num: 0,
+      contentFileList: [],
+      answerFileList: [],
+      workLoaded: false,
+      base_on_project: true,
+      category: {},
+      min_num: 2,
+      max_num: 10,
     }
   }
   componentDidMount () {
@@ -41,6 +50,7 @@ class NewWork extends Component{
           course_id: data.course_id,
           course_name: data.course_name,
           category: data.category,
+
         })
       }
     })
@@ -55,29 +65,129 @@ class NewWork extends Component{
     .then((response) => {
       if (response.data.name) {
         const data = response.data;
-        data.isEdit = true;
-        this.setState({ 
-          category: data.category,
-          course_id: data.course_id,
-          course_name: data.course_name,
+        
+        const contentFileList = data.attachments.map(item => {
+          return {
+            id: item.id,
+            uid: item.id,
+            name: appendFileSizeToUploadFile(item),
+            url: item.url,
+            filesize: item.filesize,
+            status: 'done'
+          }
+        })
+        const answerFileList = data.ref_attachments.map(item => {
+          return {
+            id: item.id,
+            uid: item.id,
+            name: appendFileSizeToUploadFile(item),
+            url: item.url,
+            filesize: item.filesize,
+            status: 'done'
+          }
+        })
+
+        this.setState({
+          ...data,
+          // course_id: data.course_id,
+          // course_name: data.course_name,
+          // category: data.category,
+          title_num: parseInt(data.name.length),
+          workLoaded: true,
+          init_min_num: data.min_num,
+          init_max_num: data.max_num,
+          // description: data.description,
+          reference_answer: data.reference_answer,
+          contentFileList,
+          answerFileList,
+        }, () => {
+          setTimeout(() => {
+            this.contentMdRef.current.setValue(data.description || '')
+            this.answerMdRef.current.setValue(data.reference_answer || '')
+          
+          }, 2000)
+          
+          this.props.form.setFieldsValue({
+            title: data.name,
+            description: data.description || '',
+            reference_answer: data.reference_answer || '',
+          });
+          
         })
-        this.newWorkFormRef.initValue(data);
+
       }
     })
     .catch(function (error) {
       console.log(error);
     });
   }
-  onCancel = () => {
-    this.props.toListPage(this.props.match.params, category.category_id)
+
+  // 输入title
+  changeTitle=(e)=>{
+    console.log(e.target.value.length);
+    this.setState({
+      title_num: parseInt(e.target.value.length)
+    })
+  }
+  handleSubmit = () => {
+    const courseId = this.state.course_id || this.props.match.params.coursesId ;
+    
+    this.props.form.validateFieldsAndScroll((err, values) => {
+      console.log(values)
+      const mdContnet = this.contentMdRef.current.getValue().trim();
+      console.log(mdContnet)
+      values.description = mdContnet;
+      // return;
+      
+      {/* max={has_commit ? init_min_num : null } */}
+      {/* min={has_commit ? init_max_num : (min_num == undefined ? 2 : min_num + 1) }  */}
+      // 已有提交作品，人数范围只能扩大
+      const { has_commit, max_num, init_max_num, min_num, init_min_num } = this.state;
+      if (has_commit) {
+        if (max_num < init_max_num || min_num > init_min_num) {
+          this.props.showNotification(`已有提交作品，人数范围只能扩大(原设置为：${init_min_num} - ${init_max_num})`)
+          return;
+        }
+      }
+
+      // const errKeys = Object.keys(err);  // || errKeys.length == 1 && errKeys[0] == 'content' && mdContnet
+      if (!err) {
+        if (this.isEdit) {
+          this.doEdit(courseId, values)
+        } else {
+          this.doNew(courseId, values)
+        }
+       
+      } else {
+        $("html").animate({ scrollTop: $('html').scrollTop() - 100 })
+      }
+    })
   }
-  
-  doEdit = (params) => {
+  doEdit = (courseId, values) => {
     const workId = this.props.match.params.workId
     const newUrl = `/homework_commons/${workId}.json`
 
+    let attachment_ids = this.state.contentFileList.map(item => {
+      return item.response ? item.response.id : item.id
+    })
+    let reference_attachment_ids = this.state.answerFileList.map(item => {
+      return item.response ? item.response.id : item.id
+    })
+
+    const { min_num, max_num, base_on_project, category } = this.state
     const isGroup = this.props.isGroup()
-    axios.put(newUrl, params)
+    axios.put(newUrl, {
+      type: isGroup ? 3 : 1,
+      name: values.title,
+      description: values.description,
+      reference_answer: values.reference_answer, 
+      attachment_ids,
+      reference_attachment_ids,
+
+      min_num,
+      max_num,
+      base_on_project
+    })
     .then((response) => {
       if (response.data.status == 0) {
         this.props.showNotification('保存成功')
@@ -88,11 +198,30 @@ class NewWork extends Component{
       console.log(error);
     });
   }
-  doNew = (params) => {
-    const courseId = this.props.match.params.coursesId ;    
+  doNew = (courseId, values) => {
     const newUrl = `/courses/${courseId}/homework_commons.json`
 
-    axios.post(newUrl, params)
+    let attachment_ids = this.state.contentFileList.map(item => {
+      return item.response ? item.response.id : item.id
+    })
+    let reference_attachment_ids = this.state.answerFileList.map(item => {
+      return item.response ? item.response.id : item.id
+    })
+    const isGroup = this.props.isGroup()
+    const { min_num, max_num, base_on_project, category } = this.state
+    
+    axios.post(newUrl, {
+      type: isGroup ? 3 : 1,
+      name: values.title,
+      description: values.description,
+      reference_answer: values.reference_answer, 
+      attachment_ids,
+      reference_attachment_ids,
+
+      min_num,
+      max_num,
+      base_on_project
+    })
     .then((response) => {
       if (response.data.status == 0) {
         this.props.showNotification('保存成功')
@@ -103,26 +232,147 @@ class NewWork extends Component{
       console.log(error);
     });
   }
+
+  handleContentUploadChange = (info) => {
+    let contentFileList = info.fileList;
+    this.setState({ contentFileList: appendFileSizeToUploadFileAll(contentFileList) });
+  }
+  handleAnswerUploadChange = (info) => {
+    let answerFileList = info.fileList;
+    this.setState({ answerFileList: appendFileSizeToUploadFileAll(answerFileList) });
+  }
   
+  onAttachmentRemove = (file, stateName) => {
+		if(file.response!=undefined){
+			this.props.confirm({
+				content: '是否确认删除?',
+
+				onOk: () => {
+					this.deleteAttachment(file, stateName)
+				},
+				onCancel() {
+					console.log('Cancel');
+				},
+			});
+
+
+			return false;
+		}
+
+  }
+  deleteAttachment = (file, stateName) => {
+    // 初次上传不能直接取uid
+    const url = `/attachments/${file.response ? file.response.id : file.uid}.json`
+    axios.delete(url, {
+    })
+      .then((response) => {
+        if (response.data) {
+          const { status } = response.data;
+          if (status == 0) {
+            console.log('--- success')
+            
+            this.setState((state) => {
+              const index = state[stateName].indexOf(file);
+              const newFileList = state[stateName].slice();
+              newFileList.splice(index, 1);
+              return {
+                [stateName]: newFileList,
+              };
+            });
+          }
+        }
+      })
+      .catch(function (error) {
+        console.log(error);
+      });
+  }
+  max_num_change = (val) => {
+    if (val < 2) {
+      this.setState({ 
+        max_num: 2,
+      })
+      return;
+    }
+    const { min_num } = this.state;
+    this.setState({ 
+      max_num: val,
+      min_num: val <= min_num ? val - 1 : min_num
+    })
+  }
+  min_num_change = (val) => {
+    this.setState({ min_num: val })
+  }
+  base_on_project_change = () => {
+    this.setState({ base_on_project: !this.state.base_on_project })
+  }
 
   render(){
     let {typeId,coursesId,pageType}=this.props.match.params;
-    
+    const { getFieldDecorator } = this.props.form;
     const isGroup = this.props.isGroup()
     const moduleName = !isGroup? "普通作业":"分组作业";
     const moduleEngName = this.props.getModuleName()
     let{
-      category
+      title_value, contentFileList, answerFileList, max_num, min_num, base_on_project,
+      init_max_num, init_min_num,
+      title_num, course_name, category, has_commit, has_project
     }=this.state
     const { current_user } = this.props
 
-    const courseId = this.props.match.params.coursesId ;    
+    const courseId = this.state.course_id || this.props.match.params.coursesId ;    
     const isEdit = this.isEdit;
-    
+    if ((isEdit == undefined ||  isEdit) && !this.state.workLoaded) {
+      return ''
+    } 
+    const uploadProps = {
+      width: 600,
+      fileList: contentFileList,
+      multiple: true,
+      // https://github.com/ant-design/ant-design/issues/15505
+      // showUploadList={false}，然后外部拿到 fileList 数组自行渲染列表。
+      // showUploadList: false,
+      action: `${getUrl()}/api/attachments.json`,
+      onChange: this.handleContentUploadChange,
+      onRemove: (file) => this.onAttachmentRemove(file, 'contentFileList'),
+      beforeUpload: (file) => {
+        console.log('beforeUpload', file.name);
+        const isLt150M = file.size / 1024 / 1024 < 150;
+        if (!isLt150M) {
+          this.props.showNotification('文件大小必须小于150MB!');
+        }
+        return isLt150M;
+      },
+    };
+    const answerUploadProps = {
+      width: 600,
+      fileList: answerFileList,
+      multiple: true,
+      // https://github.com/ant-design/ant-design/issues/15505
+      // showUploadList={false}，然后外部拿到 fileList 数组自行渲染列表。
+      // showUploadList: false,
+      action: `${getUrl()}/api/attachments.json`,
+      onChange: this.handleAnswerUploadChange,
+      onRemove: (file) => this.onAttachmentRemove(file, 'answerFileList'),
+      beforeUpload: (file) => {
+        console.log('beforeUpload', file.name);
+        const isLt150M = file.size / 1024 / 1024 < 150;
+        if (!isLt150M) {
+          this.props.showNotification('文件大小必须小于150MB!');
+        }
+        return isLt150M;
+      },
+    };
+
     return(
       <div className="newMain">
         <div className="educontent mt20 mb50">
-
+          {/* <p className="clearfix">
+            <WordsBtn style="grey" className="fl">{course_name}</WordsBtn>
+            <span className="color-grey-9 fl ml3 mr3">&gt;</span>
+            <WordsBtn style="grey" className="fl">{typeId==1 ?"普通作业":"分组作业"}</WordsBtn>
+            <span className="color-grey-9 fl ml3 mr3">&gt;</span>
+            <span>{pageType==="new"?"新建":"编辑"}</span>
+          </p> */}
           <CBreadcrumb items={[
             { to: current_user && current_user.first_category_url, name: this.state.course_name},
             { to: `/courses/${courseId}/${moduleEngName}/${category && category.category_id ? category.category_id : ''}`
@@ -141,16 +391,161 @@ class NewWork extends Component{
             </a>
           </p>
           <div>
-            <NewWorkForm wrappedComponentRef={(ref) => {this.newWorkFormRef = ref}}
-              {...this.props}
-              onCancel={this.onCancel}
-              doNew={this.doNew}
-              doEdit={this.doEdit}
-            ></NewWorkForm>
+            {/* onSubmit={this.handleSubmit} */}
+            <style>
+              {
+                `
+                .yslnewworkinputaddonAfter .ant-input{
+																		border-right: none !important;
+																		height: 40px !important;
+																		}
+                
+                `
+              }
+            </style>
+            <Form className="courseForm">
+              <Form.Item
+                label="标题"
+                className="AboutInputForm"
+              > 
+              {getFieldDecorator('title', {
+                  rules: [{
+                    required: true, message: '请输入标题'
+                  }],
+                })(
+                  <Input placeholder="请输入作业标题，最大限制60个字符" onInput={this.changeTitle} className="searchView yslnewworkinputaddonAfter searchViewAfter" style={{"width":"100%"}} maxLength={MAX_TITLE_LENGTH} addonAfter={`${String(title_num)}/${MAX_TITLE_LENGTH}`}/>
+                )}
+              </Form.Item>
+              <style>{`
+                .uploadBtn.ant-btn {
+                  border: none;
+                  color: #4CACFF;
+                  box-shadow: none;
+                  background: transparent;
+                  padding: 0 6px;
+                }
+                .ant-upload-list-item:hover .ant-upload-list-item-info{
+                  background-color:#fff;
+                }
+                .upload_1 .ant-upload-list {
+                  width: 350px;
+                }
+                
+                .ant-input-number {
+                  height: 40px;
+                  line-height: 40px;
+                }
+
+                .workContent.AboutInputForm.ant-form-item {
+                  border-bottom: none;
+                  padding-bottom: 0px !important;
+                }
+                .newWorkUpload {
+                  padding: 0px 30px 30px 30px!important;
+                  background: #fff;
+                  width: 100%;
+                  display: inline-block;
+                  border-bottom: 1px solid #EDEDED;
+                }
+                
+              `}</style>
+
+
+              {  <Form.Item
+                label="内容"
+                className="AboutInputForm workContent mdInForm"
+              > 
+                {getFieldDecorator('description', {
+                  rules: [{
+                    required: true, message: '请输入作业内容和要求'
+                  }],
+                })(
+                  <TPMMDEditor ref={this.contentMdRef} placeholder="请在此输入作业内容和要求,最大限制5000个字符" mdID={'courseContentMD'} refreshTimeout={1500} 
+                    className="courseMessageMD" initValue={this.state.description}></TPMMDEditor>
+                )}
+              </Form.Item> }
+              <Upload {...uploadProps} className="upload_1 newWorkUpload">
+                <Button className="uploadBtn">
+                  <Icon type="upload" /> 上传附件
+                </Button>
+                (单个文件150M以内)
+              </Upload>
+              
+
+              { isGroup && 
+                <Form.Item
+                  label="分组设置"
+                  className="AboutInputForm"
+                > 
+                {getFieldDecorator('personNum', {
+                    rules: [{
+                      required: false
+                      // required: true, message: '请输入最小人数和最大人数'
+                    }],
+                  })(
+                    <div>
+                      <p className="clearfix">
+                        <ConditionToolTip condition={has_commit} title={'已有提交作品，人数范围只能扩大'}>
+                        {/* max={has_commit ? init_min_num : null } */}
+                          <InputNumber placeholder="请填写每组最小人数" min={1} className="winput-240-40" value={min_num} 
+                              
+                              onChange={this.min_num_change} style={{width:'180px'}} />
+                        </ConditionToolTip>
+                        
+                        <span className="ml15 mr15">~</span>
+                        {/* min={has_commit ? init_max_num : (min_num == undefined ? 2 : min_num + 1) }  */}
+                        <ConditionToolTip condition={has_commit} title={'已有提交作品，人数范围只能扩大'}>
+                          <InputNumber className="winput-240-40" placeholder="请填写每组最大人数" value={max_num} max={10}
+                              onChange={this.max_num_change} style={{width:'180px'}} />
+                        </ConditionToolTip>
+                        <label className="color-grey-9 ml20 font-14">（项目管理员角色的成员都可以提交作品，提交作品时需要关联同组成员，组内成员作品共享）</label>
+                      </p>
+                      <p className="mt20">
+                        <ConditionToolTip condition={has_commit || has_project} title={'已有关联项目或作品，不能修改'}>
+                          <Checkbox checked={base_on_project} onChange={this.base_on_project_change}
+                              disabled={has_project || has_commit}
+                          >基于项目实施</Checkbox>
+                        </ConditionToolTip>
+                        
+                        <label className="color-grey-9 ml12 font-14">（勾选后各小组必须在educoder平台创建项目，教师可随时观察平台对各小组最新进展的实时统计）</label>
+                      </p>
+                    </div>
+                  )}
+                </Form.Item>
+              }
+              <Form.Item
+                label="参考答案"
+                className="AboutInputForm"
+                style={{"borderBottom":"none"}}
+              > 
+                {getFieldDecorator('reference_answer', {
+                  rules: [{
+                    required: false
+                  }],
+                })(
+                  <TPMMDEditor ref={this.answerMdRef} placeholder="请在此输入作业的参考答案,最大限制5000个字符" mdID={'workAnswerMD'} 
+                      className="courseMessageMD" refreshTimeout={1500} initValue={this.state.reference_answer || ''}></TPMMDEditor>
+                )}
+                <Upload {...answerUploadProps} className="upload_1">
+                  <Button className="uploadBtn">
+                    <Icon type="upload" /> 上传附件
+                  </Button>
+                  (单个文件150M以内)
+                </Upload>
+              </Form.Item>
+              <Form.Item>
+                <div className="clearfix mt30 mb30">
+                {/*  htmlType="submit"   */}
+                  <Button type="primary" onClick={this.handleSubmit} className="defalutSubmitbtn fl mr20">提交</Button>
+                  <a className="defalutCancelbtn fl" onClick={() => this.props.toListPage(this.props.match.params, category.category_id)}>取消</ a>
+                </div>
+              </Form.Item>
+            </Form>
           </div>
         </div>
       </div>
     )
   }
 }
-export default NewWork;
+const WrappedBoardsNew = Form.create({ name: 'NewWork' })(NewWork);
+export default WrappedBoardsNew;

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

@@ -257,7 +257,7 @@ class AccessoryModal extends Component{
         console.log('beforeUpload', file.name);
         const isLt150M = file.size / 1024 / 1024 < 150;
         if (!isLt150M) {
-          message.error('文件大小必须小于150MB!');
+          this.props.showNotification('文件大小必须小于150MB!');
         }
         return isLt150M;
       },

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

@@ -180,7 +180,7 @@ class AccessoryModal2 extends Component{
         console.log('beforeUpload', file.name);
         const isLt150M = file.size / 1024 / 1024 < 150;
         if (!isLt150M) {
-          message.error('文件大小必须小于150MB!');
+          this.props.showNotification('文件大小必须小于150MB!');
         }
         return isLt150M;
       },

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

@@ -396,7 +396,7 @@ class Selectsetting extends Component{
 				console.log('beforeUpload', file.name);
 				const isLt150M = file.size / 1024 / 1024 < 150;
 				if (!isLt150M) {
-					message.error('文件大小必须小于150MB!');
+					this.props.showNotification('文件大小必须小于150MB!');
 				}
 				return isLt150M;
 			},

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

@@ -344,7 +344,7 @@ class Sendresource extends Component{
 				// console.log('beforeUpload', file.name);
 				const isLt150M = file.size / 1024 / 1024 < 150;
 				if (!isLt150M) {
-					message.error('文件大小必须小于150MB!');
+					this.props.showNotification('文件大小必须小于150MB!');
 				}
 				return isLt150M;
 			},

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

@@ -708,7 +708,14 @@ a.white-btn.use_scope-btn:hover{
     color: #999!important;
     padding:0px 10px;
 }
-
+.orangeLine{
+    background: #fff;
+    border:1px solid #FE944B;
+    color: #FE944B!important;
+    padding:0px 10px;
+    line-height: 28px;
+    border-radius: 4px;
+}
 
 .colorFF6800{
     color:#FF6800;

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

@@ -332,17 +332,17 @@ class Testpapersettinghomepage extends Component{
                                 <div className="fl task_menu_ul">
                                     {this.props.isAdmin()===true?
                                         <Menu mode="horizontal" selectedKeys={tab} onClick={this.changeTab}>
-                                            <Menu.Item key="0">答题列表</Menu.Item>
-                                            <Menu.Item key="1">统计结果</Menu.Item>
-                                            <Menu.Item key="2">试卷预览</Menu.Item>
-                                            <Menu.Item key="3">设置</Menu.Item>
+                                            <Menu.Item key="0" className={"exercisesafonts"}>答题列表</Menu.Item>
+                                            <Menu.Item key="1" className={"exercisesafonts"}>统计结果</Menu.Item>
+                                            <Menu.Item key="2" className={"exercisesafonts"}>试卷预览</Menu.Item>
+                                            <Menu.Item key="3" className={"exercisesafonts"}>设置</Menu.Item>
                                         </Menu>
                                         :
                                         <Menu mode="horizontal" selectedKeys={tab} onClick={this.changeTab}>
-                                            <Menu.Item key="0">答题列表</Menu.Item>
+                                            <Menu.Item key="0" className={"exercisesafonts"}>答题列表</Menu.Item>
 																					{Commonheadofthetestpaper&&Commonheadofthetestpaper.show_statistic===true?
-																						<Menu.Item key="1">统计结果</Menu.Item>:""}
-                                            <Menu.Item key="3">设置</Menu.Item>
+																						<Menu.Item key="1" className={"exercisesafonts"}>统计结果</Menu.Item>:""}
+                                            <Menu.Item key="3" className={"exercisesafonts"}>设置</Menu.Item>
                                         </Menu>
                                     }
                                 </div>
@@ -370,7 +370,7 @@ class Testpapersettinghomepage extends Component{
                                                 padding-top: 10px;
                                                 padding-bottom: 8px;
                                              }
-                                              a:hover {
+                                              .exercisesafonts:hover {
                                                 color:#1A0B00 !important;
                                                 }
                                           `}

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

@@ -523,7 +523,7 @@ class GraduationTasksSubmitedit extends Component{
         console.log('beforeUpload', file.name);
         const isLt150M = file.size / 1024 / 1024 < 150;
         if (!isLt150M) {
-          message.error('文件大小必须小于150MB!');
+          this.props.showNotification('文件大小必须小于150MB!');
         }
         return isLt150M;
       },

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

@@ -540,7 +540,7 @@ render(){
       console.log('beforeUpload', file.name);
       const isLt150M = file.size / 1024 / 1024 < 150;
       if (!isLt150M) {
-        message.error('文件大小必须小于150MB!');
+        this.props.showNotification('文件大小必须小于150MB!');
       }
       return isLt150M;
     },

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

@@ -172,7 +172,7 @@ class GraduationTasksappraiseMainEditor extends Component{
         console.log('beforeUpload', file.name);
         const isLt150M = file.size / 1024 / 1024 < 150;
         if (!isLt150M) {
-          message.error('文件大小必须小于150MB!');
+          this.props.showNotification('文件大小必须小于150MB!');
         }
         return isLt150M;
       },

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

@@ -297,7 +297,7 @@ class GraduationTasksedit extends Component{
         console.log('beforeUpload', file.name);
         const isLt150M = file.size / 1024 / 1024 < 150;
         if (!isLt150M) {
-          message.error('文件大小必须小于150MB!');
+          this.props.showNotification('文件大小必须小于150MB!');
         }
         return isLt150M;
       },

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

@@ -49,56 +49,55 @@ class GraduationTasksnew extends Component {
 	}
 
 	Commoninterface =(fileList)=>{
+
 		let listid = []
+
 		for (var list of fileList) {
 			listid.push(list.response.id)
 		}
 		// if (GraduationTasksnewtype === true) {
-		this.props.form.validateFields((err, values) => {
-			if (!err) {
+			this.props.form.validateFields((err, values) => {
 				if (values.tasktype === undefined) {
 					this.ifHasAnchorJustScorll("tasktypes");
-					// this.scrollToAnchors("tasktypes");
 					return
 				}
-
 				if (values.name === undefined) {
-					this.scrollToAnchors("nametypes");
+					this.ifHasAnchorJustScorll("nametypes");
 					return
 				}
-
 				if (values.description === undefined) {
-					this.scrollToAnchors("descriptiontypes");
+					this.ifHasAnchorJustScorll("descriptiontypes");
 					return
-				} else if (values.description.length > 5000) {
-					this.scrollToAnchors("descriptiontypes");
+				}else if (values.description.length > 5000) {
+					this.ifHasAnchorJustScorll("descriptiontypes");
 					return
 				}
-				// console.log('Received values of form: ', values);
-				// console.log(fileList);
-				const course_id = this.props.match.params.coursesId;
-
-				let url = "/courses/" + course_id + "/graduation_tasks.json"
-				axios.post(url, {
-						task_type: parseInt(values.tasktype),
-						name: values.name,
-						description: values.description,
-						attachment_ids: listid,
-					}
-				).then((response) => {
-					// if (response.status === 200) {
-						// GraduationTasksnewtype = false;
-						// this.goback();
-					if(response!==undefined){
-						this.goback()
-					}
-					// }
-				}).catch((error) => {
-					console.log(error)
-				})
-			}
+				if (!err) {
+					// console.log('Received values of form: ', values);
+					// console.log(fileList);
+					const course_id = this.props.match.params.coursesId;
+
+					let url = "/courses/" + course_id + "/graduation_tasks.json"
+					axios.post(url, {
+							task_type: parseInt(values.tasktype),
+							name: values.name,
+							description: values.description,
+							attachment_ids: listid,
+						}
+					).then((response) => {
+						// if (response.status === 200) {
+							// GraduationTasksnewtype = false;
+							// this.goback();
+						if(response!==undefined){
+							this.goback()
+						}
+						// }
+					}).catch((error) => {
+						console.log(error)
+					})
+				}
 
-		});
+			});
 		// }
 	}
 
@@ -128,14 +127,16 @@ class GraduationTasksnew extends Component {
 	}
 	// 附件相关 START
 	handleChange = (info) => {
-		let fileList = info.fileList;
-
-		// for(var list of fileList ){
-		//   console.log(list)
-		// }
-		this.setState({
-			fileList: appendFileSizeToUploadFileAll(fileList),
-		});
+		if(info.file.status == "done" || info.file.status == "uploading"){
+			let fileList = info.fileList;
+
+			// for(var list of fileList ){
+			//   console.log(list)
+			// }
+			this.setState({
+				fileList: appendFileSizeToUploadFileAll(fileList),
+			});
+		}
 	}
 
 	// onAttachmentRemove = (file) => {
@@ -202,10 +203,10 @@ class GraduationTasksnew extends Component {
 	}
 
 	//滚动
-	ifHasAnchorJustScorll(anchor) {
+	ifHasAnchorJustScorll() {
 		// let anchor = this.getURLStuff("anchor");
 
-		// let anchor = this.state.anchor;
+		let anchor = this.state.anchor;
 		// console.log("anchor ", anchor);
 		// 对应id的话, 滚动到相应位置
 		if (!!anchor) {
@@ -273,7 +274,7 @@ class GraduationTasksnew extends Component {
 				console.log('beforeUpload', file.name);
 				const isLt150M = file.size / 1024 / 1024 < 150;
 				if (!isLt150M) {
-					message.error('文件大小必须小于150MB!');
+					this.props.showNotification('文件大小必须小于150MB!');
 				}
 				return isLt150M;
 			},
@@ -360,7 +361,7 @@ class GraduationTasksnew extends Component {
 											`
 										}
 									</style>
-									<Form.Item label="类型" id="tasktype" className={"tasktype"}>
+									<Form.Item label="类型" className={"tasktype"}>
 										{getFieldDecorator('tasktype', {
 											rules: [{required: true, message: "请选择任务类型"}],
 										})(<Select className={"greyInput mb20"}

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

@@ -314,7 +314,7 @@ class GraduateTopicNew extends Component{
         console.log('beforeUpload', file.name);
         const isLt150M = file.size / 1024 / 1024 < 150;
         if (!isLt150M) {
-          message.error('文件大小必须小于150MB!');
+          this.props.showNotification('文件大小必须小于150MB!');
         }
         return isLt150M;
       },

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

@@ -253,7 +253,7 @@ class GraduateTopicPostWorksNew extends Component{
         console.log('beforeUpload', file.name);
         const isLt150M = file.size / 1024 / 1024 < 150;
         if (!isLt150M) {
-          message.error('文件大小必须小于150MB!');
+          this.props.showNotification('文件大小必须小于150MB!');
         }
         return isLt150M;
       },

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

@@ -337,7 +337,6 @@ class PollNew extends Component {
 					})
 				}
 			}
-			// }
 		}).catch((error) => {
 			console.log(error)
 		})
@@ -2134,6 +2133,12 @@ class PollNew extends Component {
 
 	//最小值
 	HandleGradationGroupChangee = (value, index, max, length) => {
+		console.log("最小值");
+		console.log(value);
+		console.log(index);
+		console.log(max);
+		console.log(length);
+
 		// debugger
 		var minbool = false;
 		var maxbool = false;
@@ -2174,6 +2179,11 @@ class PollNew extends Component {
 	// 	console.log("2112");
 	//  console.log(value);
   // console.log(minchoices);
+		console.log("最大值");
+		console.log(value);
+		console.log(index);
+		console.log(minchoices);
+		console.log(length);
 		let arr = this.state.adddom;
 		for (var i = 0; i < arr.length; i++) {
 			if (index === i) {
@@ -2464,7 +2474,7 @@ class PollNew extends Component {
 		// console.log(this.state.projects===undefined?"":this.state.projects.poll_questions)
 		var displaymysave = (mysave === true) ? "" : "display:none;";
 		return (
-			<div>
+			<div className="newMain">
 				{/*提示*/}
 				{Modalstype && Modalstype === true ? <Modals
 					modalsType={this.state.Modalstype}
@@ -2474,14 +2484,8 @@ class PollNew extends Component {
 					modalsBottomval={this.state.ModalsBottomval}
 					loadtype={this.state.Loadtype}
 				/> : ""}
-				<style>
-					{
-						`
-				.newMains{ margin: 0 auto; padding-bottom: 235px !important; min-width:1200px; min-height: 800px !important;}
-				`
-					}
-				</style>
-				<div className="educontent newMains">
+
+				<div className="educontent mb50">
 					<p className="clearfix mb20 mt10">
 						<a className=" btn colorgrey fl hovercolorblue" onClick={()=>this.gotohome()}>{this.props.coursedata.name}</a>
 						<span className="color-grey-9 fl ml3 mr3">&gt;</span>

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

@@ -1100,7 +1100,7 @@ class ShixunHomework extends Component{
 
                   {course_modules&&course_modules.main_category.map((item,key)=>{
                     return(
-											datas&&datas.category_id===null?"":<li key={key} id={item.main_category_id} onClick={() => this.moveTos(item.main_category_id)} title={item.main_category_name}>{item.main_category_name}</li>
+											datas&&datas.category_id===null?"":<li key={key} id={item.main_category_id} onClick={() => this.moveTos(item.main_category_id)} title={item.main_category_name.length>18?item.main_category_name:""}>{item.main_category_name}</li>
 									)
                   })}
 
@@ -1109,10 +1109,10 @@ class ShixunHomework extends Component{
                   return (!this.state.dirSearchValue || item.category_name.indexOf(this.state.dirSearchValue) != -1)
                   }).map( (item,key) => {
  										if(datas&&datas.category_id!=null&&datas&&datas.category_id===item.category_id===false){
-											return <li key={key} id={item.category_id} onClick={() => this.moveTos(item.category_id )} title={item.category_name}>{item.category_name}</li>
+											return <li key={key} id={item.category_id} onClick={() => this.moveTos(item.category_id )} title={item.category_name.length>18?item.category_name:""}>{item.category_name}</li>
 										}
 										if(datas&&datas.category_id===null){
-											return <li key={key} id={item.category_id} onClick={() => this.moveTos(item.category_id )} title={item.category_name}>{item.category_name}</li>
+											return <li key={key} id={item.category_id} onClick={() => this.moveTos(item.category_id )} title={item.category_name.length>18?item.category_name:""}>{item.category_name}</li>
 										}
 									})}
 

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

@@ -82,10 +82,10 @@ class CaseDetail extends Component{
               <a href="/moop_cases" className="color-grey-9">教学案例</a> &gt; <span className="color-grey-3">{ CaseDetail.title}</span>
             </p>
             <p className="lineh-25 mb20 clearfix">
-              <span className="font-22 fl mr10 task-hide" style={{maxWidth:"800px"}}>
+              <span className="font-22 fl mr10 task-hide lineh-30" style={{maxWidth:"800px"}}>
                 { CaseDetail.title}
               </span>
-              <span className="mt5 fl">
+              <span className="mt10 fl">
                 <Tags tags={tags}></Tags>
                 {
                   CaseDetail.status == "pending" && <span class="edu-filter-btn fl cdefault edu-activity-green ml10">草稿</span>

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

@@ -47,19 +47,18 @@ class CaseNew extends Component{
 
   // 上传附件-删除确认框
   onAttachmentRemove = (file, stateName) => {
-		if(file.response!=undefined){
-			this.props.confirm({
-				content: '是否确认删除?',
-				onOk: () => {
-					this.deleteAttachment(file, stateName)
-				},
-				onCancel() {
-					console.log('Cancel');
-				},
-			});
-			return false;
-		}
-
+    if(file.response!=undefined){
+      this.props.confirm({
+        content: '是否确认删除?',
+        onOk: () => {
+          this.deleteAttachment(file, stateName)
+        },
+        onCancel() {
+          console.log('Cancel');
+        },
+      });
+      return false;
+    }
   }
 
   // 上传附件-确认删除
@@ -245,10 +244,7 @@ class CaseNew extends Component{
 
   // 选择标签
   changeType=(type)=>{
-    // console.log(this.state.casesTags);
-    // debugger
     let tags = [];
-
     if(this.state.casesTags.indexOf(type) > -1){
       tags = this.state.casesTags.filter(item => item != type);
     }else{
@@ -279,7 +275,7 @@ class CaseNew extends Component{
       beforeUpload: (file) => {
         const isLt150M = file.size / 1024 / 1024 < 150;
         if (!isLt150M) {
-          //message.error('文件大小必须小于150MB!');
+          //this.props.showNotification('文件大小必须小于150MB!');
           this.props.define({
             title:'提示', 
             content:"该文件无法上传。超过文件大小限制(150MB),建议上传到百度云等其它共享工具里，然后再txt文档里给出链接以及共享密码并上传"

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

@@ -14,7 +14,17 @@ class CaseTags extends Component{
         {
           tags && tags.map((item,key)=>{
             return(
-              <span key={key} className={item.name == "获奖案例" ? "edu-filter-btn fl cdefault edu-activity-red ml10" : "edu-filter-btn fl cdefault edu-activity-blue ml10"}>{item.name}</span>
+              <React.Fragment>
+                {
+                  item.name == "获奖案例" ?
+                  <span key={key} className="edu-filter-btn fl cdefault edu-activity-red ml10">{item.name}</span>
+                  :
+                  item.name == "入库案例" ?
+                  <span key={key} className="edu-filter-btn fl cdefault edu-activity-blue ml10">{item.name}</span>
+                  :
+                  <span key={key} className="edu-filter-btn fl cdefault edu-activity-orange-sub ml10">{item.name}</span>
+                }
+              </React.Fragment>
             )
           })
         }

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

@@ -62,6 +62,13 @@
   border: 1px solid #4CACFF;
   line-height: 17px;
 }
+.edu-activity-orange-sub {
+  background-color: #FF781B;
+  color: #fff!important;
+  cursor: pointer;
+  border: 1px solid #ff6800;
+  line-height: 17px;
+}
 
 .pointsBtn {
   width: 70px;

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

@@ -481,12 +481,13 @@ export function TPMIndexHOC(WrappedComponent) {
               }
 							`
 						}</style>
+            
+
+						<NewHeader {...this.state} {...this.props}></NewHeader>
             <Spin spinning={this.state.globalLoading} delay={0} className="globalSpin"
               size="large"
               tip= {this._gLoadingTip || "加载中..."}
             >
-
-						<NewHeader {...this.state} {...this.props}></NewHeader>
 						<div className="newContainer newContainers">
 								<WrappedComponent initCommonState={(user)=>this.initCommonState(user)}
 									{...this.props} {...this.state}
@@ -497,11 +498,12 @@ export function TPMIndexHOC(WrappedComponent) {
 
 						</div>
 
+            </Spin>
 
 						<NewFooter
 								Footerdown={Footerdown}
 						/>
-            </Spin>
+            
 		        </div>
 		    );
 	  	}

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

@@ -916,7 +916,7 @@ class Newshixuns extends Component {
         //         // console.log('beforeUpload', file.name);
         //         const isLt50M = file.size / 1024 / 1024 < 50;
         //         if (!isLt50M) {
-        //             message.error('文件大小必须小于150MB!');
+        //             this.props.showNotification('文件大小必须小于150MB!');
         //         }
         //         return isLt50M;
         //     },

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

@@ -13,6 +13,7 @@ import axios from 'axios';
 import { trace, trace_collapse ,getImageUrl, toPath} from "educoder";
 
 import RepositoryDirectories from './RepositoryDirectories'
+import RepositoryAddFile from './RepositoryAddFile'
 const $ = window.$;
 
 // 点击按钮复制功能
@@ -82,10 +83,10 @@ class Repository extends Component {
 
                     <a href="/forums/2784" target="_blank"
                        className=" guideBtn" >Git使用指南</a>
-
+                    {/* <RepositoryAddFile {...this.props} {...this.state}></RepositoryAddFile> */}
                     <div className="fr font-12 color-grey-9 pr">
-                      <label className="fl">网址克隆：</label>
-                      <input type="text" id="copy_rep_content" className="fl url-input"
+                      <label className="fl mt2">网址克隆：</label>
+                      <input type="text" id="copy_rep_content" className="fl url-input mt2"
                              defaultValue={ git_url } style={{width: 313}}/>
                       <a onClick={() => {
                         jsCopy()

public/react/src/modules/tpm/shixunchild/Repository/RepositoryAddFile.js

@@ -0,0 +1,52 @@
+import React, { Component } from 'react';
+import { ActionBtn } from 'educoder'
+
+import { Form , Modal } from 'antd'
+
+class RepositoryAddFile extends Component {
+  constructor(props) {
+    super(props);
+    this.state={
+      visible:false
+    }
+  }
+
+  addFile = () =>{
+    this.setState({
+      visible:true
+    })
+  }
+  cancelAdd = () =>{
+    this.setState({
+      visible:false
+    })
+  }
+  render(){
+    let { visible } = this.state
+    return(
+      <React.Fragment>
+        <ActionBtn style="orangeLine" className="ml20" onClick={this.addFile}>+添加文件</ActionBtn>
+        <Modal
+          className={"RepositioryModal"}
+          title={'添加文件'}
+          visible={visible}
+          closable={false}
+          footer={null}
+          destroyOnClose={true}
+          width="550px"
+        >
+          <div className="task-popup-content">
+
+          </div>
+          <div className="clearfix mt30 edu-txt-center mb10">
+            <a  className="task-btn color-white mr30" onClick={this.cancelAdd}>取消</a>
+            <a className="task-btn task-btn-orange">提交</a>
+          </div>
+        </Modal>
+      </React.Fragment>
+    )
+  }
+}
+const WrappedRepositoryAddFile = Form.create({name: 'taskRepositoryAddFile'})(RepositoryAddFile);
+// RouteHOC()
+export default (WrappedRepositoryAddFile);