From 71091bfe5384c8b92bad30df4177b1bedc4ec3da Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Mon, 29 Jul 2019 14:51:26 +0800
Subject: [PATCH 1/9] /

---
 public/react/src/modules/user/usersInfo/InfosProject.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/react/src/modules/user/usersInfo/InfosProject.js b/public/react/src/modules/user/usersInfo/InfosProject.js
index 6c1f4a666..c3f023171 100644
--- a/public/react/src/modules/user/usersInfo/InfosProject.js
+++ b/public/react/src/modules/user/usersInfo/InfosProject.js
@@ -142,7 +142,7 @@ class InfosProject extends Component{
                   {
                     item.can_visited ==false?
                     <div className="closeSquare">
-                      <img src={getImageUrl("/images/educoder/icon/lockclose.svg")} className="mt80 mb25"/>
+                      <img src={getImageUrl("images/educoder/icon/lockclose.svg")} className="mt80 mb25"/>
                       <p className="font-14 color-white">非成员不能访问</p>
                     </div>:""
                   }

From fa5f65787a152b0517b5df9a56876203e26717be Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Mon, 29 Jul 2019 14:57:48 +0800
Subject: [PATCH 2/9] /

---
 public/react/src/modules/user/usersInfo/InfosCourse.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/react/src/modules/user/usersInfo/InfosCourse.js b/public/react/src/modules/user/usersInfo/InfosCourse.js
index ff5321a9f..c4cefd2b6 100644
--- a/public/react/src/modules/user/usersInfo/InfosCourse.js
+++ b/public/react/src/modules/user/usersInfo/InfosCourse.js
@@ -147,7 +147,7 @@ class InfosCourse extends Component{
                   {
                     item.can_visited ==false?
                     <div className="closeSquare">
-                      <img src={getImageUrl("/images/educoder/icon/lockclose.svg")} className="mt80 mb25"/>
+                      <img src={getImageUrl("images/educoder/icon/lockclose.svg")} className="mt80 mb25"/>
                       <p className="font-14 color-white">非成员不能访问</p>
                     </div>:""
                   }

From 802de5004677d9e5d4e9199c6c9196cbe11f24f5 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Mon, 29 Jul 2019 14:58:43 +0800
Subject: [PATCH 3/9] w

---
 .../react/src/modules/courses/members/studentsList.js  | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/public/react/src/modules/courses/members/studentsList.js b/public/react/src/modules/courses/members/studentsList.js
index 363d06c54..6780948ef 100644
--- a/public/react/src/modules/courses/members/studentsList.js
+++ b/public/react/src/modules/courses/members/studentsList.js
@@ -36,8 +36,10 @@ const buildColumns = (that) => {
     key: 'login',
     align:'center',
     className:"color-grey-6",
-    render: (name, record) => {
-      return <span className="color-dark overflowHidden1" style={{maxWidth: '110px'}}>{name}</span>
+    render: (login, record) => {
+      return <span className="color-dark overflowHidden1" style={{maxWidth: '160px'}}
+        title={login && login.length > 10 ? login : ''}
+      >{login}</span>
     }
   }, {
     title: '姓名',
@@ -57,8 +59,8 @@ const buildColumns = (that) => {
     align:'center',
     className:"color-grey-6",
     render: (student_id, record) => {
-      return <span className="color-dark overflowHidden1" 
-          style={{maxWidth: '110px'}} >{student_id}</span>
+      return <span className="color-dark overflowHidden1 "title={student_id && student_id.length > 10 ? student_id : ''}
+          style={{maxWidth: '160px'}} >{student_id}</span>
     }
   }];
   if (course_groups && course_groups.length) {

From 308c3cc50dd9ab1a8e64eed4df4de5ae52635ea5 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Mon, 29 Jul 2019 15:13:23 +0800
Subject: [PATCH 4/9] none data

---
 public/react/src/modules/user/usersInfo/InfosCourse.js  | 2 +-
 public/react/src/modules/user/usersInfo/InfosPath.js    | 2 +-
 public/react/src/modules/user/usersInfo/InfosProject.js | 2 +-
 public/react/src/modules/user/usersInfo/InfosShixun.js  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/react/src/modules/user/usersInfo/InfosCourse.js b/public/react/src/modules/user/usersInfo/InfosCourse.js
index c4cefd2b6..2f7d206b8 100644
--- a/public/react/src/modules/user/usersInfo/InfosCourse.js
+++ b/public/react/src/modules/user/usersInfo/InfosCourse.js
@@ -130,7 +130,7 @@ class InfosCourse extends Component{
 						this.props.current_user && this.props.current_user.user_identity != "学生" ? <Create href={"/courses/new"} name={"新建课堂"} index="1"></Create> : ""
           }
           {
-            (!data || data.courses.length==0) && (this.props.current_user && this.props.current_user.user_identity === "学生" ) && <NoneData></NoneData>
+            (!data || data.courses.length==0) && (!is_current || (this.props.current_user && this.props.current_user.user_identity === "学生" )) && <NoneData></NoneData>
           }
           {
             data && data.courses && data.courses.map((item,key)=>{
diff --git a/public/react/src/modules/user/usersInfo/InfosPath.js b/public/react/src/modules/user/usersInfo/InfosPath.js
index 759527a6e..d23739280 100644
--- a/public/react/src/modules/user/usersInfo/InfosPath.js
+++ b/public/react/src/modules/user/usersInfo/InfosPath.js
@@ -152,7 +152,7 @@ class InfosPath extends Component{
 						this.props.current_user && this.props.current_user.user_identity != "学生" ? <Create href={"/paths/new"} name={"新建实践课程"} index="3"></Create>:""
           }
           {
-            (!data || data.subjects.length==0) && (this.props.current_user && this.props.current_user.user_identity === "学生" ) && <NoneData></NoneData>
+            (!data || data.subjects.length==0) && (!is_current || (this.props.current_user && this.props.current_user.user_identity === "学生" )) && <NoneData></NoneData>
           }
           {
             data && data.subjects && data.subjects.map((item,key)=>{
diff --git a/public/react/src/modules/user/usersInfo/InfosProject.js b/public/react/src/modules/user/usersInfo/InfosProject.js
index c3f023171..195e98b73 100644
--- a/public/react/src/modules/user/usersInfo/InfosProject.js
+++ b/public/react/src/modules/user/usersInfo/InfosProject.js
@@ -125,7 +125,7 @@ class InfosProject extends Component{
             <Create href={`${this.props.Headertop && this.props.Headertop.old_url}/projects/new`} name={"新建项目"} index="4"></Create>:""
           }
           {
-            (!data || data.projects.length==0) && (this.props.current_user && this.props.current_user.user_identity === "学生" ) && <NoneData></NoneData>
+           (!data || data.projects.length==0) && (!is_current || (this.props.current_user && this.props.current_user.user_identity === "学生" )) && <NoneData></NoneData>
           }
           {
             data && data.projects && data.projects.map((item,key)=>{
diff --git a/public/react/src/modules/user/usersInfo/InfosShixun.js b/public/react/src/modules/user/usersInfo/InfosShixun.js
index bac60fe6f..1550230ab 100644
--- a/public/react/src/modules/user/usersInfo/InfosShixun.js
+++ b/public/react/src/modules/user/usersInfo/InfosShixun.js
@@ -161,7 +161,7 @@ class InfosShixun extends Component{
             <Create href={"/shixuns/new"} name={"新建实训"} index="2"></Create>:""
           }
           {
-            (!data || data.shixuns.length==0) && (this.props.current_user && this.props.current_user.user_identity === "学生" ) && <NoneData></NoneData>
+            (!data || data.shixuns.length==0) && (!is_current || (this.props.current_user && this.props.current_user.user_identity === "学生" )) && <NoneData></NoneData>
           }
           {
             data && data.shixuns && data.shixuns.map((item,key)=>{

From c3b2e8eefdfb9e2c7074689e5bff3d219f651d5c 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, 29 Jul 2019 15:19:43 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/courses/busyWork/CommonWorkDetailIndex.js | 8 +++++---
 .../react/src/modules/courses/busyWork/CommonWorkList.js  | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js b/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js
index ff8e3e3a2..a300e73dc 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js
@@ -136,7 +136,7 @@ class CommonWorkDetailIndex extends Component{
       DownloadMessageval:undefined
     })
   }
-
+  bindRef = ref => { this.child = ref };
 
 
   render() {
@@ -171,8 +171,10 @@ class CommonWorkDetailIndex extends Component{
     let params = {}
     if (isListModule) {
       // TODO
-      // params = this.refs.commonWorkList._getRequestParams()
+      params =this.child._getRequestParams()!==undefined?this.child._getRequestParams():{};
     }
+    // console.log("普通作业176176176");
+    // console.log(params);
     let exportUrl = `/homework_commons/${workId}/works_list.zip?${queryString.stringify(params)}`
     let exportResultUrl = `/homework_commons/${workId}/works_list.xlsx?${queryString.stringify(params)}`
     return (
@@ -356,7 +358,7 @@ class CommonWorkDetailIndex extends Component{
                     {/* 作品列表 */}
                     <Route exact path="/courses/:coursesId/common_homeworks/:workId/list"
                         render={
-                        (props) => (<CommonWorkList ref="commonWorkList" {...this.props} {...props} {...this.state} {...commonHandler}/>)
+                        (props) => (<CommonWorkList ref="commonWorkList"  triggerRef={this.bindRef} {...this.props} {...props} {...this.state} {...commonHandler}/>)
                         }
                     ></Route>
 
diff --git a/public/react/src/modules/courses/busyWork/CommonWorkList.js b/public/react/src/modules/courses/busyWork/CommonWorkList.js
index 5938d037a..e72758316 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkList.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkList.js
@@ -401,7 +401,7 @@ class CommonWorkList extends Component{
     this.fetchList()
     on('commonwork_fetch_all', this.fetchAllListener)
     $("html").animate({ scrollTop: $('html').scrollTop() - 100 })
-
+    this.props.triggerRef(this);
   }
   componentWillUnmount() {
     off('commonwork_fetch_all', this.fetchAllListener)  

From 21f7995adde8aa236a4792afc8965a65625d630d Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Mon, 29 Jul 2019 15:20:03 +0800
Subject: [PATCH 6/9] */

---
 public/react/src/modules/user/account/ChangeHeaderPicModal.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/react/src/modules/user/account/ChangeHeaderPicModal.js b/public/react/src/modules/user/account/ChangeHeaderPicModal.js
index cef643094..76a1a2ebe 100644
--- a/public/react/src/modules/user/account/ChangeHeaderPicModal.js
+++ b/public/react/src/modules/user/account/ChangeHeaderPicModal.js
@@ -151,7 +151,7 @@ class ChangeHeaderPicModal extends Component{
                 text-align: center;
                 width: 120px;
                 height: 120px;
-                border: 1px solid #eee;
+                /* border: 1px solid #eee; */
             }
             .previewWrap {
               flex-direction: column;

From 042d096746c12b13d0696c293878b519a39523fe Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Mon, 29 Jul 2019 15:23:12 +0800
Subject: [PATCH 7/9] txt

---
 .../courses/exercise/Studentshavecompletedthelist.js        | 6 +++---
 .../graduation/tasks/GraduationTasksappraiseReply.js        | 2 +-
 .../courses/graduation/tasks/GraduationTaskssettinglist.js  | 4 ++--
 .../modules/courses/shixunHomework/Listofworksstudentone.js | 6 +++---
 .../shixunHomework/Shixunworkdetails/ShixunWorkModal.js     | 2 +-
 public/react/src/modules/forums/MemoList.js                 | 2 +-
 public/react/src/search/SearchPage.js                       | 2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
index 6f4cec877..fffadccf6 100644
--- a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
+++ b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
@@ -2565,7 +2565,7 @@ class Studentshavecompletedthelist extends Component {
 										<div className="edu-tab-con-box clearfix edu-txt-center">
 											<img className="edu-nodata-img mb20"
 													 src={getImageUrl("images/educoder/nodata.png")}/>
-											<p className="edu-nodata-p mb30">没有数据可以显示！</p>
+											<p className="edu-nodata-p mb30">暂时还没有相关数据哦！</p>
 										</div>
 									</div>
 
@@ -2630,7 +2630,7 @@ class Studentshavecompletedthelist extends Component {
 												<div className="edu-tab-con-box clearfix edu-txt-center">
 													<img className="edu-nodata-img mb20"
 															 src={getImageUrl("images/educoder/nodata.png")}/>
-													<p className="edu-nodata-p mb30">没有数据可以显示！</p>
+													<p className="edu-nodata-p mb30">暂时还没有相关数据哦！</p>
 												</div>
 											</div>
 
@@ -2692,7 +2692,7 @@ class Studentshavecompletedthelist extends Component {
 												<div className="edu-tab-con-box clearfix edu-txt-center">
 													<img className="edu-nodata-img mb20"
 															 src={getImageUrl("images/educoder/nodata.png")}/>
-													<p className="edu-nodata-p mb30">没有数据可以显示！</p>
+													<p className="edu-nodata-p mb30">暂时还没有相关数据哦！</p>
 												</div>
 											</div>
 
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReply.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReply.js
index 1e0fb3071..6c7085ca2 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReply.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReply.js
@@ -190,7 +190,7 @@ export default ImageLayerOfCommentHOC() (GraduationTasksappraiseReply);
 			{/*className="edu-tab-con-box clearfix edu-txt-center">*/}
 			{/*<img className="edu-nodata-img mb20"*/}
 					 {/*src={getImageUrl("images/educoder/nodata.png")}/>*/}
-			{/*<p className="edu-nodata-p mb30">没有数据可以显示！</p>*/}
+			{/*<p className="edu-nodata-p mb30">暂时还没有相关数据哦！</p>*/}
 		{/*</div>*/}
 	{/*</div>*/}
 {/*</div>*/}
\ No newline at end of file
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
index d773d8411..7d421da4b 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
@@ -1307,7 +1307,7 @@ class GraduationTaskssettinglist extends Component{
 														<div className="mh650 edu-back-white">
 															<div className="edu-tab-con-box clearfix edu-txt-center">
 																<img className="edu-nodata-img mb20" src={getImageUrl("images/educoder/nodata.png")}/>
-																<p className="edu-nodata-p mb30">没有数据可以显示！</p>
+																<p className="edu-nodata-p mb30">暂时还没有相关数据哦！</p>
 															</div>
 														</div>
 
@@ -1573,7 +1573,7 @@ class GraduationTaskssettinglist extends Component{
 																	className="edu-tab-con-box clearfix edu-txt-center">
 																	<img className="edu-nodata-img mb20"
 																		 src={getImageUrl("images/educoder/nodata.png")}/>
-																	<p className="edu-nodata-p mb30">没有数据可以显示！</p>
+																	<p className="edu-nodata-p mb30">暂时还没有相关数据哦！</p>
 																</div>
 															</div>
 
diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index 8ec2ffcbc..4dc41fcf7 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -2528,7 +2528,7 @@ class Listofworksstudentone extends Component {
 										<div className="mh650 edu-back-white">
 											<div className="edu-tab-con-box clearfix edu-txt-center">
 												<img className="edu-nodata-img mb20" src={getImageUrl("images/educoder/nodata.png")}/>
-												<p className="edu-nodata-p mb30">没有数据可以显示！</p>
+												<p className="edu-nodata-p mb30">暂时还没有相关数据哦！</p>
 											</div>
 										</div>
 
@@ -2747,7 +2747,7 @@ class Listofworksstudentone extends Component {
 													<div className="edu-tab-con-box clearfix edu-txt-center">
 														<img className="edu-nodata-img mb20"
 																 src={getImageUrl("images/educoder/nodata.png")}/>
-														<p className="edu-nodata-p mb30">没有数据可以显示！</p>
+														<p className="edu-nodata-p mb30">暂时还没有相关数据哦！</p>
 													</div>
 												</div>
 
@@ -2945,7 +2945,7 @@ class Listofworksstudentone extends Component {
 													<div className="edu-tab-con-box clearfix edu-txt-center">
 														<img className="edu-nodata-img mb20"
 																 src={getImageUrl("images/educoder/nodata.png")}/>
-														<p className="edu-nodata-p mb30">没有数据可以显示！</p>
+														<p className="edu-nodata-p mb30">暂时还没有相关数据哦！</p>
 													</div>
 												</div>
 
diff --git a/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js b/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js
index f1d1c43f3..cc9586577 100644
--- a/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js
+++ b/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js
@@ -258,7 +258,7 @@ class ShixunWorkModal extends Component{
 									<div className=" edu-back-white">
 										<div className="edu-tab-con-box clearfix edu-txt-center">
 											<img className="edu-nodata-img mb20" src={getImageUrl("images/educoder/nodata.png")}/>
-											<p className="edu-nodata-p mb30">没有数据可以显示！</p>
+											<p className="edu-nodata-p mb30">暂时还没有相关数据哦！</p>
 										</div>
 									</div>
 
diff --git a/public/react/src/modules/forums/MemoList.js b/public/react/src/modules/forums/MemoList.js
index fae728542..26cad1448 100644
--- a/public/react/src/modules/forums/MemoList.js
+++ b/public/react/src/modules/forums/MemoList.js
@@ -31,7 +31,7 @@ class MemoList extends Component {
             {!memo_list || memo_list.length === 0 ?
               <div className="edu-tab-con-box clearfix edu-txt-center">
                 <img className="edu-nodata-img mb20" src={getImageUrl("images/educoder/nodata.png")}/>
-                <p className="edu-nodata-p mb30">没有数据可以显示！</p>
+                <p className="edu-nodata-p mb30">暂时还没有相关数据哦！</p>
               </div>
               : renderMemoList()
             }
diff --git a/public/react/src/search/SearchPage.js b/public/react/src/search/SearchPage.js
index 32d88b392..ccdb9e12a 100644
--- a/public/react/src/search/SearchPage.js
+++ b/public/react/src/search/SearchPage.js
@@ -164,7 +164,7 @@ class SearchPage extends Component{
 							<div className="mh650 bjyss">
 								<div className="edu-tab-con-box clearfix edu-txt-center">
 									<img className="edu-nodata-img mb20" src={getImageUrl("images/educoder/nodata.png")}/>
-									<p className="edu-nodata-p mb30">没有数据可以显示！</p>
+									<p className="edu-nodata-p mb30">暂时还没有相关数据哦！</p>
 								</div>
 							</div>
 

From 32dfe561709d95b4c2f3c20ffa3ce705fc384745 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Mon, 29 Jul 2019 15:23:21 +0800
Subject: [PATCH 8/9] txt

---
 public/react/src/modules/courses/busyWork/CommonWorkList.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/react/src/modules/courses/busyWork/CommonWorkList.js b/public/react/src/modules/courses/busyWork/CommonWorkList.js
index 5938d037a..9fcf07c01 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkList.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkList.js
@@ -767,7 +767,7 @@ class CommonWorkList extends Component{
 										<div className="mh650 edu-back-white">
 											<div className="edu-tab-con-box clearfix edu-txt-center">
 												<img className="edu-nodata-img mb20" src={getImageUrl("images/educoder/nodata.png")}/>
-												<p className="edu-nodata-p mb30">没有数据可以显示！</p>
+												<p className="edu-nodata-p mb30">暂时还没有相关数据哦！</p>
 											</div>
 										</div>
 									</div>

From aecd13c5798888e1a56215490e8b641d44322573 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Mon, 29 Jul 2019 15:25:49 +0800
Subject: [PATCH 9/9] MarkdownToHtml

---
 public/react/src/modules/courses/exercise/new/JudgeDisplay.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/react/src/modules/courses/exercise/new/JudgeDisplay.js b/public/react/src/modules/courses/exercise/new/JudgeDisplay.js
index 0f8930a8a..60fbd5ac2 100644
--- a/public/react/src/modules/courses/exercise/new/JudgeDisplay.js
+++ b/public/react/src/modules/courses/exercise/new/JudgeDisplay.js
@@ -7,7 +7,7 @@ import {
 } from 'antd';
 import axios from 'axios'
 import { qNameArray } from './common'
-import {getUrl, ActionBtn, markdownToHTML} from 'educoder';
+import {getUrl, ActionBtn, markdownToHTML, MarkdownToHtml } from 'educoder';
 import QestionDisplayHeader from './QestionDisplayHeader'
 const { TextArea } = Input;
 const confirm = Modal.confirm;