diff --git a/public/react/src/modules/developer/components/myMonacoEditor/index.js b/public/react/src/modules/developer/components/myMonacoEditor/index.js index 85fee0efa..60f54ee0a 100644 --- a/public/react/src/modules/developer/components/myMonacoEditor/index.js +++ b/public/react/src/modules/developer/components/myMonacoEditor/index.js @@ -4,11 +4,11 @@ * @Github: * @Date: 2019-11-27 15:02:52 * @LastEditors: tangjiang - * @LastEditTime: 2019-12-10 09:20:42 + * @LastEditTime: 2019-12-13 16:16:56 */ import './index.scss'; import React, { useState, useRef, useEffect } from 'react'; -import { Icon, Drawer, Modal } from 'antd'; +import { Drawer, Modal } from 'antd'; import { fromStore } from 'educoder'; import { connect } from 'react-redux'; import MonacoEditor from '@monaco-editor/react'; diff --git a/public/react/src/modules/developer/studentStudy/index.js b/public/react/src/modules/developer/studentStudy/index.js index 923017ffa..f6f21f8fe 100644 --- a/public/react/src/modules/developer/studentStudy/index.js +++ b/public/react/src/modules/developer/studentStudy/index.js @@ -4,7 +4,7 @@ * @Github: * @Date: 2019-11-23 10:53:19 * @LastEditors: tangjiang - * @LastEditTime: 2019-12-12 19:08:24 + * @LastEditTime: 2019-12-13 16:46:31 */ import './index.scss'; import React, { useEffect, useState } from 'react'; @@ -25,20 +25,23 @@ function StudentStudy (props) { const { userInfo, - hack_identifier + hack_identifier, + user_program_identifier, + restoreInitialCode } = props; // 是否更新 const [isUpdate, setIsUpdate] = useState(true); - useEffect(() => { - const { - match: { params }, - getUserProgramDetail, - saveUserProgramIdentifier - } = props; + const { + match: { params }, + getUserProgramDetail, + saveUserProgramIdentifier + } = props; + + let { id } = params; - let { id } = params; + useEffect(() => { // 保存当前的id saveUserProgramIdentifier(id); // startProgramQuestion(id); @@ -46,7 +49,6 @@ function StudentStudy (props) { }, []); useEffect(() => { - console.log('=======>>>>>>>>'); const { hack = {} } = props; if (!hack.modify_code && isUpdate) { // 代码更改，提示是否需要更新代码 setIsUpdate(false); @@ -61,30 +63,11 @@ function StudentStudy (props) { okText: '立即更新', cancelText: '稍后再说', onOk () { - console.log('更新代码....'); + restoreInitialCode(id, '更新成功'); } }); } }, [props]); - // useEffect(() => { - // const {hack} = props; - // if (!hack.modify_code) { // 代码更改，提示是否需要更新代码 - // Modal.confirm({ - // title: '提示', - // content: ( - //

- // 代码文件有更新啦
- // 还未提交的代码，请自行保存 - //

- // ), - // okText: '立即更新', - // cancelText: '稍后再说', - // onOk () { - // console.log('更新代码....'); - // } - // }); - // } - // }, [props]); const _hack_id = hack_identifier || fromStore('hack_identifier'); @@ -146,11 +129,12 @@ function StudentStudy (props) { const mapStateToProps = (state) => { const { userInfo } = state.userReducer; - const { hack_identifier } = state.ojForUserReducer; + const { hack_identifier, user_program_identifier } = state.ojForUserReducer; return { userInfo, + user_program_identifier, hack_identifier - }; + }; }; const mapDispatchToProps = (dispatch) => ({ @@ -159,7 +143,9 @@ const mapDispatchToProps = (dispatch) => ({ // 调用编程题详情 getUserProgramDetail: (id) => dispatch(actions.getUserProgramDetail(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( diff --git a/public/react/src/modules/developer/studentStudy/rightpane/index.js b/public/react/src/modules/developer/studentStudy/rightpane/index.js index 39d42f749..669a8a693 100644 --- a/public/react/src/modules/developer/studentStudy/rightpane/index.js +++ b/public/react/src/modules/developer/studentStudy/rightpane/index.js @@ -4,7 +4,7 @@ * @Github: * @Date: 2019-11-27 14:59:51 * @LastEditors: tangjiang - * @LastEditTime: 2019-12-10 19:00:30 + * @LastEditTime: 2019-12-13 16:50:40 */ import React, { useState, useEffect } from 'react'; import {connect} from 'react-redux'; @@ -66,7 +66,7 @@ const RightPane = (props) => { } // 恢复初始代码 const handleRestoreInitialCode = () => { - restoreInitialCode(identifier); + restoreInitialCode(identifier, '恢复初始代码成功'); } return ( @@ -110,7 +110,7 @@ const mapDispatchToProps = (dispatch) => ({ // 保存用户代码至后台 saveUserCodeForInterval: (identifier, code) => dispatch(actions.saveUserCodeForInterval(identifier, code)), // 恢复初始代码 - restoreInitialCode: (identifier) => dispatch(actions.restoreInitialCode(identifier)), + restoreInitialCode: (identifier, msg) => dispatch(actions.restoreInitialCode(identifier, msg)), }); export default connect( diff --git a/public/react/src/redux/actions/ojForUser.js b/public/react/src/redux/actions/ojForUser.js index e3480a435..79e2045d6 100644 --- a/public/react/src/redux/actions/ojForUser.js +++ b/public/react/src/redux/actions/ojForUser.js @@ -4,7 +4,7 @@ * @Github: * @Date: 2019-11-27 13:42:11 * @LastEditors: tangjiang - * @LastEditTime: 2019-12-10 19:05:36 + * @LastEditTime: 2019-12-13 16:49:42 */ import types from "./actionTypes"; import { Base64 } from 'js-base64'; @@ -19,6 +19,7 @@ import { fetchUserCodeSubmit, fetchRestoreInitialCode } from "../../services/ojService"; +import { notification } from "antd"; // 进入编程页面时，首先调用开启编程题接口 export const startProgramQuestion = (id, props) => { @@ -384,17 +385,21 @@ export const submitUserCode = (identifier, inputValue, type) => { } // 恢复初始代码 -export const restoreInitialCode = (identifier) => { +export const restoreInitialCode = (identifier, msg) => { return (dispatch) => { fetchRestoreInitialCode(identifier).then(res => { if (res.data.status === 401) return; - console.log('恢复初始代码====》》》》', res); + // console.log('恢复初始代码====》》》》', res); const {status, data} = res; if (status === 200) { dispatch({ type: types.RESTORE_INITIAL_CODE, payload: data.code - }) + }); + notification.success({ + message: '提示', + description: msg + }); } }); } diff --git a/public/react/src/redux/actions/ojForm.js b/public/react/src/redux/actions/ojForm.js index b7fbd6e80..3eaac9023 100644 --- a/public/react/src/redux/actions/ojForm.js +++ b/public/react/src/redux/actions/ojForm.js @@ -4,7 +4,7 @@ * @Github: * @Date: 2019-11-20 16:35:46 * @LastEditors: tangjiang - * @LastEditTime: 2019-12-13 10:46:15 + * @LastEditTime: 2019-12-13 16:56:22 */ import types from './actionTypes'; import CONST from '../../constants'; @@ -251,7 +251,11 @@ export const validateOjForm = (props, type) => { // 提示发布信息 publishTask(identifier).then(res => { if (res.data.status === 0) { - message.success('发布成功!'); + // message.success('发布成功!'); + notification.success({ + message: '提示', + description: '发布成功!' + }); linkToDev(dispatch, props); } dispatch({ @@ -269,7 +273,11 @@ export const validateOjForm = (props, type) => { fetchPostOjForm(paramsObj).then(res => { if (res.status === 200) { // 保存成功后，重新跳转至列表页 if (res.data.status === 0) { - message.success(paramsObj['submitType'] === 'update' ? '更新成功' : '保存成功'); + // message.success(paramsObj['submitType'] === 'update' ? '更新成功' : '保存成功'); + notification.success({ + message: '提示', + description: paramsObj['submitType'] === 'update' ? '更新成功' : '保存成功' + }); linkToDev(dispatch, props); } dispatch({ @@ -299,7 +307,11 @@ export const handleClickCancelPublish = (props, identifier) => { if (res.status = 200) { const { data} = res; if (data.status === 0) { - message.success('撤销发布成功!'); + // message.success('撤销发布成功!'); + notification.success({ + message: '提示', + description: '撤销发布成功!' + }); linkToDev(dispatch, props); } }