From eada0a6f795027cd8ae38e2db440948f404fb9ff Mon Sep 17 00:00:00 2001
From: tangjiang <465264938@qq.com>
Date: Mon, 30 Dec 2019 09:21:01 +0800
Subject: [PATCH 01/21] update edit page

---
 public/react/src/constants/index.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/public/react/src/constants/index.js b/public/react/src/constants/index.js
index 3e7aceab0..c0e6074fc 100644
--- a/public/react/src/constants/index.js
+++ b/public/react/src/constants/index.js
@@ -3,8 +3,8 @@
  * @Author: tangjiang
  * @Github: 
  * @Date: 2019-11-20 23:10:48
- * @LastEditors: tangjiang
- * @LastEditTime: 2019-12-06 15:53:27
+ * @LastEditors  : tangjiang
+ * @LastEditTime : 2019-12-30 09:19:52
  */
 const CONST = {
   jcLabel: {
@@ -12,9 +12,10 @@ const CONST = {
     language: '编程语言',
     description: '描述',
     difficult: '难易度',
-    category: '分类',
+    category: '课程',
     openOrNot: '公开程序',
-    timeLimit: '时间限制'
+    timeLimit: '时间限制',
+    // knowledge: '知识点'
   },
   fontSetting: {
     title: '代码格式',

From bbc079b7036e61483a1c3f5c3018f7efd869c515 Mon Sep 17 00:00:00 2001
From: tangjiang <465264938@qq.com>
Date: Mon, 30 Dec 2019 11:09:01 +0800
Subject: [PATCH 02/21] add course question

---
 .../newOrEditTask/leftpane/editorTab/index.js | 92 +++++++++++++++++--
 .../modules/developer/split_pane_resizer.scss |  4 +
 public/react/src/redux/actions/actionTypes.js |  2 +
 public/react/src/redux/actions/index.js       |  3 +
 public/react/src/redux/actions/ojForm.js      | 23 ++++-
 .../react/src/redux/reducers/ojFormReducer.js |  8 +-
 public/react/src/services/ojService.js        |  8 +-
 7 files changed, 127 insertions(+), 13 deletions(-)

diff --git a/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js b/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js
index d4fc12b9c..8172a7778 100644
--- a/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js
+++ b/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js
@@ -4,12 +4,12 @@
  * @Github: 
  * @Date: 2019-11-20 10:35:40
  * @LastEditors  : tangjiang
- * @LastEditTime : 2019-12-27 14:30:55
+ * @LastEditTime : 2019-12-30 11:05:14
  */
 import './index.scss';
 // import 'katex/dist/katex.css';
 import React from 'react';
-import { Form, Input, Select, InputNumber, Button } from 'antd';
+import { Form, Input, Select, InputNumber, Button, Cascader } from 'antd';
 import { connect } from 'react-redux';
 import AddTestDemo from './AddTestDemo';
 // import QuillEditor from '../../../quillEditor';
@@ -77,6 +77,10 @@ class EditTab extends React.Component {
     }, () => {
       this.state.scrollEl.addEventListener('scroll', this.handleScroll, false);
     });
+    // 获取题库
+    this.props.getQuestion({
+      source: 'question'
+    });
   }
 
   componentWillUnmount () {
@@ -127,7 +131,8 @@ class EditTab extends React.Component {
   }
   // 改变分类
   handleChangeCategory = (value) => {
-    this.props.validateOjCategory(value);
+    console.log(value);
+    // this.props.validateOjCategory(value);
   }
   // 改变公开程序
   handleChangeOpenOrNot = (value) => {
@@ -146,7 +151,8 @@ class EditTab extends React.Component {
       addTestCase, // 添加测试用例
       deleteTestCase, // 删除测试用例
       testCasesValidate,
-      openTestCodeIndex = []
+      openTestCodeIndex = [],
+      courseQuestions
     } = this.props;
     // 表单label
     const myLabel = (name, subTitle) => {
@@ -244,6 +250,59 @@ class EditTab extends React.Component {
       ['image', 'formula'], // 数学公式、图片、视频
       ['clean'], // 清除格式
     ];
+
+    const renderCourseQuestion = (arrs) => {
+      const tempArr = [];
+      function loop (arrs, tempArr) {
+        arrs.forEach(item => {
+          const obj = {};
+          obj.value = item.id;
+          obj.label = item.name;
+          // 当item下还有子元素时，递归调用
+          if (item.sub_disciplines || item.tag_disciplines) {
+            arrs = item.sub_disciplines || item.tag_disciplines;
+            obj.children = [];
+            loop(arrs, obj.children);
+          }
+          tempArr.push(obj);
+        });
+      }
+      loop(arrs, tempArr);
+      // arrs.forEach(item => {
+      //   const obj = Object.create(null);
+      //   obj.value = item.id;
+      //   obj.label = item.name;
+      //   if (item.sub_disciplines) {
+      //     obj.children = [];
+      //     item.sub_disciplines.forEach(sub => {
+      //       const subObj = Object.create(null);
+      //       subObj.value = sub.id;
+      //       subObj.label = sub.name;
+
+      //       if (sub.tag_disciplines) {
+      //         subObj.children = [];
+      //         sub.tag_disciplines.forEach(tag => {
+      //           const tabObj = Object.create(null);
+      //           tabObj.value = tag.id;
+      //           tabObj.label = tag.name;
+      //           subObj.children.push(tabObj);
+      //         });
+      //       }
+      //       obj.children.push(subObj);
+      //     })
+      //   }
+      //   tempArr.push(obj);
+      // });
+      console.log(tempArr);
+      return (
+        <Cascader 
+          options={tempArr}
+          value={[1,1,1]}
+          expandTrigger="hover"
+          onChange={this.handleChangeCategory}
+        />
+      )
+    }
     
     return (
       <div className={'editor_area'} id="textCase">
@@ -262,14 +321,24 @@ class EditTab extends React.Component {
 
           <FormItem 
             className={`input_area flex_50 flex_50_right`}
-            label={<span>{myLabel(jcLabel['category'], '合理的分类有利于快速检索')}</span>}
+            label={<span>{myLabel(jcLabel['category'], '合理的课程分类有利于快速检索')}</span>}
             validateStatus={ojFormValidate.category.validateStatus}
             help={ojFormValidate.category.errMsg}
             colon={ false }
           >
-            <Select onChange={this.handleChangeCategory} value={`${ojForm.category}`}>
+            {/* <Select onChange={this.handleChangeCategory} value={`${ojForm.category}`}>
               {getOptions('category')}
-            </Select>
+            </Select> */}
+            {/* <Cascader 
+              options={courseQuestions}
+              expandTrigger="hover"
+              onChange={this.handleChangeCategory}
+            /> */}
+            { renderCourseQuestion(courseQuestions)}
+          </FormItem>
+
+          <FormItem>
+            
           </FormItem>
 
           <FormItem 
@@ -366,14 +435,17 @@ const mapStateToProps = (state) => {
     testCases, 
     openTestCodeIndex,
     testCasesValidate, 
-    ojFormValidate} = ojFormReducer;
+    ojFormValidate,
+    courseQuestions
+  } = ojFormReducer;
   return {
     ojForm,
     testCases,
     testCasesValidate,
     ojFormValidate,
     position,
-    openTestCodeIndex
+    openTestCodeIndex,
+    courseQuestions
   };
 };
 
@@ -390,6 +462,8 @@ const mapDispatchToProps = (dispatch) => ({
   addTestCase: (value) => dispatch(actions.addTestCase(value)),
   // 删除测试用例
   deleteTestCase: (value) => dispatch(actions.deleteTestCase(value)),
+  // 获取题库
+  getQuestion: (params) => dispatch(actions.getQuestion(params))
 });
 
 export default connect(
diff --git a/public/react/src/modules/developer/split_pane_resizer.scss b/public/react/src/modules/developer/split_pane_resizer.scss
index 8fc8b525f..26fc21479 100644
--- a/public/react/src/modules/developer/split_pane_resizer.scss
+++ b/public/react/src/modules/developer/split_pane_resizer.scss
@@ -23,6 +23,8 @@
     }
 
     .header_title{
+      font-size: 16px;
+      font-weight: bold;
       text-align: center;
     }
 
@@ -82,6 +84,8 @@
       bottom: 0;
       top: 0;
       text-align: center;
+      font-size: 16px;
+      font-weight: bold;
     }
   }  
 }
diff --git a/public/react/src/redux/actions/actionTypes.js b/public/react/src/redux/actions/actionTypes.js
index 73e3ea0b2..e3ae7044b 100644
--- a/public/react/src/redux/actions/actionTypes.js
+++ b/public/react/src/redux/actions/actionTypes.js
@@ -32,6 +32,8 @@ const types = {
   TEST_CASE_INPUT_CHANGE: 'TEST_CASE_INPUT_CHANGE', // 测试用例输入值改变时
   TEST_CASE_OUTPUT_CHANGE: 'TEST_CASE_OUTPUT_CHANGE', // 测试用例输出值改变时
   DEBUGGER_CODE: 'DEBUGGER_CODE', // 调试代码
+  GET_COURSE_QUESTION: 'GET_COURSE_QUESTION', // 获取编辑题
+  // study
   SAVE_USER_PROGRAM_ID: 'SAVE_USER_PROGRAM_ID',// 保存用户编程题id值
   USER_PROGRAM_DETAIL: 'USER_PROGRAM_DETAIL', // 用户编程题详情
   SHOW_OR_HIDE_CONTROL: 'SHOW_OR_HIDE_CONTROL', // 显示或隐藏控制台
diff --git a/public/react/src/redux/actions/index.js b/public/react/src/redux/actions/index.js
index 988a0a469..263e367df 100644
--- a/public/react/src/redux/actions/index.js
+++ b/public/react/src/redux/actions/index.js
@@ -32,6 +32,7 @@ import {
   updateTestAndValidate,
   updateOpenTestCaseIndex,
   handleClickCancelPublish,
+  getQuestion
 } from './ojForm';
 
 import {
@@ -110,6 +111,8 @@ export default {
   validateOjCategory,
   validateOpenOrNot,
   handleClickCancelPublish,
+  getQuestion,
+  // 
   addTestCase,
   deleteTestCase,
   testCaseInputChange,
diff --git a/public/react/src/redux/actions/ojForm.js b/public/react/src/redux/actions/ojForm.js
index 118295802..401c4f203 100644
--- a/public/react/src/redux/actions/ojForm.js
+++ b/public/react/src/redux/actions/ojForm.js
@@ -4,7 +4,7 @@
  * @Github: 
  * @Date: 2019-11-20 16:35:46
  * @LastEditors  : tangjiang
- * @LastEditTime : 2019-12-27 22:19:15
+ * @LastEditTime : 2019-12-30 09:56:39
  */
 import types from './actionTypes';
 import CONST from '../../constants';
@@ -12,7 +12,8 @@ import {
   fetchPostOjForm,
   fetchGetOjById,
   publishTask,
-  cancelPublicTask
+  cancelPublicTask,
+  fetchQuestion
 } from '../../services/ojService';
 import { Base64 } from 'js-base64';
 import { notification } from 'antd';
@@ -644,3 +645,21 @@ export const updateOpenTestCaseIndex = (value) => {
     payload: value
   }
 }
+
+// 获取课程题库
+export const getQuestion = (params) => {
+  // return {
+  //   type: types.GET_COURSE_QUESTION,
+  // }
+  return (dispatch) => {
+    fetchQuestion(params).then(res => {
+      const { data = {} } = res;
+      const { disciplines = [] } = data;
+      console.log('获取课程题库成功: ', res);
+      dispatch({
+        type: types.GET_COURSE_QUESTION,
+        payload: disciplines
+      })
+    })
+  }
+}
diff --git a/public/react/src/redux/reducers/ojFormReducer.js b/public/react/src/redux/reducers/ojFormReducer.js
index 952919aca..5beba6653 100644
--- a/public/react/src/redux/reducers/ojFormReducer.js
+++ b/public/react/src/redux/reducers/ojFormReducer.js
@@ -4,7 +4,7 @@
  * @Github: 
  * @Date: 2019-11-20 16:40:32
  * @LastEditors  : tangjiang
- * @LastEditTime : 2019-12-27 20:00:26
+ * @LastEditTime : 2019-12-30 09:55:37
  */
 import { Base64 } from 'js-base64';
 import types from '../actions/actionTypes';
@@ -67,6 +67,7 @@ const init = {
   testCodeStatus: 'default', // 调试代码状态  default(默认值) | loading(加载中) | loaded(加载完成) | userCase(用户自定义测试用例) | finish(测试完成)
   openTestCodeIndex: [0], // 展开的测试用例: 数组， 当出错时，展开所有出错的测试用例， 默认展开第一个
   isPublish: 0, // 是否是发布状态: 0 未发布 1 已发布
+  courseQuestions: [], // 课程题库
 }
 
 const tcValidateObj = {
@@ -306,6 +307,11 @@ const ojFormReducer = (state = initialState, action) => {
         ...state,
         openTestCodeIndex: tempArr
       }
+    case types.GET_COURSE_QUESTION:
+      return {
+        ...state,
+        courseQuestions: action.payload
+      }
     default:
       return state;
   }
diff --git a/public/react/src/services/ojService.js b/public/react/src/services/ojService.js
index 04fde2224..59151e687 100644
--- a/public/react/src/services/ojService.js
+++ b/public/react/src/services/ojService.js
@@ -4,7 +4,7 @@
  * @Github: 
  * @Date: 2019-11-20 10:55:38
  * @LastEditors  : tangjiang
- * @LastEditTime : 2019-12-27 11:06:27
+ * @LastEditTime : 2019-12-30 09:44:56
  */
 
 import axios from 'axios';
@@ -142,4 +142,10 @@ export async function fetchUploadImageUrl (id) {
 export async function fetchAddNotes (identifier, params) {
   const url = `/myproblems/${identifier}/add_notes.json`;
   return axios.post(url, params);
+}
+
+// 获取课程体系
+export async function fetchQuestion (params) {
+  const url = `/disciplines.json`;
+  return axios.get(url, { params });
 }
\ No newline at end of file

From 1075b49f6acc0a27accc16bbeae3fd1e9b60ab58 Mon Sep 17 00:00:00 2001
From: tangjiang <465264938@qq.com>
Date: Mon, 30 Dec 2019 14:23:40 +0800
Subject: [PATCH 03/21] add selector

---
 .../developer/components/knowledge/index.js   | 47 +++++++++++++++++++
 .../developer/components/knowledge/index.scss |  0
 2 files changed, 47 insertions(+)
 create mode 100644 public/react/src/modules/developer/components/knowledge/index.js
 create mode 100644 public/react/src/modules/developer/components/knowledge/index.scss

diff --git a/public/react/src/modules/developer/components/knowledge/index.js b/public/react/src/modules/developer/components/knowledge/index.js
new file mode 100644
index 000000000..b4328376d
--- /dev/null
+++ b/public/react/src/modules/developer/components/knowledge/index.js
@@ -0,0 +1,47 @@
+/*
+ * @Description: 知识点
+ * @Author: tangjiang
+ * @Github: 
+ * @Date: 2019-12-30 13:51:19
+ * @LastEditors  : tangjiang
+ * @LastEditTime : 2019-12-30 14:20:50
+ */
+import './index.scss';
+import React, { useState } from 'react';
+import { Select } from 'antd';
+
+function KnowLedge (props) {
+
+  const {
+    options = [], // 下拉选项
+    values = [], // 已选择的下拉项
+  } = props;
+
+  // 显示的下拉项
+  const [selectOptions, setSelectOptions] = useState(options);
+  // 已选择的下拉项
+  const [selectValue, setSelectValue] = useState(values);
+
+  // 渲染下拉选项
+  // 渲染下拉列表
+  const renderSelect = (options, values) => {
+    return (
+      <Select
+        style={{ width: '100%' }}
+      >
+
+      </Select>
+    )
+  }
+  
+  return (
+    <div className="knowledge-select-area">
+      { renderSelect(selectOptions, selectValue) }
+      <div className="knowledge-select-result">
+        
+      </div>
+    </div>
+  );
+}
+
+export default KnowLedge;
diff --git a/public/react/src/modules/developer/components/knowledge/index.scss b/public/react/src/modules/developer/components/knowledge/index.scss
new file mode 100644
index 000000000..e69de29bb

From 9a97db2893bfbc6c35c7cc9d0660ba0f023af0fe Mon Sep 17 00:00:00 2001
From: tangjiang <465264938@qq.com>
Date: Mon, 30 Dec 2019 14:31:13 +0800
Subject: [PATCH 04/21] add selector

---
 .../modules/developer/components/knowledge/index.js | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/public/react/src/modules/developer/components/knowledge/index.js b/public/react/src/modules/developer/components/knowledge/index.js
index b4328376d..81e9f770a 100644
--- a/public/react/src/modules/developer/components/knowledge/index.js
+++ b/public/react/src/modules/developer/components/knowledge/index.js
@@ -4,7 +4,7 @@
  * @Github: 
  * @Date: 2019-12-30 13:51:19
  * @LastEditors  : tangjiang
- * @LastEditTime : 2019-12-30 14:20:50
+ * @LastEditTime : 2019-12-30 14:28:17
  */
 import './index.scss';
 import React, { useState } from 'react';
@@ -23,13 +23,22 @@ function KnowLedge (props) {
   const [selectValue, setSelectValue] = useState(values);
 
   // 渲染下拉选项
+  const renderOptions = () => {
+
+  }
+  const handleSelectChange = (value) => {
+    console.log(value);
+  }
+
   // 渲染下拉列表
   const renderSelect = (options, values) => {
     return (
       <Select
+        placeholder="请选择"
         style={{ width: '100%' }}
+        onChange={handleSelectChange}
       >
-
+        {renderOptions(options)}
       </Select>
     )
   }

From 8ac904a82d24f640b7f39e211556ad3fd5f7b785 Mon Sep 17 00:00:00 2001
From: tangjiang <465264938@qq.com>
Date: Mon, 30 Dec 2019 16:58:10 +0800
Subject: [PATCH 05/21] add selector

---
 public/react/src/constants/index.js           |  4 +-
 .../developer/components/knowledge/index.js   | 14 +++++--
 .../newOrEditTask/leftpane/editorTab/index.js | 41 ++++++++++++++-----
 3 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/public/react/src/constants/index.js b/public/react/src/constants/index.js
index c0e6074fc..623cff362 100644
--- a/public/react/src/constants/index.js
+++ b/public/react/src/constants/index.js
@@ -4,7 +4,7 @@
  * @Github: 
  * @Date: 2019-11-20 23:10:48
  * @LastEditors  : tangjiang
- * @LastEditTime : 2019-12-30 09:19:52
+ * @LastEditTime : 2019-12-30 14:44:45
  */
 const CONST = {
   jcLabel: {
@@ -15,7 +15,7 @@ const CONST = {
     category: '课程',
     openOrNot: '公开程序',
     timeLimit: '时间限制',
-    // knowledge: '知识点'
+    knowledge: '知识点'
   },
   fontSetting: {
     title: '代码格式',
diff --git a/public/react/src/modules/developer/components/knowledge/index.js b/public/react/src/modules/developer/components/knowledge/index.js
index 81e9f770a..63d99b762 100644
--- a/public/react/src/modules/developer/components/knowledge/index.js
+++ b/public/react/src/modules/developer/components/knowledge/index.js
@@ -4,12 +4,14 @@
  * @Github: 
  * @Date: 2019-12-30 13:51:19
  * @LastEditors  : tangjiang
- * @LastEditTime : 2019-12-30 14:28:17
+ * @LastEditTime : 2019-12-30 16:54:30
  */
 import './index.scss';
 import React, { useState } from 'react';
 import { Select } from 'antd';
 
+const { Option } = Select;
+
 function KnowLedge (props) {
 
   const {
@@ -23,8 +25,11 @@ function KnowLedge (props) {
   const [selectValue, setSelectValue] = useState(values);
 
   // 渲染下拉选项
-  const renderOptions = () => {
-
+  const renderOptions = (options = []) => {
+    console.log('下拉选择: ', options);
+    return options.map((opt, i) => (
+      <Option key={`opt_${i}`} value={opt}>{opt}</Option>
+    ));
   }
   const handleSelectChange = (value) => {
     console.log(value);
@@ -34,9 +39,12 @@ function KnowLedge (props) {
   const renderSelect = (options, values) => {
     return (
       <Select
+        mode="multiple"
         placeholder="请选择"
         style={{ width: '100%' }}
         onChange={handleSelectChange}
+        autoClearSearchValue={true}
+        maxTagCount={0}
       >
         {renderOptions(options)}
       </Select>
diff --git a/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js b/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js
index 8172a7778..4672a3be7 100644
--- a/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js
+++ b/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js
@@ -4,7 +4,7 @@
  * @Github: 
  * @Date: 2019-11-20 10:35:40
  * @LastEditors  : tangjiang
- * @LastEditTime : 2019-12-30 11:05:14
+ * @LastEditTime : 2019-12-30 16:42:36
  */
 import './index.scss';
 // import 'katex/dist/katex.css';
@@ -18,6 +18,7 @@ import CONST from '../../../../../constants';
 import { toStore } from 'educoder'; // 保存和读取store值
 // import Wrapper from '../../../../../common/reactQuill';
 import QuillForEditor from '../../../../../common/quillForEditor';
+import KnowLedge from '../../../components/knowledge';
 const scrollIntoView = require('scroll-into-view');
 const {jcLabel} = CONST;
 const FormItem = Form.Item;
@@ -59,7 +60,8 @@ class EditTab extends React.Component {
       scrollHeight: 0, // 滚动元素的高度
       top: 500,
       bottom: 20,
-      offsetTop: 0
+      offsetTop: 0,
+      knowledges: ['HTML', 'CSS', 'JS', 'REACT']
     }
   }
 
@@ -131,8 +133,21 @@ class EditTab extends React.Component {
   }
   // 改变分类
   handleChangeCategory = (value) => {
-    console.log(value);
-    // this.props.validateOjCategory(value);
+    // 课程下拉值变化时， 同步更新知识点
+    const { courseQuestions } = this.props;
+    courseQuestions.forEach(item => {
+      if (value[0] && item.id === value[0]) {
+        item.sub_disciplines && item.sub_disciplines.forEach(c => {
+          if (value[1] && c.id === value[1]) {
+            // tempArr = c.tag_disciplines || [];
+            console.log('+++++', c.tag_disciplines);
+            this.setState({
+              knowledges: c.tag_disciplines || []
+            });
+          }
+        });
+      }
+    });
   }
   // 改变公开程序
   handleChangeOpenOrNot = (value) => {
@@ -154,6 +169,7 @@ class EditTab extends React.Component {
       openTestCodeIndex = [],
       courseQuestions
     } = this.props;
+    const {knowledges} = this.state;
     // 表单label
     const myLabel = (name, subTitle) => {
       if (subTitle) {
@@ -259,8 +275,8 @@ class EditTab extends React.Component {
           obj.value = item.id;
           obj.label = item.name;
           // 当item下还有子元素时，递归调用
-          if (item.sub_disciplines || item.tag_disciplines) {
-            arrs = item.sub_disciplines || item.tag_disciplines;
+          if (item.sub_disciplines) {
+            arrs = item.sub_disciplines;
             obj.children = [];
             loop(arrs, obj.children);
           }
@@ -297,7 +313,6 @@ class EditTab extends React.Component {
       return (
         <Cascader 
           options={tempArr}
-          value={[1,1,1]}
           expandTrigger="hover"
           onChange={this.handleChangeCategory}
         />
@@ -337,10 +352,16 @@ class EditTab extends React.Component {
             { renderCourseQuestion(courseQuestions)}
           </FormItem>
 
-          <FormItem>
-            
+          <FormItem
+            colon={ false }
+            className='input_area flex_100'
+            label={<span>{myLabel(jcLabel['knowledge'])}</span>}
+          >
+            <KnowLedge 
+              options={knowledges}
+            />
           </FormItem>
-
+          
           <FormItem 
             className={`input_area flex_50 flex_50_left`}
             label={<span>{myLabel(jcLabel['timeLimit'], '程序允许时间限制时长，单位：秒')}</span>}

From f7f4c413719265b125a0bd78f678384f1a954dcd Mon Sep 17 00:00:00 2001
From: tangjiang <465264938@qq.com>
Date: Mon, 30 Dec 2019 18:28:27 +0800
Subject: [PATCH 06/21] add selector

---
 .../src/modules/developer/components/knowledge/index.js  | 9 +++------
 .../modules/developer/components/knowledge/index.scss    | 5 +++++
 .../developer/newOrEditTask/leftpane/editorTab/index.js  | 2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/public/react/src/modules/developer/components/knowledge/index.js b/public/react/src/modules/developer/components/knowledge/index.js
index 63d99b762..17cf11624 100644
--- a/public/react/src/modules/developer/components/knowledge/index.js
+++ b/public/react/src/modules/developer/components/knowledge/index.js
@@ -4,7 +4,7 @@
  * @Github: 
  * @Date: 2019-12-30 13:51:19
  * @LastEditors  : tangjiang
- * @LastEditTime : 2019-12-30 16:54:30
+ * @LastEditTime : 2019-12-30 18:02:20
  */
 import './index.scss';
 import React, { useState } from 'react';
@@ -33,6 +33,8 @@ function KnowLedge (props) {
   }
   const handleSelectChange = (value) => {
     console.log(value);
+    const _result = selectOptions.filter(item => item !== value);
+    setSelectOptions(_result);
   }
 
   // 渲染下拉列表
@@ -43,8 +45,6 @@ function KnowLedge (props) {
         placeholder="请选择"
         style={{ width: '100%' }}
         onChange={handleSelectChange}
-        autoClearSearchValue={true}
-        maxTagCount={0}
       >
         {renderOptions(options)}
       </Select>
@@ -54,9 +54,6 @@ function KnowLedge (props) {
   return (
     <div className="knowledge-select-area">
       { renderSelect(selectOptions, selectValue) }
-      <div className="knowledge-select-result">
-        
-      </div>
     </div>
   );
 }
diff --git a/public/react/src/modules/developer/components/knowledge/index.scss b/public/react/src/modules/developer/components/knowledge/index.scss
index e69de29bb..a38f42c70 100644
--- a/public/react/src/modules/developer/components/knowledge/index.scss
+++ b/public/react/src/modules/developer/components/knowledge/index.scss
@@ -0,0 +1,5 @@
+.knowledge-select-area{
+  .ant-select-selection__rendered{
+    margin-bottom: 0 !important;
+  }
+}
diff --git a/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js b/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js
index 4672a3be7..4c5d89dce 100644
--- a/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js
+++ b/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js
@@ -4,7 +4,7 @@
  * @Github: 
  * @Date: 2019-11-20 10:35:40
  * @LastEditors  : tangjiang
- * @LastEditTime : 2019-12-30 16:42:36
+ * @LastEditTime : 2019-12-30 17:53:18
  */
 import './index.scss';
 // import 'katex/dist/katex.css';

From f7fc049d7e51d7523a3cd114fb255db28227eaeb Mon Sep 17 00:00:00 2001
From: tangjiang <465264938@qq.com>
Date: Mon, 30 Dec 2019 19:30:56 +0800
Subject: [PATCH 07/21] add

---
 public/react/src/AppConfig.js                       | 13 +++++++------
 .../modules/developer/components/knowledge/index.js | 12 ++++++++----
 .../developer/components/knowledge/index.scss       |  4 ++++
 .../newOrEditTask/leftpane/editorTab/index.js       |  2 +-
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js
index 859b5f579..4e91938c8 100644
--- a/public/react/src/AppConfig.js
+++ b/public/react/src/AppConfig.js
@@ -63,11 +63,11 @@ export function initAxiosInterceptors(props) {
     const requestMap = {};
 
     window.railsgettimes = function(proxy) {
-        $.ajax({url:`${proxy}/api/main/first_stamp.json`,async:false,success:function(data,status){
-           if(data.status===0){
-             return data.message;
-           }
-        }});
+        // $.ajax({url:`${proxy}/api/main/first_stamp.json`,async:false,success:function(data,status){
+        //    if(data.status===0){
+        //      return data.message;
+        //    }
+        // }});
     }
 
     window.setfalseInRequestMap = function(keyName) {
@@ -101,8 +101,9 @@ export function initAxiosInterceptors(props) {
 								}
 							}
             if(`${config[0]}`!=`true`){
+                let timestamp = Date.parse(new Date())/1000;
                 if (window.location.port === "3007") {
-                  let timestamp=railsgettimes(proxy);
+                  // let timestamp=railsgettimes(proxy);
                   console.log(timestamp)
                   let newopens=md5(opens+timestamp)
                     config.url = `${proxy}${url}`;
diff --git a/public/react/src/modules/developer/components/knowledge/index.js b/public/react/src/modules/developer/components/knowledge/index.js
index 17cf11624..5677d3630 100644
--- a/public/react/src/modules/developer/components/knowledge/index.js
+++ b/public/react/src/modules/developer/components/knowledge/index.js
@@ -4,7 +4,7 @@
  * @Github: 
  * @Date: 2019-12-30 13:51:19
  * @LastEditors  : tangjiang
- * @LastEditTime : 2019-12-30 18:02:20
+ * @LastEditTime : 2019-12-30 19:21:56
  */
 import './index.scss';
 import React, { useState } from 'react';
@@ -23,6 +23,8 @@ function KnowLedge (props) {
   const [selectOptions, setSelectOptions] = useState(options);
   // 已选择的下拉项
   const [selectValue, setSelectValue] = useState(values);
+  //
+  const [value] = useState([]);
 
   // 渲染下拉选项
   const renderOptions = (options = []) => {
@@ -32,8 +34,9 @@ function KnowLedge (props) {
     ));
   }
   const handleSelectChange = (value) => {
-    console.log(value);
-    const _result = selectOptions.filter(item => item !== value);
+    console.log('过滤结果Start=====》》》》》', selectOptions, value);
+    const _result = selectOptions.filter(item => item !== value.join(''));
+    console.log('过滤结果=====》》》》》', _result, selectOptions);
     setSelectOptions(_result);
   }
 
@@ -41,7 +44,8 @@ function KnowLedge (props) {
   const renderSelect = (options, values) => {
     return (
       <Select
-        mode="multiple"
+        value={value}
+        mode="tags"
         placeholder="请选择"
         style={{ width: '100%' }}
         onChange={handleSelectChange}
diff --git a/public/react/src/modules/developer/components/knowledge/index.scss b/public/react/src/modules/developer/components/knowledge/index.scss
index a38f42c70..28676b286 100644
--- a/public/react/src/modules/developer/components/knowledge/index.scss
+++ b/public/react/src/modules/developer/components/knowledge/index.scss
@@ -2,4 +2,8 @@
   .ant-select-selection__rendered{
     margin-bottom: 0 !important;
   }
+  .ant-select-search--inline{
+    margin-left: 5px;
+    margin-top: 2px;
+  }
 }
diff --git a/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js b/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js
index 4c5d89dce..fac58fe86 100644
--- a/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js
+++ b/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js
@@ -4,7 +4,7 @@
  * @Github: 
  * @Date: 2019-11-20 10:35:40
  * @LastEditors  : tangjiang
- * @LastEditTime : 2019-12-30 17:53:18
+ * @LastEditTime : 2019-12-30 19:20:50
  */
 import './index.scss';
 // import 'katex/dist/katex.css';

From d058bf152b75f51dee20b5a12a30ad3a7060d74d Mon Sep 17 00:00:00 2001
From: tangjiang <465264938@qq.com>
Date: Mon, 30 Dec 2019 19:36:26 +0800
Subject: [PATCH 08/21] add

---
 public/react/src/AppConfig.js                      | 14 --------------
 .../developer/components/knowledge/index.js        |  7 ++++++-
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js
index 055f6ae92..ba700794e 100644
--- a/public/react/src/AppConfig.js
+++ b/public/react/src/AppConfig.js
@@ -86,17 +86,6 @@ export function initAxiosInterceptors(props) {
     // 如果需要支持重复的请求，考虑config里面自定义一个allowRepeat参考来控制
     const requestMap = {};
 
-<<<<<<< HEAD
-    window.railsgettimes = function(proxy) {
-        // $.ajax({url:`${proxy}/api/main/first_stamp.json`,async:false,success:function(data,status){
-        //    if(data.status===0){
-        //      return data.message;
-        //    }
-        // }});
-    }
-
-=======
->>>>>>> dev_aliyun
     window.setfalseInRequestMap = function(keyName) {
         requestMap[keyName] = false;
     }
@@ -131,12 +120,9 @@ export function initAxiosInterceptors(props) {
             if(`${config[0]}`!=`true`){
                 let timestamp = Date.parse(new Date())/1000;
                 if (window.location.port === "3007") {
-<<<<<<< HEAD
                   // let timestamp=railsgettimes(proxy);
                   console.log(timestamp)
-=======
                   railsgettimes(`${proxy}/api/main/first_stamp.json`);
->>>>>>> dev_aliyun
                   let newopens=md5(opens+timestamp)
                     config.url = `${proxy}${url}`;
                     if (config.url.indexOf('?') == -1) {
diff --git a/public/react/src/modules/developer/components/knowledge/index.js b/public/react/src/modules/developer/components/knowledge/index.js
index 5677d3630..491b9cb87 100644
--- a/public/react/src/modules/developer/components/knowledge/index.js
+++ b/public/react/src/modules/developer/components/knowledge/index.js
@@ -35,7 +35,12 @@ function KnowLedge (props) {
   }
   const handleSelectChange = (value) => {
     console.log('过滤结果Start=====》》》》》', selectOptions, value);
-    const _result = selectOptions.filter(item => item !== value.join(''));
+    const _result = selectOptions.filter(item => {
+      if (item === value) {
+
+      }
+      return item !== value;
+    });
     console.log('过滤结果=====》》》》》', _result, selectOptions);
     setSelectOptions(_result);
   }

From ec9a306f92209f6152503dd23f57c8a08143aa2e Mon Sep 17 00:00:00 2001
From: tangjiang <465264938@qq.com>
Date: Mon, 30 Dec 2019 19:58:49 +0800
Subject: [PATCH 09/21] add

---
 .../developer/newOrEditTask/leftpane/editorTab/index.js       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js b/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js
index fac58fe86..88e5a8bde 100644
--- a/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js
+++ b/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js
@@ -4,7 +4,7 @@
  * @Github: 
  * @Date: 2019-11-20 10:35:40
  * @LastEditors  : tangjiang
- * @LastEditTime : 2019-12-30 19:20:50
+ * @LastEditTime : 2019-12-30 19:57:46
  */
 import './index.scss';
 // import 'katex/dist/katex.css';
@@ -61,7 +61,7 @@ class EditTab extends React.Component {
       top: 500,
       bottom: 20,
       offsetTop: 0,
-      knowledges: ['HTML', 'CSS', 'JS', 'REACT']
+      knowledges: []
     }
   }
 

From 36fd6d98aee7784d6fa063fb3e4886b26b91620e Mon Sep 17 00:00:00 2001
From: tangjiang <465264938@qq.com>
Date: Mon, 30 Dec 2019 20:12:03 +0800
Subject: [PATCH 10/21] add

---
 .../developer/components/knowledge/index.js        | 11 ++++++++---
 .../newOrEditTask/leftpane/editorTab/index.js      | 14 ++++++++++----
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/public/react/src/modules/developer/components/knowledge/index.js b/public/react/src/modules/developer/components/knowledge/index.js
index 491b9cb87..36060e8e8 100644
--- a/public/react/src/modules/developer/components/knowledge/index.js
+++ b/public/react/src/modules/developer/components/knowledge/index.js
@@ -4,10 +4,10 @@
  * @Github: 
  * @Date: 2019-12-30 13:51:19
  * @LastEditors  : tangjiang
- * @LastEditTime : 2019-12-30 19:21:56
+ * @LastEditTime : 2019-12-30 20:08:09
  */
 import './index.scss';
-import React, { useState } from 'react';
+import React, { useState, useEffect } from 'react';
 import { Select } from 'antd';
 
 const { Option } = Select;
@@ -19,6 +19,10 @@ function KnowLedge (props) {
     values = [], // 已选择的下拉项
   } = props;
 
+  useEffect(() => {
+    setSelectOptions(options || []);
+  }, [props]);
+
   // 显示的下拉项
   const [selectOptions, setSelectOptions] = useState(options);
   // 已选择的下拉项
@@ -30,7 +34,7 @@ function KnowLedge (props) {
   const renderOptions = (options = []) => {
     console.log('下拉选择: ', options);
     return options.map((opt, i) => (
-      <Option key={`opt_${i}`} value={opt}>{opt}</Option>
+      <Option key={`opt_${i}`} value={`${opt.id}`}>{opt.name}</Option>
     ));
   }
   const handleSelectChange = (value) => {
@@ -47,6 +51,7 @@ function KnowLedge (props) {
 
   // 渲染下拉列表
   const renderSelect = (options, values) => {
+    console.log('==========>>>>>>>>', options);
     return (
       <Select
         value={value}
diff --git a/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js b/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js
index 88e5a8bde..ed142e53a 100644
--- a/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js
+++ b/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js
@@ -4,7 +4,7 @@
  * @Github: 
  * @Date: 2019-11-20 10:35:40
  * @LastEditors  : tangjiang
- * @LastEditTime : 2019-12-30 19:57:46
+ * @LastEditTime : 2019-12-30 20:09:30
  */
 import './index.scss';
 // import 'katex/dist/katex.css';
@@ -139,13 +139,19 @@ class EditTab extends React.Component {
       if (value[0] && item.id === value[0]) {
         item.sub_disciplines && item.sub_disciplines.forEach(c => {
           if (value[1] && c.id === value[1]) {
-            // tempArr = c.tag_disciplines || [];
-            console.log('+++++', c.tag_disciplines);
             this.setState({
-              knowledges: c.tag_disciplines || []
+              knowledges: [...c.tag_disciplines]
+            });
+          } else {
+            this.setState({
+              knowledges: []
             });
           }
         });
+      } else {
+        this.setState({
+          knowledges: []
+        });
       }
     });
   }

From a2e80d190ca8c310ff12aae3af942309592f542a Mon Sep 17 00:00:00 2001
From: tangjiang <465264938@qq.com>
Date: Mon, 30 Dec 2019 20:47:08 +0800
Subject: [PATCH 11/21] add

---
 .../developer/components/knowledge/index.js   | 33 +++++++++++++------
 .../newOrEditTask/leftpane/editorTab/index.js | 11 +++----
 2 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/public/react/src/modules/developer/components/knowledge/index.js b/public/react/src/modules/developer/components/knowledge/index.js
index 36060e8e8..5d21b1420 100644
--- a/public/react/src/modules/developer/components/knowledge/index.js
+++ b/public/react/src/modules/developer/components/knowledge/index.js
@@ -4,7 +4,7 @@
  * @Github: 
  * @Date: 2019-12-30 13:51:19
  * @LastEditors  : tangjiang
- * @LastEditTime : 2019-12-30 20:08:09
+ * @LastEditTime : 2019-12-30 20:44:38
  */
 import './index.scss';
 import React, { useState, useEffect } from 'react';
@@ -32,26 +32,35 @@ function KnowLedge (props) {
 
   // 渲染下拉选项
   const renderOptions = (options = []) => {
-    console.log('下拉选择: ', options);
     return options.map((opt, i) => (
       <Option key={`opt_${i}`} value={`${opt.id}`}>{opt.name}</Option>
     ));
   }
+  // 过滤下拉列表项
   const handleSelectChange = (value) => {
-    console.log('过滤结果Start=====》》》》》', selectOptions, value);
+    value = +value.join('');
+    const tempArr = [...selectValue];
     const _result = selectOptions.filter(item => {
-      if (item === value) {
-
+      if (item.id === value && tempArr.findIndex(t => t.id === value) === -1) {
+        tempArr.push(item);
       }
-      return item !== value;
+      return item.id !== value;
     });
-    console.log('过滤结果=====》》》》》', _result, selectOptions);
+    console.log(tempArr)
+    setSelectValue(tempArr);
     setSelectOptions(_result);
   }
 
+  // 渲染下拉结果
+  const renderResult = (arrs) => {
+    return arrs.map(item => (
+      <div className="knowledge-item" key={`item_$(item.id)`}>
+        <span className="knowledge-item-txt"></span>
+      </div>
+    ));
+  }
   // 渲染下拉列表
-  const renderSelect = (options, values) => {
-    console.log('==========>>>>>>>>', options);
+  const renderSelect = (options) => {
     return (
       <Select
         value={value}
@@ -67,7 +76,11 @@ function KnowLedge (props) {
   
   return (
     <div className="knowledge-select-area">
-      { renderSelect(selectOptions, selectValue) }
+      { renderSelect(selectOptions) }
+      {/* 渲染下拉选择项 */}
+      <div className="knowledge-result">
+        { renderResult(selectValue) }
+      </div>
     </div>
   );
 }
diff --git a/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js b/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js
index ed142e53a..969d4df9e 100644
--- a/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js
+++ b/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js
@@ -4,7 +4,7 @@
  * @Github: 
  * @Date: 2019-11-20 10:35:40
  * @LastEditors  : tangjiang
- * @LastEditTime : 2019-12-30 20:09:30
+ * @LastEditTime : 2019-12-30 20:18:20
  */
 import './index.scss';
 // import 'katex/dist/katex.css';
@@ -135,6 +135,9 @@ class EditTab extends React.Component {
   handleChangeCategory = (value) => {
     // 课程下拉值变化时， 同步更新知识点
     const { courseQuestions } = this.props;
+    this.setState({
+      knowledges: []
+    });
     courseQuestions.forEach(item => {
       if (value[0] && item.id === value[0]) {
         item.sub_disciplines && item.sub_disciplines.forEach(c => {
@@ -142,16 +145,12 @@ class EditTab extends React.Component {
             this.setState({
               knowledges: [...c.tag_disciplines]
             });
-          } else {
+          } else if (!value[1]) {
             this.setState({
               knowledges: []
             });
           }
         });
-      } else {
-        this.setState({
-          knowledges: []
-        });
       }
     });
   }

From e54a85f4211804d1a3bb665110ef5c20b5394fd3 Mon Sep 17 00:00:00 2001
From: tangjiang <465264938@qq.com>
Date: Tue, 31 Dec 2019 09:15:28 +0800
Subject: [PATCH 12/21] add

---
 .../developer/components/knowledge/index.js       | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/public/react/src/modules/developer/components/knowledge/index.js b/public/react/src/modules/developer/components/knowledge/index.js
index 5d21b1420..6cd3d89ef 100644
--- a/public/react/src/modules/developer/components/knowledge/index.js
+++ b/public/react/src/modules/developer/components/knowledge/index.js
@@ -4,7 +4,7 @@
  * @Github: 
  * @Date: 2019-12-30 13:51:19
  * @LastEditors  : tangjiang
- * @LastEditTime : 2019-12-30 20:44:38
+ * @LastEditTime : 2019-12-31 09:06:44
  */
 import './index.scss';
 import React, { useState, useEffect } from 'react';
@@ -46,16 +46,15 @@ function KnowLedge (props) {
       }
       return item.id !== value;
     });
-    console.log(tempArr)
     setSelectValue(tempArr);
     setSelectOptions(_result);
   }
 
   // 渲染下拉结果
   const renderResult = (arrs) => {
-    return arrs.map(item => (
-      <div className="knowledge-item" key={`item_$(item.id)`}>
-        <span className="knowledge-item-txt"></span>
+    return arrs.map((item) => (
+      <div className="knowledge-item" key={`item_${item.name}`}>
+        <span className="knowledge-item-txt">{item.name}</span>
       </div>
     ));
   }
@@ -79,7 +78,11 @@ function KnowLedge (props) {
       { renderSelect(selectOptions) }
       {/* 渲染下拉选择项 */}
       <div className="knowledge-result">
-        { renderResult(selectValue) }
+        {/* { renderResult(selectValue) } */}
+        {/* <div className="knowledge-item">1111</div> */}
+        <div className="knowledge-item">
+          <span className="knowledge-item-txt">JAVA</span>
+        </div>
       </div>
     </div>
   );

From 5c0d2de5be68dd8d3db64fe98e22094a7fd9600e Mon Sep 17 00:00:00 2001
From: tangjiang <465264938@qq.com>
Date: Tue, 31 Dec 2019 11:49:21 +0800
Subject: [PATCH 13/21] add knowledge

---
 .../developer/components/knowledge/index.js   | 44 ++++++++++++++-----
 .../developer/components/knowledge/index.scss | 33 ++++++++++++++
 .../newOrEditTask/leftpane/editorTab/index.js | 38 +++++++++++-----
 .../leftpane/editorTab/index.scss             |  6 +++
 .../modules/developer/split_pane_resizer.scss | 15 ++++++-
 public/react/src/redux/actions/ojForm.js      |  5 ++-
 6 files changed, 117 insertions(+), 24 deletions(-)

diff --git a/public/react/src/modules/developer/components/knowledge/index.js b/public/react/src/modules/developer/components/knowledge/index.js
index 6cd3d89ef..ded8b3b1f 100644
--- a/public/react/src/modules/developer/components/knowledge/index.js
+++ b/public/react/src/modules/developer/components/knowledge/index.js
@@ -4,11 +4,11 @@
  * @Github: 
  * @Date: 2019-12-30 13:51:19
  * @LastEditors  : tangjiang
- * @LastEditTime : 2019-12-31 09:06:44
+ * @LastEditTime : 2019-12-31 10:42:51
  */
 import './index.scss';
 import React, { useState, useEffect } from 'react';
-import { Select } from 'antd';
+import { Select, notification } from 'antd';
 
 const { Option } = Select;
 
@@ -17,6 +17,7 @@ function KnowLedge (props) {
   const {
     options = [], // 下拉选项
     values = [], // 已选择的下拉项
+    onChange // 获取选择的值
   } = props;
 
   useEffect(() => {
@@ -46,16 +47,43 @@ function KnowLedge (props) {
       }
       return item.id !== value;
     });
+    if (tempArr.length > 50) {
+      notification.warning({
+        message: '提示',
+        description: '知识点不能超过50个'
+      });
+      return;
+    }
     setSelectValue(tempArr);
     setSelectOptions(_result);
+    // 将选择值返回
+    onChange && onChange(tempArr);
+  }
+
+  // 删除
+  const handleRemoveResult = (item) => {
+    // console.log('点击了删除按钮===>>>>', item);
+    // 将删除的值重新加入到列表中
+    const tempOptions = [...selectOptions];
+    const tempValue = selectValue.filter(t => t.id !== item.id);
+    // console.log(selectValue);
+    tempOptions.push(item);
+    setSelectOptions(tempOptions);
+    setSelectValue(tempValue);
+    // 将选择值返回
+    onChange && onChange(tempValue);
   }
 
   // 渲染下拉结果
   const renderResult = (arrs) => {
     return arrs.map((item) => (
-      <div className="knowledge-item" key={`item_${item.name}`}>
-        <span className="knowledge-item-txt">{item.name}</span>
-      </div>
+      <span className="knowledge-item" key={`item_${item.name}`}>
+        {item.name}
+        <span
+          onClick={() => handleRemoveResult(item)}
+          className="iconfont icon-roundclose knowledge-close"
+        ></span>
+      </span>
     ));
   }
   // 渲染下拉列表
@@ -78,11 +106,7 @@ function KnowLedge (props) {
       { renderSelect(selectOptions) }
       {/* 渲染下拉选择项 */}
       <div className="knowledge-result">
-        {/* { renderResult(selectValue) } */}
-        {/* <div className="knowledge-item">1111</div> */}
-        <div className="knowledge-item">
-          <span className="knowledge-item-txt">JAVA</span>
-        </div>
+        { renderResult(selectValue) }        
       </div>
     </div>
   );
diff --git a/public/react/src/modules/developer/components/knowledge/index.scss b/public/react/src/modules/developer/components/knowledge/index.scss
index 28676b286..5bd0f5f61 100644
--- a/public/react/src/modules/developer/components/knowledge/index.scss
+++ b/public/react/src/modules/developer/components/knowledge/index.scss
@@ -6,4 +6,37 @@
     margin-left: 5px;
     margin-top: 2px;
   }
+
+  .knowledge-result{
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    // margin-top: 15px;
+
+    .knowledge-item{
+      position: relative;
+      border: 1px solid #DDDDDD;
+      border-radius: 3px;
+      padding: 10px;
+      background: #fff;
+      margin-right: 10px;
+      margin-top: 10px;
+      // margin-bottom: 10px;
+
+      .knowledge-close{
+        display: none;
+        position: absolute;
+        right: -10px;
+        top: -10px;
+        background-color: rgba(250,250,250,1);
+        cursor: pointer;
+      }
+
+      &:hover{
+        .knowledge-close{
+          display: block;
+        }
+      }
+    }
+  }
 }
diff --git a/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js b/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js
index 969d4df9e..b7f0f568a 100644
--- a/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js
+++ b/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js
@@ -4,12 +4,12 @@
  * @Github: 
  * @Date: 2019-11-20 10:35:40
  * @LastEditors  : tangjiang
- * @LastEditTime : 2019-12-30 20:18:20
+ * @LastEditTime : 2019-12-31 10:49:21
  */
 import './index.scss';
 // import 'katex/dist/katex.css';
 import React from 'react';
-import { Form, Input, Select, InputNumber, Button, Cascader } from 'antd';
+import { Form, Input, Select, InputNumber, Button, Cascader, notification } from 'antd';
 import { connect } from 'react-redux';
 import AddTestDemo from './AddTestDemo';
 // import QuillEditor from '../../../quillEditor';
@@ -138,6 +138,7 @@ class EditTab extends React.Component {
     this.setState({
       knowledges: []
     });
+    // 获取当前分类下的知识点
     courseQuestions.forEach(item => {
       if (value[0] && item.id === value[0]) {
         item.sub_disciplines && item.sub_disciplines.forEach(c => {
@@ -153,6 +154,7 @@ class EditTab extends React.Component {
         });
       }
     });
+    this.props.validateOjCategory(value[1] || '');
   }
   // 改变公开程序
   handleChangeOpenOrNot = (value) => {
@@ -176,10 +178,10 @@ class EditTab extends React.Component {
     } = this.props;
     const {knowledges} = this.state;
     // 表单label
-    const myLabel = (name, subTitle) => {
+    const myLabel = (name, subTitle, nostar) => {
       if (subTitle) {
         return (
-          <span className={'label_text'}>
+          <span className={`label_text ${nostar}`}>
             {name}
             <span className={'label_sub_text'}>
               ({subTitle})
@@ -188,7 +190,7 @@ class EditTab extends React.Component {
         )
       } else {
         return (
-          <span className={'label_text'}>{name}</span>
+          <span className={`label_text ${nostar}`}>{name}</span>
         )
       }
     };
@@ -224,7 +226,14 @@ class EditTab extends React.Component {
     };
     // 添加测试用例
     const handleAddTest = () => {
-      const {position} = this.props;
+      const {position, testCases = []} = this.props;
+      if (testCases.length >= 50) {
+        notification.warning({
+          message: '提示',
+          description: '测试用例不能超过50个'
+        });
+        return;
+      }
       const obj = { // 测试用例参数
         input: '',
         output: '',
@@ -324,6 +333,15 @@ class EditTab extends React.Component {
       )
     }
     
+    // 知识点
+    const handleKnowledgeChange = (values= []) => {
+      const _result = [];
+      values.forEach(v => {
+        _result.push(v.id);
+      });
+      console.log('下拉选择的值:===>>>', _result);
+    }
+    
     return (
       <div className={'editor_area'} id="textCase">
         <Form className={'editor_form'}>
@@ -360,10 +378,11 @@ class EditTab extends React.Component {
           <FormItem
             colon={ false }
             className='input_area flex_100'
-            label={<span>{myLabel(jcLabel['knowledge'])}</span>}
+            label={<span>{myLabel(jcLabel['knowledge'], '', 'nostar')}</span>}
           >
             <KnowLedge 
               options={knowledges}
+              onChange={handleKnowledgeChange}
             />
           </FormItem>
           
@@ -412,16 +431,13 @@ class EditTab extends React.Component {
             help={ojFormValidate.description.errMsg}
             colon={ false }
           >
-            <div style={{ marginTop: '15px'}}>
-              <QuillForEditor 
+            <QuillForEditor 
                 style={{ height: '200px' }}
                 placeholder="请输入描述信息" 
                 onContentChange={handleContentChange}
                 options={quillConfig}
                 value={ojForm.description}
               />
-            </div>
-            
           </FormItem>
           
           {/* <FormItem 
diff --git a/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.scss b/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.scss
index 723678bb3..ff5df7090 100644
--- a/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.scss
+++ b/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.scss
@@ -18,6 +18,12 @@
       line-height: 1;
       content: '*';
     }
+
+    &.nostar{
+      &::before {
+        content: ''
+      }
+    }
   }
   .input_area{
     display: inline-block;
diff --git a/public/react/src/modules/developer/split_pane_resizer.scss b/public/react/src/modules/developer/split_pane_resizer.scss
index 26fc21479..49fb48690 100644
--- a/public/react/src/modules/developer/split_pane_resizer.scss
+++ b/public/react/src/modules/developer/split_pane_resizer.scss
@@ -162,6 +162,19 @@
   -moz-background-clip: padding;
   -webkit-background-clip: padding;
   background-clip: padding-box;
+
+  &::before{
+    position: absolute;
+    width: 24px;
+    height: 24px;
+    border-radius: 50%;
+    margin-top: -12px;
+    top: 50%;
+    right: -12px;
+    font-family: 'iconfont';
+    background: gold;
+    content: '\e673';
+  }
 }
  
 .Resizer:hover {
@@ -200,4 +213,4 @@
 }
 .Resizer.disabled:hover {
   border-color: transparent;
-}
\ No newline at end of file
+}
diff --git a/public/react/src/redux/actions/ojForm.js b/public/react/src/redux/actions/ojForm.js
index 401c4f203..f639cdbcb 100644
--- a/public/react/src/redux/actions/ojForm.js
+++ b/public/react/src/redux/actions/ojForm.js
@@ -4,7 +4,7 @@
  * @Github: 
  * @Date: 2019-11-20 16:35:46
  * @LastEditors  : tangjiang
- * @LastEditTime : 2019-12-30 09:56:39
+ * @LastEditTime : 2019-12-31 10:55:48
  */
 import types from './actionTypes';
 import CONST from '../../constants';
@@ -106,7 +106,8 @@ export const validateOjForm = (props, type, cb) => {
     const {ojForm, testCases, identifier, code } = getState().ojFormReducer;
     // console.log('code', code);
     /** 表单验证开始  */
-    let keys = Object.keys(ojForm);
+    // let keys = Object.keys(ojForm).filter(k => k !== '');
+    let keys = Object.keys(ojForm)
     // 循环判断每个字段是否为空
     let hasSuccess = true;
     keys.forEach(key => {

From 16f9a59e62bde6f6830dccd821b71b762566ff34 Mon Sep 17 00:00:00 2001
From: tangjiang <465264938@qq.com>
Date: Tue, 31 Dec 2019 15:52:37 +0800
Subject: [PATCH 14/21] update quill

---
 .../src/common/quillForEditor/ImageBlot.js    |   3 +-
 .../react/src/common/quillForEditor/index.js  |  29 +++--
 .../src/common/quillForEditor/index.scss      | 103 ++++++++++++++++++
 .../newOrEditTask/leftpane/editorTab/index.js |  20 ++--
 .../modules/developer/split_pane_resizer.scss |  27 +++--
 5 files changed, 150 insertions(+), 32 deletions(-)

diff --git a/public/react/src/common/quillForEditor/ImageBlot.js b/public/react/src/common/quillForEditor/ImageBlot.js
index d00f2bafd..5ff84b249 100644
--- a/public/react/src/common/quillForEditor/ImageBlot.js
+++ b/public/react/src/common/quillForEditor/ImageBlot.js
@@ -4,7 +4,7 @@
  * @Github: 
  * @Date: 2019-12-16 15:50:45
  * @LastEditors  : tangjiang
- * @LastEditTime : 2019-12-27 15:07:11
+ * @LastEditTime : 2019-12-31 13:59:02
  */
 import Quill from "quill";
 
@@ -50,6 +50,7 @@ export default class ImageBlot extends BlockEmbed {
     return node;
   }
 
+  // 获取节点值
   static value (node) {
 
     return {
diff --git a/public/react/src/common/quillForEditor/index.js b/public/react/src/common/quillForEditor/index.js
index cb214465c..f3f359a80 100644
--- a/public/react/src/common/quillForEditor/index.js
+++ b/public/react/src/common/quillForEditor/index.js
@@ -4,7 +4,7 @@
  * @Github: 
  * @Date: 2019-12-18 08:49:30
  * @LastEditors  : tangjiang
- * @LastEditTime : 2019-12-27 16:49:25
+ * @LastEditTime : 2019-12-31 15:11:37
  */
 import './index.scss';
 import 'quill/dist/quill.core.css'; // 核心样式
@@ -18,10 +18,18 @@ import deepEqual from './deepEqual.js'
 import { fetchUploadImage } from '../../services/ojService.js';
 import { getImageUrl } from 'educoder'
 import ImageBlot from './ImageBlot';
+const Size = Quill.import('attributors/style/size');
+const Font = Quill.import('formats/font');
+// const Color = Quill.import('attributes/style/color');
+Size.whitelist = ['12px', '14px', '16px', '18px', '20px', false];
+Font.whitelist = ['SimSun', 'SimHei','Microsoft-YaHei','KaiTi','FangSong','Arial','Times-New-Roman','sans-serif'];
 
 window.Quill = Quill;
 window.katex = katex;
 Quill.register(ImageBlot);
+Quill.register(Size);
+Quill.register(Font, true);
+// Quill.register(Color);
 
 function QuillForEditor ({
   placeholder,
@@ -38,15 +46,16 @@ function QuillForEditor ({
 }) {
   // toolbar 默认值
   const defaultConfig = [
-    ['bold', 'italic', 'underline'],
-    [{align: []}, {list: 'ordered'}, {list: 'bullet'}], // 列表
-    [{script: 'sub'}, {script: 'super'}],
-    [{ 'color': [] }, { 'background': [] }], 
-    [{header: [1,2,3,4,5,false]}],
-    ['blockquote', 'code-block'],
-    ['link', 'image', 'video'],
-    ['formula'],
-    ['clean']
+    'bold', 'italic', 'underline',
+    {size: ['12px', '14px', '16px', '18px', '20px']},
+    {align: []}, {list: 'ordered'}, {list: 'bullet'}, // 列表
+    {script: 'sub'}, {script: 'super'},
+    { 'color': [] }, { 'background': [] }, 
+    {header: [1,2,3,4,5,false]},
+    'blockquote', 'code-block',
+    'link', 'image', 'video',
+    'formula',
+    'clean'
   ];
 
   const editorRef = useRef(null);
diff --git a/public/react/src/common/quillForEditor/index.scss b/public/react/src/common/quillForEditor/index.scss
index 3e951e2b6..96cd45edd 100644
--- a/public/react/src/common/quillForEditor/index.scss
+++ b/public/react/src/common/quillForEditor/index.scss
@@ -7,4 +7,107 @@
       cursor: pointer;
     }
   }
+  .ql-snow .ql-picker.ql-size .ql-picker-label[data-value="12px"]::before,
+  .ql-snow .ql-picker.ql-size .ql-picker-item[data-value="12px"]::before {
+      content: '12px';
+      font-size: 12px;
+  }
+  .ql-snow .ql-picker.ql-size .ql-picker-label[data-value="14px"]::before,
+  .ql-snow .ql-picker.ql-size .ql-picker-item[data-value="14px"]::before {
+      content: '14px';
+      font-size: 14px;
+  }
+  .ql-snow .ql-picker.ql-size .ql-picker-label[data-value="16px"]::before,
+  .ql-snow .ql-picker.ql-size .ql-picker-item[data-value="16px"]::before {
+      content: '16px';
+      font-size: 16px;
+  }
+  .ql-snow .ql-picker.ql-size .ql-picker-label[data-value="18px"]::before,
+  .ql-snow .ql-picker.ql-size .ql-picker-item[data-value="18px"]::before {
+      content: '18px';
+      font-size: 18px;
+  }
+  .ql-snow .ql-picker.ql-size .ql-picker-label[data-value="20px"]::before,
+  .ql-snow .ql-picker.ql-size .ql-picker-item[data-value="20px"]::before {
+      content: '20px';
+      font-size: 20px;
+  }
+  //默认的样式
+  .ql-snow .ql-picker.ql-size .ql-picker-label::before,
+  .ql-snow .ql-picker.ql-size .ql-picker-item::before {
+      content: '14px';
+      font-size: 14px;
+  }  
+
+  .ql-snow .ql-picker.ql-font .ql-picker-label[data-value=SimSun]::before,
+  .ql-snow .ql-picker.ql-font .ql-picker-item[data-value=SimSun]::before {
+      content: "宋体";
+      font-family: "SimSun";
+  }
+  .ql-snow .ql-picker.ql-font .ql-picker-label[data-value=SimHei]::before,
+  .ql-snow .ql-picker.ql-font .ql-picker-item[data-value=SimHei]::before {
+    content: "黑体";
+    font-family: "SimHei";
+  }
+  .ql-snow .ql-picker.ql-font .ql-picker-label[data-value=Microsoft-YaHei]::before,
+  .ql-snow .ql-picker.ql-font .ql-picker-item[data-value=Microsoft-YaHei]::before {
+    content: "微软雅黑";
+    font-family: "Microsoft YaHei";
+  }
+  .ql-snow .ql-picker.ql-font .ql-picker-label[data-value=KaiTi]::before,
+  .ql-snow .ql-picker.ql-font .ql-picker-item[data-value=KaiTi]::before {
+    content: "楷体";
+    font-family: "KaiTi";
+  }
+  .ql-snow .ql-picker.ql-font .ql-picker-label[data-value=FangSong]::before,
+  .ql-snow .ql-picker.ql-font .ql-picker-item[data-value=FangSong]::before {
+    content: "仿宋";
+    font-family: "FangSong";
+  }
+  .ql-snow .ql-picker.ql-font .ql-picker-label[data-value=Arial]::before,
+  .ql-snow .ql-picker.ql-font .ql-picker-item[data-value=Arial]::before {
+    content: "Arial";
+    font-family: "Arial";
+  }
+  .ql-snow .ql-picker.ql-font .ql-picker-label[data-value=Times-New-Roman]::before,
+  .ql-snow .ql-picker.ql-font .ql-picker-item[data-value=Times-New-Roman]::before {
+    content: "Times New Roman";
+    font-family: "Times New Roman";
+  }
+  .ql-snow .ql-picker.ql-font .ql-picker-label[data-value=sans-serif]::before,
+  .ql-snow .ql-picker.ql-font .ql-picker-item[data-value=sans-serif]::before {
+    content: "sans-serif";
+    font-family: "sans-serif";
+  }
+  
+  .ql-font-SimSun {
+      font-family: "SimSun";
+  }
+  .ql-font-SimHei {
+      font-family: "SimHei";
+  }
+  .ql-font-Microsoft-YaHei {
+      font-family: "Microsoft YaHei";
+  }
+  .ql-font-KaiTi {
+      font-family: "KaiTi";
+  }
+  .ql-font-FangSong {
+      font-family: "FangSong";
+  }
+  .ql-font-Arial {
+      font-family: "Arial";
+  }
+  .ql-font-Times-New-Roman {
+      font-family: "Times New Roman";
+  }
+  .ql-font-sans-serif {
+      font-family: "sans-serif";
+  }
+
+  .ql-snow .ql-picker.ql-font .ql-picker-label::before,
+  .ql-snow .ql-picker.ql-font .ql-picker-item::before {
+    content: "微软雅黑";
+    font-family: "Microsoft YaHei";
+  } 
 }
\ No newline at end of file
diff --git a/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js b/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js
index b7f0f568a..be692ef59 100644
--- a/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js
+++ b/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js
@@ -4,7 +4,7 @@
  * @Github: 
  * @Date: 2019-11-20 10:35:40
  * @LastEditors  : tangjiang
- * @LastEditTime : 2019-12-31 10:49:21
+ * @LastEditTime : 2019-12-31 15:17:08
  */
 import './index.scss';
 // import 'katex/dist/katex.css';
@@ -271,14 +271,16 @@ class EditTab extends React.Component {
     }
     // 编辑器配置信息
     const quillConfig = [
-      [{ header: [1, 2, 3, 4, 5, 6, false] }],
-      ['bold', 'italic', 'underline', 'strike'],        // 切换按钮
-      ['blockquote', 'code-block'], // 代码块
-      [{align: []}, { 'list': 'ordered' }, { 'list': 'bullet' }], // 列表
-      [{ 'script': 'sub'}, { 'script': 'super' }], 
-      [{ 'color': [] }, { 'background': [] }],  // 字体颜色与背景色
-      ['image', 'formula'], // 数学公式、图片、视频
-      ['clean'], // 清除格式
+      { header: 1}, {header: 2},
+      // {size: ['12px', '14px', '16px', '18px', '20px', false]},
+      'bold', 'italic', 'underline', 'strike',        // 切换按钮
+      'blockquote', 'code-block', // 代码块
+      {align: []}, { 'list': 'ordered' }, { 'list': 'bullet' }, // 列表
+      { 'script': 'sub'}, { 'script': 'super' }, 
+      { 'color': [] }, { 'background': [] },  // 字体颜色与背景色
+      // {font: []},
+      'image', 'formula', // 数学公式、图片、视频
+      'clean', // 清除格式
     ];
 
     const renderCourseQuestion = (arrs) => {
diff --git a/public/react/src/modules/developer/split_pane_resizer.scss b/public/react/src/modules/developer/split_pane_resizer.scss
index 49fb48690..8d4ad171c 100644
--- a/public/react/src/modules/developer/split_pane_resizer.scss
+++ b/public/react/src/modules/developer/split_pane_resizer.scss
@@ -163,18 +163,21 @@
   -webkit-background-clip: padding;
   background-clip: padding-box;
 
-  &::before{
-    position: absolute;
-    width: 24px;
-    height: 24px;
-    border-radius: 50%;
-    margin-top: -12px;
-    top: 50%;
-    right: -12px;
-    font-family: 'iconfont';
-    background: gold;
-    content: '\e673';
-  }
+  // &::before{
+  //   position: absolute;
+  //   width: 24px;
+  //   height: 24px;
+  //   border-radius: 50%;
+  //   margin-top: -12px;
+  //   top: 50%;
+  //   right: -12px;
+  //   font-family: 'iconfont';
+  //   background: gold;
+  //   content: '\e711';
+  //   font-size: 18px;
+  //   text-align: center;
+  //   line-height: 24px;
+  // }
 }
  
 .Resizer:hover {

From ceeabea7a379d95669d122b25efc30a1756b58e2 Mon Sep 17 00:00:00 2001
From: tangjiang <465264938@qq.com>
Date: Thu, 2 Jan 2020 14:26:08 +0800
Subject: [PATCH 15/21] update editor code update

---
 .../developer/components/myMonacoEditor/index.js  |  2 +-
 .../src/modules/developer/recordDetail/index.js   |  6 ++++--
 .../developer/studentStudy/leftpane/index.js      |  4 +---
 .../developer/studentStudy/rightpane/index.js     |  8 +++++---
 public/react/src/redux/actions/ojForUser.js       | 15 +++++++--------
 .../react/src/redux/reducers/ojForUserReducer.js  |  8 ++++----
 6 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/public/react/src/modules/developer/components/myMonacoEditor/index.js b/public/react/src/modules/developer/components/myMonacoEditor/index.js
index b37770328..930561e37 100644
--- a/public/react/src/modules/developer/components/myMonacoEditor/index.js
+++ b/public/react/src/modules/developer/components/myMonacoEditor/index.js
@@ -4,7 +4,7 @@
  * @Github: 
  * @Date: 2019-11-27 15:02:52
  * @LastEditors  : tangjiang
- * @LastEditTime : 2019-12-27 20:49:46
+ * @LastEditTime : 2020-01-02 13:59:38
  */
 import './index.scss';
 import React, { useState, useRef, useEffect } from 'react';
diff --git a/public/react/src/modules/developer/recordDetail/index.js b/public/react/src/modules/developer/recordDetail/index.js
index fd93b3f2a..6675f066d 100644
--- a/public/react/src/modules/developer/recordDetail/index.js
+++ b/public/react/src/modules/developer/recordDetail/index.js
@@ -4,7 +4,7 @@
  * @Github: 
  * @Date: 2019-12-04 08:36:21
  * @LastEditors  : tangjiang
- * @LastEditTime : 2019-12-27 21:18:39
+ * @LastEditTime : 2020-01-02 13:48:02
  */
 import './index.scss';
 import React, { useState, useEffect } from 'react';
@@ -57,7 +57,9 @@ function RecordDetail (props) {
   const handleReturn = (identifier) => {
     if (identifier) {
       saveEditorCodeForDetail('');
-      props.history.push(`/myproblems/${identifier}`);
+      setTimeout(() => {
+        props.history.push(`/myproblems/${identifier}`);
+      }, 300);
     }
   }
 
diff --git a/public/react/src/modules/developer/studentStudy/leftpane/index.js b/public/react/src/modules/developer/studentStudy/leftpane/index.js
index ac8d89321..88c5ee9a0 100644
--- a/public/react/src/modules/developer/studentStudy/leftpane/index.js
+++ b/public/react/src/modules/developer/studentStudy/leftpane/index.js
@@ -4,7 +4,7 @@
  * @Github: 
  * @Date: 2019-11-23 11:33:41
  * @LastEditors  : tangjiang
- * @LastEditTime : 2019-12-27 16:03:04
+ * @LastEditTime : 2020-01-02 13:51:22
 //  */
 import './index.scss';
 import React, { useState, useEffect, useMemo } from 'react';
@@ -50,8 +50,6 @@ const LeftPane = (props) => {
     record: (<CommitRecord />),
     comment: (<Comment />)
   };
-
-  console.log('======>>>>>>>', props);
   
   useEffect(() => {
     setDefaultActiveKey(userCodeTab);
diff --git a/public/react/src/modules/developer/studentStudy/rightpane/index.js b/public/react/src/modules/developer/studentStudy/rightpane/index.js
index ed500fb3a..bebaea1e8 100644
--- a/public/react/src/modules/developer/studentStudy/rightpane/index.js
+++ b/public/react/src/modules/developer/studentStudy/rightpane/index.js
@@ -4,7 +4,7 @@
  * @Github: 
  * @Date: 2019-11-27 14:59:51
  * @LastEditors  : tangjiang
- * @LastEditTime : 2019-12-27 19:23:46
+ * @LastEditTime : 2020-01-02 14:23:43
  */
 import React, { useState, useEffect } from 'react';
 import {connect} from 'react-redux';
@@ -39,7 +39,7 @@ const RightPane = (props) => {
     changeLoadingState
   } = props;
 
-  const [editorCode, setEditorCode] = useState(editor_code || hack.code);
+  // const [editorCode, setEditorCode] = useState(editor_code || hack.code);
   const [noteClazz, setNoteClazz] = useState('editor_nodte_area');
   const [noteCount] = useState(5000);
   // const [code, setCode] = useState(editor_code || hack.code);
@@ -65,8 +65,9 @@ const RightPane = (props) => {
   let timer = null; // 定时器
   // 代码块内容变化时
   const handleCodeChange = (value) => {
+    // console.log('编辑器代码 ======》》》》》》》》》++++++++++', value);
     saveUserInputCode(value);
-    setEditorCode(value);
+    // setEditorCode(value);
     if (!timer) {
       timer = setInterval(function () {
         clearInterval(timer);
@@ -116,6 +117,7 @@ const RightPane = (props) => {
   const { getFieldDecorator } = props.form;
   return (
     <div className={'right_pane_code_wrap'}>
+
       <MyMonacoEditor
         notice={notice}
         identifier={identifier}
diff --git a/public/react/src/redux/actions/ojForUser.js b/public/react/src/redux/actions/ojForUser.js
index 45594631f..99c759996 100644
--- a/public/react/src/redux/actions/ojForUser.js
+++ b/public/react/src/redux/actions/ojForUser.js
@@ -4,7 +4,7 @@
  * @Github: 
  * @Date: 2019-11-27 13:42:11
  * @LastEditors  : tangjiang
- * @LastEditTime : 2019-12-27 11:06:09
+ * @LastEditTime : 2020-01-02 14:17:49
  */
 import types from "./actionTypes";
 import { Base64 } from 'js-base64';
@@ -116,16 +116,15 @@ export const saveUserCodeForInterval = (identifier, code) => {
     });
     // console.log('+++', userCode);
     fetchUpdateCode(identifier, {
-      code: userCode
+      code: Base64.encode(userCode)
     }).then(res => {
       if (res.data.status === 401) {
         return;
       };
-      dispatch({
-        type: types.RESTORE_INITIAL_CODE,
-        payload: userCode
-      });
-      
+      // dispatch({
+      //   type: types.RESTORE_INITIAL_CODE,
+      //   payload: userCode
+      // });
       setTimeout(() => {
         dispatch({
           type: types.AUTO_UPDATE_CODE,
@@ -342,7 +341,7 @@ export const getUserCommitRecord = (identifier) => {
 export const getUserCommitRecordDetail = (identifier) => {
   return (dispatch) => {
     fetchUserCommitRecordDetail(identifier).then(res => {
-      console.log('提交记录详情======》》》》', res);
+      // console.log('提交记录详情======》》》》', res);
       const { data } = res;
       if (data.status === 401) return;
       dispatch({
diff --git a/public/react/src/redux/reducers/ojForUserReducer.js b/public/react/src/redux/reducers/ojForUserReducer.js
index 721c3e2cc..475d14d79 100644
--- a/public/react/src/redux/reducers/ojForUserReducer.js
+++ b/public/react/src/redux/reducers/ojForUserReducer.js
@@ -4,7 +4,7 @@
  * @Github: 
  * @Date: 2019-11-27 13:41:48
  * @LastEditors  : tangjiang
- * @LastEditTime : 2019-12-27 21:28:28
+ * @LastEditTime : 2020-01-02 14:24:09
  */
 import types from "../actions/actionTypes";
 import { Base64 } from 'js-base64';
@@ -94,10 +94,11 @@ const ojForUserReducer = (state = initialState, action) => {
         pages: Object.assign({}, state.pages, { total: records_count })
       }
     case types.SAVE_USER_CODE:
-      let curCode = Base64.encode(action.payload);
+      // console.log('save_user_code: ', action.payload);
+      // let curCode = Base64.encode(action.payload);
       return {
         ...state,
-        userCode: curCode,
+        userCode: action.payload,
         isUpdateCode: true,
       }
     case types.IS_UPDATE_CODE:
@@ -136,7 +137,6 @@ const ojForUserReducer = (state = initialState, action) => {
       } else {
         curHack['code'] = '';
       }
-      console.log(curHack);
       return {
         ...state,
         hack: Object.assign({}, state.hack, curHack),

From 71156118b918e1346052889e024eecc5f86aa680 Mon Sep 17 00:00:00 2001
From: tangjiang <465264938@qq.com>
Date: Thu, 2 Jan 2020 18:33:10 +0800
Subject: [PATCH 16/21] add course

---
 public/react/src/constants/index.js           |   5 +-
 .../developer/components/knowledge/index.js   |   3 +-
 .../modules/developer/newOrEditTask/index.js  |   8 +-
 .../newOrEditTask/leftpane/editorTab/index.js | 115 ++++++++++--------
 public/react/src/redux/actions/actionTypes.js |   3 +
 public/react/src/redux/actions/index.js       |   8 +-
 public/react/src/redux/actions/ojForm.js      |  72 +++++++----
 .../react/src/redux/reducers/ojFormReducer.js |  56 +++++++--
 8 files changed, 180 insertions(+), 90 deletions(-)

diff --git a/public/react/src/constants/index.js b/public/react/src/constants/index.js
index 623cff362..e9401e76e 100644
--- a/public/react/src/constants/index.js
+++ b/public/react/src/constants/index.js
@@ -4,7 +4,7 @@
  * @Github: 
  * @Date: 2019-11-20 23:10:48
  * @LastEditors  : tangjiang
- * @LastEditTime : 2019-12-30 14:44:45
+ * @LastEditTime : 2020-01-02 14:57:02
  */
 const CONST = {
   jcLabel: {
@@ -15,7 +15,8 @@ const CONST = {
     category: '课程',
     openOrNot: '公开程序',
     timeLimit: '时间限制',
-    knowledge: '知识点'
+    knowledge: '知识点',
+    sub_discipline_id: '课程'
   },
   fontSetting: {
     title: '代码格式',
diff --git a/public/react/src/modules/developer/components/knowledge/index.js b/public/react/src/modules/developer/components/knowledge/index.js
index ded8b3b1f..6bbc1efd0 100644
--- a/public/react/src/modules/developer/components/knowledge/index.js
+++ b/public/react/src/modules/developer/components/knowledge/index.js
@@ -4,7 +4,7 @@
  * @Github: 
  * @Date: 2019-12-30 13:51:19
  * @LastEditors  : tangjiang
- * @LastEditTime : 2019-12-31 10:42:51
+ * @LastEditTime : 2020-01-02 17:00:10
  */
 import './index.scss';
 import React, { useState, useEffect } from 'react';
@@ -88,6 +88,7 @@ function KnowLedge (props) {
   }
   // 渲染下拉列表
   const renderSelect = (options) => {
+    // console.log('+++++', options);
     return (
       <Select
         value={value}
diff --git a/public/react/src/modules/developer/newOrEditTask/index.js b/public/react/src/modules/developer/newOrEditTask/index.js
index 83200beac..eb894d1d0 100644
--- a/public/react/src/modules/developer/newOrEditTask/index.js
+++ b/public/react/src/modules/developer/newOrEditTask/index.js
@@ -35,6 +35,7 @@ const NewOrEditTask = (props) => {
     getUserInfoForNew,
     handleCancelPublish,
     validateOjForm,
+    getQuestion
     // updateTestAndValidate,
   } = props;
   
@@ -53,6 +54,10 @@ const NewOrEditTask = (props) => {
   useEffect(() => {
     // 获取用户信息
     getUserInfoForNew();
+    // 获取课程列表
+    getQuestion({
+      source: 'question'
+    });
     // console.log('获取路由参数： ====', props.match.params);
     const id = props.match.params.id;
     // 保存OJForm的id号，指明是编辑还是新增
@@ -273,7 +278,8 @@ const mapDispatchToProps = (dispatch) => ({
   startProgramQuestion: (id, props) => dispatch(actions.startProgramQuestion(id, props)),
   // 新建时获取信息
   getUserInfoForNew: () => dispatch(actions.getUserInfoForNew()),
-  validateOjForm: (props, type, cb) => dispatch(actions.validateOjForm(props, type, cb))
+  validateOjForm: (props, type, cb) => dispatch(actions.validateOjForm(props, type, cb)),
+  getQuestion: (params) => dispatch(actions.getQuestion(params))
 });
 
 export default withRouter(connect(
diff --git a/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js b/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js
index be692ef59..578f4a94e 100644
--- a/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js
+++ b/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js
@@ -4,7 +4,7 @@
  * @Github: 
  * @Date: 2019-11-20 10:35:40
  * @LastEditors  : tangjiang
- * @LastEditTime : 2019-12-31 15:17:08
+ * @LastEditTime : 2020-01-02 17:42:04
  */
 import './index.scss';
 // import 'katex/dist/katex.css';
@@ -61,7 +61,8 @@ class EditTab extends React.Component {
       top: 500,
       bottom: 20,
       offsetTop: 0,
-      knowledges: []
+      // knowledges: [],
+      // coursers: [] // 选中的课程
     }
   }
 
@@ -80,12 +81,16 @@ class EditTab extends React.Component {
       this.state.scrollEl.addEventListener('scroll', this.handleScroll, false);
     });
     // 获取题库
-    this.props.getQuestion({
-      source: 'question'
-    });
+    // this.props.getQuestion({
+    //   source: 'question'
+    // });
   }
 
-  componentWillUnmount () {
+  // componentDidUpdate (nextProp) {
+  //   console.log(nextProp);
+  // }
+  
+  componentWillUnmount (nextPro) {
     this.state.scrollEl.removeEventListener('scroll', this.handleScroll, false);
   }
 
@@ -131,30 +136,25 @@ class EditTab extends React.Component {
   handleTimeLimitChange = (value) => {
     this.props.validateOjTimeLimit(value);
   }
-  // 改变分类
-  handleChangeCategory = (value) => {
+  // 改变方向
+  handleChangeSubDisciplineId = (value) => {
     // 课程下拉值变化时， 同步更新知识点
-    const { courseQuestions } = this.props;
-    this.setState({
-      knowledges: []
-    });
+    const { courseQuestions, saveKnowledge } = this.props;
+    saveKnowledge([]);
     // 获取当前分类下的知识点
     courseQuestions.forEach(item => {
       if (value[0] && item.id === value[0]) {
         item.sub_disciplines && item.sub_disciplines.forEach(c => {
           if (value[1] && c.id === value[1]) {
-            this.setState({
-              knowledges: [...c.tag_disciplines]
-            });
+            saveKnowledge(...c.tag_disciplines)
           } else if (!value[1]) {
-            this.setState({
-              knowledges: []
-            });
+            saveKnowledge([]);
           }
         });
       }
     });
-    this.props.validateOjCategory(value[1] || '');
+    // this.props.validateOjCategory(value[1] || '');
+    this.props.validateOjSubDisciplineId(value[1] || '');
   }
   // 改变公开程序
   handleChangeOpenOrNot = (value) => {
@@ -174,9 +174,12 @@ class EditTab extends React.Component {
       deleteTestCase, // 删除测试用例
       testCasesValidate,
       openTestCodeIndex = [],
-      courseQuestions
+      courseQuestions,
+      tag_discipline_id,
+      knowledges
     } = this.props;
-    const {knowledges} = this.state;
+    console.log('+++++++++', knowledges);
+    // const {knowledges} = this.state;
     // 表单label
     const myLabel = (name, subTitle, nostar) => {
       if (subTitle) {
@@ -285,6 +288,7 @@ class EditTab extends React.Component {
 
     const renderCourseQuestion = (arrs) => {
       const tempArr = [];
+      const sub_id = this.props.ojForm.sub_discipline_id;
       function loop (arrs, tempArr) {
         arrs.forEach(item => {
           const obj = {};
@@ -300,37 +304,30 @@ class EditTab extends React.Component {
         });
       }
       loop(arrs, tempArr);
-      // arrs.forEach(item => {
-      //   const obj = Object.create(null);
-      //   obj.value = item.id;
-      //   obj.label = item.name;
-      //   if (item.sub_disciplines) {
-      //     obj.children = [];
-      //     item.sub_disciplines.forEach(sub => {
-      //       const subObj = Object.create(null);
-      //       subObj.value = sub.id;
-      //       subObj.label = sub.name;
-
-      //       if (sub.tag_disciplines) {
-      //         subObj.children = [];
-      //         sub.tag_disciplines.forEach(tag => {
-      //           const tabObj = Object.create(null);
-      //           tabObj.value = tag.id;
-      //           tabObj.label = tag.name;
-      //           subObj.children.push(tabObj);
-      //         });
-      //       }
-      //       obj.children.push(subObj);
-      //     })
-      //   }
-      //   tempArr.push(obj);
-      // });
-      console.log(tempArr);
+  
+      // 获取选中的下拉值
+      let choid_ids = [];
+      // let tempKnowledges = [];
+      tempArr.forEach(t => {
+        // debugger;
+        if (sub_id && t.children) {
+          t.children.forEach(c => {
+            if (c.value === sub_id) {
+              choid_ids = [t.value, c.value];
+              // tempKnowledges = c.children || [];
+            }
+          });
+        }
+      });
+      
+      console.log(choid_ids);
       return (
         <Cascader 
           options={tempArr}
           expandTrigger="hover"
-          onChange={this.handleChangeCategory}
+          value={choid_ids}
+          // onChange={this.handleChangeCategory}
+          onChange={this.handleChangeSubDisciplineId}
         />
       )
     }
@@ -342,6 +339,8 @@ class EditTab extends React.Component {
         _result.push(v.id);
       });
       console.log('下拉选择的值:===>>>', _result);
+      // 保存选择的知识点
+      this.props.saveTagDisciplineId(_result);
     }
     
     return (
@@ -361,9 +360,9 @@ class EditTab extends React.Component {
 
           <FormItem 
             className={`input_area flex_50 flex_50_right`}
-            label={<span>{myLabel(jcLabel['category'], '合理的课程分类有利于快速检索')}</span>}
-            validateStatus={ojFormValidate.category.validateStatus}
-            help={ojFormValidate.category.errMsg}
+            label={<span>{myLabel(jcLabel['sub_discipline_id'], '合理的课程分类有利于快速检索')}</span>}
+            validateStatus={ojFormValidate.sub_discipline_id.validateStatus}
+            help={ojFormValidate.sub_discipline_id.errMsg}
             colon={ false }
           >
             {/* <Select onChange={this.handleChangeCategory} value={`${ojForm.category}`}>
@@ -384,6 +383,7 @@ class EditTab extends React.Component {
           >
             <KnowLedge 
               options={knowledges}
+              values={tag_discipline_id}
               onChange={handleKnowledgeChange}
             />
           </FormItem>
@@ -480,7 +480,9 @@ const mapStateToProps = (state) => {
     openTestCodeIndex,
     testCasesValidate, 
     ojFormValidate,
-    courseQuestions
+    courseQuestions,
+    tag_discipline_id,
+    knowledges
   } = ojFormReducer;
   return {
     ojForm,
@@ -489,7 +491,9 @@ const mapStateToProps = (state) => {
     ojFormValidate,
     position,
     openTestCodeIndex,
-    courseQuestions
+    courseQuestions,
+    tag_discipline_id,
+    knowledges
   };
 };
 
@@ -502,12 +506,15 @@ const mapDispatchToProps = (dispatch) => ({
   validateOjTimeLimit: (value) => dispatch(actions.validateOjTimeLimit(value)),
   validateOjCategory: (value) => dispatch(actions.validateOjCategory(value)),
   validateOpenOrNot: (value) => dispatch(actions.validateOpenOrNot(value)),
+  validateOjSubDisciplineId: (value) => dispatch(actions.validateOjSubDisciplineId(value)),
+  saveTagDisciplineId: (value) => dispatch(actions.saveTagDisciplineId(value)),
   // 新增测试用例
   addTestCase: (value) => dispatch(actions.addTestCase(value)),
   // 删除测试用例
   deleteTestCase: (value) => dispatch(actions.deleteTestCase(value)),
+  saveKnowledge: (value) => dispatch(actions.saveKnowledge(value))
   // 获取题库
-  getQuestion: (params) => dispatch(actions.getQuestion(params))
+  // getQuestion: (params) => dispatch(actions.getQuestion(params))
 });
 
 export default connect(
diff --git a/public/react/src/redux/actions/actionTypes.js b/public/react/src/redux/actions/actionTypes.js
index e3ae7044b..867563ea7 100644
--- a/public/react/src/redux/actions/actionTypes.js
+++ b/public/react/src/redux/actions/actionTypes.js
@@ -18,7 +18,9 @@ const types = {
   VALIDATE_OJ_DIFFICULT: 'VALIDATE_OJ_DIFFICULT', // 难易度
   VALIDATE_OJ_TIMELIMIT: 'VALIDATE_OJ_TIMELIMIT', // 时间限制
   VALIDATE_OJ_CATEGORY: 'VALIDATE_OJ_CATEGORY', // 分类
+  VALIDATE_OJ_SUB_DISCIPLINE_ID: 'VALIDATE_OJ_SUB_DISCIPLINE_ID', // 方向
   VALIDATE_OJ_OPENORNOT: 'VALIDATE_OJ_OPENORNOT', // 公开程序
+  SAVE_TAG_DISCIPLINE_ID: 'SAVE_TAG_DISCIPLINE_ID', // 保存知识点
   SAVE_OJ_FORM: 'SAVE_OJ_FORM', // 保存表单
   ADD_TEST_CASE: 'ADD_TEST_CASE', // 添加测试用例
   DELETE_TEST_CASE: 'DELETE_TEST_CASE', // 删除测试用例
@@ -33,6 +35,7 @@ const types = {
   TEST_CASE_OUTPUT_CHANGE: 'TEST_CASE_OUTPUT_CHANGE', // 测试用例输出值改变时
   DEBUGGER_CODE: 'DEBUGGER_CODE', // 调试代码
   GET_COURSE_QUESTION: 'GET_COURSE_QUESTION', // 获取编辑题
+  CHANGE_KNOWLEDGES: 'CHANGE_KNOWLEDGES', // 保存所选择的知识点
   // study
   SAVE_USER_PROGRAM_ID: 'SAVE_USER_PROGRAM_ID',// 保存用户编程题id值
   USER_PROGRAM_DETAIL: 'USER_PROGRAM_DETAIL', // 用户编程题详情
diff --git a/public/react/src/redux/actions/index.js b/public/react/src/redux/actions/index.js
index 263e367df..99ab53f2f 100644
--- a/public/react/src/redux/actions/index.js
+++ b/public/react/src/redux/actions/index.js
@@ -25,6 +25,8 @@ import {
   validateOjTimeLimit,
   validateOjCategory,
   validateOpenOrNot,
+  validateOjSubDisciplineId,
+  saveTagDisciplineId,
   addTestCase,
   deleteTestCase,
   testCaseInputChange,
@@ -32,7 +34,8 @@ import {
   updateTestAndValidate,
   updateOpenTestCaseIndex,
   handleClickCancelPublish,
-  getQuestion
+  getQuestion,
+  saveKnowledge
 } from './ojForm';
 
 import {
@@ -110,8 +113,11 @@ export default {
   validateOjTimeLimit,
   validateOjCategory,
   validateOpenOrNot,
+  validateOjSubDisciplineId,
+  saveTagDisciplineId,
   handleClickCancelPublish,
   getQuestion,
+  saveKnowledge,
   // 
   addTestCase,
   deleteTestCase,
diff --git a/public/react/src/redux/actions/ojForm.js b/public/react/src/redux/actions/ojForm.js
index f639cdbcb..539798ff4 100644
--- a/public/react/src/redux/actions/ojForm.js
+++ b/public/react/src/redux/actions/ojForm.js
@@ -4,7 +4,7 @@
  * @Github: 
  * @Date: 2019-11-20 16:35:46
  * @LastEditors  : tangjiang
- * @LastEditTime : 2019-12-31 10:55:48
+ * @LastEditTime : 2020-01-02 17:38:12
  */
 import types from './actionTypes';
 import CONST from '../../constants';
@@ -46,6 +46,10 @@ const maps = {
     label: jcLabel['category'],
     type: types.VALIDATE_OJ_CATEGORY
   },
+  sub_discipline_id: {
+    label: jcLabel['sub_discipline_id'],
+    type: types.VALIDATE_OJ_SUB_DISCIPLINE_ID
+  },
   openOrNot: {
     label: jcLabel['openOrNot'],
     type: types.VALIDATE_OJ_OPENORNOT
@@ -111,17 +115,19 @@ export const validateOjForm = (props, type, cb) => {
     // 循环判断每个字段是否为空
     let hasSuccess = true;
     keys.forEach(key => {
-      const value = ojForm[key];
-      const validateResult = emptyValidate(key, value);
-      const errMsg = validateResult[key].errMsg;
-      if (errMsg) {
-        hasSuccess = false;
-        dispatch(
-          {
-            type: maps[key].type, 
-            payload: payloadInfo(key, value, errMsg, validateResult[key])
-          }
-        )
+      if (!['category'].includes(key)) {
+        const value = ojForm[key];
+        const validateResult = emptyValidate(key, value);
+        const errMsg = validateResult[key].errMsg;
+        if (errMsg) {
+          hasSuccess = false;
+          dispatch(
+            {
+              type: maps[key].type, 
+              payload: payloadInfo(key, value, errMsg, validateResult[key])
+            }
+          )
+        }
       }
     });
     // 验证测试用例中的数组是否都有对应的值
@@ -199,8 +205,8 @@ export const validateOjForm = (props, type, cb) => {
     if (hasSuccess) {
       // console.log('表单保存的数据为: ', getState());
       const {ojFormReducer} = getState();
-      const {code, score, ojForm, testCases = []} = ojFormReducer;
-      const {category, description, difficult, language, name, openOrNot, timeLimit} = ojForm;
+      const {code, score, ojForm, testCases = [], tag_discipline_id = []} = ojFormReducer;
+      const {category, description, difficult, language, name, openOrNot, timeLimit, sub_discipline_id} = ojForm;
       let paramsObj = {};
       const hack = { // 编程题干
         name,
@@ -209,6 +215,8 @@ export const validateOjForm = (props, type, cb) => {
         category,
         'open_or_not': openOrNot,
         'time_limit': timeLimit,
+        sub_discipline_id,
+        // tag_discipline_id,
         score
       };
 
@@ -225,7 +233,8 @@ export const validateOjForm = (props, type, cb) => {
         paramsObj['params'] = {
           hack,
           hack_sets: tempTc,
-          hack_codes
+          hack_codes,
+          tags: tag_discipline_id
         }
         paramsObj['submitType'] = 'add';
       } else { // 存在时调用更新接口
@@ -244,7 +253,8 @@ export const validateOjForm = (props, type, cb) => {
           hack,
           hack_sets,
           hack_codes,
-          update_hack_sets
+          update_hack_sets,
+          tags: tag_discipline_id
         }
         paramsObj['submitType'] = 'update';
         paramsObj['identifier'] = identifier;
@@ -485,6 +495,15 @@ export const validateOjCategory = (value) => {
     payload: payloadInfo('category', value, errMsg, validate)
   }
 };
+// 验证方向
+export const validateOjSubDisciplineId = (value) => {
+  const validate = emptyValidate('sub_discipline_id', value)['sub_discipline_id'];
+  const errMsg = validate.errMsg;
+  return {
+    type: types.VALIDATE_OJ_SUB_DISCIPLINE_ID,
+    payload: payloadInfo('sub_discipline_id', value, errMsg, validate)
+  }
+};
 // 验证公开程序
 export const validateOpenOrNot = (value) => {
   const validate = emptyValidate('openOrNot', value)['openOrNot'];
@@ -494,6 +513,14 @@ export const validateOpenOrNot = (value) => {
     payload: payloadInfo('openOrNot', value, errMsg, validate)
   }
 };
+// 保存知识点
+export const saveTagDisciplineId = (value) => {
+  // console.log('====????????????', value);
+  return {
+    type: types.SAVE_TAG_DISCIPLINE_ID,
+    payload: value
+  };
+}
 // 新增测试用例
 export const addTestCase = (obj) => {
   return {
@@ -624,7 +651,6 @@ export const testCaseOutputChange = (value, index) => {
 
 // // 调试代码时，更改对应的状态值
 // export const changeTestCodeStatus = () => {
-
 // 更新测试用命及验证
 export const updateTestAndValidate = (obj) => {
   return (dispatch) => {
@@ -649,14 +675,10 @@ export const updateOpenTestCaseIndex = (value) => {
 
 // 获取课程题库
 export const getQuestion = (params) => {
-  // return {
-  //   type: types.GET_COURSE_QUESTION,
-  // }
   return (dispatch) => {
     fetchQuestion(params).then(res => {
       const { data = {} } = res;
       const { disciplines = [] } = data;
-      console.log('获取课程题库成功: ', res);
       dispatch({
         type: types.GET_COURSE_QUESTION,
         payload: disciplines
@@ -664,3 +686,11 @@ export const getQuestion = (params) => {
     })
   }
 }
+
+// 保存所选择的知识点
+export const saveKnowledge = (values) => {
+  return {
+    type: types.CHANGE_KNOWLEDGES,
+    payload: values
+  }
+}
diff --git a/public/react/src/redux/reducers/ojFormReducer.js b/public/react/src/redux/reducers/ojFormReducer.js
index 5beba6653..d604a6156 100644
--- a/public/react/src/redux/reducers/ojFormReducer.js
+++ b/public/react/src/redux/reducers/ojFormReducer.js
@@ -4,7 +4,7 @@
  * @Github: 
  * @Date: 2019-11-20 16:40:32
  * @LastEditors  : tangjiang
- * @LastEditTime : 2019-12-30 09:55:37
+ * @LastEditTime : 2020-01-02 17:36:40
  */
 import { Base64 } from 'js-base64';
 import types from '../actions/actionTypes';
@@ -15,10 +15,12 @@ const init = {
     language: '',
     description: '',
     difficult: '',
-    category: '',
+    sub_discipline_id: '', // 方向 
+    // category: '',
     // openOrNot: 1,
     timeLimit: 3
   },
+  tag_discipline_id: [], // 知识点
   ojFormValidate: {
     name: {
       validateStatus: '',
@@ -36,14 +38,18 @@ const init = {
       validateStatus: '',
       errMsg: ''
     },
-    category: {
-      validateStatus: '',
-      errMsg: ''
-    },
+    // category: {
+    //   validateStatus: '',
+    //   errMsg: ''
+    // },
     // openOrNot: {
     //   validateStatus: '',
     //   errMsg: ''
     // },
+    sub_discipline_id: {
+      validateStatus: '',
+      errMsg: ''
+    },
     timeLimit: {
       validateStatus: '',
       errMsg: ''
@@ -68,6 +74,7 @@ const init = {
   openTestCodeIndex: [0], // 展开的测试用例: 数组， 当出错时，展开所有出错的测试用例， 默认展开第一个
   isPublish: 0, // 是否是发布状态: 0 未发布 1 已发布
   courseQuestions: [], // 课程题库
+  knowledges: [], // 知识点下拉值
 }
 
 const tcValidateObj = {
@@ -128,10 +135,17 @@ const ojFormReducer = (state = initialState, action) => {
       return returnState(state, ojForm, ojFormValidate);
     case types.VALIDATE_OJ_CATEGORY:
       return returnState(state, ojForm, ojFormValidate);
+    case types.VALIDATE_OJ_SUB_DISCIPLINE_ID:
+      return returnState(state, ojForm, ojFormValidate);
     case types.VALIDATE_OJ_OPENORNOT:
       return returnState(state, ojForm, ojFormValidate);
     case types.VALIDATE_OJ_TIMELIMIT:
       return returnState(state, ojForm, ojFormValidate);
+    case types.SAVE_TAG_DISCIPLINE_ID:
+      return {
+        ...state,
+        tag_discipline_id: action.payload
+      }
     case types.ADD_TEST_CASE:
       const { testCase, tcValidate } = action.payload;
       const tcArrs = state.testCases.concat([testCase]);
@@ -175,7 +189,8 @@ const ojFormReducer = (state = initialState, action) => {
        * 6. 更改测试用例状态
        * 7. 添加测试用例验证
        */
-      const { code = '', description, language, name, hack_sets = [], time_limit, difficult, category, status } = action.payload;
+      const { code = '', description, language, name, hack_sets = [], time_limit, difficult, category, status, sub_discipline_id, tag_discipline_id } = action.payload;
+      const { courseQuestions } = state;
       let desc = null;
       try {
         desc = JSON.parse(description)
@@ -189,7 +204,8 @@ const ojFormReducer = (state = initialState, action) => {
         difficult,
         category,
         openOrNot: 1,
-        timeLimit: time_limit
+        timeLimit: time_limit,
+        sub_discipline_id
       };
       // state.code = code; // 保存代码块值
       let curPosition = 0;
@@ -209,6 +225,18 @@ const ojFormReducer = (state = initialState, action) => {
       } else if (Array.isArray(code)) {
         cbcode = Base64.decode(code[code.length - 1]);
       }
+
+      // console.log('++++>>>>>>>>>>>>>', courseQuestions);
+      let temp_knowledges = [];
+      courseQuestions.forEach(c => {
+        if (sub_discipline_id && c.sub_disciplines) {
+          c.sub_disciplines.forEach(sub => {
+            if (+sub.id === sub_discipline_id) {
+              temp_knowledges = sub.tag_disciplines || [];
+            }
+          });
+        }
+      });
       // state.position = curPosition; // 计算下一个测试用例的位置值
       return {
         ...state,
@@ -219,7 +247,9 @@ const ojFormReducer = (state = initialState, action) => {
         testCasesValidate: curTcValidates,
         testCodeStatus: hack_sets.length > 0 ? 'userCase' : 'default',
         isPublish: status,
-        showCode: cbcode
+        showCode: cbcode,
+        tag_discipline_id,
+        knowledges: temp_knowledges
       }
     case types.CHANGE_PUBLISH_VALUE:
       return {
@@ -302,7 +332,7 @@ const ojFormReducer = (state = initialState, action) => {
       if (tIndex === -1) {
         tempArr.push(action.payload);
       }
-      console.log(tempArr);
+      // console.log(tempArr);
       return {
         ...state,
         openTestCodeIndex: tempArr
@@ -312,6 +342,12 @@ const ojFormReducer = (state = initialState, action) => {
         ...state,
         courseQuestions: action.payload
       }
+    case types.CHANGE_KNOWLEDGES: {
+      return {
+        ...state,
+        knowledges: action.payload
+      }
+    }
     default:
       return state;
   }

From a06b169973d6d704a483e0d5b9ee5076a841ace5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 3 Jan 2020 09:21:37 +0800
Subject: [PATCH 17/21] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/courses/Resource/Fileslistitem.js    | 12 ++++++------
 .../courses/shixunHomework/Trainingjobsetting.js     |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/public/react/src/modules/courses/Resource/Fileslistitem.js b/public/react/src/modules/courses/Resource/Fileslistitem.js
index 99888e558..e7e31baab 100644
--- a/public/react/src/modules/courses/Resource/Fileslistitem.js
+++ b/public/react/src/modules/courses/Resource/Fileslistitem.js
@@ -253,22 +253,22 @@ class Fileslistitem extends Component{
 											{discussMessage.is_publish===false?<CoursesListType typelist={["未发布"]} typesylename={""}/>:""}
 
 											{this.props.isAdmin?
-												<span className={"fr mr10 mt2"} onClick={(event)=>this.eventStop(event)}>
-                      <WordsBtn style="blue" className="colorblue font-16 mr20 fr">
+												<span className={"fr mt2"} onClick={(event)=>this.eventStop(event)}>
+                      <WordsBtn style="blue" className="colorblue font-16 ml20 fr">
                           <a className="btn colorblue fontweight400"
 														 onClick={()=>this.settingList()}>设置</a>
                         </WordsBtn>
                       </span>:""}
 
 											{this.props.isStudent===true&&this.props.current_user.login===discussMessage.author.login?
-												<span className={"fr mr10 mt2"} onClick={(event)=>this.eventStop(event)}>
+												<span className={"fr mt2"} onClick={(event)=>this.eventStop(event)}>
 
-                      <WordsBtn style="blue" className="colorblue font-16 mr20 fr">
+                      <WordsBtn style="blue" className="colorblue font-16 ml20  fr">
                         <a className="btn colorblue fontweight400"
 													 onClick={()=>this.settingList()}>设置</a>
                       </WordsBtn>
 
-										  <WordsBtn style="blue" className="colorblue font-16 mr20 fr">
+										  <WordsBtn style="blue" className="colorblue font-16 ml20 fr">
                         <a className="btn colorblue fontweight400"
 													 onClick={()=>this.onDelete(discussMessage.id)}>删除</a>
                       </WordsBtn>
@@ -329,7 +329,7 @@ class Fileslistitem extends Component{
                            { discussMessage.publish_time===null?"":discussMessage.is_publish===true?moment(discussMessage.publish_time).fromNow():moment(discussMessage.publish_time).format('YYYY-MM-DD HH:mm')}
                         </span>
                       </span>
-											{discussMessage&&discussMessage.category_name===null?"":this.props.child===false?<div className="color-grey9 task-hide fr mr60" title={discussMessage&&discussMessage.category_name}
+											{discussMessage&&discussMessage.category_name===null?"":this.props.child===false?<div className="color-grey9 task-hide fr mr30" title={discussMessage&&discussMessage.category_name}
 													 style={{"max-width":"268px"}}>所属目录：{discussMessage&&discussMessage.category_name}
 											</div>:""}
 										</p>
diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
index d15e8eaab..58de030d3 100644
--- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
+++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
@@ -2678,7 +2678,7 @@ class Trainingjobsetting extends Component {
 																	onChange={this.onChangeeffectiveness}
 																	checked={this.state.work_efficiencys} style={{color: "#666666"}}>效率分<span
 													className={"font-14 color-grey-c font-16 ml15"}
-													style={{textAlign: "left"}}>(选中，则学生最终成绩包含效率分)</span>
+													style={{textAlign: "left"}}>(选中，则学生最终成绩包含效率分。效率分在作业截止或者补交结束后由系统自动生成)</span>
 												</Checkbox>
 												<div>
 

From 8d04fa0c7a6b2fe0c3b95f806fffdc7f7dcdf051 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 3 Jan 2020 09:43:36 +0800
Subject: [PATCH 18/21] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../courses/shixunHomework/ShixunWorkReport.js   | 16 ++++++++--------
 .../shixunreport/ConclusionEvaluation.js         |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
index 90e6e6a4f..26f32eebd 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
@@ -370,11 +370,11 @@ class ShixunWorkReport extends Component {
 						{this.props.isAdmin() ?<a
 							className=" color-blue font-14 fr  ml20 mt15"
 							onClick={()=>this.confirmysl(`/student_works/${homeworkid}/export_shixun_work_report.pdf`)}
-						> <Spin size="small" spinning={this.state.isspinning}>导出实训报告数据</Spin></a>:
+						> <Spin size="small" spinning={this.state.isspinning}>导出实训报告</Spin></a>:
 							parseInt(this.props&&this.props.user.user_id)===parseInt(data&&data.user_id)?<a
 								className=" color-blue font-14 fr  ml20 mt15"
 								onClick={()=>this.confirmysl(`/student_works/${homeworkid}/export_shixun_work_report.pdf`)}
-							> <Spin size="small" spinning={this.state.isspinning}>导出实训报告数据</Spin></a>:""
+							> <Spin size="small" spinning={this.state.isspinning}>导出实训报告</Spin></a>:""
 						}
 						{/*{this.props.isAdmin() ?work_comment_hidden===true? "":<a*/}
 							{/*className=" color-blue font-14 fr  ml20 mt15"*/}
@@ -467,20 +467,20 @@ class ShixunWorkReport extends Component {
 									<div className={"fl edu-back-white ml39 "}>
 										   <p className={"back_font"}>{data&&data.username}</p>
 
-										   <p className={"mb16"}>
-												 <span className={"passbox"}>
-													  <div className={"passfont"}><span className={"color999"}>通过关卡：</span>  <span className={"colorCF3B3B"}>{data&&data.complete_count}/{data&&data.challenges_count}</span></div>
+										   <p className={"mb16 mt20"}>
+												 <span className={"passbox "}>
+													  <div className={"passfont mb10"}><span className={"color999"}>当前完成关卡：</span>  <span className={"colorCF3B3B"}>{data&&data.complete_count}/{data&&data.challenges_count}</span></div>
 												    <div className={"passfontbom"}><span className={"color999"}>经验值：</span>  <span  className={"color333"}>{data&&data.myself_experience}/{data&&data.total_experience}</span></div>
 												 </span>
 
 												 <span className={"passbox"}>
-												  	<div className={"passfontmid"}><span className={"color999"}>课堂最高完成效率：</span>  <span className={data&&data.max_efficiency===null?"color999":"color333"}>{data&&data.max_efficiency===null?'--':data&&data.max_efficiency}</span></div>
 													  <div className={"passfontbommid"}><span className={"color999"}>完成效率：</span> <span  className={data&&data.efficiency===null?"color999":"color333"}>{data&&data.efficiency===null?'--':data&&data.efficiency}</span></div>
+												  	<div className={"passfontmid mb10"}><span className={"color999"}>课堂最高完成效率：</span>  <span className={data&&data.max_efficiency===null?"color999":"color333"}>{data&&data.max_efficiency===null?'--':data&&data.max_efficiency}</span></div>
 												 </span>
 
 												 <span className={"passbox"}>
-												   	<div><span className={"color999"}>通关时间：</span>  <span className={data&&data.passed_time===null?"color999":"color333"}>{data&&data.passed_time===null||data&&data.passed_time=== "--"?'--':moment(data&&data.passed_time).format('YYYY-MM-DD HH:mm')}</span></div>
-												    <div><span className={"color999"}>实战耗时：</span> <span className={data&&data.efficiency===null?"color999":"color333"}>{data&&data.time_consuming===null?'--':data&&data.time_consuming}</span></div>
+												   	<div className={"mb10"}><span className={"color999"}>通关时间：</span>  <span className={data&&data.passed_time===null?"color999":"color333"}>{data&&data.passed_time===null||data&&data.passed_time=== "--"?'--':moment(data&&data.passed_time).format('YYYY-MM-DD HH:mm')}</span></div>
+												    {/*<div><span className={"color999"}>实战耗时：</span> <span className={data&&data.efficiency===null?"color999":"color333"}>{data&&data.time_consuming===null?'--':data&&data.time_consuming}</span></div>*/}
 												 </span>
 									   	 </p>
 
diff --git a/public/react/src/modules/courses/shixunHomework/shixunreport/ConclusionEvaluation.js b/public/react/src/modules/courses/shixunHomework/shixunreport/ConclusionEvaluation.js
index 8d678f335..aa2da8594 100644
--- a/public/react/src/modules/courses/shixunHomework/shixunreport/ConclusionEvaluation.js
+++ b/public/react/src/modules/courses/shixunHomework/shixunreport/ConclusionEvaluation.js
@@ -66,7 +66,7 @@ class ConclusionEvaluation extends Component {
 				</span>
 				),
 			},{
-			title: '最终成绩',
+			title: '当前成绩',
 			dataIndex: 'grade',
 			key: 'grade',
 			render: (text, record) => (
@@ -81,7 +81,7 @@ class ConclusionEvaluation extends Component {
 				</span>
 			),
 		}, {
-			title: '实战耗时',
+			title: '实战总耗时',
 			key: 'elapsed',
 			dataIndex: 'elapsed',
 

From b52b1a612dfb94c6f5caa2be43e9062a66641160 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 3 Jan 2020 09:47:25 +0800
Subject: [PATCH 19/21] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/courses/shixunHomework/ShixunWorkReport.js    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
index 26f32eebd..22337d7da 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
@@ -465,17 +465,17 @@ class ShixunWorkReport extends Component {
 									</div>
 
 									<div className={"fl edu-back-white ml39 "}>
-										   <p className={"back_font"}>{data&&data.username}</p>
+										   <p className={"back_font mt10"}>{data&&data.username}</p>
 
-										   <p className={"mb16 mt20"}>
+										   <p className={"mb16 mt10"}>
 												 <span className={"passbox "}>
 													  <div className={"passfont mb10"}><span className={"color999"}>当前完成关卡：</span>  <span className={"colorCF3B3B"}>{data&&data.complete_count}/{data&&data.challenges_count}</span></div>
 												    <div className={"passfontbom"}><span className={"color999"}>经验值：</span>  <span  className={"color333"}>{data&&data.myself_experience}/{data&&data.total_experience}</span></div>
 												 </span>
 
 												 <span className={"passbox"}>
-													  <div className={"passfontbommid"}><span className={"color999"}>完成效率：</span> <span  className={data&&data.efficiency===null?"color999":"color333"}>{data&&data.efficiency===null?'--':data&&data.efficiency}</span></div>
-												  	<div className={"passfontmid mb10"}><span className={"color999"}>课堂最高完成效率：</span>  <span className={data&&data.max_efficiency===null?"color999":"color333"}>{data&&data.max_efficiency===null?'--':data&&data.max_efficiency}</span></div>
+													  <div className={"passfontbommid mb10"}><span className={"color999"}>完成效率：</span> <span  className={data&&data.efficiency===null?"color999":"color333"}>{data&&data.efficiency===null?'--':data&&data.efficiency}</span></div>
+												  	<div className={"passfontmid "}><span className={"color999"}>课堂最高完成效率：</span>  <span className={data&&data.max_efficiency===null?"color999":"color333"}>{data&&data.max_efficiency===null?'--':data&&data.max_efficiency}</span></div>
 												 </span>
 
 												 <span className={"passbox"}>

From ec3ab4d6dba56f6d1d64ce4d8effe57e474677f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 3 Jan 2020 09:49:42 +0800
Subject: [PATCH 20/21] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/courses/shixunHomework/ShixunWorkReport.js  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
index 22337d7da..3765b2932 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
@@ -469,17 +469,17 @@ class ShixunWorkReport extends Component {
 
 										   <p className={"mb16 mt10"}>
 												 <span className={"passbox "}>
-													  <div className={"passfont mb10"}><span className={"color999"}>当前完成关卡：</span>  <span className={"colorCF3B3B"}>{data&&data.complete_count}/{data&&data.challenges_count}</span></div>
+													  <div className={"passfont mb5"}><span className={"color999"}>当前完成关卡：</span>  <span className={"colorCF3B3B"}>{data&&data.complete_count}/{data&&data.challenges_count}</span></div>
 												    <div className={"passfontbom"}><span className={"color999"}>经验值：</span>  <span  className={"color333"}>{data&&data.myself_experience}/{data&&data.total_experience}</span></div>
 												 </span>
 
 												 <span className={"passbox"}>
-													  <div className={"passfontbommid mb10"}><span className={"color999"}>完成效率：</span> <span  className={data&&data.efficiency===null?"color999":"color333"}>{data&&data.efficiency===null?'--':data&&data.efficiency}</span></div>
+													  <div className={"passfontbommid mb5"}><span className={"color999"}>完成效率：</span> <span  className={data&&data.efficiency===null?"color999":"color333"}>{data&&data.efficiency===null?'--':data&&data.efficiency}</span></div>
 												  	<div className={"passfontmid "}><span className={"color999"}>课堂最高完成效率：</span>  <span className={data&&data.max_efficiency===null?"color999":"color333"}>{data&&data.max_efficiency===null?'--':data&&data.max_efficiency}</span></div>
 												 </span>
 
 												 <span className={"passbox"}>
-												   	<div className={"mb10"}><span className={"color999"}>通关时间：</span>  <span className={data&&data.passed_time===null?"color999":"color333"}>{data&&data.passed_time===null||data&&data.passed_time=== "--"?'--':moment(data&&data.passed_time).format('YYYY-MM-DD HH:mm')}</span></div>
+												   	<div><span className={"color999"}>通关时间：</span>  <span className={data&&data.passed_time===null?"color999":"color333"}>{data&&data.passed_time===null||data&&data.passed_time=== "--"?'--':moment(data&&data.passed_time).format('YYYY-MM-DD HH:mm')}</span></div>
 												    {/*<div><span className={"color999"}>实战耗时：</span> <span className={data&&data.efficiency===null?"color999":"color333"}>{data&&data.time_consuming===null?'--':data&&data.time_consuming}</span></div>*/}
 												 </span>
 									   	 </p>

From f41321ba1838729cc662867b812211c4e65e479d Mon Sep 17 00:00:00 2001
From: tangjiang <465264938@qq.com>
Date: Fri, 3 Jan 2020 09:51:23 +0800
Subject: [PATCH 21/21] add course

---
 public/react/src/AppConfig.js                 |  2 +-
 .../developer/components/knowledge/index.js   | 19 +++++++++++++++----
 .../newOrEditTask/leftpane/editorTab/index.js |  7 ++++---
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js
index db6de7f47..94abb3740 100644
--- a/public/react/src/AppConfig.js
+++ b/public/react/src/AppConfig.js
@@ -83,7 +83,7 @@ export function initAxiosInterceptors(props) {
 			//proxy="http://47.96.87.25:48080"
 			proxy="https://pre-newweb.educoder.net"
       proxy="https://test-newweb.educoder.net"
-    //   proxy="https://test-jupyterweb.educoder.net"
+      proxy="https://test-jupyterweb.educoder.net"
 	     //proxy="http://192.168.2.63:3001"
 
     // 在这里使用requestMap控制，避免用户通过双击等操作发出重复的请求；
diff --git a/public/react/src/modules/developer/components/knowledge/index.js b/public/react/src/modules/developer/components/knowledge/index.js
index 6bbc1efd0..b287a42c9 100644
--- a/public/react/src/modules/developer/components/knowledge/index.js
+++ b/public/react/src/modules/developer/components/knowledge/index.js
@@ -4,7 +4,7 @@
  * @Github: 
  * @Date: 2019-12-30 13:51:19
  * @LastEditors  : tangjiang
- * @LastEditTime : 2020-01-02 17:00:10
+ * @LastEditTime : 2020-01-03 09:32:24
  */
 import './index.scss';
 import React, { useState, useEffect } from 'react';
@@ -21,13 +21,23 @@ function KnowLedge (props) {
   } = props;
 
   useEffect(() => {
-    setSelectOptions(options || []);
+    const _options = [];
+    const _selects = [];
+    options.forEach(opt => {
+      if (!values.includes(opt.id)) {
+        _options.push(opt);
+      } else {
+        _selects.push(opt);
+      }
+    });
+    setSelectOptions(_options || []);
+    setSelectValue(_selects || []);
   }, [props]);
 
   // 显示的下拉项
   const [selectOptions, setSelectOptions] = useState(options);
   // 已选择的下拉项
-  const [selectValue, setSelectValue] = useState(values);
+  const [selectValue, setSelectValue] = useState([]);
   //
   const [value] = useState([]);
 
@@ -87,8 +97,9 @@ function KnowLedge (props) {
     ));
   }
   // 渲染下拉列表
-  const renderSelect = (options) => {
+  const renderSelect = (options = []) => {
     // console.log('+++++', options);
+    // setSelectValue(_selects);
     return (
       <Select
         value={value}
diff --git a/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js b/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js
index 578f4a94e..9c98e4b01 100644
--- a/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js
+++ b/public/react/src/modules/developer/newOrEditTask/leftpane/editorTab/index.js
@@ -4,7 +4,7 @@
  * @Github: 
  * @Date: 2019-11-20 10:35:40
  * @LastEditors  : tangjiang
- * @LastEditTime : 2020-01-02 17:42:04
+ * @LastEditTime : 2020-01-03 09:20:12
  */
 import './index.scss';
 // import 'katex/dist/katex.css';
@@ -146,7 +146,8 @@ class EditTab extends React.Component {
       if (value[0] && item.id === value[0]) {
         item.sub_disciplines && item.sub_disciplines.forEach(c => {
           if (value[1] && c.id === value[1]) {
-            saveKnowledge(...c.tag_disciplines)
+            saveKnowledge(c.tag_disciplines)
+            console.log(c.tag_disciplines);
           } else if (!value[1]) {
             saveKnowledge([]);
           }
@@ -178,7 +179,7 @@ class EditTab extends React.Component {
       tag_discipline_id,
       knowledges
     } = this.props;
-    console.log('+++++++++', knowledges);
+    console.log('knowledge======>>>>>>', knowledges);
     // const {knowledges} = this.state;
     // 表单label
     const myLabel = (name, subTitle, nostar) => {