From c7dad0d3ef8acb1f0d3a6458a785d92ca43bce77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Mon, 9 Mar 2020 20:17:39 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/courses/Index.js     |   4 +-
 .../src/modules/courses/Resource/index.js     |  62 ++-
 .../courses/coursesPublic/sendResources.js    | 508 ++++++++++++++++++
 3 files changed, 567 insertions(+), 7 deletions(-)
 create mode 100644 public/react/src/modules/courses/coursesPublic/sendResources.js

diff --git a/public/react/src/modules/courses/Index.js b/public/react/src/modules/courses/Index.js
index fb4afd436..8a21e76da 100644
--- a/public/react/src/modules/courses/Index.js
+++ b/public/react/src/modules/courses/Index.js
@@ -10,7 +10,7 @@ import { CNotificationHOC } from './common/CNotificationHOC'
 import {ImageLayerOfCommentHOC} from '../page/layers/ImageLayerOfCommentHOC'
 import "./css/Courses.css"
 //引入对应跳转的组件
-
+//里面有资源
 const ListPageIndex = Loadable({
     loader: () => import('./ListPageIndex'),
     loading:Loading,
@@ -964,4 +964,4 @@ class CoursesIndex extends Component{
     }
 }
 
-export default withRouter(ImageLayerOfCommentHOC({imgSelector: '.imageLayerParent img, .imageLayerParent .imageTarget', parentSelector: '.newMain'}) (CNotificationHOC() ( SnackbarHOC() ( TPMIndexHOC(CoursesIndex) ))));
\ No newline at end of file
+export default withRouter(ImageLayerOfCommentHOC({imgSelector: '.imageLayerParent img, .imageLayerParent .imageTarget', parentSelector: '.newMain'}) (CNotificationHOC() ( SnackbarHOC() ( TPMIndexHOC(CoursesIndex) ))));
diff --git a/public/react/src/modules/courses/Resource/index.js b/public/react/src/modules/courses/Resource/index.js
index 8187cd5af..250d643dc 100644
--- a/public/react/src/modules/courses/Resource/index.js
+++ b/public/react/src/modules/courses/Resource/index.js
@@ -6,6 +6,8 @@ import Modals from '../../modals/Modals';
 import Sendtofilesmodal from "../coursesPublic/SendToFilesModal";
 import Selectresource from "../coursesPublic/SelectResource";
 import Sendresource from "../coursesPublic/sendResource";
+import SendResources from "../coursesPublic/sendResources";
+
 import Selectsetting from "../coursesPublic/SelectSetting";
 import HomeworkModal from "../coursesPublic/HomeworkModal";
 import Fileslistitem from './Fileslistitem';
@@ -34,7 +36,9 @@ class Fileslists extends Component{
       name:"",
       sendTotype:false,
       Accessoryvisible:false,
-      discussMessageid:undefined,
+			Addanexternallink:false,
+			Exterchainname:"添加外链",
+			discussMessageid:undefined,
       course_modules:undefined,
       has_course_groups:false,
       course_is_public:undefined,
@@ -570,6 +574,35 @@ class Fileslists extends Component{
     })
 
   }
