merge aliyun

app/controllers/discusses_controller.rb

@@ -15,7 +15,7 @@ class DiscussesController < ApplicationController
       disscusses = Discuss.where(:dis_id => @container.id, :dis_type => @container.class.to_s,
                                              :root_id => nil)
       @discusses = disscusses.joins("left join games on discusses.challenge_id = games.challenge_id and discusses.user_id = games.user_id")
-                       .select("discusses.*, games.identifier").includes(:user, :praise_treads)
+                       .select("discusses.*, games.identifier").includes(:user, :praise_treads).limit(LIMIT).offset(offset)
     else
       disscusses = Discuss.where("dis_id = :dis_id and dis_type = :dis_type and root_id is null and
                                       (discusses.hidden = :hidden or discusses.user_id = :user_id)",

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-03 09:32:24
+ * @LastEditTime : 2020-01-03 18:56:36
  */
 import './index.scss';
 import React, { useState, useEffect } from 'react';
@@ -49,7 +49,8 @@ function KnowLedge (props) {
   }
   // 过滤下拉列表项
   const handleSelectChange = (value) => {
-    value = +value.join('');
+    // value = +value.join('');
+    value = +value;
     const tempArr = [...selectValue];
     const _result = selectOptions.filter(item => {
       if (item.id === value && tempArr.findIndex(t => t.id === value) === -1) {
@@ -103,7 +104,7 @@ function KnowLedge (props) {
     return (
       <Select
         value={value}
-        mode="tags"
+        // mode="tags"
         placeholder="请选择"
         style={{ width: '100%' }}
         onChange={handleSelectChange}

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

@@ -4,7 +4,11 @@
  * @Github: 
  * @Date: 2019-11-20 10:35:40
  * @LastEditors  : tangjiang
+<<<<<<< HEAD
  * @LastEditTime : 2020-01-03 17:35:45
+=======
+ * @LastEditTime : 2020-01-03 19:02:17
+>>>>>>> dev_aliyun
  */
 import './index.scss';
 // import 'katex/dist/katex.css';