From 245569cabeaad9b9aa766ab8a3754a5290eaa0fc Mon Sep 17 00:00:00 2001 From: caicai8 <1149225589@qq.com> Date: Fri, 30 Aug 2019 17:40:30 +0800 Subject: [PATCH] issue --- public/react/src/common/course/ActionBtn.js | 2 +- .../src/modules/courses/boards/BoardsNew.js | 2 +- .../courses/busyWork/CommonWorkPost.js | 2 +- .../src/modules/courses/busyWork/NewWork.js | 4 +- .../courses/coursesPublic/AccessoryModal.js | 2 +- .../courses/coursesPublic/AccessoryModal2.js | 2 +- .../courses/coursesPublic/SelectSetting.js | 2 +- .../courses/coursesPublic/sendResource.js | 2 +- .../react/src/modules/courses/css/Courses.css | 9 +++- .../tasks/GraduationTasksSubmitedit.js | 2 +- .../tasks/GraduationTasksSubmitnew.js | 2 +- .../GraduationTasksappraiseMainEditor.js | 2 +- .../graduation/tasks/GraduationTasksedit.js | 2 +- .../graduation/tasks/GraduationTasksnew.js | 52 +++++++++---------- .../graduation/topics/GraduateTopicNew.js | 2 +- .../topics/GraduateTopicPostWorksNew.js | 2 +- .../react/src/modules/moop_cases/CaseNew.js | 3 +- .../react/src/modules/moop_cases/CaseTags.js | 12 ++++- .../src/modules/moop_cases/css/moopCases.css | 7 +++ .../src/modules/tpm/newshixuns/Newshixuns.js | 2 +- .../tpm/shixunchild/Repository/Repository.js | 7 +-- .../Repository/RepositoryAddFile.js | 52 +++++++++++++++++++ 22 files changed, 126 insertions(+), 48 deletions(-) create mode 100644 public/react/src/modules/tpm/shixunchild/Repository/RepositoryAddFile.js diff --git a/public/react/src/common/course/ActionBtn.js b/public/react/src/common/course/ActionBtn.js index f10a56910..484c85eb0 100644 --- a/public/react/src/common/course/ActionBtn.js +++ b/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 { diff --git a/public/react/src/modules/courses/boards/BoardsNew.js b/public/react/src/modules/courses/boards/BoardsNew.js index 0b27ea8b8..316c97247 100644 --- a/public/react/src/modules/courses/boards/BoardsNew.js +++ b/public/react/src/modules/courses/boards/BoardsNew.js @@ -275,7 +275,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; }, diff --git a/public/react/src/modules/courses/busyWork/CommonWorkPost.js b/public/react/src/modules/courses/busyWork/CommonWorkPost.js index 1859d6b70..e6df6ae89 100644 --- a/public/react/src/modules/courses/busyWork/CommonWorkPost.js +++ b/public/react/src/modules/courses/busyWork/CommonWorkPost.js @@ -594,7 +594,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; }, diff --git a/public/react/src/modules/courses/busyWork/NewWork.js b/public/react/src/modules/courses/busyWork/NewWork.js index 525e13922..289df5a6c 100644 --- a/public/react/src/modules/courses/busyWork/NewWork.js +++ b/public/react/src/modules/courses/busyWork/NewWork.js @@ -335,7 +335,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; }, @@ -354,7 +354,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; }, diff --git a/public/react/src/modules/courses/coursesPublic/AccessoryModal.js b/public/react/src/modules/courses/coursesPublic/AccessoryModal.js index 71d92cd0c..54845aac4 100644 --- a/public/react/src/modules/courses/coursesPublic/AccessoryModal.js +++ b/public/react/src/modules/courses/coursesPublic/AccessoryModal.js @@ -256,7 +256,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; }, diff --git a/public/react/src/modules/courses/coursesPublic/AccessoryModal2.js b/public/react/src/modules/courses/coursesPublic/AccessoryModal2.js index 6808ded8a..8a5338c72 100644 --- a/public/react/src/modules/courses/coursesPublic/AccessoryModal2.js +++ b/public/react/src/modules/courses/coursesPublic/AccessoryModal2.js @@ -178,7 +178,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; }, diff --git a/public/react/src/modules/courses/coursesPublic/SelectSetting.js b/public/react/src/modules/courses/coursesPublic/SelectSetting.js index 2870c5d12..41e27bd01 100644 --- a/public/react/src/modules/courses/coursesPublic/SelectSetting.js +++ b/public/react/src/modules/courses/coursesPublic/SelectSetting.js @@ -389,7 +389,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; }, diff --git a/public/react/src/modules/courses/coursesPublic/sendResource.js b/public/react/src/modules/courses/coursesPublic/sendResource.js index 715e4acf9..cf3bfe13a 100644 --- a/public/react/src/modules/courses/coursesPublic/sendResource.js +++ b/public/react/src/modules/courses/coursesPublic/sendResource.js @@ -338,7 +338,7 @@ debugger // console.log('beforeUpload', file.name); const isLt150M = file.size / 1024 / 1024 < 150; if (!isLt150M) { - message.error('文件大小必须小于150MB!'); + this.props.showNotification('文件大小必须小于150MB!'); } return isLt150M; }, diff --git a/public/react/src/modules/courses/css/Courses.css b/public/react/src/modules/courses/css/Courses.css index 4f37ac816..74637571f 100644 --- a/public/react/src/modules/courses/css/Courses.css +++ b/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; diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js index ce704ef6e..45b338e5c 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js @@ -520,7 +520,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; }, diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js index 3c8318796..f1f725332 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js @@ -538,7 +538,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; }, diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseMainEditor.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseMainEditor.js index 24fdd75cf..355b5b1bf 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseMainEditor.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseMainEditor.js @@ -169,7 +169,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; }, diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js index 869295c59..b8e46ee7c 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js @@ -294,7 +294,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; }, diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js index fae87fb65..4d33698ab 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js +++ b/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; - - // 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) => { @@ -271,7 +271,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; }, diff --git a/public/react/src/modules/courses/graduation/topics/GraduateTopicNew.js b/public/react/src/modules/courses/graduation/topics/GraduateTopicNew.js index 329cd169b..07d172d42 100644 --- a/public/react/src/modules/courses/graduation/topics/GraduateTopicNew.js +++ b/public/react/src/modules/courses/graduation/topics/GraduateTopicNew.js @@ -310,7 +310,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; }, diff --git a/public/react/src/modules/courses/graduation/topics/GraduateTopicPostWorksNew.js b/public/react/src/modules/courses/graduation/topics/GraduateTopicPostWorksNew.js index 50551adae..fc47e1fcd 100644 --- a/public/react/src/modules/courses/graduation/topics/GraduateTopicPostWorksNew.js +++ b/public/react/src/modules/courses/graduation/topics/GraduateTopicPostWorksNew.js @@ -249,7 +249,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; }, diff --git a/public/react/src/modules/moop_cases/CaseNew.js b/public/react/src/modules/moop_cases/CaseNew.js index 7d0cd735c..a0e8082ff 100644 --- a/public/react/src/modules/moop_cases/CaseNew.js +++ b/public/react/src/modules/moop_cases/CaseNew.js @@ -273,7 +273,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文档里给出链接以及共享密码并上传" @@ -377,6 +377,7 @@ class CaseNew extends Component{ { checkTag &&
请选择标签
diff --git a/public/react/src/modules/moop_cases/CaseTags.js b/public/react/src/modules/moop_cases/CaseTags.js index 4b4f0670c..3d0c93a20 100644 --- a/public/react/src/modules/moop_cases/CaseTags.js +++ b/public/react/src/modules/moop_cases/CaseTags.js @@ -14,7 +14,17 @@ class CaseTags extends Component{ { tags && tags.map((item,key)=>{ return( - {item.name} + + { + item.name == "获奖案例" ? + {item.name} + : + item.name == "入库案例" ? + {item.name} + : + {item.name} + } + ) }) } diff --git a/public/react/src/modules/moop_cases/css/moopCases.css b/public/react/src/modules/moop_cases/css/moopCases.css index 47c98a833..7a58cee61 100644 --- a/public/react/src/modules/moop_cases/css/moopCases.css +++ b/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; diff --git a/public/react/src/modules/tpm/newshixuns/Newshixuns.js b/public/react/src/modules/tpm/newshixuns/Newshixuns.js index fbbc807b5..d7e3f268a 100644 --- a/public/react/src/modules/tpm/newshixuns/Newshixuns.js +++ b/public/react/src/modules/tpm/newshixuns/Newshixuns.js @@ -913,7 +913,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; // }, diff --git a/public/react/src/modules/tpm/shixunchild/Repository/Repository.js b/public/react/src/modules/tpm/shixunchild/Repository/Repository.js index c888ba6d8..ea9e51694 100644 --- a/public/react/src/modules/tpm/shixunchild/Repository/Repository.js +++ b/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 { Git使用指南 - + {/* */}
- - 网址克隆： + { jsCopy() diff --git a/public/react/src/modules/tpm/shixunchild/Repository/RepositoryAddFile.js b/public/react/src/modules/tpm/shixunchild/Repository/RepositoryAddFile.js new file mode 100644 index 000000000..79133f34c --- /dev/null +++ b/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( + + +添加文件 + +
+ +
+
+ 取消 + 提交 +
+ + + ) + } +} +const WrappedRepositoryAddFile = Form.create({name: 'taskRepositoryAddFile'})(RepositoryAddFile); +// RouteHOC() +export default (WrappedRepositoryAddFile); \ No newline at end of file