+  //添加外链资源设置
+	sendResourcessls = (ints,bool) => {
+  	if(bool===true){
+
+  		if(ints===1){
+				this.setState({
+					Addanexternallink:true,
+					Exterchainname:"添加外链"
+				})
+
+			}else{
+				this.setState({
+					Addanexternallink:true,
+					Exterchainname:"资源设置"
+				})
+
+			}
+
+
+		}else{
+			this.setState({
+				Addanexternallink:false,
+			})
+		}
+
+	}
+
+
+
 
   Cancelvisible=()=>{
 
@@ -729,7 +762,9 @@ class Fileslists extends Component{
       course_is_public,
 			filesId,
 			child,
-			sort
+			sort,
+			Addanexternallink,
+			Exterchainname
     } = this.state;
     let category_id= this.props.match.params.category_id;
 
@@ -781,7 +816,7 @@ class Fileslists extends Component{
               loadtype={Loadtype}
           />:""}
           {
-            shixunmodal===true||Accessoryvisible===true||Settingtype===true?<style>
+            shixunmodal===true||Accessoryvisible===true||Settingtype===true||Addanexternallink===true?<style>
               {
                 `
               body {
@@ -821,6 +856,21 @@ class Fileslists extends Component{
               has_course_groups={this.state.has_course_groups}
               attachmentId={this.state.coursesecondcategoryid}
           />:""}
+
+					{/*添加外链*/}
+					{Addanexternallink&&Addanexternallink===true?<SendResources
+						{...this.props}
+						{...this.state}
+						modalname={Exterchainname}
+						visible={Addanexternallink}
+						Cancelname={"取消"}
+						Savesname={"确认"}
+						Cancel={()=>this.sendResourcessls(1,false)}
+						categoryid={category_id}
+						setupdate={(ints,bool)=>this.sendResourcessls(ints,bool)}
+						has_course_groups={this.state.has_course_groups}
+						attachmentId={this.state.coursesecondcategoryid}
+					/>:""}
  					{/*设置资源*/}
           {Settingtype&&Settingtype===true?<Selectsetting
               {...this.props}
@@ -858,8 +908,10 @@ class Fileslists extends Component{
                     {this.props.isAdmin()?parseInt(this.props.match.params.main_id)!=parseInt(this.props.coursesids)?<WordsBtn style="blue" onClick={()=>this.editDir(name)} className={"mr30 font-16"}>目录重命名</WordsBtn>:"":""}
 
                     {this.props.isAdmin()||this.props.isStudent() ? this.props.user&&this.props.user.main_site===true? <WordsBtn style="blue" className="mr30 font-16" onClick={()=>this.addResource()}>选用资源</WordsBtn>:"":""}
-                    {this.props.isAdmin()||this.props.isStudent() ? <WordsBtn style="blue" className=" font-16" onClick={()=>this.sendResources()}>上传资源</WordsBtn>:""}
-                  </React.Fragment>
+                    {this.props.isAdmin()||this.props.isStudent() ? <WordsBtn style="blue" className="mr30 font-16" onClick={()=>this.sendResources()}>上传资源</WordsBtn>:""}
+										{this.props.isAdmin()||this.props.isStudent() ? <WordsBtn style="blue" className=" font-16" onClick={()=>this.sendResourcessls(1,true)}>添加外链</WordsBtn>:""}
+
+									</React.Fragment>
                 }
 
                 secondRowLeft={
diff --git a/public/react/src/modules/courses/coursesPublic/sendResources.js b/public/react/src/modules/courses/coursesPublic/sendResources.js
new file mode 100644
index 000000000..2927fc1b0
--- /dev/null
+++ b/public/react/src/modules/courses/coursesPublic/sendResources.js
@@ -0,0 +1,508 @@
+import React,{ Component } from "react";
+import { Modal,Checkbox,Upload,Button,Icon,message,DatePicker,Select,Tooltip,Radio,Input} from "antd";
+import axios from 'axios';
+import Modals from '../../modals/Modals';
+import {getUploadActionUrl,handleDateString,appendFileSizeToUploadFileAll} from 'educoder';
+import locale from 'antd/lib/date-picker/locale/zh_CN';
+import moment from 'moment';
+const CheckboxGroup = Checkbox.Group;
+const Option = Select.Option;
+function range(start, end) {
+	const result = [];
+	for (let i = start; i < end; i++) {
+		result.push(i);
+	}
+	return result;
+}
+function disabledDateTime() {
+	return {
+		// disabledHours: () => range(0, 24).splice(4, 20),
+		disabledMinutes: () => range(1, 30).concat(range(31, 60)),
+		// disabledSeconds: () => [0, 60],
+	};
+}
+
+function disabledDate(current) {
+	return current && current < moment().endOf('day').subtract(1, 'days');
+}
+
+
+const dateFormat="YYYY-MM-DD HH:mm";
+class sendResources extends Component{
+	constructor(props){
+		super(props);
+		this.state={
+			group_ids:[],
+			fileList:[],
+			Modalstype:false,
+			Modalstopval:"",
+			ModalCancel:"",
+			ModalSave:"",
+			fileListtype:false,
+			loadtype:false,
+			is_public:false,
+			datatime:undefined,
+			resourcesname:"",
+			resourceurl:"",
+			addonAfteronelens3:0,
+			// moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),
+			course_group_publish_times:[
+				{
+					course_group_id : undefined,
+					publish_time :""
+				}],
+			course_groups:undefined,
+			course_groups_count:undefined,
+			Radiovalue:0,
+			Radiovaluetype:false,
+			resourceurlbool:false,
+			resourcesnamebool:false,
+		}
+	}
+
+
+	componentDidMount() {
+
+	}
+
+	//勾选实训
+	shixunhomeworkedit=(list)=>{
+
+		this.setState({
+			group_ids:list
+		})
+
+	}
+	// 附件相关 START
+	handleChange = (info) => {
+		console.log(info)
+
+		if (info.file.status === 'uploading' || info.file.status === 'done' || info.file.status === 'removed') {
+			let fileList = info.fileList;
+			if (info.file.status != "removed") {
+				this.setState({
+					fileList: appendFileSizeToUploadFileAll(fileList),
+					fileListtype: true
+				});
+			} else {
+				this.setState({
+					fileList: appendFileSizeToUploadFileAll(fileList),
+				});
+			}
+		}
+	}
+
+	onAttachmentRemove = (file) => {
+		if(!file.percent || file.percent == 100){
+			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) {
+							this.setState({
+								fileListtype:false,
+								fileList:[]
+							})
+						}
+
+					}
+				})
+				.catch(function (error) {
+					console.log(error);
+				});
+			this.setState({
+				fileListtype:false,
+			})
+		}else{
+			this.setState({
+				fileListtype:false,
+				fileList:[]
+			})
+		}
+	}
+
+	ModalCancelModalCancel=()=>{
+		this.setState({
+			Modalstype:false,
+			Modalstopval:"",
+			ModalSave:this.ModalCancelModalCancel,
+			loadtype:false
+		})
+		this.props.Cancel()
+	}
+	Saves=()=>{
+		debugger
+
+		let {resourcesname,resourceurl,description,is_public,datatime,Radiovalue} =this.state;
+		const reg = /^[\s\S]*.*[^\s][\s\S]*$/;
+
+		if (!reg.test(resourcesname)) {
+			this.setState({
+				resourcesnamebool:true
+			})
+			return;
+		}
+		if (!reg.test(resourceurl)) {
+			this.setState({
+				resourceurlbool:true
+			})
+			return;
+		}
+
+
+
+		if(this.state.Radiovalue===1){
+			if(datatime===undefined||datatime===null||datatime=== ""){
+				this.setState({
+					Radiovaluetype:true
+				})
+				return
+			}else{
+				this.setState({
+					Radiovaluetype:false
+				})
+			}
+		}
+
+
+
+		if(description===undefined){
+
+		}else if(description.length>100){
+
+			this.setState({
+				descriptiontype:true
+			})
+			return
+		}
+
+		let coursesId=this.props.match.params.coursesId;
+		let attachmentId=this.props.attachmentId;
+		let url="/files/upload.json";
+
+
+		axios.post(url,{
+			course_id:coursesId,
+			course_second_category_id:this.props.coursesidtype===undefined||this.props.coursesidtype==="node"?0:attachmentId,
+			is_public:is_public,
+			publish_time:Radiovalue===1?datatime===undefined? undefined:datatime:undefined,
+			description:description,
+			delay_publish:Radiovalue,
+		}).then((result)=>{
+
+
+			if(result.data.status===0){
+				this.ModalCancelModalCancel();
+				this.props.updataleftNavfun();
+				this.props.showNotification("上传资源成功");
+				this.props.setupdate(this.props.attachmentId)
+			}else{
+				this.props.showNotification(result.data.message);
+			}
+		})
+
+
+
+	}
+
+	settextarea=(e)=>{
+		this.setState({
+			description:e.target.value
+		})
+	}
+
+	onChangepublic=(e)=>{
+
+		this.setState({
+			is_public:e.target.checked
+		})
+
+	}
+
+	onChangeTimepublish= (date, dateString,key,type) => {
+		if(type===1){
+			this.setState({
+				datatime:handleDateString(dateString),
+			})
+		}else if(type===2){
+			let {course_group_publish_times}=this.state;
+			let newgroup_publish=course_group_publish_times;
+			for(var i=0; i<newgroup_publish.length; i++){
+				if(i===parseInt(key)){
+					newgroup_publish[i].publish_time=handleDateString(dateString);
+				}
+			}
+			this.setState({
+				course_group_publish_times:newgroup_publish,
+			})
+		}
+
+	}
+
+	RadioonChange=(e)=>{
+		if(e.target.value===0){
+			this.setState({
+				datatime:undefined
+			})
+		}
+		this.setState({
+			Radiovalue: e.target.value,
+		});
+	}
+
+	handleChanges=(e)=>{
+		let les=e.target.value.length;
+
+		if(e.target.value.length>=61){
+
+
+		}else{
+			this.setState({
+				resourcesname:e.target.value,
+				addonAfteronelens3:les,
+				resourcesnamebool:false,
+
+			})
+
+		}
+
+	}
+
+	handleChangess=(e)=>{
+    this.setState({
+			resourceurl:e.target.value,
+			resourceurlbool:false,
+		})
+	}
+
+
+
+	render(){
+		let { newfileListtype,descriptiontype,
+			is_public,
+			datatime,
+			resourcesname,
+			resourceurl,
+			addonAfteronelens3,
+			resourceurlbool,
+			resourcesnamebool,
+		}=this.state;
+
+		const uploadProps = {
+			width: 600,
+			// showUploadList:false,
+			action: `${getUploadActionUrl()}`,
+			onChange: this.handleChange,
+			onRemove: this.onAttachmentRemove,
+			beforeUpload: (file) => {
+				// console.log('beforeUpload', file.name);
+				const isLt150M = file.size / 1024 / 1024 < 150;
+				if (!isLt150M) {
+					this.props.showNotification('文件大小必须小于150MB!');
+				}
+				return isLt150M;
+			},
+		};
+		const radioStyle = {
+			display: 'block',
+			height: '30px',
+			lineHeight: '30px',
+		};
+
+
+
+		return(
+			<div>
+				{/*提示*/}
+				<Modals
+					modalsType={this.state.Modalstype}
+					modalsTopval={this.state.Modalstopval}
+					modalCancel={this.state.ModalCancel}
+					modalSave={this.state.ModalSave}
+					loadtype= {this.state.loadtype}
+
+				/>
+
+				<Modal
+					keyboard={false}
+					className={"HomeworkModal"}
+					title={this.props.modalname}
+					visible={this.props.visible}
+					closable={false}
+					footer={null}
+					destroyOnClose={true}
+				>
+					<div className="task-popup-content">
+						<p className="task-popup-text-center font-16">
+
+							<span className={"color-blue underline"}> </span>
+						</p>
+
+						<style>{`
+                .uploadBtn.ant-btn {
+                  border: none;
+                  color: #4CACFF;
+                  box-shadow: none;
+                  background: transparent;
+                  border:1px solid #4CACFF;
+                  padding-left: 6px;
+                  margin-right: 5px;
+                }
+                .ant-upload-list-item:hover .ant-upload-list-item-info{
+                  padding: 0 12px 0 0px;
+                  background-color:#fff;
+                }
+                .upload_1 .ant-upload-list {
+                  width: 350px;
+                }
+                .ant-upload-select{
+                  float: left;
+                }
+
+          			.winth540{
+          			    width: 540px;
+										height: 34px;
+								}
+								
+								 .winth540 .ant-input-group-wrapper{
+							    width: 86%  !important;
+
+								 }
+								 
+								 	 .flexoo  .ant-input{
+								 	 
+								 	  width: 86%  !important;
+
+								    }
+
+              `}</style>
+
+						<p className={"winth540"} style={{
+							width: '100%',
+							display: "flex",
+							flexDirection:"row",
+						}}>
+							<span className="color-ooo fl mt6">资源名称：</span>
+							<Input className="" placeholder="请输入资源名称，最大限制60字符"  value={resourcesname}  onChange={this.handleChanges} addonAfter={String(addonAfteronelens3)+"/60"}  maxLength={60} />
+
+
+						</p>
+						{
+							resourcesnamebool?
+								<p className=" color-red" style={{
+									marginLeft: "13%"
+								}}>请输入资源名称</p>
+								:
+								""
+						}
+						<p className={resourcesnamebool===true?"winth540 flexoo mt10":"winth540 flexoo mt16"} style={{
+							width: '100%',
+							display: "flex",
+							flexDirection:"row",
+
+						}}>
+							<span className="color-ooo fl mt6">链接地址：</span>
+							<Input className="" placeholder="请输入外链url"   value={resourceurl}   onChange={this.handleChangess}  />
+						</p>
+						{
+							resourceurlbool?
+								<p className=" color-red" style={{
+									marginLeft: "13%"
+								}}>请输入外链url</p>
+								:
+								""
+						}
+
+
+						<p className={this.state.fileListtype===true?"mt25":""}>
+							<style>{`
+                .ant-checkbox-wrapper{
+                  margin-left:0px !important;
+                  margin-top:10px;
+                }
+              `}</style>
+
+							{this.props.course_is_public===true?<div>
+								<span className={"color-ooo"}>公开：</span><Checkbox  checked={is_public} onChange={this.onChangepublic}>
+								<span className={"font-14 color-ooo"}>选中，所有用户可见，否则课堂成员可见</span>
+							</Checkbox>
+							</div>:""}
+
+							<style>{`
+                .Selectleft20{
+                   margin-left: 20px !important;
+                   width: 176px;
+                   height: 40px;
+                }
+               #startimes .ant-calendar-picker-icon{
+                  margin-top:-11px;
+                }
+                .resourcebox{
+                   max-height:150px;
+                    overflow: auto;
+                }
+              `}</style>
+						</p>
+
+
+						<div className={this.props.course_is_public===true?"mt10":""}>
+							<span className={"color-ooo fl mt6"}>发布设置：</span>
+							<Radio.Group onChange={this.RadioonChange} value={this.state.Radiovalue} style={{'width': '460px'}}>
+								<Radio style={radioStyle} value={0}>
+									立即发布
+								</Radio>
+								<Tooltip placement="bottom" title={this.props.isStudent()===true?"不支持学生延迟发布":""}>
+									<Radio style={radioStyle} value={1} className={"fl"} disabled={this.props.isStudent()}>
+										<span className={"mr5"}>延期发布</span>
+										<DatePicker
+
+											dropdownClassName="hideDisable"
+											showTime={{ format: 'HH:mm' }}
+											locale={locale}
+											format={dateFormat}
+											placeholder="请选择发布时间"
+											id={"startime"}
+											showToday={false}
+											width={"210px"}
+											value={this.state.Radiovalue===1?datatime===undefined||datatime===""?undefined:moment(datatime, dateFormat):undefined}
+											onChange={(e,index)=>this.onChangeTimepublish(e,index,undefined,1)}
+											disabledTime={disabledDateTime}
+											disabledDate={disabledDate}
+											disabled={this.state.Radiovalue===1?false:true}
+										/>
+									</Radio>
+								</Tooltip>
+								<span className={"fl mt5 color-grey-c"}>(按照设置的时间定时发布)</span>
+							</Radio.Group>
+						</div>
+						<div className="mt10" style={{
+							width: '100%',
+							display: "flex",
+							flexDirection:"row",
+						}}>
+							<span className="color-ooo fl mt6">资源描述：</span>
+							{/*{course_group_publish_timestype===true?<p className={"color-red mt10"}>请填写完整</p>:""}*/}
+							<textarea  placeholder="请在此输入资源描述，最大限制100个字符" className={"mt10"} value={this.state.description} onInput={this.settextarea} style={{
+								width: '86%',
+								height:'120px',
+								border:'1px solid rgba(234,234,234,1)',
+								padding: '10px'
+							}}></textarea>
+						</div>
+
+						{descriptiontype===true?<p className={"color-red"}>请输入资源描述，最大限制100个字符</p>:""}
+						{this.state.Radiovaluetype===true?<p className={"color-red"}>发布时间不能为空</p>:""}
+						<div className="clearfix mt30 edu-txt-center mb10">
+							<a  className="task-btn color-white mr70" onClick={this.props.Cancel}>{this.props.Cancelname}</a>
+							<a className="task-btn task-btn-orange" onClick={()=>this.Saves()}>{this.props.Savesname}</a>
+						</div>
+
+					</div>
+				</Modal>
+			</div>
+		)
+	}
+}
+export default sendResources;

From f87becc4967af7a8a2ec427e53cc236d9e50edaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Mon, 9 Mar 2020 22:07:52 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=8F=8F=E8=BF=B0?=
 =?UTF-8?q?=E6=96=B9=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/courses/Resource/Fileslistitem.js | 298 ++++++++++++------
 .../src/modules/courses/Resource/index.js     |  23 +-
 .../courses/coursesPublic/sendResources.js    |  77 +++--
 3 files changed, 274 insertions(+), 124 deletions(-)

diff --git a/public/react/src/modules/courses/Resource/Fileslistitem.js b/public/react/src/modules/courses/Resource/Fileslistitem.js
index 53f607b2e..37dd95298 100644
--- a/public/react/src/modules/courses/Resource/Fileslistitem.js
+++ b/public/react/src/modules/courses/Resource/Fileslistitem.js
@@ -1,6 +1,6 @@
-import React,{ Component } from "react";
-import { WordsBtn } from 'educoder';
-import {Tooltip,message} from 'antd';
+import React, {Component} from "react";
+import {WordsBtn} from 'educoder';
+import {Tooltip, message} from 'antd';
 import {Link} from 'react-router-dom';
 import {getImageUrl} from 'educoder';
 import axios from 'axios'
@@ -10,25 +10,40 @@ import CoursesListType from '../coursesPublic/CoursesListType';
 import Showoldfiles from "../coursesPublic/Showoldfiles";
 import Modals from '../../modals/Modals';
 
-class Fileslistitem extends Component{
-	constructor(props){
+class Fileslistitem extends Component {
+	constructor(props) {
 		super(props);
-		this.state = {
-
-		}
+		this.state = {}
 	}
 
-	settingList=()=>{
-		let {discussMessage}=this.props
+	settingList = (bools) => {
+		let {discussMessage} = this.props
 
 		this.setState({
-			discussMessageid:discussMessage.id
+			discussMessageid: discussMessage.id
 		})
-		this.props.Settingtypes(discussMessage.id)
-	}
+		if (bools === true) {
+			this.props.Settingtypes(discussMessage.id)
+		} else {
+			this.props.Settingtypess(discussMessage.id)
+		}
 
-	showfiles=(list)=>{
-		if(this.props.checkIfLogin()===false){
+	}
+	//外链
+	showfiless = (url,id) => {
+		window.open(url)
+		let urls=`/files/${id}/update_visits.json`;
+		axios.post(urls,{
+		}).then((result)=>{
+			if(result.data.status===0){
+       this.props.Updateresourcepage()
+			}else{
+				this.props.showNotification(result.data.message);
+			}
+		})
+	}
+	showfiles = (list) => {
+		if (this.props.checkIfLogin() === false) {
 			this.props.showLoginDialog()
 			return
 		}
@@ -43,21 +58,21 @@ class Fileslistitem extends Component{
 		// 	return
 		// }
 
-		if(list.is_history_file===false){
+		if (list.is_history_file === false) {
 			// this.props.DownloadFileA(list.title,list.url)
 			//window.location.href=list.url;
 			window.open(list.url, '_blank');
-		}else{
-			let {discussMessage,coursesId}=this.props
-			let file_id=discussMessage.id
-			let url="/files/"+file_id+"/histories.json"
-			axios.get(url,{
-				params:{
-					course_id:coursesId
+		} else {
+			let {discussMessage, coursesId} = this.props
+			let file_id = discussMessage.id
+			let url = "/files/" + file_id + "/histories.json"
+			axios.get(url, {
+				params: {
+					course_id: coursesId
 				},
-			}).then((result)=>{
+			}).then((result) => {
 
-				if(result.data.attachment_histories.length===0){
+				if (result.data.attachment_histories.length === 0) {
 					// if(result.data.is_pdf===true){
 					// 	this.props.ShowOnlinePdf(result.data.url)
 					// 	//预览pdf
@@ -66,64 +81,66 @@ class Fileslistitem extends Component{
 					// }
 					// this.props.DownloadFileA(result.data.title,result.data.url)
 					window.open(list.url, '_blank');
-				}else{
+				} else {
 					this.setState({
-						Showoldfiles:true,
-						allfiles:result.data
+						Showoldfiles: true,
+						allfiles: result.data
 					})
 				}
 
 
-			}).catch((error)=>{
+			}).catch((error) => {
 				console.log(error)
 			})
 		}
 
 	}
 
-	closaoldfilesprops=()=>{
+	closaoldfilesprops = () => {
 		this.setState({
-			Showoldfiles:false,
+			Showoldfiles: false,
 		})
 	}
 
 	onDelete = (id) => {
 
 		this.setState({
-			Modalstype:true,
-			Modalstopval:"是否确认删除?",
-			ModalCancel:this.cancelmodel,
-			ModalSave:()=>this.savedelete(id),
+			Modalstype: true,
+			Modalstopval: "是否确认删除?",
+			ModalCancel: this.cancelmodel,
+			ModalSave: () => this.savedelete(id),
 		})
 
 	}
 
-	cancelmodel=()=>{
+	cancelmodel = () => {
 
 		this.setState({
-			Modalstype:false,
-			Loadtype:false,
-			Modalstopval:"",
-			ModalCancel:"",
-			ModalSave:"",
-			checkBoxValues:[],
+			Modalstype: false,
+			Loadtype: false,
+			Modalstopval: "",
+			ModalCancel: "",
+			ModalSave: "",
+			checkBoxValues: [],
 		})
 
 	}
 
-	savedelete=(id)=>{
+	savedelete = (id) => {
 
 		this.setState({
-			Modalstype:false,
+			Modalstype: false,
 		})
 
 
 		const cid = this.props.match.params.coursesId
 		const url = `/files/bulk_delete.json`;
-		axios.delete(url, { data: {
-					course_id:cid,
+		axios.delete(url, {
+				data: {
+					course_id: cid,
 					ids: [id],
-				}})
+				}
+			})
 			.then((response) => {
 				if (response.data.status == 0) {
 					//Modalstopval:response.data.message,
@@ -132,11 +149,11 @@ class Fileslistitem extends Component{
 					this.setState({
 						// Modalstype:true,
 						// Modalstopval:"删除成功",
-						ModalsBottomval:"",
+						ModalsBottomval: "",
 						// ModalSave:this.cancelmodel,
 						// Loadtype:true,
-						checkBoxValues:[],
-						checkAllValue:false
+						checkBoxValues: [],
+						checkAllValue: false
 					})
 
 					this.props.showNotification("删除成功");
@@ -147,28 +164,30 @@ class Fileslistitem extends Component{
 			});
 	}
 
-	eventStop = (event) =>{
+	eventStop = (event) => {
 		event.stopPropagation()
 	}
 
-	render(){
+	render() {
 
-		const { checkBox,
-			discussMessage,index
+		const {
+			checkBox,
+			discussMessage, index
 		} = this.props;
 
-		return(
+		let bools = discussMessage.link && discussMessage.link ? false : true;
+		return (
 			<div className="graduateTopicList boardsList">
 
 				{/*提示*/}
-				{this.state.Modalstype&&this.state.Modalstype===true?<Modals
+				{this.state.Modalstype && this.state.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}
-				/>:""}
+				/> : ""}
 				<Showoldfiles
 					{...this.props}
 					visible={this.state.Showoldfiles}
@@ -213,67 +232,130 @@ class Fileslistitem extends Component{
              margin-top:2px;
             }
           `}</style>
-				<div className="clearfix ds pr contentSection" style={{cursor : this.props.isAdmin ? "pointer" : "default"}} onClick={() => window.$(`.sourceitem${index} input`).click() }>
-					<h6 onClick={(event)=>this.eventStop(event)}>
+				<div className="clearfix ds pr contentSection" style={{cursor: this.props.isAdmin ? "pointer" : "default"}}
+						 onClick={() => window.$(`.sourceitem${index} input`).click()}>
+					<h6 onClick={(event) => this.eventStop(event)}>
 		        	<span className={`sourceitem${index} fl mr12 mt3`}>
 								{checkBox}
 							</span>
 						{
-							this.props.isAdmin ? <a
-								// href={"/courses/" + coursesId + "/graduation/graduation_tasks/" + categoryid + "/" + taskid + "/list"}
-								onClick={()=>this.showfiles(discussMessage)}
-								title={discussMessage.title}
-								className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.title}</a> : ""
+							this.props.isAdmin ?
+								(bools === true ?
+										<a
+											// href={"/courses/" + coursesId + "/graduation/graduation_tasks/" + categoryid + "/" + taskid + "/list"}
+											onClick={() => this.showfiles(discussMessage)}
+											title={discussMessage.title}
+											className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.title}</a>
+										:
+										<a
+											// href={"/courses/" + coursesId + "/graduation/graduation_tasks/" + categoryid + "/" + taskid + "/list"}
+											onClick={() => this.showfiless(discussMessage.link,discussMessage.id)}
+											title={discussMessage.title}
+											className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.title}</a>
+								)
+
+								: ""
 						}
 						{
-							this.props.isStudent?  <a
-								onClick={()=>this.showfiles(discussMessage)}
-								title={discussMessage.title}
-								className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.title}</a> :""
+							this.props.isStudent ?
+								(bools === true ?
+										<a
+											onClick={() => this.showfiles(discussMessage)}
+											title={discussMessage.title}
+											className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.title}</a>
+
+										:
+										<a
+											onClick={() => this.showfiless(discussMessage.link,discussMessage.id)}
+											title={discussMessage.title}
+											className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.title}</a>
+
+								)
+
+
+								: ""
 						}
 
 						{
-							this.props.isNotMember===true?
+							this.props.isNotMember === true ?
 								discussMessage.is_lock === true ?
-									<span className="fl mt3 font-16 font-bd color-dark maxwidth580 pointer"  title={"私有属性，非课堂成员不能访问"}>{discussMessage.title}</span>
-									:<a
-										onClick={()=>this.showfiles(discussMessage)}
-										title={discussMessage.title}
-										className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.title}</a>:""
+									<span className="fl mt3 font-16 font-bd color-dark maxwidth580 pointer"
+												title={"私有属性，非课堂成员不能访问"}>{discussMessage.title}</span>
+									:
+									(bools === true ?
+
+											<a
+												onClick={() => this.showfiles(discussMessage)}
+												title={discussMessage.title}
+												className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.title}</a> :
+
+											<a
+												onClick={() =>this.showfiless(discussMessage.link,discussMessage.id)}
+												title={discussMessage.title}
+												className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.title}</a>
+
+									)
+
+
+								: ""
 						}
 
 
 						{
 							discussMessage.is_lock === true ?
-								<Tooltip  title={"私有属性，非课堂成员不能访问"}  placement="bottom">
+								<Tooltip title={"私有属性，非课堂成员不能访问"} placement="bottom">
 									<i className="iconfont icon-guansuo color-grey-c ml10 font-16 fl mt4"></i>
 								</Tooltip>
-								:""
+								: ""
+						}
+						<style>
+							{
+								`
+								.fwlz{
+								width:40px;
+								height:20px;
+								border-radius:2px;
+								border:1px solid rgba(250,100,0,1);
+								font-size:12px;
+								font-family:MicrosoftYaHei;
+								color:rgba(250,100,0,1);
+								text-align: center;
+                margin-left: 15px;
+								}
+								`
+							}
+						</style>
+						{
+							discussMessage.link && discussMessage.link ?
+								<p className="fl mt3 fwlz pointer">外链</p>
+								:
+								""
 						}
