@@ -65,6 +66,7 @@ function ExecResult (props) {
输入: {input}
输出: {output}
+ 执行用时: {`${execute_time}s`}
);
} else if (state === 4){
@@ -109,6 +111,7 @@ function ExecResult (props) {
// 渲染状态变化时渲染相应的内容
useEffect(() => {
+ // console.log('执行状态====》》》》', excuteState);
if ('loading' === excuteState) {
setRenderCtx(() => (renderLoading));
} else if ('loaded' === excuteState) {
@@ -120,7 +123,7 @@ function ExecResult (props) {
// 提交详情变化时
useEffect(() => {
- console.log('提交记录详情=====>>>>>', excuteDetail);
+ // console.log('提交记录详情=====>>>>>', excuteDetail);
setCodeResult(excuteDetail);
}, [excuteDetail]);
diff --git a/public/react/src/modules/developer/components/initTabCtx/index.js b/public/react/src/modules/developer/components/initTabCtx/index.js
index c4b989354..221558cdc 100644
--- a/public/react/src/modules/developer/components/initTabCtx/index.js
+++ b/public/react/src/modules/developer/components/initTabCtx/index.js
@@ -4,7 +4,7 @@
* @Github:
* @Date: 2019-11-27 19:46:14
* @LastEditors: tangjiang
- * @LastEditTime: 2019-11-27 23:49:21
+ * @LastEditTime: 2019-12-03 09:14:59
*/
import './index.scss';
import React, { useState, useEffect, useRef, useImperativeHandle, forwardRef } from 'react';
@@ -28,7 +28,7 @@ function InitTabCtx (props, ref) {
useImperativeHandle(ref, () => ({
handleTestCodeFormSubmit: (cb) => {
- console.log('父组件调用我啦~~~~~~~~~');
+ // console.log('父组件调用我啦~~~~~~~~~');
_handleTestCodeFormSubmit(cb);
}
}));
diff --git a/public/react/src/modules/developer/components/myMonacoEditor/index.js b/public/react/src/modules/developer/components/myMonacoEditor/index.js
index 56f30ea2e..989fc07ba 100644
--- a/public/react/src/modules/developer/components/myMonacoEditor/index.js
+++ b/public/react/src/modules/developer/components/myMonacoEditor/index.js
@@ -4,7 +4,7 @@
* @Github:
* @Date: 2019-11-27 15:02:52
* @LastEditors: tangjiang
- * @LastEditTime: 2019-11-28 12:39:39
+ * @LastEditTime: 2019-12-03 09:29:54
*/
import './index.scss';
import React, { useState, useRef, useEffect } from 'react';
@@ -13,17 +13,18 @@ import { connect } from 'react-redux';
import MonacoEditor from '@monaco-editor/react';
import SettingDrawer from '../../components/monacoSetting';
import CONST from '../../../../constants';
-import actions from '../../../../redux/actions';
+// import actions from '../../../../redux/actions';
const { fontSetting, opacitySetting } = CONST;
-const MyMonacoEditor = (props) => {
+function MyMonacoEditor (props, ref) {
const {
language,
code,
showOrHideControl,
- saveUserInputCode
+ // saveUserInputCode,
+ onCodeChange
} = props;
const [showDrawer, setShowDrawer] = useState(false); // 控制配置滑框
const [editCode, setEditCode] = useState('');
@@ -41,6 +42,7 @@ const MyMonacoEditor = (props) => {
useEffect(() => {
setHeight(showOrHideControl ? 'calc(100% - 382px)' : 'calc(100% - 112px)');
}, [showOrHideControl]);
+
// 控制侧边栏设置的显示
const handleShowDrawer = () => {
setShowDrawer(true);
@@ -62,8 +64,9 @@ const MyMonacoEditor = (props) => {
// TODO 需要优化 节流
const val = editorRef.current.getValue();
setEditCode(val);
+ onCodeChange(val);
// 值一变化保存当前代码值
- saveUserInputCode(val);
+ // saveUserInputCode(val);
});
}
@@ -104,7 +107,7 @@ const MyMonacoEditor = (props) => {
)
-}
+};
const mapStateToProps = (state) => {
const { showOrHideControl } = state.commonReducer;
@@ -114,9 +117,10 @@ const mapStateToProps = (state) => {
};
const mapDispatchToProps = (dispatch) => ({
- saveUserInputCode: (code) => dispatch(actions.saveUserInputCode(code)),
+ // saveUserInputCode: (code) => dispatch(actions.saveUserInputCode(code)),
});
+// MyMonacoEditor = React.forwardRef(MyMonacoEditor);
export default connect(
mapStateToProps,
mapDispatchToProps
diff --git a/public/react/src/modules/developer/newOrEditTask/index.js b/public/react/src/modules/developer/newOrEditTask/index.js
index 1c6da31c1..6e1ec7a4a 100644
--- a/public/react/src/modules/developer/newOrEditTask/index.js
+++ b/public/react/src/modules/developer/newOrEditTask/index.js
@@ -6,10 +6,10 @@
* @Last Modified time: 2019-11-19 23:23:41
*/
import './index.scss';
-import React, { useCallback, useEffect } from 'react';
+import React, { useState, useEffect, useRef } from 'react';
import { connect } from 'react-redux';
import SplitPane from 'react-split-pane';// import { Form } from 'antd';
-import { Button, Icon } from 'antd';
+import { Button, Icon, notification } from 'antd';
import { Link } from 'react-router-dom';
import LeftPane from './leftpane';
import RightPane from './rightpane';
@@ -20,15 +20,76 @@ const NewOrEditTask = (props) => {
const {
publishLoading,
handlePublish,
+ testCases = [],
+ // ojTestCaseValidate = [],
changeSubmitLoadingStatus,
changePublishLoadingStatus,
+ updateTestAndValidate,
identifier,
} = props;
+
+ const leftRef = useRef(null);
+ const rightRef = useRef(null);
+
+ const [formDate, setFormData] = useState({});
+
+ // const isNullOrUndefiendOrZero = (value) => {
+ // if ([undefined, null, ''].includes(value)) {
+ // return true;
+ // }
+ // return false;
+ // }
// 表单提交
- const handleSubmitForm = (code) => {
- props.saveOjFormCode(code); // 保存代码块值
- // TODO
- // identifier 存在时
+ const handleSubmitForm = () => {
+ // 调用输入表单验证功能
+
+
+ // let hasErrorForTestCase = false;
+ // const tempTestCaseValidate = [];
+ // // 验证测试用例
+ // testCases.forEach(tc => {
+ // const obj = {};
+ // if (isNullOrUndefiendOrZero(tc.input)) {
+ // hasErrorForTestCase = true;
+ // obj['input'] = {
+ // validateStatus: 'error',
+ // errMsg: '输入值不能为空'
+ // }
+ // } else {
+ // obj['input'] = {
+ // validateStatus: '',
+ // errMsg: ''
+ // }
+ // }
+ // if (isNullOrUndefiendOrZero(tc.output)) {
+ // hasErrorForTestCase = true;
+ // obj['output'] = {
+ // validateStatus: 'error',
+ // errMsg: '输出值不能为空'
+ // }
+ // } else {
+ // obj['output'] = {
+ // validateStatus: '',
+ // errMsg: ''
+ // }
+ // }
+ // // 更改测试用例值
+ // tempTestCaseValidate.push(obj);
+ // });
+ // // 验证代码块
+ // if (!formValue || hasErrorForTestCase) {
+ // // 验证不通过时， 回滚按钮状态
+ // changeSubmitLoadingStatus(false);
+ // changePublishLoadingStatus(false);
+ // updateTestAndValidate({ // 测试用例
+ // testCaseValidate: tempTestCaseValidate
+ // });
+ // return;
+ // }
+ // console.log('调用提交接口===========》》》》》》》》》》》》');
+ // props.saveOjFormCode(code); // 保存代码块值
+ // // TODO
+ // // identifier 存在时
if (props.identifier) {
props.handleUpdateOjForm(props);
} else {
@@ -65,7 +126,7 @@ const NewOrEditTask = (props) => {
后退
-
{props.name || ''}
+
{props.name || ''}