m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update debug

Browse Source
yslnewtiku
tangjiang 5 years ago
parent 60a6c7002f
commit 0a3eee940d
22 changed files with 145 additions and 74 deletions
Show Stats Download Patch File Download Diff File

9
public/react/src/common/components/comment/CommentForm.js
Unescape View File

@ -4,14 +4,14 @@
* @Github: * @Github:
* @Date: 2019-12-17 17:32:55 * @Date: 2019-12-17 17:32:55
* @LastEditors : tangjiang * @LastEditors : tangjiang
* @LastEditTime : 2019-12-24 17:27:41 * @LastEditTime : 2019-12-26 11:11:57
*/ */
import './index.scss'; import './index.scss';
import React, { useState } from 'react'; import React, { useState } from 'react';
import { Form, Button, Input } from 'antd'; import { Form, Button, Input } from 'antd';
import QuillForEditor from '../../quillForEditor'; import QuillForEditor from '../../quillForEditor';
// import { QuillDeltaToHtmlConverter } from 'quill-delta-to-html' // import { QuillDeltaToHtmlConverter } from 'quill-delta-to-html'
import {formatDelta} from './util'; // import {formatDelta} from './util';
const FormItem = Form.Item; const FormItem = Form.Item;
function CommentForm (props) { function CommentForm (props) {
@ -68,8 +68,9 @@ function CommentForm (props) {
const content = ctx; const content = ctx;
props.form.setFieldsValue({'comment': ''}); props.form.setFieldsValue({'comment': ''});
setCtx(''); setCtx('');
const _html = formatDelta(content.ops); // const _html = formatDelta(content.ops);
onSubmit && onSubmit(_html); console.log('保存的内容=====》》》》', content);
onSubmit && onSubmit(JSON.stringify(content));
} }
}); });
} }

30
public/react/src/common/components/comment/CommentItem.js
Unescape View File

