From fa64909b1fdd5ca4bb7a46f0b7ae9746660c64db Mon Sep 17 00:00:00 2001
From: dinglink <837816638@qq.com>
Date: Tue, 17 Mar 2020 10:07:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/courses/Resource/index.js     |  4 ++--
 .../courses/coursesDetail/CoursesLeftNav.js   | 19 ++++++++++++-------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/public/react/src/modules/courses/Resource/index.js b/public/react/src/modules/courses/Resource/index.js
index 9b645fe39..5c8cc7831 100644
--- a/public/react/src/modules/courses/Resource/index.js
+++ b/public/react/src/modules/courses/Resource/index.js
@@ -1038,8 +1038,8 @@ class Fileslists extends Component{
                             filesId&&filesId===itm.value?"":
                             <div>
                               <div className="bordboom" style={{display:'flex',marginTop:15,height:30}}>
-                                <div onClick={() => this.moveTos(itm.value )} style={{marginLeft:15,color:'#000000'}}>{itm.title}</div>
-                                <i  style={{marginLeft:15}} onClick={() => this.istowshow(itm,filesId)} className="iconfont icon-xiajiantou font-12 ml2"></i>
+                                <div onClick={() => this.moveTos(itm.value )} style={{marginLeft:15,width:200,color:'#000000',overflow: 'hidden',textOverflow:'ellipsis',whiteSpace: 'nowrap'}}>{itm.title}</div>
+                                 {itm.children.length===0?'':<i  style={{marginLeft:15}} onClick={() => this.istowshow(itm,filesId)} className="iconfont icon-xiajiantou font-12 ml2"></i>} 
                                 </div>
                                     { this.state.istowshowid===itm.value?
                                     itm.children.map((tt,ti) => {
diff --git a/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js b/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js
index 4db80dd5f..0dc7ff127 100644
--- a/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js
+++ b/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js
@@ -595,11 +595,10 @@ class Coursesleftnav extends Component{
 
   }
 
-  Navmodalnames=(e,id,type,setnavid,name)=>{
+  Navmodalnames=(e,id,type,setnavid,name,towid)=>{
     e.stopPropagation();//阻止冒泡
     this.getatahcment()
       navidtype=false
-      console.log(e,id,type,setnavid,name)
       if(id===1||id===2||id===6){
         this.setState({
           Navmodalname:id===2?"新建分班":"新建目录",
@@ -608,7 +607,9 @@ class Coursesleftnav extends Component{
           Navmodalnametype:true,
           Navmodaltypename:id,
           Navmodalziyname:name,
+          treedefaultValue:towid,
           setnavid:setnavid,
+          parentid:towid,
           NavmodalValue:""
         })
       }else if(id===3||id===4||id===5||id===7){
@@ -620,7 +621,9 @@ class Coursesleftnav extends Component{
           Navmodalnametype:true,
           Navmodaltypename:id,
           setnavid:setnavid,
+          treedefaultValue:towid,
           Navmodalziyname:name,
+          parentid:towid,
           NavmodalValue:name
         })
 
@@ -1051,7 +1054,7 @@ class Coursesleftnav extends Component{
     let {twosandiantypes,twosandiantypenum}=this.state;
     return (item.type==="graduation"?"": <div className={item.type===twosandiantypes&&twosandiantypenum===index?"sandianboxs":"sandianboxs"} >
           {/*作业/资源*/}
-          {item.type==="attachment"&&san!=='san'?<div onClick={e=>this.Navmodalnames(e,1,"attachment",iem.category_id,"资源")}>新建目录</div>:""}
+          {item.type==="attachment"&&san!=='san'?<div onClick={e=>this.Navmodalnames(e,1,"attachment",item.id,"资源",iem.category_id)}>新建目录</div>:""}
           {item.type==="shixun_homework"||item.type==="attachment"||item.type==="graduation"||item.type==="common_homework"||item.type==="group_homework"?<div onClick={e=>this.Navmodalnames(e,4,"editSecondname",iem.category_id,iem.category_name)}>重命名</div>:""}
           {item.type==="shixun_homework"||item.type==="attachment"||item.type==="common_homework"||item.type==="group_homework"?<div onClick={e=>this.deleteSecondary(e,1,iem.category_id)}>删除</div>:""}
           {/*分班*/}
@@ -1166,20 +1169,22 @@ class Coursesleftnav extends Component{
            >
              <div>    
                {this.state.Navmodalziyname==="资源"?<div className="df" style={{marginBottom:50}}> 
-             <div  className={"fl mt5"}>上级目录：</div>
+             <div  className={"fl mt5"} >上级目录：</div>
+            
              <TreeSelect
               className={"input-flex-35 greyInput fl"}
-              dropdownStyle={{ maxHeight: 400, overflow: 'auto' }}
+              style={{width:200}}
+              dropdownStyle={{ maxHeight: 400 ,width:300,overflow: 'auto' }}
               treeData={this.state.treeData}
               placeholder="资源"
-              defaultValue={this.state.setnavid}
+              defaultValue={this.state.treedefaultValue}
               treeDefaultExpandAll
               onChange={this.tronChange}
             />
                 </div>:''}
              
              <div className="df" > 
-                <div className={"fl mt5"}>{this.state.Navtitles}：</div>
+                <div className={"fl mt5"}  >{this.state.Navtitles}：</div>
                 <Input placeholder={this.state.Navplaceholder}
                     className={"input-flex-35 greyInput fl"}
                     maxLength="60"