Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

app/controllers/admins/shixun_settings_controller.rb

@@ -5,9 +5,10 @@ class Admins::ShixunSettingsController < Admins::BaseController
 
     shixun_settings = Admins::ShixunSettingsQuery.call(params)
     @editing_shixuns = shixun_settings.where(status:0).size
-    @pending_shixuns = shixun_settings.where(status:1).size
+    @processed_shixuns = shixun_settings.where(status:2, public: 0).size
-    @processed_shixuns = shixun_settings.where(status:2).size
     @closed_shixuns = shixun_settings.where(status:3).size
+    @pending_public_shixuns = shixun_settings.where(public:1).size
+    @processed_pubic_shixuns = shixun_settings.where(public:2).size
 
     @sort_json = {
       can_copy: params[:can_copy].present? ? params[:can_copy] : false,

app/controllers/admins/shixuns_controller.rb

@@ -5,10 +5,8 @@ class Admins::ShixunsController < Admins::BaseController
     params[:sort_direction] = params[:sort_direction].presence || 'desc'
     shixuns = Admins::ShixunQuery.call(params)
     @editing_shixuns = shixuns.where(status:0).size
-    @pending_shixuns = shixuns.where(status:1).size
+    @processed_shixuns = shixuns.where(status:2, public: 0).size
-    @processed_shixuns = shixuns.where(status:2).size
     @closed_shixuns = shixuns.where(status:3).size
-    @none_public_shixuns = shixuns.where(public:0).size
     @pending_public_shixuns = shixuns.where(public:1).size
     @processed_pubic_shixuns = shixuns.where(public:2).size
     @shixuns_type_check = MirrorRepository.pluck(:type_name,:id)

app/controllers/hack_user_lastest_codes_controller.rb

@@ -1,10 +1,10 @@
 class HackUserLastestCodesController < ApplicationController
   before_action :require_login, except: [:listen_result]
-  before_action :find_my_hack, only: [:show, :code_debug, :code_submit, :update_code, :sync_code,
+  before_action :find_my_hack, only: [:show, :code_debug, :code_submit, :update_code, :sync_code, :add_notes,
                                       :listen_result, :result, :submit_records, :restore_initial_code]
   before_action :update_user_hack_status, only: [:code_debug, :code_submit]
-  before_action :require_auth_identity, only: [:update_code, :restore_initial_code, :sync_code]
+  before_action :require_auth_identity, only: [:add_notes]
-  before_action :require_manager_identity, only: [:update_code]
+  before_action :require_manager_identity, only: [:show, :update_code, :restore_initial_code, :sync_code]
 
   def show
     @my_hack.update_attribute(:submit_status, 0) if @my_hack.submit_status == 1
@@ -67,7 +67,6 @@ class HackUserLastestCodesController < ApplicationController
 
   end
 
-
   # 提交记录详情
   def record_detail
     @hack_user = HackUserCode.find params[:id]
@@ -109,6 +108,11 @@ class HackUserLastestCodesController < ApplicationController
 
   end
 
+  def add_notes
+    @my_hack.update_attribute(:notes, params[:notes])
+    render_ok
+  end
+
   private
   def find_my_hack
     @my_hack = HackUserLastestCode.find_by(identifier: params[:identifier])
@@ -168,7 +172,7 @@ class HackUserLastestCodesController < ApplicationController
       # 编程题已经发布，且之前未通关奖励积分
       @hack.increment!(:pass_num)
       if @hack.status == 1 && !@my_hack.passed?
-        reward_attrs = { container_id: game.id, container_type: 'Hack', score: @hack.score }
+        reward_attrs = { container_id: @hack.id, container_type: 'Hack', score: @hack.score }
         RewardGradeService.call(@my_hack.user, reward_attrs)
         RewardExperienceService.call(@my_hack.user, reward_attrs)
         # 评测完成更新通过数

app/controllers/hacks_controller.rb

@@ -188,10 +188,13 @@ class HacksController < ApplicationController
   def param_update_sets sets, all_sets_id
     delete_set_ids = all_sets_id - sets.map{|set|set[:id]}
     @hack.hack_sets.where(id: delete_set_ids).destroy_all
+    logger.info("#######sets:#{sets}")
     sets.each do |set|
+      logger.info("###set[:id]： #{set[:id]}")
+      logger.info("###all_sets： #{all_sets_id.include?(set[:id])}")
       if all_sets_id.include?(set[:id])
         update_attrs = {input: set[:input], output: set[:output], position: set[:position]}
-        @hack.hack_sets.find_by!(id: set[:id]).update_attributes(update_attrs)
+        @hack.hack_sets.find_by!(id: set[:id]).update_attributes!(update_attrs)
       end
     end
   end

app/models/hack_set.rb

@@ -1,5 +1,5 @@
 class HackSet < ApplicationRecord
-  #validates :input, presence: { message: "测试集输入不能为空" }
+  validates :input, presence: { message: "测试集输入不能为空" }
   validates :output, presence: { message: "测试集输出不能为空" }
   validates_uniqueness_of :input, scope: [:hack_id, :input], message: "多个测试集的输入不能相同"
   # 编程题测试集

app/models/hack_user_lastest_code.rb

@@ -12,4 +12,6 @@ class HackUserLastestCode < ApplicationRecord
   scope :mine_hack, ->(author_id){ where(user_id: author_id) }
   scope :passed, -> {where(status: 1)}
 
+  validates_length_of :notes, maximum: 5000, message: "笔记不能超过5000个字"
+
 end

app/queries/admins/shixun_query.rb

@@ -13,25 +13,14 @@ class Admins::ShixunQuery < ApplicationQuery
     all_shixuns = Shixun.all
     status =
         case params[:status]
-        when "editing" then [0]
+        when "editing" then {status: 0}
-        when "pending" then [1]
+        when "processed" then {status: 2, public: 0}
-        when "processed" then [2]
+        when "pending" then {public: 1}
-        when "closed" then [3]
+        when "publiced" then {public: 2}
-        else
+        when "closed" then {status: 3}
-          [0,1,2,3]
         end
 
-    public =
+    all_shixuns = all_shixuns.where(status) if status.present?
-      case params[:public]
-      when "editing" then [0]
-      when "pending" then [1]
-      when "processed" then [2]
-      else
-        [0,1,2]
-      end
-
-    all_shixuns = all_shixuns.where(status: status) if status.present?
-    all_shixuns = all_shixuns.where(public: public) if public.present?
 
     if params[:fork_status].present?
       all_shixuns = all_shixuns.where.not(fork_from: nil)

app/queries/admins/shixun_settings_query.rb

@@ -15,16 +15,15 @@ class Admins::ShixunSettingsQuery < ApplicationQuery
     all_shixuns = all_shixuns.where(id: params[:id]) if params[:id].present?
 
     status =
-        case params[:status]
+      case params[:status]
-        when "editing" then [0]
+      when "editing" then {status: 0}
-        when "pending" then [1]
+      when "processed" then {status: 2, public: 0}
-        when "processed" then [2]
+      when "pending" then {public: 1}
-        when "closed" then [3]
+      when "publiced" then {public: 2}
-        else
+      when "closed" then {status: 3}
-          [0,1,2,3]
+      end
-        end
+
-
+    all_shixuns = all_shixuns.where(status) if status.present?
-    all_shixuns = all_shixuns.where(status: status) if status.present?
 
     if params[:tag].present?
       all_shixuns = all_shixuns.joins(:mirror_repositories).where("mirror_repositories.id = ?",params[:tag].to_i)

app/services/shixun_search_service.rb

@@ -33,6 +33,10 @@ class ShixunSearchService < ApplicationService
       @shixuns = status == "published" ? @shixuns.where(status: 2) : @shixuns.where(status: [0, 1])
     end
 
+    if params[:no_jupyter]
+      @shixuns = @shixuns.where(is_jupyter: 0)
+    end
+
     ## 筛选 难度
     if params[:diff].present? && params[:diff].to_i != 0
       @shixuns = @shixuns.where(trainee: params[:diff])

app/views/admins/shixun_settings/index.html.erb

@@ -8,7 +8,7 @@
       <div class="d-flex position-r">
         <div class="form-group mr-2">
           <label for="status">状态：</label>
-          <% status_options = [['全部', ''], ["编辑中(#{@editing_shixuns})", "editing"], ["待审核(#{@pending_shixuns})", 'pending'], ["已发布(#{@processed_shixuns})", 'processed'],["已关闭(#{@closed_shixuns})",'closed']] %>
+          <% status_options = [['全部', ''], ["编辑中(#{@editing_shixuns})", "editing"], ["已发布未公开(#{@processed_shixuns})", 'processed'], ["待审核(#{@pending_public_shixuns})", 'pending'], ["已公开(#{@processed_pubic_shixuns})", 'publiced'], ["已关闭(#{@closed_shixuns})",'closed']] %>
           <%= select_tag(:status, options_for_select(status_options), class: 'form-control') %>
         </div>
         <div class="form-group mr-2">

app/views/admins/shixuns/index.html.erb

@@ -8,16 +8,10 @@
       <div class="d-flex position-r">
         <div class="form-group">
           <label for="status">状态：</label>
-          <% status_options = [['全部', ''], ["编辑中(#{@editing_shixuns})", "editing"], ["待审核(#{@pending_shixuns})", 'pending'], ["已发布(#{@processed_shixuns})", 'processed'],["已关闭(#{@closed_shixuns})",'closed']] %>
+          <% status_options = [['全部', ''], ["编辑中(#{@editing_shixuns})", "editing"], ["已发布未公开(#{@processed_shixuns})", 'processed'], ["待审核(#{@pending_public_shixuns})", 'pending'], ["已公开(#{@processed_pubic_shixuns})", 'publiced'], ["已关闭(#{@closed_shixuns})",'closed']] %>
           <%= select_tag(:status, options_for_select(status_options), class: 'form-control') %>
         </div>
 
-        <div class="form-group mr-2">
-          <label for="status">公开：</label>
-          <% public_options = [['全部', ''], ["未公开(#{@none_public_shixuns})", "editing"], ["待审核(#{@pending_public_shixuns})", 'pending'], ["已公开(#{@processed_pubic_shixuns})", 'processed']] %>
-          <%= select_tag(:public, options_for_select(public_options), class: 'form-control') %>
-        </div>
-
         <div class="form-group mr-2">
           <label for="tag-choosed">技术平台：</label>
           <%= select_tag(:tag, options_for_select(@shixuns_type_check.unshift(["",nil])), class: 'form-control',id:"tag-choosed") %>

app/views/challenges/edit.json.jbuilder

@@ -14,7 +14,7 @@ if @tab == 0
 elsif @tab == 1
   # 评测设置的编辑模式
   json.(@challenge, :id, :path, :exec_path, :show_type, :original_picture_path, :expect_picture_path, :picture_path,
-      :web_route, :test_set_score, :test_set_average)
+      :web_route, :test_set_score, :test_set_average, :exec_time)
   json.has_web_route @shixun.has_web_route?
   json.test_sets @challenge.test_sets do |set|
     json.hidden (set.is_public ? 0 : 1)

app/views/hack_user_lastest_codes/show.json.jbuilder

@@ -5,6 +5,7 @@ json.hack do
   json.code @my_hack.code
   json.pass_count @hack.pass_num
   json.submit_count @hack.submit_num
+  json.notes @my_hack.notes
   json.modify_code @modify
   json.comments_count @hack.discusses.count
   json.user_praise @hack.praise_treads.select{|pt| pt.user_id == current_user.id}.length > 0

config/routes.rb

@@ -90,6 +90,7 @@ Rails.application.routes.draw do
         get :submit_records
         post :restore_initial_code
         post :sync_code
+        post :add_notes
       end
 
       collection do

db/migrate/20191226083915_add_notes_hack_user_lastest_codes.rb

@@ -0,0 +1,5 @@
+class AddNotesHackUserLastestCodes < ActiveRecord::Migration[5.2]
+  def change
+    add_column :hack_user_lastest_codes, :notes, :longtext
+  end
+end

db/migrate/20191226092304_modify_task_pass_2_for_challenges.rb

@@ -0,0 +1,8 @@
+class ModifyTaskPass2ForChallenges < ActiveRecord::Migration[5.2]
+  def change
+    challenges = Challenge.where("task_pass like '%frac%'")
+    challenges.find_each do |c|
+      c.update_column(:task_pass, c.task_pass.gsub('\f\frac', '\frac'))
+    end
+  end
+end

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

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

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

@@ -4,14 +4,19 @@
  * @Github: 
  * @Date: 2019-12-17 17:35:17
  * @LastEditors  : tangjiang
- * @LastEditTime : 2019-12-25 14:53:41
+ * @LastEditTime : 2019-12-26 11:30:32
  */
 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 CommentIcon from './CommentIcon';
 import { getImageUrl, CNotificationHOC } from 'educoder'
 import { Icon } from 'antd';
 import CommentForm from './CommentForm';
+import QuillForEditor from '../../quillForEditor';
 
 function CommentItem ({
   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) => {
@@ -182,6 +197,13 @@ function CommentItem ({
             type={!hidden ? "xianshi" : 'yincang1'} 
             iconClick={() => handleShowOrHide(id, !hidden ? 1 : 0)}
           />
+
+          <CommentIcon
+            style={{ display: can_delete ? 'inline-block' : 'none'}}
+            className='comment-icon-margin' 
+            type={'shanchu'} 
+            iconClick={() => deleteComment(id)}
+          />
           {/* 回复 */}
           <CommentIcon 
             className='comment-icon-margin' 

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

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

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

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

public/react/src/common/quillForEditor/index.js

@@ -3,8 +3,8 @@
  * @Author: tangjiang
  * @Github: 
  * @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 'quill/dist/quill.core.css'; // 核心样式
@@ -32,7 +32,8 @@ function QuillForEditor ({
   style = {},
   wrapStyle = {},
   showUploadImage,
-  onContentChange
+  onContentChange,
+  // getQuillContent
 }) {
   // toolbar 默认值
   const defaultConfig = [
@@ -54,8 +55,8 @@ function QuillForEditor ({
 
   // 文本内容变化时
   const handleOnChange = content => {
-    // console.log('编辑器内容====》》》》', content);
+    // getQuillContent && getQuillContent(quill);
-    onContentChange && onContentChange(content);
+    onContentChange && onContentChange(content, quill);
   };
   
   const renderOptions = options || defaultConfig;

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

@@ -3,8 +3,8 @@
  * @Author: tangjiang
  * @Github: 
  * @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 React, { useState, useRef, useEffect } from 'react';
@@ -23,7 +23,7 @@ const ControlSetting = (props) => {
     submitLoading,
     identifier,
     excuteState,
-    showOrHideControl,
+    // showOrHideControl,
     commitTestRecordDetail,
     changeLoadingState,
     changeSubmitLoadingStatus,

public/react/src/modules/developer/components/controlSetting/index.scss

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

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

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

public/react/src/modules/developer/components/initTabCtx/index.scss

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

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

@@ -3,8 +3,8 @@
  * @Author: tangjiang
  * @Github: 
  * @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 React, { useState, useRef, useEffect } from 'react';
@@ -155,7 +155,7 @@ function MyMonacoEditor (props, ref) {
               onClick={handleUpdateNotice}
             >
               {/* <Icon type="bell" /> */}
-              <MyIcon type="iconxiaoxi1" />
+              <MyIcon type="iconxiaoxi1" style={{fontSize: '18px'}}/>
             </Badge>
           </Tooltip>
           <Tooltip
@@ -166,7 +166,7 @@ function MyMonacoEditor (props, ref) {
               className="flex_normal" 
               onClick={handleRestoreCode} 
               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> */}
           </Tooltip>
@@ -174,7 +174,7 @@ function MyMonacoEditor (props, ref) {
             placement="bottom"
             title="设置"
           >
-            <MyIcon className='code-icon' type="iconshezhi" onClick={handleShowDrawer}/>
+            <MyIcon className='code-icon' type="iconshezhi" onClick={handleShowDrawer} style={{fontSize: '18px'}}/>
           </Tooltip>
         </div>
         <MonacoEditor

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

@@ -26,6 +26,18 @@
       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{

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

@@ -3,8 +3,8 @@
  * @Author: tangjiang
  * @Github: 
  * @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 React from 'react';
@@ -17,7 +17,7 @@ const { TextArea } = Input;
 const FormItem = Form.Item;
 const AddTestDemo = (props) => {
   const {
-    key,
+    // key,
     // onSubmitTest,
     onDeleteTest, 
     testCase,

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

@@ -3,8 +3,8 @@
  * @Author: tangjiang
  * @Github: 
  * @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 'katex/dist/katex.css';
@@ -222,10 +222,16 @@ class EditTab extends React.Component {
     }
 
     // 描述信息变化时
-    const handleContentChange = (content) => {
+    const handleContentChange = (content, quill) => {
       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 = [

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

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

public/react/src/modules/developer/newOrEditTask/rightpane/index.js

@@ -3,8 +3,8 @@
  * @Author: tangjiang
  * @Github: 
  * @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 React from 'react';
@@ -25,15 +25,15 @@ function RightPane (props, ref) {
   // let timer = null;
   // 代码改变时，保存
   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);
   }

public/react/src/modules/developer/newOrEditTask/rightpane/initTabCtx/index.scss

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

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

@@ -3,8 +3,8 @@
  * @Author: tangjiang
  * @Github: 
  * @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 React, { useState, useEffect } from 'react';
@@ -15,6 +15,7 @@ import { Link } from 'react-router-dom';
 import MonacoEditor from '@monaco-editor/react';
 import { connect } from 'react-redux';
 // import { getImageUrl } from 'educoder';
+import { withRouter } from 'react-router'
 import actions from '../../../redux/actions';
 import CONST from '../../../constants';
 import UserInfo from '../components/userInfo';
@@ -53,6 +54,12 @@ function RecordDetail (props) {
     }
   }, [recordDetail]);
   
+  const handleReturn = (identifier) => {
+    if (identifier) {
+      saveEditorCodeForDetail('');
+      props.history.push(`/myproblems/${identifier}`);
+    }
+  }
   return (
     <div className="record_detail_area">
       <div className="record_detail_header">
@@ -67,8 +74,9 @@ function RecordDetail (props) {
           <span>{detail.name || 'test'}</span>
         </div>
         <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>
         </div>
       </div>
@@ -89,7 +97,7 @@ function RecordDetail (props) {
             语言: <span className="status_label_sub">{detail.language}</span>
           </span>
           <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>
         </div>
         <div className="result_error_area">
@@ -134,7 +142,7 @@ const mapDispatchToProps = (dispatch) => ({
   saveEditorCodeForDetail: (code) => dispatch(actions.saveEditorCodeForDetail(code))
 });
 
-export default connect(
+export default withRouter(connect(
   mapStateToProps,
   mapDispatchToProps
-)(RecordDetail);
+)(RecordDetail));

public/react/src/modules/developer/split_pane_resizer.scss

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

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

@@ -3,8 +3,8 @@
  * @Author: tangjiang
  * @Github: 
  * @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 React, { useEffect, useState } from 'react';
@@ -25,9 +25,9 @@ function StudentStudy (props) {
 
   const [hasUpdate, setHasUpdate] = useState(true);
   const {
-    // hack,
+    hack,
     userInfo,
-    hack_identifier,
+    // hack_identifier,
     // user_program_identifier,
     restoreInitialCode,
     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);
     props.saveEditorCodeForDetail();
-    props.history.push(`/problems/${_hack_id}/edit`);
+    props.history.push(`/problems/${identifier}/edit`);
     props.clearOjForUserReducer();
   }
   // 处理退出 
@@ -115,13 +115,13 @@ function StudentStudy (props) {
         </div> */}
         <UserInfo userInfo={userInfo}/>
         <div className={'study_name'}>
-      <span>乘积最大序列 {hasUpdate}</span>
+          <span>{hack.name}</span>
         </div>
         <div className={'study_quit'}>
           {/* to={`/problems/${_hack_id}/edit`} */}
           <span 
             style={{ display: userInfo.hack_manager ? 'inline-block' : 'none' }}
-            onClick={handleClickEditor} 
+            onClick={() => handleClickEditor(hack.identifier)} 
             className={`quit-btn`}
           >
             <Icon type="form" className="quit-icon"/> 编辑

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

@@ -1,6 +1,52 @@
 @import '../split_pane_resizer.scss';
 .split-pane-area{
   height: calc(100vh - 65px);
+
+  .right_pane_code_wrap{
+    position: relative;
+
+    .editor_nodte_area,
+    .student_notes{
+      position: absolute;
+      z-index: 100;
+    }
+    .student_notes{
+      right: 0px;
+      top: 50%;
+      width: 36px;
+      height: 36px;
+      margin-top: -18px;
+      border-radius: 50%;
+      background: #5091FF;
+      color: #fff;
+      font-size: 18px;
+      text-align: center;
+      transform: translateX(18px);
+      cursor: pointer;
+      opacity: 0.5;
+      transition: all .3s;
+      &:hover{
+        opacity: 1;
+        transform: translateX(-10px);
+      }
+    }
+    .editor_nodte_area{
+      right: 10px;
+      top: 50%;
+      width: 450px;
+      height: 200px;
+      margin-top: -100px;
+      background: #fff;
+      border-radius: 5px;
+      padding: 14px 10px 0;
+      // opacity: ;
+      transform: translateX(500px);
+      transition: all .3s;
+      &.active{
+        transform: translateX(0px);
+      }
+    }
+  }
 }
 
 .right_pane_code_wrap{

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

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

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

@@ -3,15 +3,20 @@
  * @Author: tangjiang
  * @Github: 
  * @Date: 2019-11-27 14:59:51
- * @LastEditors: tangjiang
+ * @LastEditors  : tangjiang
- * @LastEditTime: 2019-12-20 14:01:57
+ * @LastEditTime : 2019-12-26 17:56:51
  */
 import React, { useState, useEffect } from 'react';
 import {connect} from 'react-redux';
 import MyMonacoEditor from '../../components/myMonacoEditor';
 import ControlSetting from '../../components/controlSetting';
 import actions from '../../../../redux/actions';
-
+// import QuillForEditor from '../../../../common/quillForEditor';
+// import TextArea from 'antd/lib/input/TextArea';
+import { Input, Form, Button } from 'antd';
+// import FormItem from 'antd/lib/form/FormItem';
+const { TextArea } = Input;
+const FormItem = Form.Item;
 const RightPane = (props) => {
   
   const {
@@ -20,6 +25,7 @@ const RightPane = (props) => {
     submitUserCode,
     input,
     hack,
+    loading,
     notice,
     updateCode,
     hadCodeUpdate,
@@ -27,12 +33,15 @@ const RightPane = (props) => {
     updateNotice,
     saveUserInputCode,
     restoreInitialCode,
-    saveOpacityType,
+    // saveOpacityType,
-    saveUserCodeForInterval
+    saveUserCodeForInterval,
+    addNotes,
+    changeLoadingState
   } = props;
 
   const [editorCode, setEditorCode] = useState('');
-
+  const [noteClazz, setNoteClazz] = useState('editor_nodte_area');
+  const [noteCount] = useState(5000);
   let initFlag = true;
   useEffect(() => {
     if (editor_code) {
@@ -86,6 +95,28 @@ const RightPane = (props) => {
     updateNotice && updateNotice();
   };
 
+  const handleClickNote = () => {
+    setNoteClazz('editor_nodte_area active');
+  }
+
+  const handleCancelNote = () => {
+    props.form.resetFields();
+    setNoteClazz('editor_nodte_area');
+  }
+ 
+  const handleSubmitNote = () => {
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        changeLoadingState(true);
+        addNotes(identifier, values, function () {
+          setNoteClazz('editor_nodte_area');
+          props.form.resetFields();
+        });
+      }
+    });
+  }
+
+  const { getFieldDecorator } = props.form;
   return (
     <div className={'right_pane_code_wrap'}>
       <MyMonacoEditor
@@ -98,6 +129,40 @@ const RightPane = (props) => {
         onUpdateNotice={handleUpdateNotice}
         onRestoreInitialCode={handleRestoreInitialCode}
       />
+
+      <span 
+        className="iconfont icon-biji student_notes"
+        onClick={handleClickNote}
+      ></span>
+      
+      {/* <div className="student_notes">
+        <TextArea rows={5} />
+      </div> */}
+      <div className={noteClazz}>
+        <Form>
+          <FormItem>
+            {
+              getFieldDecorator('notes',{
+                rules: [
+                  { required: true, message: '笔记不能为空' },
+                  { max: noteCount, message: `笔记最大字数为${noteCount}` }
+                ],
+                initialValue: (hack && hack.notes) || ''
+              })(<TextArea
+                max={noteCount}
+                placeholder="请输入笔记内容"
+                rows="5"
+              />)
+            }
+            
+          </FormItem>
+          <FormItem style={{ textAlign: 'right' }}>
+            <Button loading={loading} style={{ marginRight: '10px' }} onClick={handleCancelNote}>取消</Button>
+            <Button type="primary" onClick={handleSubmitNote}>提交</Button>
+          </FormItem>
+        </Form>
+      </div>
+      
       <ControlSetting 
         identifier={identifier}
         inputValue={input}
@@ -117,10 +182,14 @@ const mapStateToProps = (state) => {
     notice,
     hadCodeUpdate
   } = state.ojForUserReducer;
+  const {
+    loading
+  } = state.commonReducer;
   // const { language, code } = hack;
   return {
     hack,
     notice,
+    loading,
     hadCodeUpdate,
     editor_code,
     input: userTestInput,
@@ -141,9 +210,12 @@ const mapDispatchToProps = (dispatch) => ({
   // 恢复初始代码
   restoreInitialCode: (identifier, msg) => dispatch(actions.restoreInitialCode(identifier, msg)),
   // saveOpacityType: (type) => dispatch(actions.saveOpacityType(type))
+  // 添加笔记
+  addNotes: (identifier, params, cb) => dispatch(actions.addNotes(identifier, params, cb)),
+  changeLoadingState: (flag) => dispatch(actions.changeLoadingState(flag))
 });
 
 export default connect(
   mapStateToProps,
   mapDispatchToProps
-)(RightPane);
+)(Form.create()(RightPane));

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

@@ -56,7 +56,8 @@ const types = {
   CLEAR_OJ_FOR_USER_REDUCER: 'CLEAR_OJ_FOR_USER_REDUCER', // 退出时清空 ojForUserReducer保存内容
   ADD_OJ_LIKE_COUNT: 'ADD_OJ_LIKE_COUNT', // 增加点赞数
   CHANGE_RECORD_PAGINATION_PAGE: 'CHANGE_RECORD_PAGINATION_PAGE', // 改变提交分页
-  UPDATE_OJ_FOR_USER_COMMENT_COUNT: 'UPDATE_OJ_FOR_USER_COMMENT_COUNT', // 更新 hack 中的评论数
+  UPDATE_OJ_FOR_USER_COMMENT_COUNT: 'UPDATE_OJ_FOR_USER_COMMENT_COUNT', // 更新 hack 中的评论数,
+  UPDATE_NOTE_CONTENT: 'UPDATE_NOTE_CONTENT', // 更新笔记内容
   /*** jupyter  */
   GET_JUPYTER_DATA_SETS: 'GET_JUPYTER_DATA_SETS', // jupyter 数据集
   GET_JUPYTER_TPI_URL: 'GET_JUPYTER_TPI_URL', // 获取 jupyter url

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

@@ -50,7 +50,8 @@ import {
   saveEditorCodeForDetail,
   saveOpacityType,
   clearOjForUserReducer,
-  changeRecordPagination
+  changeRecordPagination,
+  addNotes
   // isUpdateCodeCtx
 } from './ojForUser';
 
@@ -137,6 +138,7 @@ export default {
   saveOpacityType,
   clearOjForUserReducer,
   changeRecordPagination,
+  addNotes,
   // jupyter
   getJupyterTpiDataSet,
   getJupyterTpiUrl,

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

@@ -4,7 +4,7 @@
  * @Github: 
  * @Date: 2019-11-27 13:42:11
  * @LastEditors  : tangjiang
- * @LastEditTime : 2019-12-25 14:27:58
+ * @LastEditTime : 2019-12-26 18:32:08
  */
 import types from "./actionTypes";
 import { Base64 } from 'js-base64';
@@ -17,7 +17,8 @@ import {
   fetchUserCommitRecordDetail,
   fetchUpdateCode,
   fetchUserCodeSubmit,
-  fetchRestoreInitialCode
+  fetchRestoreInitialCode,
+  fetchAddNotes
 } from "../../services/ojService";
 import { notification } from "antd";
 
@@ -488,3 +489,33 @@ export const changeRecordPagination = (page) => {
   }
 }
 // 更新通知状态
+
+// 添加笔记
+export const addNotes = (identifier, params, cb) => {
+  return (dispatch) => {
+    fetchAddNotes(identifier, params).then(res => {
+      // console.log('添加笔记成功===>>', res);
+      dispatch({
+        type: types.LOADING_STATUS,
+        payload: false
+      });
+      const { data } = res;
+      if (data.status === 0) {
+        cb && cb();
+        notification.success({
+          message: '提示',
+          description: '添加笔记成功'
+        });
+        dispatch({
+          type: types.UPDATE_NOTE_CONTENT,
+          payload: params.notes
+        })
+      }
+    }).catch(() => {
+      dispatch({
+        type: types.LOADING_STATUS,
+        payload: false
+      });
+    })
+  }
+}

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

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

public/react/src/redux/reducers/ojForUserReducer.js

@@ -4,7 +4,7 @@
  * @Github: 
  * @Date: 2019-11-27 13:41:48
  * @LastEditors  : tangjiang
- * @LastEditTime : 2019-12-25 17:09:53
+ * @LastEditTime : 2019-12-26 18:34:56
  */
 import types from "../actions/actionTypes";
 import { Base64 } from 'js-base64';
@@ -111,7 +111,7 @@ const ojForUserReducer = (state = initialState, action) => {
         userCodeTab: action.payload
       }
     case types.GET_COMMIT_RECORD_DETAIL_BY_ID:
-      tempDetail = action.payload;
+      tempDetail = action.payload.data;
       if (tempDetail['error_msg']) {
         tempDetail['error_msg'] = Base64.decode(tempDetail['error_msg']);
       } 
@@ -218,6 +218,13 @@ const ojForUserReducer = (state = initialState, action) => {
         ...state,
         hack: Object.assign({}, state.hack, { comments_count: _comments_count })
       }
+    // 修改笔记内容
+    case types.UPDATE_NOTE_CONTENT:
+      const _hack1 = Object.assign({}, state.hack, {notes: action.payload });
+      return {
+        ...state,
+        hack: _hack1
+      }
     default:
       return state;
   }

public/react/src/services/ojService.js

@@ -4,7 +4,7 @@
  * @Github: 
  * @Date: 2019-11-20 10:55:38
  * @LastEditors  : tangjiang
- * @LastEditTime : 2019-12-25 14:27:30
+ * @LastEditTime : 2019-12-26 17:37:38
  */
 
 import axios from 'axios';
@@ -137,3 +137,9 @@ export async function fetchUploadImageUrl (id) {
   const url = `/attachments/${id}`;
   return axios.get(url);
 } 
+
+// 添加笔记
+export async function fetchAddNotes (identifier, params) {
+  const url = `/myproblems/${identifier}/add_notes.json`;
+  return axios.post(url, params);
+}