Merge branch 'dev_cs' into dev_aliyun

# Conflicts:
#	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

@@ -338,7 +338,7 @@ class NewWork 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;
       },
@@ -357,7 +357,7 @@ class NewWork 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/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/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

@@ -57,24 +57,22 @@ class GraduationTasksnew extends Component {
 		}
 		// if (GraduationTasksnewtype === true) {
 			this.props.form.validateFields((err, values) => {
+				if (values.tasktype === undefined) {
+					this.ifHasAnchorJustScorll("tasktypes");
+					return
+				}
+				if (values.name === undefined) {
+					this.ifHasAnchorJustScorll("nametypes");
+					return
+				}
+				if (values.description === undefined) {
+					this.ifHasAnchorJustScorll("descriptiontypes");
+					return
+				}else if (values.description.length > 5000) {
+					this.ifHasAnchorJustScorll("descriptiontypes");
+					return
+				}
 				if (!err) {
-					if (values.tasktype === undefined) {
-						this.scrollToAnchors("tasktypes");
-						return
-					}
-
-					if (values.name === undefined) {
-						this.scrollToAnchors("nametypes");
-						return
-					}
-
-					if (values.description === undefined) {
-						this.scrollToAnchors("descriptiontypes");
-						return
-					} else if (values.description.length > 5000) {
-						this.scrollToAnchors("descriptiontypes");
-						return
-					}
 					// console.log('Received values of form: ', values);
 					// console.log(fileList);
 					const course_id = this.props.match.params.coursesId;
@@ -129,14 +127,16 @@ class GraduationTasksnew extends Component {
 	}
 	// 附件相关 START
 	handleChange = (info) => {
-		let fileList = info.fileList;
+		if(info.file.status == "done" || info.file.status == "uploading"){
-
+			let fileList = info.fileList;
-		// for(var list of fileList ){
+
-		//   console.log(list)
+			// for(var list of fileList ){
-		// }
+			//   console.log(list)
-		this.setState({
+			// }
-			fileList: appendFileSizeToUploadFileAll(fileList),
+			this.setState({
-		});
+				fileList: appendFileSizeToUploadFileAll(fileList),
+			});
+		}
 	}
 
 	// onAttachmentRemove = (file) => {
@@ -274,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;
 			},

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/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){
+    if(file.response!=undefined){
-			this.props.confirm({
+      this.props.confirm({
-				content: '是否确认删除?',
+        content: '是否确认删除?', 
-				onOk: () => {
+        onOk: () => {
-					this.deleteAttachment(file, stateName)
+          this.deleteAttachment(file, stateName)
-				},
+        },
-				onCancel() {
+        onCancel() {
-					console.log('Cancel');
+          console.log('Cancel');
-				},
+        },
-			});
+      });
-			return false;
+      return false;
-		}
+    }
-
   }
 
   // 上传附件-确认删除
@@ -276,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文档里给出链接以及共享密码并上传"
@@ -380,6 +379,7 @@ class CaseNew extends Component{
                 <ul className="fl libraries_tab">
                     <li className={ casesTags.indexOf(1) > -1 ? "active" :"" } onClick={()=>this.changeType(1)}>获奖案例</li>
                     <li className={ casesTags.indexOf(2) > -1 ? "active" :"" } onClick={()=>this.changeType(2)}>入库案例</li>
+                    <li className={ casesTags.indexOf(3) > -1 ? "active" :"" } onClick={()=>this.changeType(3)}>企业案例</li>
                 </ul>
                 {
                   checkTag && <div class="ant-form-explain">请选择标签</div>

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/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>
+                      <label className="fl mt2">网址克隆：</label>
-                      <input type="text" id="copy_rep_content" className="fl url-input"
+                      <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);