From daa49f4277fd47fdfd73b65a22001dc2da42cfa5 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Fri, 23 Aug 2019 17:32:32 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E9=95=BF=20=E8=AF=84=E9=98=85?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/courses/busyWork/CommonWorkAppraise.js |  6 ++++--
 .../src/modules/courses/busyWork/common/LeaderIcon.js  | 10 ++++++----
 .../src/modules/page/layers/ImageLayerOfCommentHOC.js  |  4 +++-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/public/react/src/modules/courses/busyWork/CommonWorkAppraise.js b/public/react/src/modules/courses/busyWork/CommonWorkAppraise.js
index c9d18a154..b3c9d1178 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkAppraise.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkAppraise.js
@@ -92,6 +92,7 @@ class CommonWorkAppraise extends Component{
     if (this.props.match.params.studentWorkId != prevProps.match.params.studentWorkId) {
       this.getWork();
       this.getReviseAttachments()
+      this.commonWorkAppraiseReply && this.commonWorkAppraiseReply.fetchAllComments()
     }
   }
   
@@ -163,7 +164,7 @@ class CommonWorkAppraise extends Component{
       attachments, homework_id, project_info, work_members, is_evaluation,
       description, update_user_name, update_time, commit_time, author_name,
       revise_attachments, revise_reason, atta_update_user, atta_update_time, atta_update_user_login,
-      Modalstype,Modalstopval,ModalCancel,ModalSave,loadtype
+      Modalstype,Modalstopval,ModalCancel,ModalSave,loadtype, is_leader_work
     } =this.state;
 
     let courseId=this.props.match.params.coursesId;
@@ -262,7 +263,7 @@ class CommonWorkAppraise extends Component{
               </div>
               <div className={"ml20 color-grey-6"}>
                 <div className="">
-                  当前组员：{author_name}
+                  当前组员：{author_name} {is_leader_work && <LeaderIcon small={true} ></LeaderIcon>}
                 </div>
                 <div>
                   其他组员：
@@ -286,6 +287,7 @@ class CommonWorkAppraise extends Component{
             {/* task_type={datalist&&datalist.task_type} */}
             <CommonWorkAppraiseReply {...this.props} task_id={studentWorkId} 
                 onReplySuccess={this.onReplySuccess} {...this.state}
+                wrappedComponentRef={(ref) => {this.commonWorkAppraiseReply = ref}}
             ></CommonWorkAppraiseReply>
 
         </div>
diff --git a/public/react/src/modules/courses/busyWork/common/LeaderIcon.js b/public/react/src/modules/courses/busyWork/common/LeaderIcon.js
index 2718c7e8c..526e165c5 100644
--- a/public/react/src/modules/courses/busyWork/common/LeaderIcon.js
+++ b/public/react/src/modules/courses/busyWork/common/LeaderIcon.js
@@ -1,8 +1,9 @@
 import React,{Component} from "React";
 
 export default function LeaderIcon(props = {}) {
+    let icon = null;
     if (props.small) {
-        <div className="font-8 blueFull Actionbtn" style={{ 
+        icon = <div className="font-8 blueFull Actionbtn" style={{ 
             height: '14px',
             'line-height': '14px',
             width: '24px',
@@ -10,8 +11,9 @@ export default function LeaderIcon(props = {}) {
             'margin-top': '-2px',
             'margin-left': '2px',
             'vertical-align': 'middle', }}>组长</div>
+    } else {
+        icon = <div className="font-8 blueFull Actionbtn" style={{ height: '16px', 'line-height': '16px', width: '30px'}}>组长</div>
+    
     }
-    return (
-        <div className="font-8 blueFull Actionbtn" style={{ height: '16px', 'line-height': '16px', width: '30px'}}>组长</div>
-    )
+    return icon
 }
\ No newline at end of file
diff --git a/public/react/src/modules/page/layers/ImageLayerOfCommentHOC.js b/public/react/src/modules/page/layers/ImageLayerOfCommentHOC.js
index 50072c627..d19aa03ec 100644
--- a/public/react/src/modules/page/layers/ImageLayerOfCommentHOC.js
+++ b/public/react/src/modules/page/layers/ImageLayerOfCommentHOC.js
@@ -37,6 +37,8 @@ export function ImageLayerOfCommentHOC(options = {}) {
       }
       // jQuery._data( $('.newMain')[0], "events" )
       componentDidMount() {	
+        this.props.wrappedComponentRef && this.props.wrappedComponentRef(this.refs['wrappedComponentRef'])
+
         // commentsDelegateParent #game_left_contents #tab_con_4
         setTimeout(() => {
           $(options.parentSelector || ".commentsDelegateParent")
@@ -60,7 +62,7 @@ export function ImageLayerOfCommentHOC(options = {}) {
           <React.Fragment>
             <ImageLayer {...this.state} onImageLayerClose={this.onImageLayerClose}></ImageLayer>
 
-            <WrappedComponent {...this.props} >
+            <WrappedComponent {...this.props} ref="wrappedComponentRef">
             </WrappedComponent>
           </React.Fragment>
         )