diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js index fee6eb724..b8f41d349 100644 --- a/public/react/src/AppConfig.js +++ b/public/react/src/AppConfig.js @@ -42,11 +42,11 @@ if (isDev) { window.location.search.indexOf('debug=a') != -1 ? 'admin' : parsed.debug || 'admin' } // 超管 -debugType="admin"; +//debugType="admin"; // 老师 // debugType="teacher"; // 学生 -// debugType="student"; + debugType="student"; diff --git a/public/react/src/modules/courses/Resource/Fileslistitem.js b/public/react/src/modules/courses/Resource/Fileslistitem.js index 35c558d8e..4515884cd 100644 --- a/public/react/src/modules/courses/Resource/Fileslistitem.js +++ b/public/react/src/modules/courses/Resource/Fileslistitem.js @@ -18,7 +18,7 @@ class Fileslistitem extends Component { settingList = (bools) => { let {discussMessage} = this.props - + console.log(discussMessage); this.setState({ discussMessageid: discussMessage.id }) @@ -429,7 +429,7 @@ class Fileslistitem extends Component { {discussMessage && discussMessage.category_name === null ? "" : this.props.child === false ?
所属目录：{discussMessage && discussMessage.category_name} + style={{display:'flex',"max-width": "268px"}}>所属目录：
{discussMessage && discussMessage. parent_category_name}
/
{discussMessage && discussMessage.category_name}
: ""}

diff --git a/public/react/src/modules/courses/Resource/index.js b/public/react/src/modules/courses/Resource/index.js index fc578b633..e55ca7662 100644 --- a/public/react/src/modules/courses/Resource/index.js +++ b/public/react/src/modules/courses/Resource/index.js @@ -1,5 +1,5 @@ import React,{ Component } from "react"; -import { Input, Checkbox, Table, Tooltip, Pagination,Spin } from "antd"; +import { Input, Checkbox, Table, Tooltip, Pagination,Spin, Divider } from "antd"; import { WordsBtn,on, off, trigger ,getUrl} from 'educoder'; import axios from 'axios'; import Modals from '../../modals/Modals'; @@ -17,6 +17,7 @@ import _ from 'lodash' import './style.css'; import '../css/members.css'; import moment from 'moment'; +import { tuple } from "antd/lib/_util/type"; class Fileslists extends Component{ constructor(props){ super(props); @@ -45,7 +46,11 @@ class Fileslists extends Component{ isSpin:false, course_second_categories:[], title: "", - link: "" + link: "", + //是否展开 + istowshowid:'', + //新增参数判断几级目录 + parent_category_id:'', } } @@ -141,10 +146,6 @@ class Fileslists extends Component{ } } - - - - } updadatalist=(id)=>{ @@ -163,7 +164,7 @@ class Fileslists extends Component{ let list = response.data.course_modules; let course_second_categoriess; list.map((item, key) => { - course_second_categoriess = item.course_second_categories?item.course_second_categories:[] + course_second_categoriess = item.children?item.children:[] }) this.setState({ @@ -181,8 +182,8 @@ class Fileslists extends Component{ } updatafiled=()=>{ - - let{sort}=this.state; + console.log(5) + let{sort}=this.state; if(this.props.match.params.main_id){ this.seactall(undefined,sort); }else if(this.props.match.params.Id){ @@ -216,12 +217,15 @@ class Fileslists extends Component{ }) newsort="desc" } - + console.log(1) this.getfileslist(pagesize,page,tagname,searchValue,newsort,sorttype,coursesecondcategoryid); } getfileslist=(pagesize,page,tagname,searchValue,sort,sorttype,coursesecondcategoryid)=>{ + + this.updadatalist(0); + let url = "/files.json"; const courseid = this.props.match.params.coursesId; let id=coursesecondcategoryid; @@ -248,7 +252,8 @@ class Fileslists extends Component{ unpublish_count:list.unpublish_count, files:list.files, filesId:list.id, - name:list.name, + name:list.name, + parent_category_id:list.parent_category_id, course_is_public:result.data.data.course_is_public, page:page @@ -453,15 +458,21 @@ class Fileslists extends Component{ } addDir = () => { - let {filesId,course_modules}=this.state; + let {filesId,course_modules,coursesecondcategoryid}=this.state; + + //调用获取资源接口 刷新数据 this.setState({ checkBoxValues:[] - }) + }) + if(parseInt(this.props.match.params.main_id)!=parseInt(this.props.coursesids)){ - trigger('attachmentAddlog', parseInt( course_modules&&course_modules.course_modules[0].id)) + + trigger('attachmentAddlog', {id: parseInt( course_modules&&course_modules.course_modules[0].value),name:'资源',coursesecondcategoryid:coursesecondcategoryid}) }else{ - trigger('attachmentAddlog', parseInt(filesId)) - } + console.log(parseInt(filesId)) + + trigger('attachmentAddlog', {id:parseInt(filesId),name:'资源',coursesecondcategoryid:coursesecondcategoryid}) + } } @@ -554,7 +565,9 @@ class Fileslists extends Component{ PaginationTask=(page)=>{ let {search,order,selectpage,checkAllValue,checkBoxValues}=this.state; - let selectpagetype=selectpage===page?true:false + let selectpagetype=selectpage===page&&checkBoxValues.length===15?true:false + console.log(selectpagetype) + this.setState({ page:page, checkAllValue:selectpagetype, @@ -658,6 +671,13 @@ class Fileslists extends Component{ }) } + //判断二级链接是否显示 + istowshow(item){ + this.setState({ + istowshowid:item.value + }) + } + moveTos=(id)=>{ let {checkBoxValues} = this.state; @@ -773,7 +793,9 @@ class Fileslists extends Component{ this.setState({ course_groupslist:id }) - } + } + + render(){ let { searchValue, checkBoxValues, @@ -940,7 +962,7 @@ class Fileslists extends Component{ } } {/*{this.props.isAdmin()?parseInt(this.props.match.params.main_id)===parseInt(this.props.coursesids)?this.addDir()} className={"mr30 font-16"}>新建目录:"":""}*/} - {this.props.isAdmin()?this.addDir()} className={"mr30 font-16"}>新建目录:""} + {this.props.isAdmin()?this.state.parent_category_id===null||this.state.parent_category_id===undefined||this.state.parent_category_id===0?this.addDir()} className={"mr30 font-16"}>新建目录:"":''} {this.props.isAdmin()?parseInt(this.props.match.params.main_id)!=parseInt(this.props.coursesids)?this.editDir(name)} className={"mr30 font-16"}>目录重命名:"":""} {this.props.isAdmin()||this.props.isStudent() ? this.props.user&&this.props.user.main_site===true? this.addResource()}>选用资源:"":""} @@ -998,31 +1020,54 @@ class Fileslists extends Component{ .courseSecond{ margin-left: 10px; padding: 10px; - } + } + `} -