Merge branch 'dev_item_bank' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_item_bank

app/controllers/concerns/git_helper.rb

@@ -46,10 +46,15 @@ module GitHelper
   end
 
   # 添加目录
-  def add_git_folder(folder_path, author_name, author_email, message)
+  def git_add_folder(folder_path, author_name, author_email, message)
     GitService.add_tree(file_path: folder_path, message: message, author_name: author_name, author_email: author_email)
   end
 
+  # 删除文件
+  def git_delete_file(file_path, author_name, author_email, message)
+    GitService.delete_file(file_path: file_path, message: message, author_name: author_name, author_email: author_email)
+  end
+
   # 版本库Fork功能
   def project_fork(container, original_rep_path, username)
     raise Educoder::TipException.new("fork源路径为空,fork失败!") if original_rep_path.blank?

app/controllers/shixuns_controller.rb

@@ -901,12 +901,14 @@ class ShixunsController < ApplicationController
 	def upload_git_folder
 		author_name = current_user.real_name
 		author_email = current_user.git_mail
-		add_git_folder(@path, author_name, author_email, "upload folder by browser")
+		git_add_folder(@path, author_name, author_email, "upload folder by browser")
 		render_ok
 	end
 
 	def delete_git_file
-
+		author_name = current_user.real_name
+		author_email = current_user.git_mail
+		git_delete_file(@path, author_name, author_email, "delete filer by browser")
 		render_ok
 	end
 

app/services/git_service.rb

@@ -6,7 +6,7 @@ class GitService
 
   class << self
 
-    ['add_repository', 'fork_repository', 'delete_repository', 'file_tree', 'update_file', 'file_content', 'commits', 'add_tree'].each do |method|
+    ['add_repository', 'fork_repository', 'delete_repository', 'file_tree', 'update_file', 'file_content', 'commits', 'add_tree', 'delete_file'].each do |method|
       define_method method do |params|
         post(method, params)
       end

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

@@ -36,6 +36,7 @@ const types = {
   DEBUGGER_CODE: 'DEBUGGER_CODE', // 调试代码
   GET_COURSE_QUESTION: 'GET_COURSE_QUESTION', // 获取编辑题
   CHANGE_KNOWLEDGES: 'CHANGE_KNOWLEDGES', // 保存所选择的知识点
+  SET_OJ_INITIAL_VALUE: 'SET_OJ_INITIAL_VALUE', // 设置初始值
   // study
   SAVE_USER_PROGRAM_ID: 'SAVE_USER_PROGRAM_ID',// 保存用户编程题id值
   USER_PROGRAM_DETAIL: 'USER_PROGRAM_DETAIL', // 用户编程题详情

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

@@ -35,7 +35,8 @@ import {
   updateOpenTestCaseIndex,
   handleClickCancelPublish,
   getQuestion,
-  saveKnowledge
+  saveKnowledge,
+  setOjInitialValue
 } from './ojForm';
 
 import {
@@ -123,6 +124,7 @@ export default {
   handleClickCancelPublish,
   getQuestion,
   saveKnowledge,
+  setOjInitialValue,
   // 
   addTestCase,
   deleteTestCase,

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

@@ -4,7 +4,7 @@
  * @Github: 
  * @Date: 2019-11-20 16:35:46
  * @LastEditors  : tangjiang
- * @LastEditTime : 2020-01-02 17:38:12
+ * @LastEditTime : 2020-01-03 16:40:54
  */
 import types from './actionTypes';
 import CONST from '../../constants';
@@ -694,3 +694,19 @@ export const saveKnowledge = (values) => {
     payload: values
   }
 }
+
+/**
+ * 新增时跳转到OJ时带的默认参数: 
+ * @param {}} params 
+ * { 
+ *  difficult: '',  // 难易度
+ *  sub_discipline_id: '' // 课程方向
+ *  tag_discipline_id： [] 知识点
+ * }
+ */
+export const setOjInitialValue = (params) => {
+  return {
+    type: types.SET_OJ_INITIAL_VALUE,
+    payload: params
+  }
+}

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

@@ -4,7 +4,7 @@
  * @Github: 
  * @Date: 2019-11-20 16:40:32
  * @LastEditors  : tangjiang
- * @LastEditTime : 2020-01-02 17:36:40
+ * @LastEditTime : 2020-01-03 16:39:09
  */
 import { Base64 } from 'js-base64';
 import types from '../actions/actionTypes';
@@ -348,6 +348,13 @@ const ojFormReducer = (state = initialState, action) => {
         knowledges: action.payload
       }
     }
+    case types.SET_OJ_INITIAL_VALUE:
+      const _p = action.payload;
+      return {
+        ...state,
+        ojForm: Object.assign({}, state.ojForm, {difficult: _p.difficult, sub_discipline_id: _p.sub_discipline_id}),
+        tag_discipline_id: _p.tag_discipline_id || []
+      }
     default:
       return state;
   }