https://www.trustie.net/issues/28456

public/react/src/common/components/comment/CommentItem.js

@@ -6,7 +6,7 @@
  * @LastEditors  : tangjiang
  * @LastEditTime : 2019-12-27 11:05:17
  */
-import './index.less';
+import './index.scss';
 import React, { useState } from 'react';
 import CommentIcon from './CommentIcon';
 import { getImageUrl, CNotificationHOC } from 'educoder'
@@ -53,7 +53,6 @@ function CommentItem({
       title: '提示',
       content: ('确定要删除该条回复吗?'),
       onOk() {
-        console.log('点击了删除', id);
         submitDeleteComment && submitDeleteComment(id);
       }
     });
@@ -83,7 +82,6 @@ function CommentItem({
   };
 
   const handleShowUploadImage = (url) => {
-    // console.log('==============>>>>>>>>>>>>',url);
     setUrl(url);
   }
   // 评论内容

public/react/src/common/components/comment/index.js

@@ -7,39 +7,28 @@
  * @LastEditTime : 2019-12-24 18:03:21
  */
 import React from 'react';
-// import CommentForm from './CommentForm';
 import CommentList from './CommentList';
-function Comment (props) {
+function Comment(props) {
 
-  const { 
+  const {
     commentLists,
-    // addComment,
-    // cancelComment,
     isAdmin,
     addChildComment,
     likeComment,
     showOrHideComment,
     submitDeleteComment
   } = props;
-  
+
-  // const handleCancelComment = () => {
-  //   cancelComment && cancelComment();
-  // };
   return (
-    <React.Fragment>
+    <CommentList
-      {/* <CommentForm 
+      isAdmin={isAdmin}
-        onCancel={handleCancelComment}
+      likeComment={likeComment}
-        onSubmit={addComment}
+      showOrHideComment={showOrHideComment}
-      /> */}
+      commentLists={commentLists}
-      <CommentList 
+      submitChildComment={addChildComment}
-        isAdmin={isAdmin}
+      submitDeleteComment={submitDeleteComment}
-        likeComment={likeComment}
+    />
-        showOrHideComment={showOrHideComment}
+
-        commentLists={commentLists}
-        submitChildComment={addChildComment}
-        submitDeleteComment={submitDeleteComment}
-      />
-    </React.Fragment>
   );
 }
 

public/react/src/redux/actions/ojForUser.js

@@ -133,33 +133,29 @@ export const saveUserCodeForInterval = (identifier, code) => {
  * @param {*} inputValue 输入值: 自定义 | 系统返回的
  * @param {*} type 测评类型 debug | submit
  */
-//原来的方法未能区分从编辑入口进来的情况，这时代码也是更新了的。
+//原来的方法未能区分从编辑入口进来的情况，这时代码也是更新了的。以及ctrl+z undo未能触发chnage事件 monaco-editor的bug。 这里去除isUpdateCode
 export const updateCode = (identifier, inputValue, type) => {
   return (dispatch, getState) => {
-    const { editor_code, isUpdateCode } = getState().ojForUserReducer;
+    const { editor_code } = getState().ojForUserReducer;
-    if (isUpdateCode) {
+    fetchUpdateCode(identifier, {
-      fetchUpdateCode(identifier, {
+      code: Base64.encode(editor_code)
-        code: Base64.encode(editor_code)
+    }).then(res => {
-      }).then(res => {
+      if (res) {
-        if (res) {
+        if (res.data.status === 401) {
-          if (res.data.status === 401) {
+          dispatch({ // 改变 loading 值
-            dispatch({ // 改变 loading 值
+            type: types.LOADING_STATUS,
-              type: types.LOADING_STATUS,
+            payload: false
-              payload: false
-            });
-            return;
-          };
-          dispatch({
-            type: types.IS_UPDATE_CODE,
-            flag: false
           });
-          dispatch(debuggerCode(identifier, inputValue, type));
+          return;
-        }
+        };
-      });
+        dispatch({
-    } else {
+          type: types.IS_UPDATE_CODE,
-      // 没有更新时，直接调用调试接口
+          flag: false
-      dispatch(debuggerCode(identifier, inputValue, type));
+        });
-    }
+        dispatch(debuggerCode(identifier, inputValue, type));
+      }
+    });
+
   }
 }
 
@@ -370,14 +366,6 @@ export const saveUserInputCode = (code) => {
   }
 }
 
-// 监听是否更新代码块内容
-// export const isUpdateCodeCtx = (flag) => {
-//   return {
-//     type: types.IS_UPDATE_CODE,
-//     payload: flag
-//   };
-// }
-
 // 改变学员测评 tab 值
 export const changeUserCodeTab = (key) => {
   return {
@@ -392,7 +380,7 @@ export const changeUserCodeTab = (key) => {
  */
 export const submitUserCode = (identifier, inputValue, type) => {
   return (dispatch, getState) => {
-    const { editor_code, isUpdateCode, hack } = getState().ojForUserReducer;
+    const { editor_code, hack } = getState().ojForUserReducer;
     function userCodeSubmit() {
       fetchUserCodeSubmit(identifier).then(res => {
         if (res.status === 200) {
@@ -413,32 +401,29 @@ export const submitUserCode = (identifier, inputValue, type) => {
         });
       });
     }
-    if (isUpdateCode) {
+    fetchUpdateCode(identifier, {
-      fetchUpdateCode(identifier, {
+      code: Base64.encode(editor_code)
-        code: Base64.encode(editor_code)
+    }).then(res => {
-      }).then(res => {
+      // 是否更新了代码, 目的是当代码没有更新时不调用更新代码接口，目录没有实现
-        // 是否更新了代码, 目的是当代码没有更新时不调用更新代码接口，目录没有实现
+      if (res.data.status === 401) {
-        if (res.data.status === 401) {
-          dispatch({
-            type: types.SUBMIT_LOADING_STATUS,
-            payload: false
-          });
-          return;
-        };
-        dispatch({
-          type: types.IS_UPDATE_CODE,
-          flag: false
-        });
-        userCodeSubmit();
-      }).catch(() => {
         dispatch({
           type: types.SUBMIT_LOADING_STATUS,
           payload: false
-        })
+        });
+        return;
+      };
+      dispatch({
+        type: types.IS_UPDATE_CODE,
+        flag: false
       });
-    } else {
       userCodeSubmit();
-    }
+    }).catch(() => {
+      dispatch({
+        type: types.SUBMIT_LOADING_STATUS,
+        payload: false
+      })
+    });
+
   }
 }