|
|
|
@ -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-12 19:08:24
|
|
|
|
* @LastEditTime: 2019-12-13 17:19:15
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
import './index.scss';
|
|
|
|
import './index.scss';
|
|
|
|
import React, { useEffect, useState } from 'react';
|
|
|
|
import React, { useEffect, useState } from 'react';
|
|
|
|
@ -23,15 +23,15 @@ import { withRouter } from 'react-router';
|
|
|
|
|
|
|
|
|
|
|
|
function StudentStudy (props) {
|
|
|
|
function StudentStudy (props) {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
const [hasUpdate, setHasUpdate] = useState(true);
|
|
|
|
const {
|
|
|
|
const {
|
|
|
|
|
|
|
|
// hack,
|
|
|
|
userInfo,
|
|
|
|
userInfo,
|
|
|
|
hack_identifier
|
|
|
|
hack_identifier,
|
|
|
|
|
|
|
|
// user_program_identifier,
|
|
|
|
|
|
|
|
restoreInitialCode
|
|
|
|
} = props;
|
|
|
|
} = props;
|
|
|
|
|
|
|
|
|
|
|
|
// 是否更新
|
|
|
|
|
|
|
|
const [isUpdate, setIsUpdate] = useState(true);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
useEffect(() => {
|
|
|
|
|
|
|
|
const {
|
|
|
|
const {
|
|
|
|
match: { params },
|
|
|
|
match: { params },
|
|
|
|
getUserProgramDetail,
|
|
|
|
getUserProgramDetail,
|
|
|
|
@ -39,6 +39,8 @@ function StudentStudy (props) {
|
|
|
|
} = props;
|
|
|
|
} = props;
|
|
|
|
|
|
|
|
|
|
|
|
let { id } = params;
|
|
|
|
let { id } = params;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
useEffect(() => {
|
|
|
|
// 保存当前的id
|
|
|
|
// 保存当前的id
|
|
|
|
saveUserProgramIdentifier(id);
|
|
|
|
saveUserProgramIdentifier(id);
|
|
|
|
// startProgramQuestion(id);
|
|
|
|
// startProgramQuestion(id);
|
|
|
|
@ -46,10 +48,9 @@ function StudentStudy (props) {
|
|
|
|
}, []);
|
|
|
|
}, []);
|
|
|
|
|
|
|
|
|
|
|
|
useEffect(() => {
|
|
|
|
useEffect(() => {
|
|
|
|
console.log('=======>>>>>>>>');
|
|
|
|
|
|
|
|
const { hack = {} } = props;
|
|
|
|
const { hack = {} } = props;
|
|
|
|
if (!hack.modify_code && isUpdate) { // 代码更改，提示是否需要更新代码
|
|
|
|
if (hack.modify_code && hasUpdate) { // 代码更改，提示是否需要更新代码
|
|
|
|
setIsUpdate(false);
|
|
|
|
setHasUpdate(false);
|
|
|
|
Modal.confirm({
|
|
|
|
Modal.confirm({
|
|
|
|
title: '提示',
|
|
|
|
title: '提示',
|
|
|
|
content: (
|
|
|
|
content: (
|
|
|
|
@ -61,30 +62,11 @@ function StudentStudy (props) {
|
|
|
|
okText: '立即更新',
|
|
|
|
okText: '立即更新',
|
|
|
|
cancelText: '稍后再说',
|
|
|
|
cancelText: '稍后再说',
|
|
|
|
onOk () {
|
|
|
|
onOk () {
|
|
|
|
console.log('更新代码....');
|
|
|
|
restoreInitialCode(id, '更新成功');
|
|
|
|
}
|
|
|
|
}
|
|
|
|
});
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}, [props]);
|
|
|
|
}, [props, hasUpdate, setHasUpdate]);
|
|
|
|
// useEffect(() => {
|
|
|
|
|
|
|
|
// const {hack} = props;
|
|
|
|
|
|
|
|
// if (!hack.modify_code) { // 代码更改，提示是否需要更新代码
|
|
|
|
|
|
|
|
// Modal.confirm({
|
|
|
|
|
|
|
|
// title: '提示',
|
|
|
|
|
|
|
|
// content: (
|
|
|
|
|
|
|
|
// <p>
|
|
|
|
|
|
|
|
// 代码文件有更新啦 <br />
|
|
|
|
|
|
|
|
// 还未提交的代码，请自行保存
|
|
|
|
|
|
|
|
// </p>
|
|
|
|
|
|
|
|
// ),
|
|
|
|
|
|
|
|
// okText: '立即更新',
|
|
|
|
|
|
|
|
// cancelText: '稍后再说',
|
|
|
|
|
|
|
|
// onOk () {
|
|
|
|
|
|
|
|
// console.log('更新代码....');
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
// });
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
// }, [props]);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
const _hack_id = hack_identifier || fromStore('hack_identifier');
|
|
|
|
const _hack_id = hack_identifier || fromStore('hack_identifier');
|
|
|
|
|
|
|
|
|
|
|
|
@ -110,7 +92,7 @@ function StudentStudy (props) {
|
|
|
|
</div> */}
|
|
|
|
</div> */}
|
|
|
|
<UserInfo userInfo={userInfo}/>
|
|
|
|
<UserInfo userInfo={userInfo}/>
|
|
|
|
<div className={'study_name'}>
|
|
|
|
<div className={'study_name'}>
|
|
|
|
<span>乘积最大序列</span>
|
|
|
|
<span>乘积最大序列 {hasUpdate}</span>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
<div className={'study_quit'}>
|
|
|
|
<div className={'study_quit'}>
|
|
|
|
{/* to={`/problems/${_hack_id}/edit`} */}
|
|
|
|
{/* to={`/problems/${_hack_id}/edit`} */}
|
|
|
|
@ -146,9 +128,11 @@ function StudentStudy (props) {
|
|
|
|
|
|
|
|
|
|
|
|
const mapStateToProps = (state) => {
|
|
|
|
const mapStateToProps = (state) => {
|
|
|
|
const { userInfo } = state.userReducer;
|
|
|
|
const { userInfo } = state.userReducer;
|
|
|
|
const { hack_identifier } = state.ojForUserReducer;
|
|
|
|
const { hack_identifier, user_program_identifier, hack } = state.ojForUserReducer;
|
|
|
|
return {
|
|
|
|
return {
|
|
|
|
|
|
|
|
hack,
|
|
|
|
userInfo,
|
|
|
|
userInfo,
|
|
|
|
|
|
|
|
user_program_identifier,
|
|
|
|
hack_identifier
|
|
|
|
hack_identifier
|
|
|
|
};
|
|
|
|
};
|
|
|
|
};
|
|
|
|
};
|
|
|
|
@ -159,7 +143,9 @@ const mapDispatchToProps = (dispatch) => ({
|
|
|
|
// 调用编程题详情
|
|
|
|
// 调用编程题详情
|
|
|
|
getUserProgramDetail: (id) => dispatch(actions.getUserProgramDetail(id)),
|
|
|
|
getUserProgramDetail: (id) => dispatch(actions.getUserProgramDetail(id)),
|
|
|
|
saveUserProgramIdentifier: (id) => dispatch(actions.saveUserProgramIdentifier(id)),
|
|
|
|
saveUserProgramIdentifier: (id) => dispatch(actions.saveUserProgramIdentifier(id)),
|
|
|
|
saveEditorCodeForDetail: (code) => dispatch(actions.saveEditorCodeForDetail(code))
|
|
|
|
saveEditorCodeForDetail: (code) => dispatch(actions.saveEditorCodeForDetail(code)),
|
|
|
|
|
|
|
|
// 恢复初始代码
|
|
|
|
|
|
|
|
restoreInitialCode: (identifier, msg) => dispatch(actions.restoreInitialCode(identifier, msg)),
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
|
|
export default withRouter(connect(
|
|
|
|
export default withRouter(connect(
|
|
|
|
|
