From 303546c40a9635f3e905d0312b3e94ec03dbdd94 Mon Sep 17 00:00:00 2001
From: caicai8 <1149225589@qq.com>
Date: Tue, 10 Mar 2020 20:08:53 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../courses/coursesDetail/CoursesLeftNav.js    | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js b/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js
index 6569b4f10..535573d02 100644
--- a/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js
+++ b/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js
@@ -465,13 +465,14 @@ class Coursesleftnav extends Component{
 				Modalstopval:"隐藏后将不再显示此模块，",
 				ModalsBottomval:"后续可在课堂设置中重新勾选模块恢复显示",
 				ModalSave:()=>this.edithiddens(id),
+				loadtype:false
 			})
 		}else{
 			this.setState({
 				ModalsType:true,
 				Modalstopval:"您不能隐藏所有课堂模块，请至少保留",
 				ModalsBottomval:"其中一个模块。",
-				loadtype:true,
+				loadtype:false,
 				ModalSave:()=>this.cannerNavmoda(),
 			})
 		}
@@ -674,6 +675,7 @@ class Coursesleftnav extends Component{
        ModalsType:false,
        Modalstopval:"",
        loadtype:false,
+       antIcon:false
      })
      notification.open({
        message: "删除成功",
@@ -692,6 +694,7 @@ class Coursesleftnav extends Component{
     axios.delete(url).then((result)=>{
       if(result.data.status===0){
         this.updatadeleteSecondary(mainurl || result.data.right_url);
+        
       }
     }).catch((error)=>{
       console.log(error)
@@ -699,17 +702,16 @@ class Coursesleftnav extends Component{
   }
   deleteSecondary=(e,type,id,mainurl)=>{
     e.stopPropagation();//阻止冒泡
+    debugger;
     if(type===1){
       let url="/course_second_categories/"+id+".json"
-
       this.setState({
-         ModalsType:true,
-         Modalstopval:"该目录下的内容将被移动到父目录,",
-         ModalsBottomval:"是否确认删除?",
-         ModalSave:()=>this.deletenavchilds(url,mainurl),
-         loadtype:false
+        loadtype:false,
+        ModalsType:true,
+        Modalstopval:"该目录下的内容将被移动到父目录,",
+        ModalsBottomval:"是否确认删除?",
+        ModalSave:()=>this.deletenavchilds(url,mainurl)
       })
-
     }else if(type===2){
       let url="/course_groups/"+id+".json"
       this.setState({

From 8434bce93742af38686cd45e4d60f76d9c7cd7a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Tue, 10 Mar 2020 20:17:09 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=99=AE=E9=80=9A=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E3=80=81=E5=88=86=E7=BB=84=E4=BD=9C=E4=B8=9A=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=B7=B2=E8=AF=84=E6=95=B0=E3=80=81=E8=B5=84=E6=BA=90=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/courses/Resource/index.js             | 2 +-
 .../react/src/modules/courses/coursesDetail/CoursesLeftNav.js  | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/public/react/src/modules/courses/Resource/index.js b/public/react/src/modules/courses/Resource/index.js
index 8f32699ce..b35eb4e06 100644
--- a/public/react/src/modules/courses/Resource/index.js
+++ b/public/react/src/modules/courses/Resource/index.js
@@ -916,7 +916,7 @@ class Fileslists extends Component{
 							{
 								`
 								 .filesnameslist{
-										max-width: 389px;
+										max-width: 200px;
 										overflow: hidden;
 										text-overflow: ellipsis;
 										white-space: nowrap;
diff --git a/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js b/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js
index 6569b4f10..04bbe71ba 100644
--- a/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js
+++ b/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js
@@ -692,6 +692,9 @@ class Coursesleftnav extends Component{
     axios.delete(url).then((result)=>{
       if(result.data.status===0){
         this.updatadeleteSecondary(mainurl || result.data.right_url);
+        this.setState({
+          antIcon:false
+        })
       }
     }).catch((error)=>{
       console.log(error)