From e67128cfbd8df73f57b8f2b5f1b5cb485fc01905 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Thu, 4 Jul 2019 15:26:36 +0800 Subject: [PATCH 1/4] moduleChineseName --- public/react/src/modules/courses/busyWork/commonWork.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/courses/busyWork/commonWork.js b/public/react/src/modules/courses/busyWork/commonWork.js index 8b2a3dced..85fd2ff66 100644 --- a/public/react/src/modules/courses/busyWork/commonWork.js +++ b/public/react/src/modules/courses/busyWork/commonWork.js @@ -401,7 +401,7 @@ class commonWork extends Component{ } secondRowLeft={
- 共 {mainList&&mainList.all_count} 个作业 + 共 {mainList&&mainList.all_count} 个{moduleChineseName} 已发布：{published_count}个 {/* {this.props.isAdmin()?:""} */} 未发布：{unpublished_count}个 From 1f1a041f6fcc859abf53fad57bf0185c34b63c12 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Thu, 4 Jul 2019 15:49:15 +0800 Subject: [PATCH 2/4] scroll --- public/react/src/App.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/public/react/src/App.js b/public/react/src/App.js index 15105f749..85267a4e6 100644 --- a/public/react/src/App.js +++ b/public/react/src/App.js @@ -224,7 +224,11 @@ class App extends Component { componentDidMount() { // force an update if the URL changes - history.listen(() => this.forceUpdate()); + history.listen(() => { + this.forceUpdate() + const $ = window.$ + $("html").animate({ scrollTop: $('html').scrollTop() - 0 }) + }); initAxiosInterceptors(this.props) From 48b9615f3ca8a1918190fde88f7534ab15b60331 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Thu, 4 Jul 2019 15:56:11 +0800 Subject: [PATCH 3/4] =?UTF-8?q?https://www.trustie.net/issues/21919=20?= =?UTF-8?q?=E5=8F=AF=E8=83=BD=E4=BC=9A=E6=9C=89=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/App.js | 1 + 1 file changed, 1 insertion(+) diff --git a/public/react/src/App.js b/public/react/src/App.js index 85267a4e6..f7530989e 100644 --- a/public/react/src/App.js +++ b/public/react/src/App.js @@ -227,6 +227,7 @@ class App extends Component { history.listen(() => { this.forceUpdate() const $ = window.$ + // https://www.trustie.net/issues/21919 可能会有问题 $("html").animate({ scrollTop: $('html').scrollTop() - 0 }) }); From 81852407d0ee09b46170baa7a5b64682e5f8c0cb Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Thu, 4 Jul 2019 16:40:18 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=95=B4=E7=BB=84=EF=BC=8C=E5=BB=B6?= =?UTF-8?q?=E8=BF=9F=E5=8A=A0=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/common/components/Cropper.js | 42 ++++++++++--------- .../GraduationTasksappraiseReplyChild.js | 2 +- 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/public/react/src/common/components/Cropper.js b/public/react/src/common/components/Cropper.js index f11248751..94b47747f 100644 --- a/public/react/src/common/components/Cropper.js +++ b/public/react/src/common/components/Cropper.js @@ -6,27 +6,8 @@ const $ = window.$ let _url_origin = getUrl2() // let _url_origin = `http://47.96.87.25:48080`; -if (!window.Cropper) { - $.ajaxSetup({ - cache: true - }); - $('head').append($('') - .attr('href', `${_url_origin}/react/public/js/cropper/cropper.min.css`)); - - $.getScript( - `${_url_origin}/react/public/js/cropper/cropper.js`, - (data, textStatus, jqxhr) => { - - }); - $.getScript( - `${_url_origin}/react/public/js/cropper/html2canvas.min.js`, - (data, textStatus, jqxhr) => { - - }); -} - function save_avatar(){ // if($(img_lg).html().trim() == ""){ @@ -93,9 +74,30 @@ class Cropper extends Component { // console.log(event.detail.scaleX); // console.log(event.detail.scaleY); }, - preview: this.props.previewId ? `#${this.props.previewId}` : '.img-preview', } + + if (!window.Cropper) { + $.ajaxSetup({ + cache: true + }); + + + $('head').append($('') + .attr('href', `${_url_origin}/react/public/js/cropper/cropper.min.css`)); + + $.getScript( + `${_url_origin}/react/public/js/cropper/cropper.js`, + (data, textStatus, jqxhr) => { + + }); + $.getScript( + `${_url_origin}/react/public/js/cropper/html2canvas.min.js`, + (data, textStatus, jqxhr) => { + + }); + } + setTimeout(() => { const image = document.getElementById(this.props.imageId || '__image'); this.cropper = new window.Cropper(image, this.options); diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReplyChild.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReplyChild.js index 83d42f9fc..56f633d2a 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReplyChild.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReplyChild.js @@ -77,7 +77,7 @@ class GraduationTasksappraiseReplyChild extends Component{ {this.props.ultimate===true ? "": isAdmin && this.props.addSuccess()} - showSameScore={true} + showSameScore={this.props.task_type == 2} > }