From 51e3325feed809a338b04c494c1d71c9fdd0e37f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Thu, 26 Sep 2019 16:56:14 +0800 Subject: [PATCH] =?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/Resource/Fileslistitem.js | 4 +--- .../src/modules/courses/boards/BoardsListItem.js | 5 ++--- .../src/modules/courses/busyWork/CommonWorkItem.js | 7 ++++--- .../src/modules/courses/exercise/ExerciseListItem.js | 4 +--- .../courses/graduation/tasks/GraduateTaskItem.js | 4 +--- .../courses/graduation/topics/GraduateTopicItem.js | 12 +++++------- .../react/src/modules/courses/poll/PollListItem.js | 4 +--- .../courses/shixunHomework/ShixunhomeWorkItem.js | 4 +--- 8 files changed, 16 insertions(+), 28 deletions(-) diff --git a/public/react/src/modules/courses/Resource/Fileslistitem.js b/public/react/src/modules/courses/Resource/Fileslistitem.js index fe0794a18..4713431ca 100644 --- a/public/react/src/modules/courses/Resource/Fileslistitem.js +++ b/public/react/src/modules/courses/Resource/Fileslistitem.js @@ -232,9 +232,7 @@ class Fileslistitem extends Component{ { this.props.isNotMember===true? discussMessage.is_lock === true ? - - {discussMessage.title} - + {discussMessage.title} :this.showfiles(discussMessage)} title={discussMessage.title} diff --git a/public/react/src/modules/courses/boards/BoardsListItem.js b/public/react/src/modules/courses/boards/BoardsListItem.js index e27e7ad65..021a41b7a 100644 --- a/public/react/src/modules/courses/boards/BoardsListItem.js +++ b/public/react/src/modules/courses/boards/BoardsListItem.js @@ -62,12 +62,11 @@ class BoardsListItem extends Component{
onItemClick(discussMessage)}>
- 40 ? discussMessage.subject : ''}`} placement="bottom"> - {canNotLink?{discussMessage.subject}:{discussMessage.subject}: {} : () => this.onTitleClick(discussMessage)} >{discussMessage.subject}} - { !!discussMessage.sticky && 置顶 } { diff --git a/public/react/src/modules/courses/busyWork/CommonWorkItem.js b/public/react/src/modules/courses/busyWork/CommonWorkItem.js index c51606e35..c92d91c48 100644 --- a/public/react/src/modules/courses/busyWork/CommonWorkItem.js +++ b/public/react/src/modules/courses/busyWork/CommonWorkItem.js @@ -164,13 +164,14 @@ class CommonWorkItem extends Component{
this.props.onItemClick(Object.assign({}, item, {id: item.homework_id})) }>

- - {canNotLink? + {canNotLink? {item.name} : {} : () => this.onItemClick(item)} + title={item.name} >{item.name}} - {/* 只有非课堂成员且作业是私有的情况下才会为true */} { item.private_icon===true ? diff --git a/public/react/src/modules/courses/exercise/ExerciseListItem.js b/public/react/src/modules/courses/exercise/ExerciseListItem.js index 479c9710a..07606bd58 100644 --- a/public/react/src/modules/courses/exercise/ExerciseListItem.js +++ b/public/react/src/modules/courses/exercise/ExerciseListItem.js @@ -128,9 +128,7 @@ class ExerciseListItem extends Component{ { this.props.isNotMember()? item.lock_status === 0 ? - - {item.exercise_name} - + {item.exercise_name} : this.toDetailPage(`/courses/${coursesId}/exercises/${item.id}/student_exercise_list?tab=0`)}>{item.exercise_name}:"" } diff --git a/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js b/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js index 17ae8ca28..2b27571e2 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js @@ -247,9 +247,7 @@ class GraduateTaskItem extends Component{ { this.props.isNotMember===true?this.props.discussMessage.private_icon===true? - - {discussMessage.name} - + {discussMessage.name} :this.toDetailPage("/courses/"+coursesId+"/graduation_tasks/"+categoryid+"/"+taskid+"/list")} title={discussMessage.name} className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}:"" diff --git a/public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js b/public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js index afef56e1b..d11c90703 100644 --- a/public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js +++ b/public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js @@ -90,18 +90,16 @@ class GraduateTopicItem extends Component{

{ isNotMember? - - {discussMessage.private_icon===true?{discussMessage.name}: - {discussMessage.name}} - :"" - + discussMessage.private_icon===true?{discussMessage.name}: + {discussMessage.name} + :"" } { isStudent? this.toDetailPage(`${discussMessage.id}`)} - className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}:"" + className="fl mt3 font-16 font-bd color-dark maxwidth580" title={discussMessage.name}>{discussMessage.name}:"" } { - isAdmin? this.toDetailPage(`${discussMessage.id}`)} className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}:"" + isAdmin? this.toDetailPage(`${discussMessage.id}`)} className="fl mt3 font-16 font-bd color-dark maxwidth580" title={discussMessage.name}>{discussMessage.name}:"" } { discussMessage.private_icon===true? diff --git a/public/react/src/modules/courses/poll/PollListItem.js b/public/react/src/modules/courses/poll/PollListItem.js index b4c2f108e..1e453d180 100644 --- a/public/react/src/modules/courses/poll/PollListItem.js +++ b/public/react/src/modules/courses/poll/PollListItem.js @@ -57,9 +57,7 @@ class PollListItem extends Component{

{ canNotLink ? - - {item.polls_name} - + {item.polls_name} : this.toDetailPage(`/courses/${coursesId}/polls/${item.id}/detail`)} className="fl font-16 font-bd mt2 color-grey-3 task-hide pointer" style={{"maxWidth":"600px"}} title={item.polls_name}>{item.polls_name} } diff --git a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js index 74692dcb8..e08fb7d8e 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js @@ -328,9 +328,7 @@ class ShixunhomeWorkItem extends Component{ { this.props.isNotMember===true? this.props.discussMessage.private_icon===true? - - {discussMessage.name} - + {discussMessage.name} : this.hrefjumpskip(`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/list?tab=0`)} title={discussMessage.name} className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}:""