From fc4ec9aab3a925b6106b602e1153873c31aebaec Mon Sep 17 00:00:00 2001 From: tangjiang <465264938@qq.com> Date: Fri, 6 Dec 2019 09:59:02 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dissues=E5=91=BD=E4=BB=A4?= =?UTF-8?q?=E8=A1=8C=E6=97=B6=E9=97=B4=E5=8F=8A=E4=BB=A3=E7=A0=81=E5=9D=97?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/page/component/WebSSHTimer.js | 7 +++---- .../react/src/modules/page/component/monaco/TPIMonaco.js | 4 +++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/public/react/src/modules/page/component/WebSSHTimer.js b/public/react/src/modules/page/component/WebSSHTimer.js index a42dfc29b..e83887345 100644 --- a/public/react/src/modules/page/component/WebSSHTimer.js +++ b/public/react/src/modules/page/component/WebSSHTimer.js @@ -47,7 +47,7 @@ const five_min = 5 * 60 * 1000; 倒计时为0时，出现“重启”按钮 */ const isSSHInIframe = false; -class WebSSHTimer extends React.PureComponent { +class WebSSHTimer extends Component { constructor(props) { super(props) @@ -165,7 +165,6 @@ class WebSSHTimer extends React.PureComponent { }) } componentDidUpdate(prevProps, prevState, snapshot) { - console.log('======',prevProps, this.state, this.startTimeRemain); // 仅初始化一次 if (prevProps.showTimerProp === false && this.props.showTimerProp === true) { if (this.intervalHandler) { @@ -199,8 +198,8 @@ class WebSSHTimer extends React.PureComponent { // } } else if (e.data.tp === "sshWorking") { - this.startTimeRemain = 60; - this.forceUpdate() + // this.startTimeRemain = 60; + // this.forceUpdate(); } }); // } else { diff --git a/public/react/src/modules/page/component/monaco/TPIMonaco.js b/public/react/src/modules/page/component/monaco/TPIMonaco.js index 519125f93..5e687e9ce 100644 --- a/public/react/src/modules/page/component/monaco/TPIMonaco.js +++ b/public/react/src/modules/page/component/monaco/TPIMonaco.js @@ -244,8 +244,10 @@ class TPIMonaco extends Component { // 重要：setState(因获取代码、重置代码等接口引起的调用)调用引起的变化才需要setValue editor_monaco.setValue(this.props.repositoryCode) } - // 代码没变也需要layout，可能从命令行自动切回了代码tab + // 代码没变也需要layout，可能从命令行自动切回了代码tab + editor_monaco.layout(); + // Clears the editor's undo history. // TODO // extend_editor.clearHistory() From ab88d8d83ab310b04a7a310f8851a4bb9871d346 Mon Sep 17 00:00:00 2001 From: tangjiang <465264938@qq.com> Date: Fri, 6 Dec 2019 11:19:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8DTPI=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/developer/DeveloperHome.js | 1 - public/react/src/modules/developer/index.js | 3 ++- .../developer/newOrEditTask/leftpane/editorTab/index.js | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/public/react/src/modules/developer/DeveloperHome.js b/public/react/src/modules/developer/DeveloperHome.js index 0ba8bf0c9..1816ccbc7 100644 --- a/public/react/src/modules/developer/DeveloperHome.js +++ b/public/react/src/modules/developer/DeveloperHome.js @@ -179,7 +179,6 @@ class DeveloperHome extends React.PureComponent { componentDidMount() { // 是否是我的，如果是我的 显示编辑按钮 const { isMySource } = this.props; - console.log(this.props); if (isMySource) { this.handleFilterSearch({come_from: 'mine'}); diff --git a/public/react/src/modules/developer/index.js b/public/react/src/modules/developer/index.js index 54bce6695..fb64b3f67 100644 --- a/public/react/src/modules/developer/index.js +++ b/public/react/src/modules/developer/index.js @@ -7,6 +7,7 @@ */ import React from 'react'; import { TPMIndexHOC } from '../tpm/TPMIndexHOC'; +import { SnackbarHOC } from 'educoder'; import DeveloperHome from './DeveloperHome'; const App = (props) => { @@ -15,4 +16,4 @@ const App = (props) => { ); } -export default TPMIndexHOC(App); +export default SnackbarHOC()(TPMIndexHOC(App)); diff --git a/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js b/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js index 804df70fb..f13c53b22 100644 --- a/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js +++ b/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js @@ -4,7 +4,7 @@ * @Github: * @Date: 2019-11-20 10:35:40 * @LastEditors: tangjiang - * @LastEditTime: 2019-12-04 19:56:43 + * @LastEditTime: 2019-12-05 18:07:32 */ import 'quill/dist/quill.core.css'; import 'quill/dist/quill.bubble.css'; @@ -18,6 +18,7 @@ import AddTestDemo from './AddTestDemo'; import QuillEditor from '../../../quillEditor'; import actions from '../../../../../redux/actions'; import CONST from '../../../../../constants'; +import { fromStore, toStore } from 'educoder'; // 保存和读取store值 const scrollIntoView = require('scroll-into-view'); const {jcLabel} = CONST; const FormItem = Form.Item; @@ -110,6 +111,8 @@ class EditTab extends React.Component { // 改变描述信息 handleChangeDescription = (value) => { // console.log('获取的编辑器内容为: ', value); + // 描述信息变化时，将信息保存至store中 + toStore('oj_description', value); this.props.validateOjDescription(value); } // 改变难易度