修复编辑器背景与重复的代码更新提示

video_transcode
harry 5 years ago
parent a9a74219b5
commit 862135ef8a

@ -22,7 +22,7 @@ const SettingDrawer = (props) => {
return +fromStore('oj_fontSize') || 14;
});
const [theme, setTheme] = useState(() => {
return fromStore('oj_theme') || 'dark';
return fromStore('oj_theme') || 'vs-dark';
});
const { title, type = 'label', content = [] } = props;
@ -78,7 +78,8 @@ const SettingDrawer = (props) => {
>
{opt.text}
</option>
)});
)
});
renderResult = (
<div className={'setting_desc'} key={`sel_${index}`}>
<span className={'flex_item'}>{ctx.text}</span>

@ -1,13 +1,14 @@
.monaco_editor_area {
height: 100%;
background-color: rgba(7,15,25,1);
.code_title {
display: flex;
align-items: center;
background-color: rgba(18,28,36,1);
color: #fff;
height: 56px;
background-color: rgba(18, 28, 36, 1);
padding: 0 20px;
.flex_strict {
flex: 1;
}
@ -17,9 +18,11 @@
cursor: pointer;
margin-right: 20px;
}
.code-icon {
cursor: pointer;
}
.flex_strict,
.flex_normal,
.code-icon {
@ -27,23 +30,13 @@
}
}
// .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 {
.ant-drawer-close {
color: #ffffff;
}
.ant-drawer-content {
top: 120px;
bottom: 56px;
@ -51,6 +44,7 @@
// background: #333333;
background: rgba(7, 15, 25, 1);
color: #fff;
.setting_h2 {
color: #fff;
}
@ -62,6 +56,7 @@
// line-height: 24px;
margin-top: 4px;
}
select option {
background: gold;
color: #fff;
@ -76,21 +71,8 @@
animation-iteration-count: 3;
}
// .monaco-editor, .monaco-editor-background, .monaco-editor .inputarea.ime-input,
// .monaco-editor .margin,
// .minimap slider-mouseover,
// .minimap-decorations-layer{
// background:rgba(3,19,40,1) !important;
// }
@keyframes blink {
50% {
color: #fff;
}
}
.monaco-editor, .monaco-editor-background, .monaco-editor .inputarea.ime-input,
.monaco-editor .margin,
.minimap .minimap-decorations-layer{
background-color: transparent !important;
}

@ -65,7 +65,6 @@ function RecordDetail (props) {
const handleEditorCode = (identifier, code) => {
if (identifier) {
console.log(code);
saveEditorCodeForDetail(code);
props.history.push(`/myproblems/${identifier}`);
}

@ -1,55 +1,74 @@
@import '../split_pane_resizer.scss';
.result_code_area .monaco-editor, .monaco-editor-background, .monaco-editor .inputarea.ime-input{
.result_code_area .monaco-editor,
.monaco-editor-background,
.monaco-editor .inputarea.ime-input {
background-color: #f9f9f9 !important;
}
.result_code_area .monaco-editor .line-numbers {
color: #999 !important;
}
.result_code_area .monaco-editor .current-line~.line-numbers {
color: #0b216f !important;
}
.result_code_area .minimap-decorations-layer {
background: rgba(225, 225, 225, 0.2) !important;
}
.result_code_area .monaco-editor .margin {
background-color: #eee !important;
}
.record_detail_area {
background: #fff;
.record_detail_ctx {
padding: 0 20px;
.detail_ctx_header {
position: relative;
height: 56px;
}
.header_h2 {
line-height: 56px;
}
.header_btn {
position: absolute;
right: 0;
top: 14px;
}
.detail_ctx_status {
height: 18px;
line-height: 18px;
.status_label {
color: rgba(153, 153, 153, 1);
margin-right: 40px;
}
.status_label_error {
color: #E51C24;
}
.status_label_success {
color: #28BD8B;
}
.status_label_sub {
color: #333333;
}
.pass_case {
float: right;
margin-right: 0;
}
.pass_case_span {
margin-right: 10px;
}
@ -59,6 +78,7 @@
// height: 500px;
height: calc(100vh - 360px);
}
.result_error_area {
margin-top: 15px;
background: rgba(250, 250, 250, 1);

@ -12,13 +12,10 @@ import { connect } from 'react-redux';
import SplitPane from 'react-split-pane';
import LeftPane from './leftpane';
import RightPane from './rightpane';
// import { Link } from 'react-router-dom';
// import { getImageUrl } from 'educoder'
// import RightPane from '../newOrEditTask/rightpane';
import { Icon } from 'antd';
import UserInfo from '../components/userInfo';
import actions from '../../../redux/actions';
import { fromStore, CNotificationHOC } from 'educoder';
import { CNotificationHOC } from 'educoder';
import { withRouter } from 'react-router';
function StudentStudy(props) {
@ -27,8 +24,6 @@ function StudentStudy(props) {
const {
hack,
userInfo,
// hack_identifier,
// user_program_identifier,
restoreInitialCode,
changeUserCodeTab,
changeShowOrHideControl,
@ -74,7 +69,7 @@ function StudentStudy(props) {
changeUserCodeTab(tab);
}
}, []);
// console.log(hack, hack.modify_code)
useEffect(() => {
if (hack && hack.modify_code && hasUpdate) { // 代码更改,提示是否需要更新代码
setHasUpdate(false);

@ -58,7 +58,7 @@ const RightPane = (props) => {
clearInterval(timer);
timer = null;
saveUserCodeForInterval(identifier);
}, 10000);
}, 5000);
}
}

@ -137,6 +137,7 @@ const ojForUserReducer = (state = initialState, action) => {
} else {
curHack['code'] = '';
}
curHack['modify_code'] = false
return {
...state,
hack: Object.assign({}, state.hack, curHack),

Loading…
Cancel
Save