@ -4,14 +4,19 @@
* @Github: * @Github:
* @Date: 2019-12-17 17:35:17 * @Date: 2019-12-17 17:35:17
* @LastEditors : tangjiang * @LastEditors : tangjiang
* @LastEditTime : 2019-12-25 14:53:41 * @LastEditTime : 2019-12-26 11:30:32
*/ */
import './index.scss'; import './index.scss';
import 'quill/dist/quill.core.css'; // 核心样式
import 'quill/dist/quill.snow.css'; // 有工具栏
import 'quill/dist/quill.bubble.css'; // 无工具栏
import 'katex/dist/katex.min.css'; // katex 表达式样式
import React, { useState } from 'react'; import React, { useState } from 'react';
import CommentIcon from './CommentIcon'; import CommentIcon from './CommentIcon';
import { getImageUrl, CNotificationHOC } from 'educoder' import { getImageUrl, CNotificationHOC } from 'educoder'
import { Icon } from 'antd'; import { Icon } from 'antd';
import CommentForm from './CommentForm'; import CommentForm from './CommentForm';
import QuillForEditor from '../../quillForEditor';
function CommentItem ({ function CommentItem ({
isAdmin, isAdmin,
@ -81,9 +86,19 @@ function CommentItem ({
}; };
// 评论内容 // 评论内容
const commentCtx = (ctx) => ( const commentCtx = (ctx) => {
<p className="item-ctx" dangerouslySetInnerHTML={{ __html: ctx}}></p> let _ctx = null;
); try {
_ctx = JSON.parse(ctx);
} catch (e) {
_ctx = ctx;
}
return (
<QuillForEditor
readOnly={true}
value={_ctx}
/>
)};
// 加载更多 // 加载更多
const handleOnLoadMore = (len) => { const handleOnLoadMore = (len) => {
@ -182,6 +197,13 @@ function CommentItem ({
type={!hidden ? "xianshi" : 'yincang1'} type={!hidden ? "xianshi" : 'yincang1'}
iconClick={() => handleShowOrHide(id, !hidden ? 1 : 0)} iconClick={() => handleShowOrHide(id, !hidden ? 1 : 0)}
/> />
<CommentIcon
style={{ display: can_delete ? 'inline-block' : 'none'}}
className='comment-icon-margin'
type={'shanchu'}
iconClick={() => deleteComment(id)}
/>
{/* 回复 */} {/* 回复 */}
<CommentIcon <CommentIcon
className='comment-icon-margin' className='comment-icon-margin'

2
public/react/src/common/components/comment/index.scss
Unescape View File

@ -64,10 +64,12 @@ $ml: 20px;
} }
.item-ctx{ .item-ctx{
position: relative;
line-height: $lh22; line-height: $lh22;
font-size: $fz12; font-size: $fz12;
color: #333; color: #333;
margin-top: 10px; margin-top: 10px;
vertical-align: top;
} }
.comment_icon_area{ .comment_icon_area{
display: flex; display: flex;

10
public/react/src/common/components/comment/util.js
Unescape View File

@ -4,7 +4,7 @@
* @Github: * @Github:
* @Date: 2019-12-24 08:51:25 * @Date: 2019-12-24 08:51:25
* @LastEditors : tangjiang * @LastEditors : tangjiang
* @LastEditTime : 2019-12-24 10:45:44 * @LastEditTime : 2019-12-26 09:30:11
*/ */
export const formatDelta = (deltas) => { export const formatDelta = (deltas) => {
@ -22,6 +22,8 @@ export const formatDelta = (deltas) => {
keys.forEach(key => { keys.forEach(key => {
text = operate(text, key, element['attributes'][key]); text = operate(text, key, element['attributes'][key]);
}); });
} else if (element['insert']['formula']) {
text = element['insert']['formula'];
} }
} else { } else {
const image = element['insert']['image']; const image = element['insert']['image'];
@ -42,7 +44,7 @@ export const formatDelta = (deltas) => {
formatted.push(text); formatted.push(text);
}); });
console.log(formatted);
return formatted.join(''); return formatted.join('');
} }
@ -53,7 +55,7 @@ export const formatDelta = (deltas) => {
*/ */
export const operate = (text, key, value) => { export const operate = (text, key, value) => {
let operatedText = null; let operatedText = null;
debugger;
switch (key) { switch (key) {
case 'bold': case 'bold':
operatedText = `<strong>${text}</strong>`; operatedText = `<strong>${text}</strong>`;
@ -68,7 +70,7 @@ export const operate = (text, key, value) => {
operatedText = `<u>${text}</u>`; operatedText = `<u>${text}</u>`;
break; break;
case 'link': case 'link':
operatedText = `<a href="${value}" target="blank">${text}</a>`; operatedText = `<a href="${value}" style="color: #5091ff; text-decoration: underline;" target="bland">${text}</a>`;
break; break;
default: default:
operatedText = text; operatedText = text;

11
public/react/src/common/quillForEditor/index.js
Unescape View File

@ -3,8 +3,8 @@
* @Author: tangjiang * @Author: tangjiang
* @Github: * @Github:
* @Date: 2019-12-18 08:49:30 * @Date: 2019-12-18 08:49:30
* @LastEditors: tangjiang * @LastEditors : tangjiang
* @LastEditTime: 2019-12-20 16:07:37 * @LastEditTime : 2019-12-26 10:22:26
*/ */
import './index.scss'; import './index.scss';
import 'quill/dist/quill.core.css'; // 核心样式 import 'quill/dist/quill.core.css'; // 核心样式
@ -32,7 +32,8 @@ function QuillForEditor ({
style = {}, style = {},
wrapStyle = {}, wrapStyle = {},
showUploadImage, showUploadImage,
onContentChange onContentChange,
// getQuillContent
}) { }) {
// toolbar 默认值 // toolbar 默认值
const defaultConfig = [ const defaultConfig = [
@ -54,8 +55,8 @@ function QuillForEditor ({
// 文本内容变化时 // 文本内容变化时
const handleOnChange = content => { const handleOnChange = content => {
// console.log('编辑器内容====》》》》', content); // getQuillContent && getQuillContent(quill);
onContentChange && onContentChange(content); onContentChange && onContentChange(content, quill);
}; };
const renderOptions = options || defaultConfig; const renderOptions = options || defaultConfig;

6
public/react/src/modules/developer/components/controlSetting/index.js
Unescape View File

@ -3,8 +3,8 @@
* @Author: tangjiang * @Author: tangjiang
* @Github: * @Github:
* @Date: 2019-11-27 16:02:36 * @Date: 2019-11-27 16:02:36
* @LastEditors: tangjiang * @LastEditors : tangjiang
* @LastEditTime: 2019-12-20 14:37:39 * @LastEditTime : 2019-12-26 15:17:28
*/ */
import './index.scss'; import './index.scss';
import React, { useState, useRef, useEffect } from 'react'; import React, { useState, useRef, useEffect } from 'react';
@ -23,7 +23,7 @@ const ControlSetting = (props) => {
submitLoading, submitLoading,
identifier, identifier,
excuteState, excuteState,
showOrHideControl, // showOrHideControl,
commitTestRecordDetail, commitTestRecordDetail,
changeLoadingState, changeLoadingState,
changeSubmitLoadingStatus, changeSubmitLoadingStatus,

10
public/react/src/modules/developer/components/controlSetting/index.scss
Unescape View File

@ -31,6 +31,14 @@
opacity: 0; opacity: 0;
} }
} }
.ant-tabs-bar{
padding: 0;
}
.ant-tabs-nav .ant-tabs-tab{
padding: 12px 0px;
}
} }
@ -52,7 +60,7 @@
z-index: 20; z-index: 20;
height: 56px; height: 56px;
padding-right: 20px; padding-right: 20px;
padding-left: 10px; padding-left: 5px;
background: rgba(18,28,36,1); background: rgba(18,28,36,1);
// background:rgba(48,48,48,1); // background:rgba(48,48,48,1);
} }

9
public/react/src/modules/developer/components/execResult/index.js
Unescape View File

@ -4,7 +4,7 @@
* @Github: * @Github:
* @Date: 2019-11-28 08:44:54 * @Date: 2019-11-28 08:44:54
* @LastEditors : tangjiang * @LastEditors : tangjiang
* @LastEditTime : 2019-12-25 11:42:10 * @LastEditTime : 2019-12-26 08:51:21
*/ */
import './index.scss'; import './index.scss';
import React, { useState, useEffect } from 'react'; import React, { useState, useEffect } from 'react';
@ -80,6 +80,13 @@ function ExecResult (props) {
</React.Fragment> </React.Fragment>
); );
} else if (state === 4){ } else if (state === 4){
return (
<p className={'result_info_style'}>
{/* 系统繁忙，请稍后重试 */}
{error_msg}
</p>
)
} else if (state === 3) {
return ( return (
<p className={'result_info_style'}> <p className={'result_info_style'}>
系统繁忙，请稍后重试 系统繁忙，请稍后重试

2
public/react/src/modules/developer/components/initTabCtx/index.scss
Unescape View File

@ -41,7 +41,7 @@
} }
} }
.flex_l{ .flex_l{
padding: 0 10px 0 20px; padding: 0 10px 0 10px;
color: #fff; color: #fff;
} }
.flex_r{ .flex_r{

10
public/react/src/modules/developer/components/myMonacoEditor/index.js
Unescape View File

@ -3,8 +3,8 @@
* @Author: tangjiang * @Author: tangjiang
* @Github: * @Github:
* @Date: 2019-11-27 15:02:52 * @Date: 2019-11-27 15:02:52
* @LastEditors: tangjiang * @LastEditors : tangjiang
* @LastEditTime: 2019-12-20 20:07:11 * @LastEditTime : 2019-12-26 15:19:34
*/ */
import './index.scss'; import './index.scss';
import React, { useState, useRef, useEffect } from 'react'; import React, { useState, useRef, useEffect } from 'react';
@ -155,7 +155,7 @@ function MyMonacoEditor (props, ref) {
onClick={handleUpdateNotice} onClick={handleUpdateNotice}
> >
{/* <Icon type="bell" /> */} {/* <Icon type="bell" /> */}
<MyIcon type="iconxiaoxi1" /> <MyIcon type="iconxiaoxi1" style={{fontSize: '18px'}}/>
</Badge> </Badge>
</Tooltip> </Tooltip>
<Tooltip <Tooltip
@ -166,7 +166,7 @@ function MyMonacoEditor (props, ref) {
className="flex_normal" className="flex_normal"
onClick={handleRestoreCode} onClick={handleRestoreCode}
type="iconzaicizairu" type="iconzaicizairu"
style={{ display: identifier ? 'inline-block' : 'none'}} style={{ display: identifier ? 'inline-block' : 'none', fontSize: '18px'}}
/> />
{/* <span onClick={handleRestoreCode} className="flex_normal" style={{ display: identifier ? 'inline-block' : 'none'}}>{renderRestore}</span> */} {/* <span onClick={handleRestoreCode} className="flex_normal" style={{ display: identifier ? 'inline-block' : 'none'}}>{renderRestore}</span> */}
</Tooltip> </Tooltip>
@ -174,7 +174,7 @@ function MyMonacoEditor (props, ref) {
placement="bottom" placement="bottom"
title="设置" title="设置"
> >
<MyIcon className='code-icon' type="iconshezhi" onClick={handleShowDrawer}/> <MyIcon className='code-icon' type="iconshezhi" onClick={handleShowDrawer} style={{fontSize: '18px'}}/>
</Tooltip> </Tooltip>
</div> </div>
<MonacoEditor <MonacoEditor

12
public/react/src/modules/developer/components/myMonacoEditor/index.scss
Unescape View File

@ -26,6 +26,18 @@
color: #666; color: #666;
} }
} }
.margin,
.margin-view-overlays,
.current-line{
width: 40px !important;
}
.monaco-editor .margin-view-overlays .line-numbers{
text-align: center;
}
.monaco-scrollable-element{
left: 40px !important;
}
} }
.setting_drawer{ .setting_drawer{

6
public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/AddTestDemo.js
Unescape View File

@ -3,8 +3,8 @@
* @Author: tangjiang * @Author: tangjiang
* @Github: * @Github:
* @Date: 2019-11-21 09:19:38 * @Date: 2019-11-21 09:19:38
* @LastEditors: tangjiang * @LastEditors : tangjiang
* @LastEditTime: 2019-12-20 17:32:10 * @LastEditTime : 2019-12-26 15:33:01
*/ */
import './index.scss'; import './index.scss';
import React from 'react'; import React from 'react';
@ -17,7 +17,7 @@ const { TextArea } = Input;
const FormItem = Form.Item; const FormItem = Form.Item;
const AddTestDemo = (props) => { const AddTestDemo = (props) => {
const { const {
key, // key,
// onSubmitTest, // onSubmitTest,
onDeleteTest, onDeleteTest,
testCase, testCase,

16
public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js
Unescape View File

@ -3,8 +3,8 @@
* @Author: tangjiang * @Author: tangjiang
* @Github: * @Github:
* @Date: 2019-11-20 10:35:40 * @Date: 2019-11-20 10:35:40
* @LastEditors: tangjiang * @LastEditors : tangjiang
* @LastEditTime: 2019-12-20 16:53:55 * @LastEditTime : 2019-12-26 16:00:57
*/ */
import './index.scss'; import './index.scss';
// import 'katex/dist/katex.css'; // import 'katex/dist/katex.css';
@ -222,10 +222,16 @@ class EditTab extends React.Component {
} }
// 描述信息变化时 // 描述信息变化时
const handleContentChange = (content) => { const handleContentChange = (content, quill) => {
console.log('描述信息为: ', content); console.log('描述信息为: ', content);
// 保存获取的描述信息至redux中 // if (quill.getText())
this.handleChangeDescription(content); console.log('========>>>>>', quill.getText().length);
if (quill.getText().length === 1) {
this.handleChangeDescription('');
} else {
// 保存获取的描述信息至redux中
this.handleChangeDescription(content);
}
} }
// 编辑器配置信息 // 编辑器配置信息
const quillConfig = [ const quillConfig = [

2
public/react/src/modules/developer/newOrEditTask/leftpane/index.js
Unescape View File

@ -58,7 +58,7 @@ function LeftPane (props) {
<ul className={'add_editor_list_area'}> <ul className={'add_editor_list_area'}>
{ renderNavItem } { renderNavItem }
</ul> </ul>
<div className="comp_ctx"> <div className="comp_ctx" style={{ height: 'calc(100vh - 177px)' }}>
{ renderComp } { renderComp }
</div> </div>
</React.Fragment> </React.Fragment>

22
public/react/src/modules/developer/newOrEditTask/rightpane/index.js
Unescape View File

@ -3,8 +3,8 @@
* @Author: tangjiang * @Author: tangjiang
* @Github: * @Github:
* @Date: 2019-12-01 10:18:35 * @Date: 2019-12-01 10:18:35
* @LastEditors: tangjiang * @LastEditors : tangjiang
* @LastEditTime: 2019-12-09 11:38:15 * @LastEditTime : 2019-12-26 13:51:40
*/ */
import './index.scss'; import './index.scss';
import React from 'react'; import React from 'react';
@ -25,15 +25,15 @@ function RightPane (props, ref) {
// let timer = null; // let timer = null;
// 代码改变时，保存 // 代码改变时，保存
const handleCodeChange = (updateCode) => { const handleCodeChange = (updateCode) => {
// 保存用户输入的代码 // if (props.identifier) {
// if (!timer) { // // 保存用户输入的代码
// timer = setInterval(() => { // if (!timer) {
// clearInterval(timer); // timer = setInterval(() => {
// timer = null; // clearInterval(timer);
// if (updateCode) { // timer = null;
// console.log('调用更新代码------>>>>>>', updateCode);
// } // }, 3000);
// }, 3000); // }
// } // }
saveOjFormCode(updateCode); saveOjFormCode(updateCode);
} }

2
public/react/src/modules/developer/newOrEditTask/rightpane/initTabCtx/index.scss
Unescape View File

@ -41,7 +41,7 @@
} }
} }
.flex_l{ .flex_l{
padding: 0 10px 0 20px; padding: 0 10px 0 10px;
color: #fff; color: #fff;
} }
.flex_r{ .flex_r{

22
public/react/src/modules/developer/recordDetail/index.js
Unescape View File

@ -3,8 +3,8 @@
* @Author: tangjiang * @Author: tangjiang
* @Github: * @Github:
* @Date: 2019-12-04 08:36:21 * @Date: 2019-12-04 08:36:21
* @LastEditors: tangjiang * @LastEditors : tangjiang
* @LastEditTime: 2019-12-20 20:05:57 * @LastEditTime : 2019-12-26 14:04:16
*/ */
import './index.scss'; import './index.scss';
import React, { useState, useEffect } from 'react'; import React, { useState, useEffect } from 'react';
@ -15,6 +15,7 @@ import { Link } from 'react-router-dom';
import MonacoEditor from '@monaco-editor/react'; import MonacoEditor from '@monaco-editor/react';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
// import { getImageUrl } from 'educoder'; // import { getImageUrl } from 'educoder';
import { withRouter } from 'react-router'
import actions from '../../../redux/actions'; import actions from '../../../redux/actions';
import CONST from '../../../constants'; import CONST from '../../../constants';
import UserInfo from '../components/userInfo'; import UserInfo from '../components/userInfo';
@ -53,6 +54,12 @@ function RecordDetail (props) {
} }
}, [recordDetail]); }, [recordDetail]);
const handleReturn = (identifier) => {
if (identifier) {
saveEditorCodeForDetail('');
props.history.push(`/myproblems/${identifier}`);
}
}
return ( return (
<div className="record_detail_area"> <div className="record_detail_area">
<div className="record_detail_header"> <div className="record_detail_header">
@ -67,8 +74,9 @@ function RecordDetail (props) {
<span>{detail.name || 'test'}</span> <span>{detail.name || 'test'}</span>
</div> </div>
<div className={'study_quit'}> <div className={'study_quit'}>
<Button style={{ visibility: identifier ? 'visible' : 'hidden'}}> <Button style={{ visibility: identifier ? 'visible' : 'hidden'}} onClick={() => handleReturn(identifier)}>
<Link to={`/myproblems/${identifier}`}>返回该题</Link> 返回该题
{/* <Link to={`/myproblems/${identifier}`}>返回该题</Link> */}
</Button> </Button>
</div> </div>
</div> </div>
@ -89,7 +97,7 @@ function RecordDetail (props) {
语言: <span className="status_label_sub">{detail.language}</span> 语言: <span className="status_label_sub">{detail.language}</span>
</span> </span>
<span className="status_label" style={{ visibility: detail.status === 0 ? 'visible' : 'hidden'}}> <span className="status_label" style={{ visibility: detail.status === 0 ? 'visible' : 'hidden'}}>
执行用时: <span className="status_label_sub">{`${detail.execute_time && (+detail.execute_time * 1000)}ms`}</span> 执行用时: <span className="status_label_sub">{`${detail.execute_time && Number(detail.execute_time * 1000).toFixed(2)}ms`}</span>
</span> </span>
</div> </div>
<div className="result_error_area"> <div className="result_error_area">
@ -134,7 +142,7 @@ const mapDispatchToProps = (dispatch) => ({
saveEditorCodeForDetail: (code) => dispatch(actions.saveEditorCodeForDetail(code)) saveEditorCodeForDetail: (code) => dispatch(actions.saveEditorCodeForDetail(code))
}); });
export default connect( export default withRouter(connect(
mapStateToProps, mapStateToProps,
mapDispatchToProps mapDispatchToProps
)(RecordDetail); )(RecordDetail));

3
public/react/src/modules/developer/split_pane_resizer.scss
Unescape View File

@ -148,8 +148,9 @@
} }
.Resizer { .Resizer {
position: relative;
background: #000; background: #000;
opacity: 0.2; // opacity: 0.2;
z-index: 1; z-index: 1;
-moz-box-sizing: border-box; -moz-box-sizing: border-box;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;

20
public/react/src/modules/developer/studentStudy/index.js
Unescape View File

@ -3,8 +3,8 @@
* @Author: tangjiang * @Author: tangjiang
* @Github: * @Github:
* @Date: 2019-11-23 10:53:19 * @Date: 2019-11-23 10:53:19
* @LastEditors: tangjiang * @LastEditors : tangjiang
* @LastEditTime: 2019-12-20 14:54:39 * @LastEditTime : 2019-12-26 15:02:12
*/ */
import './index.scss'; import './index.scss';
import React, { useEffect, useState } from 'react'; import React, { useEffect, useState } from 'react';
@ -25,9 +25,9 @@ function StudentStudy (props) {
const [hasUpdate, setHasUpdate] = useState(true); const [hasUpdate, setHasUpdate] = useState(true);
const { const {
// hack, hack,
userInfo, userInfo,
hack_identifier, // hack_identifier,
// user_program_identifier, // user_program_identifier,
restoreInitialCode, restoreInitialCode,
changeShowOrHideControl changeShowOrHideControl
@ -85,13 +85,13 @@ function StudentStudy (props) {
// } // }
// }); // });
} }
const _hack_id = hack_identifier || fromStore('hack_identifier'); // const _hack_id = hack_identifier || fromStore('hack_identifier');
// 处理编辑 // 处理编辑
const handleClickEditor = () => { const handleClickEditor = (identifier) => {
if (!identifier) return;
changeShowOrHideControl(false); changeShowOrHideControl(false);
props.saveEditorCodeForDetail(); props.saveEditorCodeForDetail();
props.history.push(`/problems/${_hack_id}/edit`); props.history.push(`/problems/${identifier}/edit`);
props.clearOjForUserReducer(); props.clearOjForUserReducer();
} }
// 处理退出 // 处理退出
@ -115,13 +115,13 @@ function StudentStudy (props) {
</div> */} </div> */}
<UserInfo userInfo={userInfo}/> <UserInfo userInfo={userInfo}/>
<div className={'study_name'}> <div className={'study_name'}>
<span>乘积最大序列 {hasUpdate}</span> <span>{hack.name}</span>
</div> </div>
<div className={'study_quit'}> <div className={'study_quit'}>
{/* to={`/problems/${_hack_id}/edit`} */} {/* to={`/problems/${_hack_id}/edit`} */}
<span <span
style={{ display: userInfo.hack_manager ? 'inline-block' : 'none' }} style={{ display: userInfo.hack_manager ? 'inline-block' : 'none' }}
onClick={handleClickEditor} onClick={() => handleClickEditor(hack.identifier)}
className={`quit-btn`} className={`quit-btn`}
> >
<Icon type="form" className="quit-icon"/> 编辑 <Icon type="form" className="quit-icon"/> 编辑

2
public/react/src/modules/developer/studentStudy/leftpane/comment/index.js
Unescape View File

@ -4,7 +4,7 @@
* @Github: * @Github:
* @Date: 2019-11-27 09:49:35 * @Date: 2019-11-27 09:49:35
* @LastEditors : tangjiang * @LastEditors : tangjiang
* @LastEditTime : 2019-12-25 10:55:44 * @LastEditTime : 2019-12-26 10:43:45
*/ */
import './index.scss'; import './index.scss';
import React, { useEffect, useState } from 'react'; import React, { useEffect, useState } from 'react';

9
public/react/src/redux/actions/ojForm.js
Unescape View File

@ -4,7 +4,7 @@
* @Github: * @Github:
* @Date: 2019-11-20 16:35:46 * @Date: 2019-11-20 16:35:46
* @LastEditors : tangjiang * @LastEditors : tangjiang
* @LastEditTime : 2019-12-23 10:55:28 * @LastEditTime : 2019-12-26 15:45:28
*/ */
import types from './actionTypes'; import types from './actionTypes';
import CONST from '../../constants'; import CONST from '../../constants';
@ -58,7 +58,8 @@ const maps = {
// 非空校验 // 非空校验
const emptyValidate = (key, value) => { const emptyValidate = (key, value) => {
if ([undefined, '', null].includes(value)) { const reg = /^[\s\S]*.*[^\s][\s\S]*$/;
if (!reg.test(value)) {
return { return {
[key]: { [key]: {
validateStatus: 'error', validateStatus: 'error',
@ -472,7 +473,7 @@ export const testCaseInputChange = (value, index) => {
const bool = testCases.some((item, i) => { const bool = testCases.some((item, i) => {
if (i !== index) { if (i !== index) {
if (item['input'] === value) { if (item['input'] === value) {
_errMsg=`与测试用例${index}的输入值重复了，请重新填写`; _errMsg=`与测试用例${i + 1}的输入值重复了，请重新填写`;
} }
return item['input'] === value; return item['input'] === value;
} else { } else {
@ -566,4 +567,4 @@ export const updateOpenTestCaseIndex = (value) => {
type: types.UPDATE_OPEN_TESTCASE_INDEX, type: types.UPDATE_OPEN_TESTCASE_INDEX,
payload: value payload: value
} }
} }

4
public/react/src/redux/reducers/ojForUserReducer.js
Unescape View File

@ -4,7 +4,7 @@
* @Github: * @Github:
* @Date: 2019-11-27 13:41:48 * @Date: 2019-11-27 13:41:48
* @LastEditors : tangjiang * @LastEditors : tangjiang
* @LastEditTime : 2019-12-25 17:09:53 * @LastEditTime : 2019-12-26 13:39:41
*/ */
import types from "../actions/actionTypes"; import types from "../actions/actionTypes";
import { Base64 } from 'js-base64'; import { Base64 } from 'js-base64';
@ -111,7 +111,7 @@ const ojForUserReducer = (state = initialState, action) => {
userCodeTab: action.payload userCodeTab: action.payload
} }
case types.GET_COMMIT_RECORD_DETAIL_BY_ID: case types.GET_COMMIT_RECORD_DETAIL_BY_ID:
tempDetail = action.payload; tempDetail = action.payload.data;
if (tempDetail['error_msg']) { if (tempDetail['error_msg']) {
tempDetail['error_msg'] = Base64.decode(tempDetail['error_msg']); tempDetail['error_msg'] = Base64.decode(tempDetail['error_msg']);
} }

Write Preview
Loading…
Cancel
Save