From 9d02a4b189f26ff5fd934cde53013a605af7b422 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Sat, 20 Jul 2019 22:58:05 +0800 Subject: [PATCH 1/6] =?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/shixunHomework/ShixunhomeWorkItem.js | 2 +- public/react/src/modules/user/usersInfo/InfosCourse.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js index e026ad622..e87af8ec4 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js @@ -373,7 +373,7 @@ class ShixunhomeWorkItem extends Component{ width:192px !important; } .homepagePostSettingbox{ - width:121px !important; + width:139px !important; } ` } diff --git a/public/react/src/modules/user/usersInfo/InfosCourse.js b/public/react/src/modules/user/usersInfo/InfosCourse.js index d4c82ad2f..146316111 100644 --- a/public/react/src/modules/user/usersInfo/InfosCourse.js +++ b/public/react/src/modules/user/usersInfo/InfosCourse.js @@ -104,7 +104,7 @@ class InfosCourse extends Component{ let isStudent = this.props.isStudent(); let is_current=this.props.is_current; - // console.log(this.props.current_user&&this.props.current_user.user_identity==="学生") + console.log(this.props.current_user&&this.props.current_user.user_identity==="学生") return(
From 3d2213815e3e8633311ef0f06946dfcadefd35e3 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Sat, 20 Jul 2019 22:59:31 +0800 Subject: [PATCH 2/6] 54 --- .../src/modules/comment/CommentItemMDEditor.css | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/public/react/src/modules/comment/CommentItemMDEditor.css b/public/react/src/modules/comment/CommentItemMDEditor.css index 4a714f09b..8b0eb4ab6 100644 --- a/public/react/src/modules/comment/CommentItemMDEditor.css +++ b/public/react/src/modules/comment/CommentItemMDEditor.css @@ -24,6 +24,22 @@ .panel-comment_item .editor__resize { transform: translateX(-2%); + + position: absolute; + width: 120px; + height: 4px; + left: 54%; + transform: translateX(-50%); + margin-top: 2px; + border-top: 1px solid #ccc; + border-bottom: 1px solid #ccc; + cursor: row-resize; + text-indent: 110%; + white-space: nowrap; + overflow: hidden; + text-transform: capitalize; + + box-sizing: border-box; } /*帖子回復按鈕*/ From 9b005da451c8860176fc306d5a53272f040222d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Sat, 20 Jul 2019 23:03:23 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/courses/shixunHomework/Listofworksstudentone.js | 6 +++--- .../modules/courses/shixunHomework/ShixunhomeWorkItem.js | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index a774d6684..2af9d6f33 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -913,9 +913,9 @@ class Listofworksstudentone extends Component { } componentWillReceiveProps(nextProps) { - // console.log("+++++++++916"); - // console.log(nextProps); - // console.log(this.props) + console.log("+++++++++916"); + console.log(nextProps); + console.log(this.props) // console.log(this.props.isAdmin()); if (nextProps.code_review != this.props.code_review) { if (nextProps.code_review !== undefined) { diff --git a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js index e026ad622..9ebd5cb9e 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js @@ -381,7 +381,8 @@ class ShixunhomeWorkItem extends Component{ {this.props.isAdmin?
实训详情 {this.props.isAdminOrCreator()?this.editname(discussMessage.name,discussMessage.homework_id)} className={"btn colorblue ml20 font-16"}>重命名:""} - 设置 + {/* 设置*/} + 设置
:""} From 20036d9947ffc88ac8ec2aa6a6db9717c89955cb Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Sat, 20 Jul 2019 23:06:10 +0800 Subject: [PATCH 4/6] right --- public/react/src/modules/comment/CommentItemMDEditor.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/public/react/src/modules/comment/CommentItemMDEditor.css b/public/react/src/modules/comment/CommentItemMDEditor.css index 8b0eb4ab6..0f9c31231 100644 --- a/public/react/src/modules/comment/CommentItemMDEditor.css +++ b/public/react/src/modules/comment/CommentItemMDEditor.css @@ -47,6 +47,11 @@ a.commentsbtn.task-btn-blue { background: #4CACFF !important; } +.commentTab a.commentsbtn.task-btn-blue { + margin-right: 22px; + margin-top: 6px; +} + .editormd-grid-table-row a.editormd-emoji-btn.selected { border-bottom: 2px solid #4CACFF!important; From 49cf04286a3fc818bf6096613f667ec41b5eea77 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Sat, 20 Jul 2019 23:09:00 +0800 Subject: [PATCH 5/6] commentTab --- public/react/src/modules/page/main/LeftView.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/page/main/LeftView.js b/public/react/src/modules/page/main/LeftView.js index 428d898cb..b00319502 100644 --- a/public/react/src/modules/page/main/LeftView.js +++ b/public/react/src/modules/page/main/LeftView.js @@ -336,7 +336,7 @@ class LeftView extends Component {
-
+
{ loadingComments ? : From a641062931b928c14232bc20e1833f61db4a75e8 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Sat, 20 Jul 2019 23:09:57 +0800 Subject: [PATCH 6/6] u --- public/react/src/modules/courses/members/teacherList.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/courses/members/teacherList.js b/public/react/src/modules/courses/members/teacherList.js index 92b0e0d4b..fc6b56313 100644 --- a/public/react/src/modules/courses/members/teacherList.js +++ b/public/react/src/modules/courses/members/teacherList.js @@ -65,7 +65,7 @@ function buildColumns(that) { sorter: showSorter, sortOrder: sortedInfo.columnKey === 'name' && sortedInfo.order, render: (name, record) => { - return 4 ? name : ''}`}>{name} } }, {