-						{discussMessage.is_publish===false?<CoursesListType typelist={["未发布"]} typesylename={""}/>:""}
 
-						{this.props.isAdmin?
-							<span className={"fr mt2"} onClick={(event)=>this.eventStop(event)}>
+						{discussMessage.is_publish === false ? <CoursesListType typelist={["未发布"]} typesylename={""}/> : ""}
+
+						{this.props.isAdmin ?
+							<span className={"fr mt2"} onClick={(event) => this.eventStop(event)}>
                       <WordsBtn style="blue" className="colorblue font-16 ml20 fr">
                           <a className="btn colorblue fontweight400"
-														 onClick={()=>this.settingList()}>设置</a>
+														 onClick={() => this.settingList(bools)}>设置</a>
                         </WordsBtn>
-                      </span>:""}
+                      </span> : ""}
 
-						{this.props.isStudent===true&&this.props.current_user.login===discussMessage.author.login?
-							<span className={"fr mt2"} onClick={(event)=>this.eventStop(event)}>
+						{this.props.isStudent === true && this.props.current_user.login === discussMessage.author.login ?
+							<span className={"fr mt2"} onClick={(event) => this.eventStop(event)}>
 
                       <WordsBtn style="blue" className="colorblue font-16 ml20  fr">
                         <a className="btn colorblue fontweight400"
-													 onClick={()=>this.settingList()}>设置</a>
+													 onClick={() => this.settingList(bools)}>设置</a>
                       </WordsBtn>
 
 										  <WordsBtn style="blue" className="colorblue font-16 ml20 fr">
                         <a className="btn colorblue fontweight400"
-													 onClick={()=>this.onDelete(discussMessage.id)}>删除</a>
+													 onClick={() => this.onDelete(discussMessage.id)}>删除</a>
                       </WordsBtn>
 
-                      </span>:""}
+                      </span> : ""}
 					</h6>
 					<style>
 						{
@@ -288,7 +370,6 @@ class Fileslistitem extends Component{
 					</style>
 
 
-
 					<style>
 						{
 							`
@@ -315,28 +396,45 @@ class Fileslistitem extends Component{
 
 					{/*</p>}*/}
 
-					<p className={this.props.isAdmin===true?"color-grey panel-lightgrey mt8 fl ml30":"color-grey panel-lightgrey mt8 fl ml13"} style={{width:'100%'}}>
+					<p
+						className={this.props.isAdmin === true ? "color-grey panel-lightgrey mt8 fl ml30" : "color-grey panel-lightgrey mt8 fl ml13"}
+						style={{width: '100%'}}>
                       <span className="mr50">
                         <span className="mr15 color-dark">{discussMessage.author.name}</span>
-                        <span className="mr15 color-grey9">大小 {discussMessage.filesize}</span>
-                        <span className="mr15 color-grey9">下载 {discussMessage.downloads_count}</span>
+												{
+													bools ?
+														<span className="mr15 color-grey9">大小 {discussMessage.filesize}</span>
+
+														:
+														""
+												}
+
+												{
+													bools ?
+														<span className="mr15 color-grey9">下载 {discussMessage.downloads_count}</span>
+														:
+														<span className="mr15 color-grey9">点击次数：{discussMessage.downloads_count}</span>
+
+												}
 												{/*<span className="mr15 color-grey9">引用 {discussMessage.quotes}</span>*/}
 												<span className="mr15 color-grey-c">
                             {/*{moment(discussMessage.publish_time).format('YYYY-MM-DD HH:mm:ss')}*/}
 													{/*{moment(discussMessage.publish_time).fromNow()}*/}
-													{ discussMessage.publish_time===null?"":
-														discussMessage.is_publish===true?"":"发布于"}
-													{ discussMessage.publish_time===null?"":discussMessage.is_publish===true?moment(discussMessage.publish_time).fromNow():moment(discussMessage.publish_time).format('YYYY-MM-DD HH:mm')}
+													{discussMessage.publish_time === null ? "" :
+														discussMessage.is_publish === true ? "" : "发布于"}
+													{discussMessage.publish_time === null ? "" : discussMessage.is_publish === true ? moment(discussMessage.publish_time).fromNow() : moment(discussMessage.publish_time).format('YYYY-MM-DD HH:mm')}
                         </span>
                       </span>
-						{discussMessage&&discussMessage.category_name===null?"":this.props.child===false?<div className="color-grey9 task-hide fr mr30" title={discussMessage&&discussMessage.category_name}
-																																																	style={{"max-width":"268px"}}>所属目录：{discussMessage&&discussMessage.category_name}
-						</div>:""}
+						{discussMessage && discussMessage.category_name === null ? "" : this.props.child === false ?
+							<div className="color-grey9 task-hide fr mr30" title={discussMessage && discussMessage.category_name}
+									 style={{"max-width": "268px"}}>所属目录：{discussMessage && discussMessage.category_name}
+							</div> : ""}
 					</p>
 
 
-
-					<p className={this.props.isAdmin===true?"color-grey panel-lightgrey mt8 fl ml30":"color-grey panel-lightgrey mt8 fl ml13"} style={{width:'94%'}}>
+					<p
+						className={this.props.isAdmin === true ? "color-grey panel-lightgrey mt8 fl ml30" : "color-grey panel-lightgrey mt8 fl ml13"}
+						style={{width: '94%'}}>
 						<style>
 							{
 								`
@@ -349,7 +447,8 @@ class Fileslistitem extends Component{
 													`
 							}
 						</style>
-						<span className="color-dark isspans">资源描述 :{discussMessage.description===null?"暂无描述":discussMessage.description}</span>
+						<span
+							className="color-dark isspans">资源描述 :{discussMessage.description === null ? "暂无描述" : discussMessage.description}</span>
 						{/*<span className="mr50">*/}
 						{/*/!*<span className="mr15 color-dark"></span>*!/*/}
 						{/*<span  className="mr15 color-dark">*/}
@@ -365,4 +464,5 @@ class Fileslistitem extends Component{
 		)
 	}
 }
+
 export default Fileslistitem;
diff --git a/public/react/src/modules/courses/Resource/index.js b/public/react/src/modules/courses/Resource/index.js
index 250d643dc..ee6dc5750 100644
--- a/public/react/src/modules/courses/Resource/index.js
+++ b/public/react/src/modules/courses/Resource/index.js
@@ -597,14 +597,22 @@ class Fileslists extends Component{
 			this.setState({
 				Addanexternallink:false,
 			})
+			if(ints===1){
+			this.Updateresourcepage();
+			}
+
 		}
 
 	}
 
 
+	Updateresourcepage=()=>{
+		let{pagesize,tagname,searchValue,page,sort,sorttype,coursesecondcategoryid}=this.state;
+		this.getfileslist(pagesize,page,tagname,searchValue,sort,sorttype,coursesecondcategoryid);
+	}
 
 
-  Cancelvisible=()=>{
+	Cancelvisible=()=>{
 
     this.setState({
       Accessoryvisible:false,
@@ -620,6 +628,14 @@ class Fileslists extends Component{
     })
   }
 
+	Settingtypess=(id)=>{
+		this.setState({
+			Addanexternallink:true,
+			Exterchainname:"资源设置",
+			discussMessageid:id,
+		})
+	}
+
   moveTos=(id)=>{
 
     let {checkBoxValues} = this.state;
@@ -863,9 +879,10 @@ class Fileslists extends Component{
 						{...this.state}
 						modalname={Exterchainname}
 						visible={Addanexternallink}
+						discussMessageid={discussMessageid}
 						Cancelname={"取消"}
 						Savesname={"确认"}
-						Cancel={()=>this.sendResourcessls(1,false)}
+						Cancel={()=>this.sendResourcessls(2,false)}
 						categoryid={category_id}
 						setupdate={(ints,bool)=>this.sendResourcessls(ints,bool)}
 						has_course_groups={this.state.has_course_groups}
@@ -1049,11 +1066,13 @@ class Fileslists extends Component{
                                 {...this.props}
 																{...this.state}
                                 discussMessage={item}
+																Updateresourcepage={()=>this.Updateresourcepage()}
                                 isAdmin={this.props.isAdmin()}
                                 isStudent={this.props.isStudent()}
                                 isNotMember={this.props.isNotMember()}
                                 checkBox={this.props.isAdmin()?<Checkbox value={item.id} key={item.id}></Checkbox>:""}
                                 Settingtypes={(id)=>this.Settingtypes(id)}
+																Settingtypess={(id)=>this.Settingtypess(id)}
                                 coursesId={this.props.match.params.coursesId}
                                 updatafiledfun={()=>this.updatafiled()}
                                 index={index}
diff --git a/public/react/src/modules/courses/coursesPublic/sendResources.js b/public/react/src/modules/courses/coursesPublic/sendResources.js
index 2927fc1b0..6bbe308f9 100644
--- a/public/react/src/modules/courses/coursesPublic/sendResources.js
+++ b/public/react/src/modules/courses/coursesPublic/sendResources.js
@@ -133,7 +133,7 @@ class sendResources extends Component{
 		this.props.Cancel()
 	}
 	Saves=()=>{
-		debugger
+
 
 		let {resourcesname,resourceurl,description,is_public,datatime,Radiovalue} =this.state;
 		const reg = /^[\s\S]*.*[^\s][\s\S]*$/;
@@ -178,30 +178,61 @@ class sendResources extends Component{
 			return
 		}
 
-		let coursesId=this.props.match.params.coursesId;
-		let attachmentId=this.props.attachmentId;
-		let url="/files/upload.json";
-
-
-		axios.post(url,{
-			course_id:coursesId,
-			course_second_category_id:this.props.coursesidtype===undefined||this.props.coursesidtype==="node"?0:attachmentId,
-			is_public:is_public,
-			publish_time:Radiovalue===1?datatime===undefined? undefined:datatime:undefined,
-			description:description,
-			delay_publish:Radiovalue,
-		}).then((result)=>{
+		if(this.props.Exterchainname==="资源设置"){
+			//设置
+			let coursesId=this.props.match.params.coursesId;
+			let attachmentId=this.props.attachmentId;
+			let url="/files/"+this.props.discussMessageid+".json";
+
+			axios.put(url,{
+				name:resourcesname,
+				link:resourceurl,
+				course_id:coursesId,
+				course_second_category_id:this.props.coursesidtype===undefined||this.props.coursesidtype==="node"?0:attachmentId,
+				is_public:is_public,
+				publish_time:Radiovalue===1?datatime===undefined? undefined:datatime:undefined,
+				description:description,
+				delay_publish:Radiovalue,
+			}).then((result)=>{
+				if(result.data.status===0){
+					this.ModalCancelModalCancel();
+					this.props.updataleftNavfun();
+					this.props.showNotification("设置资源成功");
+					this.props.setupdate(1,false)
+				}else{
+					this.props.showNotification(result.data.message);
+				}
+			})
 
+		}else{
+			let coursesId=this.props.match.params.coursesId;
+			let attachmentId=this.props.attachmentId;
+			let url="/files/upload.json";
+
+
+			axios.post(url,{
+				name:resourcesname,
+				link:resourceurl,
+				course_id:coursesId,
+				course_second_category_id:this.props.coursesidtype===undefined||this.props.coursesidtype==="node"?0:attachmentId,
+				is_public:is_public,
+				publish_time:Radiovalue===1?datatime===undefined? undefined:datatime:undefined,
+				description:description,
+				delay_publish:Radiovalue,
+			}).then((result)=>{
+
+
+				if(result.data.status===0){
+					this.ModalCancelModalCancel();
+					this.props.updataleftNavfun();
+					this.props.showNotification("上传资源成功");
+					this.props.setupdate(1,false)
+				}else{
+					this.props.showNotification(result.data.message);
+				}
+			})
 
-			if(result.data.status===0){
-				this.ModalCancelModalCancel();
-				this.props.updataleftNavfun();
-				this.props.showNotification("上传资源成功");
-				this.props.setupdate(this.props.attachmentId)
-			}else{
-				this.props.showNotification(result.data.message);
-			}
-		})
+		}
 
 
 

From 68d5c72d8ec7ca5bd0220b60afbb5bec4b6254ed Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Mon, 9 Mar 2020 22:11:27 +0800
Subject: [PATCH 3/3] 1

---
 app/controllers/users/videos_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/users/videos_controller.rb b/app/controllers/users/videos_controller.rb
index fdd7e0c76..b317efc83 100644
--- a/app/controllers/users/videos_controller.rb
+++ b/app/controllers/users/videos_controller.rb
@@ -57,7 +57,7 @@ class Users::VideosController < Users::BaseController
     video = Video.find_by(id: params[:id])
     return render_forbidden unless video.user_id == current_user.id  || current_user.admin_or_business?
     return render_not_found if video.blank?
-    return render_error('该状态下不能删除视频') unless video.pending?
+    return render_error('该状态下不能删除视频') unless video.published?
 
     video.destroy!