m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

代码块添加定时保存，描述信息添加缓存

Browse Source
dev_daiao
tangjiang 5 years ago
parent 6416596b48
commit 93ed0c8eee
7 changed files with 44 additions and 27 deletions
Show Stats Download Patch File Download Diff File

3
public/react/src/modules/developer/newOrEditTask/index.js
Unescape View File

@ -28,7 +28,6 @@ const NewOrEditTask = (props) => {
identifier, identifier,
} = props; } = props;
console.log('props =====>>>>', props);
// 表单提交 // 表单提交
const handleSubmitForm = () => { const handleSubmitForm = () => {
// 调用输入表单验证功能 // 调用输入表单验证功能
@ -77,7 +76,7 @@ const NewOrEditTask = (props) => {
onClick={handleClickPublish}>立即发布</Button> onClick={handleClickPublish}>立即发布</Button>
</div> </div>
<div className="split-pane-area"> <div className="split-pane-area">
<SplitPane split="vertical" minSize={200} maxSize={-200} defaultSize="50%"> <SplitPane split="vertical" minSize={350} maxSize={-350} defaultSize="40%">
<div className={'split-pane-left'}> <div className={'split-pane-left'}>
<LeftPane /> <LeftPane />
</div> </div>

4
public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js
Unescape View File

@ -4,7 +4,7 @@
* @Github: * @Github:
* @Date: 2019-11-20 10:35:40 * @Date: 2019-11-20 10:35:40
* @LastEditors: tangjiang * @LastEditors: tangjiang
* @LastEditTime: 2019-12-06 16:56:24 * @LastEditTime: 2019-12-06 20:20:27
*/ */
import 'quill/dist/quill.core.css'; import 'quill/dist/quill.core.css';
import 'quill/dist/quill.bubble.css'; import 'quill/dist/quill.bubble.css';
@ -272,7 +272,7 @@ class EditTab extends React.Component {
style={{ height: '300px' }} style={{ height: '300px' }}
placeholder="请输入描述信息" placeholder="请输入描述信息"
onEditorChange={this.handleChangeDescription} onEditorChange={this.handleChangeDescription}
htmlCtx={ojForm.description} htmlCtx={ojForm.description || fromStore('oj_description')}
options={quillConfig} options={quillConfig}
/> />
</FormItem> </FormItem>

23
public/react/src/modules/developer/newOrEditTask/rightpane/index.js
Unescape View File

@ -4,7 +4,7 @@
* @Github: * @Github:
* @Date: 2019-12-01 10:18:35 * @Date: 2019-12-01 10:18:35
* @LastEditors: tangjiang * @LastEditors: tangjiang
* @LastEditTime: 2019-12-03 09:11:50 * @LastEditTime: 2019-12-06 17:50:58
*/ */
import './index.scss'; import './index.scss';
import React from 'react'; import React from 'react';
@ -17,14 +17,25 @@ function RightPane (props, ref) {
const { const {
// identifier, // identifier,
code,
onSubmitForm, onSubmitForm,
saveOjFormCode saveOjFormCode
} = props; } = props;
// let timer = null;
// 代码改变时，保存 // 代码改变时，保存
const handleCodeChange = (code) => { const handleCodeChange = (updateCode) => {
// 保存用户输入的代码 // 保存用户输入的代码
saveOjFormCode(code); // if (!timer) {
// timer = setInterval(() => {
// clearInterval(timer);
// timer = null;
// if (updateCode) {
// console.log('调用更新代码------>>>>>>', updateCode);
// }
// }, 3000);
// }
saveOjFormCode(updateCode);
} }
// 启动调试代码 // 启动调试代码
// const handleDebuggerCode = (value) => { // const handleDebuggerCode = (value) => {
@ -32,7 +43,11 @@ function RightPane (props, ref) {
// } // }
return ( return (
<div className={'right_pane_code_wrap'}> <div className={'right_pane_code_wrap'}>
<MyMonacoEditor language={props.language} code={props.code} onCodeChange={handleCodeChange}/> <MyMonacoEditor
language={props.language}
code={props.code}
onCodeChange={handleCodeChange}/>
<ControlSetting <ControlSetting
// identifier={identifier} // identifier={identifier}
inputValue={props.input} inputValue={props.input}

4
public/react/src/modules/developer/studentStudy/index.js
Unescape View File

@ -4,7 +4,7 @@
* @Github: * @Github:
* @Date: 2019-11-23 10:53:19 * @Date: 2019-11-23 10:53:19
* @LastEditors: tangjiang * @LastEditors: tangjiang
* @LastEditTime: 2019-12-06 17:02:32 * @LastEditTime: 2019-12-06 18:59:22
*/ */
import './index.scss'; import './index.scss';
import React, { useEffect } from 'react'; import React, { useEffect } from 'react';
@ -56,7 +56,7 @@ const StudentStudy = (props) => {
</div> </div>
</div> </div>
<div className="split-pane-area"> <div className="split-pane-area">
<SplitPane split="vertical" minSize={350} maxSize={-350} defaultSize="50%"> <SplitPane split="vertical" minSize={350} maxSize={-350} defaultSize="40%">
<div className={'split-pane-left'}> <div className={'split-pane-left'}>
<LeftPane /> <LeftPane />
</div> </div>

24
public/react/src/modules/developer/studentStudy/rightpane/index.js
Unescape View File

@ -4,7 +4,7 @@
* @Github: * @Github:
* @Date: 2019-11-27 14:59:51 * @Date: 2019-11-27 14:59:51
* @LastEditors: tangjiang * @LastEditors: tangjiang
* @LastEditTime: 2019-12-06 17:17:27 * @LastEditTime: 2019-12-06 18:48:52
*/ */
import React, { useState, useEffect } from 'react'; import React, { useState, useEffect } from 'react';
import {connect} from 'react-redux'; import {connect} from 'react-redux';
@ -22,12 +22,14 @@ const RightPane = (props) => {
hack, hack,
updateCode, updateCode,
saveUserInputCode, saveUserInputCode,
restoreInitialCode restoreInitialCode,
saveUserCodeForInterval
} = props; } = props;
const [editorCode, setEditorCode] = useState(''); const [editorCode, setEditorCode] = useState('');
useEffect(() => { useEffect(() => {
console.log('1111111');
setEditorCode(hack.code); setEditorCode(hack.code);
}, [hack]); }, [hack]);
@ -38,22 +40,19 @@ const RightPane = (props) => {
// updateCode(identifier, submitInput, 'submit'); // updateCode(identifier, submitInput, 'submit');
} }
let timer = null; // 定时器
// 代码块内容变化时 // 代码块内容变化时
const handleCodeChange = (code) => { const handleCodeChange = (code) => {
// 保存用户提交的代码块 // 保存用户提交的代码块
// console.log(code); console.log(code);
// 保存用户代码块
const { userCode } = props;
let timer;
if (!timer) { if (!timer) {
timer = setInterval(() => { timer = setInterval(() => {
if (userCode && userCode !== code) {
} else {
clearInterval(timer); clearInterval(timer);
timer = null; timer = null;
} saveUserCodeForInterval(identifier, code);
}, 3000); }, 3000);
} }
// 保存用户代码块
saveUserInputCode(code); saveUserInputCode(code);
} }
// 代码调试 // 代码调试
@ -86,11 +85,10 @@ const RightPane = (props) => {
const mapStateToProps = (state) => { const mapStateToProps = (state) => {
const {user_program_identifier, hack, userTestInput, userCode} = state.ojForUserReducer; const {user_program_identifier, hack, userTestInput} = state.ojForUserReducer;
// const { language, code } = hack; // const { language, code } = hack;
return { return {
hack, hack,
userCode,
input: userTestInput, input: userTestInput,
submitInput: hack.input, submitInput: hack.input,
identifier: user_program_identifier identifier: user_program_identifier
@ -102,8 +100,10 @@ const mapDispatchToProps = (dispatch) => ({
submitUserCode: (identifier, inputValue, type) => dispatch(actions.submitUserCode(identifier, inputValue, type)), submitUserCode: (identifier, inputValue, type) => dispatch(actions.submitUserCode(identifier, inputValue, type)),
// 更新代码块内容 // 更新代码块内容
updateCode: (identifier, inputValue, type) => dispatch(actions.updateCode(identifier, inputValue, type)), updateCode: (identifier, inputValue, type) => dispatch(actions.updateCode(identifier, inputValue, type)),
// 保存用户代码块 // 保存用户代码块至Reducer中
saveUserInputCode: (code) => dispatch(actions.saveUserInputCode(code)), saveUserInputCode: (code) => dispatch(actions.saveUserInputCode(code)),
// 保存用户代码至后台
saveUserCodeForInterval: (identifier, code) => dispatch(actions.saveUserCodeForInterval(identifier, code)),
// 恢复初始代码 // 恢复初始代码
restoreInitialCode: (identifier) => dispatch(actions.restoreInitialCode(identifier)), restoreInitialCode: (identifier) => dispatch(actions.restoreInitialCode(identifier)),
}); });

5
public/react/src/redux/actions/ojForUser.js
Unescape View File

@ -4,7 +4,7 @@
* @Github: * @Github:
* @Date: 2019-11-27 13:42:11 * @Date: 2019-11-27 13:42:11
* @LastEditors: tangjiang * @LastEditors: tangjiang
* @LastEditTime: 2019-12-06 17:16:14 * @LastEditTime: 2019-12-06 17:56:02
*/ */
import types from "./actionTypes"; import types from "./actionTypes";
import { Base64 } from 'js-base64'; import { Base64 } from 'js-base64';
@ -84,11 +84,12 @@ export const getUserProgramDetail = (identifier, type) => {
export const saveUserCodeForInterval = (identifier, code) => { export const saveUserCodeForInterval = (identifier, code) => {
return (dispatch) => { return (dispatch) => {
fetchUpdateCode(identifier, { fetchUpdateCode(identifier, {
code code: Base64.encode(code)
}).then(res => { }).then(res => {
if (res.data.status === 401) { if (res.data.status === 401) {
return; return;
}; };
console.log('代码保存成功', res);
}); });
} }
} }

4
public/react/src/redux/actions/ojForm.js
Unescape View File

@ -4,13 +4,14 @@
* @Github: * @Github:
* @Date: 2019-11-20 16:35:46 * @Date: 2019-11-20 16:35:46
* @LastEditors: tangjiang * @LastEditors: tangjiang
* @LastEditTime: 2019-12-05 08:47:50 * @LastEditTime: 2019-12-06 20:24:11
*/ */
import types from './actionTypes'; import types from './actionTypes';
import CONST from '../../constants'; import CONST from '../../constants';
import { fetchPostOjForm, fetchGetOjById, publishTask } from '../../services/ojService'; import { fetchPostOjForm, fetchGetOjById, publishTask } from '../../services/ojService';
import { Base64 } from 'js-base64'; import { Base64 } from 'js-base64';
import { message, notification } from 'antd'; import { message, notification } from 'antd';
import { toStore } from 'educoder';
const { jcLabel } = CONST; const { jcLabel } = CONST;
// 表单字段映射 // 表单字段映射
const maps = { const maps = {
@ -205,6 +206,7 @@ export const validateOjForm = (props, type) => {
} }
function linkToDev () { function linkToDev () {
toStore('oj_description', '');
dispatch({ dispatch({
type: types.IS_MY_SOURCE, type: types.IS_MY_SOURCE,
payload: true payload: true

Write Preview
Loading…
Cancel
Save