{
testCases,
openTestCodeIndex,
testCasesValidate,
- ojFormValidate} = ojFormReducer;
+ ojFormValidate,
+ courseQuestions,
+ tag_discipline_id,
+ knowledges
+ } = ojFormReducer;
return {
ojForm,
testCases,
testCasesValidate,
ojFormValidate,
position,
- openTestCodeIndex
+ openTestCodeIndex,
+ courseQuestions,
+ tag_discipline_id,
+ knowledges
};
};
@@ -386,10 +507,15 @@ const mapDispatchToProps = (dispatch) => ({
validateOjTimeLimit: (value) => dispatch(actions.validateOjTimeLimit(value)),
validateOjCategory: (value) => dispatch(actions.validateOjCategory(value)),
validateOpenOrNot: (value) => dispatch(actions.validateOpenOrNot(value)),
+ validateOjSubDisciplineId: (value) => dispatch(actions.validateOjSubDisciplineId(value)),
+ saveTagDisciplineId: (value) => dispatch(actions.saveTagDisciplineId(value)),
// 新增测试用例
addTestCase: (value) => dispatch(actions.addTestCase(value)),
// 删除测试用例
deleteTestCase: (value) => dispatch(actions.deleteTestCase(value)),
+ saveKnowledge: (value) => dispatch(actions.saveKnowledge(value))
+ // 获取题库
+ // getQuestion: (params) => dispatch(actions.getQuestion(params))
});
export default connect(
diff --git a/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.scss b/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.scss
index 723678bb3..ff5df7090 100644
--- a/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.scss
+++ b/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.scss
@@ -18,6 +18,12 @@
line-height: 1;
content: '*';
}
+
+ &.nostar{
+ &::before {
+ content: ''
+ }
+ }
}
.input_area{
display: inline-block;
diff --git a/public/react/src/modules/developer/recordDetail/index.js b/public/react/src/modules/developer/recordDetail/index.js
index fd93b3f2a..6675f066d 100644
--- a/public/react/src/modules/developer/recordDetail/index.js
+++ b/public/react/src/modules/developer/recordDetail/index.js
@@ -4,7 +4,7 @@
* @Github:
* @Date: 2019-12-04 08:36:21
* @LastEditors : tangjiang
- * @LastEditTime : 2019-12-27 21:18:39
+ * @LastEditTime : 2020-01-02 13:48:02
*/
import './index.scss';
import React, { useState, useEffect } from 'react';
@@ -57,7 +57,9 @@ function RecordDetail (props) {
const handleReturn = (identifier) => {
if (identifier) {
saveEditorCodeForDetail('');
- props.history.push(`/myproblems/${identifier}`);
+ setTimeout(() => {
+ props.history.push(`/myproblems/${identifier}`);
+ }, 300);
}
}
diff --git a/public/react/src/modules/developer/split_pane_resizer.scss b/public/react/src/modules/developer/split_pane_resizer.scss
index 8fc8b525f..8d4ad171c 100644
--- a/public/react/src/modules/developer/split_pane_resizer.scss
+++ b/public/react/src/modules/developer/split_pane_resizer.scss
@@ -23,6 +23,8 @@
}
.header_title{
+ font-size: 16px;
+ font-weight: bold;
text-align: center;
}
@@ -82,6 +84,8 @@
bottom: 0;
top: 0;
text-align: center;
+ font-size: 16px;
+ font-weight: bold;
}
}
}
@@ -158,6 +162,22 @@
-moz-background-clip: padding;
-webkit-background-clip: padding;
background-clip: padding-box;
+
+ // &::before{
+ // position: absolute;
+ // width: 24px;
+ // height: 24px;
+ // border-radius: 50%;
+ // margin-top: -12px;
+ // top: 50%;
+ // right: -12px;
+ // font-family: 'iconfont';
+ // background: gold;
+ // content: '\e711';
+ // font-size: 18px;
+ // text-align: center;
+ // line-height: 24px;
+ // }
}
.Resizer:hover {
@@ -196,4 +216,4 @@
}
.Resizer.disabled:hover {
border-color: transparent;
-}
\ No newline at end of file
+}
diff --git a/public/react/src/modules/developer/studentStudy/leftpane/index.js b/public/react/src/modules/developer/studentStudy/leftpane/index.js
index ac8d89321..88c5ee9a0 100644
--- a/public/react/src/modules/developer/studentStudy/leftpane/index.js
+++ b/public/react/src/modules/developer/studentStudy/leftpane/index.js
@@ -4,7 +4,7 @@
* @Github:
* @Date: 2019-11-23 11:33:41
* @LastEditors : tangjiang
- * @LastEditTime : 2019-12-27 16:03:04
+ * @LastEditTime : 2020-01-02 13:51:22
// */
import './index.scss';
import React, { useState, useEffect, useMemo } from 'react';
@@ -50,8 +50,6 @@ const LeftPane = (props) => {
record: (),
comment: ()
};
-
- console.log('======>>>>>>>', props);
useEffect(() => {
setDefaultActiveKey(userCodeTab);
diff --git a/public/react/src/modules/developer/studentStudy/rightpane/index.js b/public/react/src/modules/developer/studentStudy/rightpane/index.js
index ed500fb3a..bebaea1e8 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-27 19:23:46
+ * @LastEditTime : 2020-01-02 14:23:43
*/
import React, { useState, useEffect } from 'react';
import {connect} from 'react-redux';
@@ -39,7 +39,7 @@ const RightPane = (props) => {
changeLoadingState
} = props;
- const [editorCode, setEditorCode] = useState(editor_code || hack.code);
+ // const [editorCode, setEditorCode] = useState(editor_code || hack.code);
const [noteClazz, setNoteClazz] = useState('editor_nodte_area');
const [noteCount] = useState(5000);
// const [code, setCode] = useState(editor_code || hack.code);
@@ -65,8 +65,9 @@ const RightPane = (props) => {
let timer = null; // 定时器
// 代码块内容变化时
const handleCodeChange = (value) => {
+ // console.log('编辑器代码 ======》》》》》》》》》++++++++++', value);
saveUserInputCode(value);
- setEditorCode(value);
+ // setEditorCode(value);
if (!timer) {
timer = setInterval(function () {
clearInterval(timer);
@@ -116,6 +117,7 @@ const RightPane = (props) => {
const { getFieldDecorator } = props.form;
return (
+
{
});
// console.log('+++', userCode);
fetchUpdateCode(identifier, {
- code: userCode
+ code: Base64.encode(userCode)
}).then(res => {
if (res.data.status === 401) {
return;
};
- dispatch({
- type: types.RESTORE_INITIAL_CODE,
- payload: userCode
- });
-
+ // dispatch({
+ // type: types.RESTORE_INITIAL_CODE,
+ // payload: userCode
+ // });
setTimeout(() => {
dispatch({
type: types.AUTO_UPDATE_CODE,
@@ -342,7 +341,7 @@ export const getUserCommitRecord = (identifier) => {
export const getUserCommitRecordDetail = (identifier) => {
return (dispatch) => {
fetchUserCommitRecordDetail(identifier).then(res => {
- console.log('提交记录详情======》》》》', res);
+ // console.log('提交记录详情======》》》》', res);
const { data } = res;
if (data.status === 401) return;
dispatch({
diff --git a/public/react/src/redux/actions/ojForm.js b/public/react/src/redux/actions/ojForm.js
index 118295802..539798ff4 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-27 22:19:15
+ * @LastEditTime : 2020-01-02 17:38:12
*/
import types from './actionTypes';
import CONST from '../../constants';
@@ -12,7 +12,8 @@ import {
fetchPostOjForm,
fetchGetOjById,
publishTask,
- cancelPublicTask
+ cancelPublicTask,
+ fetchQuestion
} from '../../services/ojService';
import { Base64 } from 'js-base64';
import { notification } from 'antd';
@@ -45,6 +46,10 @@ const maps = {
label: jcLabel['category'],
type: types.VALIDATE_OJ_CATEGORY
},
+ sub_discipline_id: {
+ label: jcLabel['sub_discipline_id'],
+ type: types.VALIDATE_OJ_SUB_DISCIPLINE_ID
+ },
openOrNot: {
label: jcLabel['openOrNot'],
type: types.VALIDATE_OJ_OPENORNOT
@@ -105,21 +110,24 @@ export const validateOjForm = (props, type, cb) => {
const {ojForm, testCases, identifier, code } = getState().ojFormReducer;
// console.log('code', code);
/** 表单验证开始 */
- let keys = Object.keys(ojForm);
+ // let keys = Object.keys(ojForm).filter(k => k !== '');
+ let keys = Object.keys(ojForm)
// 循环判断每个字段是否为空
let hasSuccess = true;
keys.forEach(key => {
- const value = ojForm[key];
- const validateResult = emptyValidate(key, value);
- const errMsg = validateResult[key].errMsg;
- if (errMsg) {
- hasSuccess = false;
- dispatch(
- {
- type: maps[key].type,
- payload: payloadInfo(key, value, errMsg, validateResult[key])
- }
- )
+ if (!['category'].includes(key)) {
+ const value = ojForm[key];
+ const validateResult = emptyValidate(key, value);
+ const errMsg = validateResult[key].errMsg;
+ if (errMsg) {
+ hasSuccess = false;
+ dispatch(
+ {
+ type: maps[key].type,
+ payload: payloadInfo(key, value, errMsg, validateResult[key])
+ }
+ )
+ }
}
});
// 验证测试用例中的数组是否都有对应的值
@@ -197,8 +205,8 @@ export const validateOjForm = (props, type, cb) => {
if (hasSuccess) {
// console.log('表单保存的数据为: ', getState());
const {ojFormReducer} = getState();
- const {code, score, ojForm, testCases = []} = ojFormReducer;
- const {category, description, difficult, language, name, openOrNot, timeLimit} = ojForm;
+ const {code, score, ojForm, testCases = [], tag_discipline_id = []} = ojFormReducer;
+ const {category, description, difficult, language, name, openOrNot, timeLimit, sub_discipline_id} = ojForm;
let paramsObj = {};
const hack = { // 编程题干
name,
@@ -207,6 +215,8 @@ export const validateOjForm = (props, type, cb) => {
category,
'open_or_not': openOrNot,
'time_limit': timeLimit,
+ sub_discipline_id,
+ // tag_discipline_id,
score
};
@@ -223,7 +233,8 @@ export const validateOjForm = (props, type, cb) => {
paramsObj['params'] = {
hack,
hack_sets: tempTc,
- hack_codes
+ hack_codes,
+ tags: tag_discipline_id
}
paramsObj['submitType'] = 'add';
} else { // 存在时调用更新接口
@@ -242,7 +253,8 @@ export const validateOjForm = (props, type, cb) => {
hack,
hack_sets,
hack_codes,
- update_hack_sets
+ update_hack_sets,
+ tags: tag_discipline_id
}
paramsObj['submitType'] = 'update';
paramsObj['identifier'] = identifier;
@@ -483,6 +495,15 @@ export const validateOjCategory = (value) => {
payload: payloadInfo('category', value, errMsg, validate)
}
};
+// 验证方向
+export const validateOjSubDisciplineId = (value) => {
+ const validate = emptyValidate('sub_discipline_id', value)['sub_discipline_id'];
+ const errMsg = validate.errMsg;
+ return {
+ type: types.VALIDATE_OJ_SUB_DISCIPLINE_ID,
+ payload: payloadInfo('sub_discipline_id', value, errMsg, validate)
+ }
+};
// 验证公开程序
export const validateOpenOrNot = (value) => {
const validate = emptyValidate('openOrNot', value)['openOrNot'];
@@ -492,6 +513,14 @@ export const validateOpenOrNot = (value) => {
payload: payloadInfo('openOrNot', value, errMsg, validate)
}
};
+// 保存知识点
+export const saveTagDisciplineId = (value) => {
+ // console.log('====????????????', value);
+ return {
+ type: types.SAVE_TAG_DISCIPLINE_ID,
+ payload: value
+ };
+}
// 新增测试用例
export const addTestCase = (obj) => {
return {
@@ -622,7 +651,6 @@ export const testCaseOutputChange = (value, index) => {
// // 调试代码时，更改对应的状态值
// export const changeTestCodeStatus = () => {
-
// 更新测试用命及验证
export const updateTestAndValidate = (obj) => {
return (dispatch) => {
@@ -644,3 +672,25 @@ export const updateOpenTestCaseIndex = (value) => {
payload: value
}
}
+
+// 获取课程题库
+export const getQuestion = (params) => {
+ return (dispatch) => {
+ fetchQuestion(params).then(res => {
+ const { data = {} } = res;
+ const { disciplines = [] } = data;
+ dispatch({
+ type: types.GET_COURSE_QUESTION,
+ payload: disciplines
+ })
+ })
+ }
+}
+
+// 保存所选择的知识点
+export const saveKnowledge = (values) => {
+ return {
+ type: types.CHANGE_KNOWLEDGES,
+ payload: values
+ }
+}
diff --git a/public/react/src/redux/reducers/ojForUserReducer.js b/public/react/src/redux/reducers/ojForUserReducer.js
index 721c3e2cc..475d14d79 100644
--- a/public/react/src/redux/reducers/ojForUserReducer.js
+++ b/public/react/src/redux/reducers/ojForUserReducer.js
@@ -4,7 +4,7 @@
* @Github:
* @Date: 2019-11-27 13:41:48
* @LastEditors : tangjiang
- * @LastEditTime : 2019-12-27 21:28:28
+ * @LastEditTime : 2020-01-02 14:24:09
*/
import types from "../actions/actionTypes";
import { Base64 } from 'js-base64';
@@ -94,10 +94,11 @@ const ojForUserReducer = (state = initialState, action) => {
pages: Object.assign({}, state.pages, { total: records_count })
}
case types.SAVE_USER_CODE:
- let curCode = Base64.encode(action.payload);
+ // console.log('save_user_code: ', action.payload);
+ // let curCode = Base64.encode(action.payload);
return {
...state,
- userCode: curCode,
+ userCode: action.payload,
isUpdateCode: true,
}
case types.IS_UPDATE_CODE:
@@ -136,7 +137,6 @@ const ojForUserReducer = (state = initialState, action) => {
} else {
curHack['code'] = '';
}
- console.log(curHack);
return {
...state,
hack: Object.assign({}, state.hack, curHack),
diff --git a/public/react/src/redux/reducers/ojFormReducer.js b/public/react/src/redux/reducers/ojFormReducer.js
index 952919aca..d604a6156 100644
--- a/public/react/src/redux/reducers/ojFormReducer.js
+++ b/public/react/src/redux/reducers/ojFormReducer.js
@@ -4,7 +4,7 @@
* @Github:
* @Date: 2019-11-20 16:40:32
* @LastEditors : tangjiang
- * @LastEditTime : 2019-12-27 20:00:26
+ * @LastEditTime : 2020-01-02 17:36:40
*/
import { Base64 } from 'js-base64';
import types from '../actions/actionTypes';
@@ -15,10 +15,12 @@ const init = {
language: '',
description: '',
difficult: '',
- category: '',
+ sub_discipline_id: '', // 方向
+ // category: '',
// openOrNot: 1,
timeLimit: 3
},
+ tag_discipline_id: [], // 知识点
ojFormValidate: {
name: {
validateStatus: '',
@@ -36,14 +38,18 @@ const init = {
validateStatus: '',
errMsg: ''
},
- category: {
- validateStatus: '',
- errMsg: ''
- },
+ // category: {
+ // validateStatus: '',
+ // errMsg: ''
+ // },
// openOrNot: {
// validateStatus: '',
// errMsg: ''
// },
+ sub_discipline_id: {
+ validateStatus: '',
+ errMsg: ''
+ },
timeLimit: {
validateStatus: '',
errMsg: ''
@@ -67,6 +73,8 @@ const init = {
testCodeStatus: 'default', // 调试代码状态 default(默认值) | loading(加载中) | loaded(加载完成) | userCase(用户自定义测试用例) | finish(测试完成)
openTestCodeIndex: [0], // 展开的测试用例: 数组， 当出错时，展开所有出错的测试用例， 默认展开第一个
isPublish: 0, // 是否是发布状态: 0 未发布 1 已发布
+ courseQuestions: [], // 课程题库
+ knowledges: [], // 知识点下拉值
}
const tcValidateObj = {
@@ -127,10 +135,17 @@ const ojFormReducer = (state = initialState, action) => {
return returnState(state, ojForm, ojFormValidate);
case types.VALIDATE_OJ_CATEGORY:
return returnState(state, ojForm, ojFormValidate);
+ case types.VALIDATE_OJ_SUB_DISCIPLINE_ID:
+ return returnState(state, ojForm, ojFormValidate);
case types.VALIDATE_OJ_OPENORNOT:
return returnState(state, ojForm, ojFormValidate);
case types.VALIDATE_OJ_TIMELIMIT:
return returnState(state, ojForm, ojFormValidate);
+ case types.SAVE_TAG_DISCIPLINE_ID:
+ return {
+ ...state,
+ tag_discipline_id: action.payload
+ }
case types.ADD_TEST_CASE:
const { testCase, tcValidate } = action.payload;
const tcArrs = state.testCases.concat([testCase]);
@@ -174,7 +189,8 @@ const ojFormReducer = (state = initialState, action) => {
* 6. 更改测试用例状态
* 7. 添加测试用例验证
*/
- const { code = '', description, language, name, hack_sets = [], time_limit, difficult, category, status } = action.payload;
+ const { code = '', description, language, name, hack_sets = [], time_limit, difficult, category, status, sub_discipline_id, tag_discipline_id } = action.payload;
+ const { courseQuestions } = state;
let desc = null;
try {
desc = JSON.parse(description)
@@ -188,7 +204,8 @@ const ojFormReducer = (state = initialState, action) => {
difficult,
category,
openOrNot: 1,
- timeLimit: time_limit
+ timeLimit: time_limit,
+ sub_discipline_id
};
// state.code = code; // 保存代码块值
let curPosition = 0;
@@ -208,6 +225,18 @@ const ojFormReducer = (state = initialState, action) => {
} else if (Array.isArray(code)) {
cbcode = Base64.decode(code[code.length - 1]);
}
+
+ // console.log('++++>>>>>>>>>>>>>', courseQuestions);
+ let temp_knowledges = [];
+ courseQuestions.forEach(c => {
+ if (sub_discipline_id && c.sub_disciplines) {
+ c.sub_disciplines.forEach(sub => {
+ if (+sub.id === sub_discipline_id) {
+ temp_knowledges = sub.tag_disciplines || [];
+ }
+ });
+ }
+ });
// state.position = curPosition; // 计算下一个测试用例的位置值
return {
...state,
@@ -218,7 +247,9 @@ const ojFormReducer = (state = initialState, action) => {
testCasesValidate: curTcValidates,
testCodeStatus: hack_sets.length > 0 ? 'userCase' : 'default',
isPublish: status,
- showCode: cbcode
+ showCode: cbcode,
+ tag_discipline_id,
+ knowledges: temp_knowledges
}
case types.CHANGE_PUBLISH_VALUE:
return {
@@ -301,11 +332,22 @@ const ojFormReducer = (state = initialState, action) => {
if (tIndex === -1) {
tempArr.push(action.payload);
}
- console.log(tempArr);
+ // console.log(tempArr);
return {
...state,
openTestCodeIndex: tempArr
}
+ case types.GET_COURSE_QUESTION:
+ return {
+ ...state,
+ courseQuestions: action.payload
+ }
+ case types.CHANGE_KNOWLEDGES: {
+ return {
+ ...state,
+ knowledges: action.payload
+ }
+ }
default:
return state;
}
diff --git a/public/react/src/services/ojService.js b/public/react/src/services/ojService.js
index 04fde2224..59151e687 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-27 11:06:27
+ * @LastEditTime : 2019-12-30 09:44:56
*/
import axios from 'axios';
@@ -142,4 +142,10 @@ export async function fetchUploadImageUrl (id) {
export async function fetchAddNotes (identifier, params) {
const url = `/myproblems/${identifier}/add_notes.json`;
return axios.post(url, params);
+}
+
+// 获取课程体系
+export async function fetchQuestion (params) {
+ const url = `/disciplines.json`;
+ return axios.get(url, { params });
}
\ No newline at end of file