fix

public/react/src/modules/developer/components/myMonacoEditor/index.js

@@ -48,7 +48,6 @@ function MyMonacoEditor(props, ref) {
   });
   const [height, setHeight] = useState('calc(100% - 56px)');
   const editorRef = useRef(null);
-  console.log(language, code, '-------========----------')
 
   useEffect(() => {
     setHeight(showOrHideControl ? 'calc(100% - 378px)' : 'calc(100% - 56px)');

public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js

@@ -359,15 +359,11 @@ class EditTab extends React.Component {
       values.forEach(v => {
         _result.push(v.id);
       });
-      // console.log('下拉选择的值:===>>>', _result);
-      // 保存选择的知识点
       this.props.saveTagDisciplineId(_result);
     }
 
     // 新增知识点
     const handleAddKnowledge = (values) => {
-      // console.log('调用了新增知识点并返回了结果: ', values);
-      // 获取课程id
       const { sub_discipline_id } = this.props.ojForm;
       const obj = Object.assign({}, values, { sub_discipline_id })
       tagDisciplines(obj);
@@ -395,14 +391,6 @@ class EditTab extends React.Component {
             help={ojFormValidate.sub_discipline_id.errMsg}
             colon={false}
           >
-            {/* <Select onChange={this.handleChangeCategory} value={`${ojForm.category}`}>
-              {getOptions('category')}
-            </Select> */}
-            {/* <Cascader
-              options={courseQuestions}
-              expandTrigger="hover"
-              onChange={this.handleChangeCategory}
-            /> */}
             {renderCourseQuestion(courseQuestions)}
           </FormItem>
 

public/react/src/modules/developer/studentStudy/index.js

@@ -15,7 +15,11 @@ import RightPane from './rightpane';
 import { Icon } from 'antd';
 import UserInfo from '../components/userInfo';
 import actions from '../../../redux/actions';
+<<<<<<< HEAD
 import { CNotificationHOC } from 'educoder';
+=======
+import { fromStore, CNotificationHOC } from 'educoder';
+>>>>>>> 73d555c... fix
 import { withRouter } from 'react-router';
 
 function StudentStudy(props) {
@@ -73,12 +77,11 @@ function StudentStudy(props) {
   }, []);
 
   useEffect(() => {
-    const { hack = {} } = props;
-    if (hack.modify_code && hasUpdate) { // 代码更改，提示是否需要更新代码
+    if (hack && hack.modify_code && hasUpdate) { // 代码更改，提示是否需要更新代码
       setHasUpdate(false);
       handleUpdateNotice();
     }
-  }, [props, hasUpdate, setHasUpdate]);
+  }, [hack, hasUpdate]);
 
   const handleUpdateNotice = () => {
     console.log(props);