- {/*
-
后退
- */}
{props.name || ''}
{ renderQuit() }
- {/* 退出 */}
- {/* */}
@@ -206,6 +220,8 @@ const mapDispatchToProps = (dispatch) => ({
handleFormSubmit: (props) => dispatch(actions.validateOjForm(props)),
// 发布表单
handlePublish: (props, type) => dispatch(actions.validateOjForm(props, type)),
+ // 撤销发布
+ handleCancelPublish: (props, identifier) => dispatch(actions.handleClickCancelPublish(props, identifier)),
// 更新OJForm
handleUpdateOjForm: (props) => dispatch(actions.validateOjForm(props)),
// 根据id号获取表单信息
diff --git a/public/react/src/redux/actions/index.js b/public/react/src/redux/actions/index.js
index e52b88fc5..c19fa7e41 100644
--- a/public/react/src/redux/actions/index.js
+++ b/public/react/src/redux/actions/index.js
@@ -31,6 +31,7 @@ import {
testCaseOutputChange,
updateTestAndValidate,
updateOpenTestCaseIndex,
+ handleClickCancelPublish,
} from './ojForm';
import {
@@ -79,6 +80,7 @@ export default {
validateOjTimeLimit,
validateOjCategory,
validateOpenOrNot,
+ handleClickCancelPublish,
addTestCase,
deleteTestCase,
testCaseInputChange,
diff --git a/public/react/src/redux/actions/ojForm.js b/public/react/src/redux/actions/ojForm.js
index c49e628f3..b7fbd6e80 100644
--- a/public/react/src/redux/actions/ojForm.js
+++ b/public/react/src/redux/actions/ojForm.js
@@ -4,11 +4,16 @@
* @Github:
* @Date: 2019-11-20 16:35:46
* @LastEditors: tangjiang
- * @LastEditTime: 2019-12-10 19:54:56
+ * @LastEditTime: 2019-12-13 10:46:15
*/
import types from './actionTypes';
import CONST from '../../constants';
-import { fetchPostOjForm, fetchGetOjById, publishTask } from '../../services/ojService';
+import {
+ fetchPostOjForm,
+ fetchGetOjById,
+ publishTask,
+ cancelPublicTask
+} from '../../services/ojService';
import { Base64 } from 'js-base64';
import { message, notification, Modal } from 'antd';
import { toStore } from 'educoder';
@@ -80,6 +85,18 @@ const payloadInfo = (key, value, errMsg, validateInfo) => ({
}
});
+// 接口调用成功后，跳转至列表页
+function linkToDev (dispatch, props) {
+ toStore('oj_description', '');
+ dispatch({
+ type: types.IS_MY_SOURCE,
+ payload: true
+ });
+ setTimeout(() => {
+ props.history.push('/problems');
+ }, 1000);
+}
+
// 表单提交验证
export const validateOjForm = (props, type) => {
return (dispatch, getState) => {
@@ -229,59 +246,31 @@ export const validateOjForm = (props, type) => {
paramsObj['identifier'] = identifier;
}
- // 接口调用成功后，跳转至列表页
- function linkToDev () {
- toStore('oj_description', '');
- dispatch({
- type: types.IS_MY_SOURCE,
- payload: true
- });
- setTimeout(() => {
- props.history.push('/problems');
- }, 1000);
- }
-
// 调用保存或更新
if (type === 'publish') {
// 提示发布信息
- Modal.confirm({
- title: '提示',
- content: `
- 发布后即可应用到自己管理的课堂,
- 是否确定发布?`,
- okText: '确定',
- cancelText: '取消',
- onOk () {
- publishTask(identifier).then(res => {
- if (res.data.status === 0) {
- message.success('发布成功!');
- linkToDev();
- }
- dispatch({
- type: types.PUBLISH_LOADING_STATUS,
- payload: false
- });
- }).catch(() => {
- dispatch({
- type: types.PUBLISH_LOADING_STATUS,
- payload: false
- });
- });
- },
- onCancel () {
- dispatch({
- type: types.PUBLISH_LOADING_STATUS,
- payload: false
- });
+ publishTask(identifier).then(res => {
+ if (res.data.status === 0) {
+ message.success('发布成功!');
+ linkToDev(dispatch, props);
}
+ dispatch({
+ type: types.PUBLISH_LOADING_STATUS,
+ payload: false
+ });
+ }).catch(() => {
+ dispatch({
+ type: types.PUBLISH_LOADING_STATUS,
+ payload: false
+ });
});
} else {
// 调用更新
fetchPostOjForm(paramsObj).then(res => {
if (res.status === 200) { // 保存成功后，重新跳转至列表页
- if (res.data.identifier) {
- message.success('保存成功!');
- linkToDev();
+ if (res.data.status === 0) {
+ message.success(paramsObj['submitType'] === 'update' ? '更新成功' : '保存成功');
+ linkToDev(dispatch, props);
}
dispatch({
type: types.SUBMIT_LOADING_STATUS,
@@ -299,6 +288,29 @@ export const validateOjForm = (props, type) => {
}
}
};
+// 撤销发布
+export const handleClickCancelPublish = (props, identifier) => {
+ return (dispatch) => {
+ cancelPublicTask(identifier).then(res => {
+ dispatch({
+ type: types.PUBLISH_LOADING_STATUS,
+ payload: false
+ });
+ if (res.status = 200) {
+ const { data} = res;
+ if (data.status === 0) {
+ message.success('撤销发布成功!');
+ linkToDev(dispatch, props);
+ }
+ }
+ }).catch(() => {
+ dispatch({
+ type: types.PUBLISH_LOADING_STATUS,
+ payload: false
+ });
+ })
+ }
+}
// 保存提交的代码
export const saveOjFormCode = (value) => {
return {
diff --git a/public/react/src/services/ojService.js b/public/react/src/services/ojService.js
index 74c243379..9700f7031 100644
--- a/public/react/src/services/ojService.js
+++ b/public/react/src/services/ojService.js
@@ -4,7 +4,7 @@
* @Github:
* @Date: 2019-11-20 10:55:38
* @LastEditors: tangjiang
- * @LastEditTime: 2019-12-10 20:46:16
+ * @LastEditTime: 2019-12-13 10:09:12
*/
import axios from 'axios';
@@ -95,6 +95,12 @@ export async function publishTask (identifier) {
return axios.post(url);
}
+// 撤销发布
+export async function cancelPublicTask (identifier) {
+ const url = `/problems/${identifier}/cancel_publish.json`;
+ return axios.post(url);
+}
+
// 更新用户编辑代码
export async function fetchUpdateCode (identifier, params) {
const url = `/myproblems/${identifier}/update_code.json`;