Merge pull request 'issue' (#480) from durian/forgeplus-react:gitlink_server into gitlink_server

public/js/editormd/editormd.min.js

@@ -560,7 +560,6 @@
 
                     // 此处影响公式加载
                     editormd.loadScript(loadPath + "marked.min", function () {
-
                         editormd.$marked = marked;
 
                         if (settings.previewCodeHighlight) {

src/forge/AboutUs/AboutUs.jsx

@@ -35,7 +35,7 @@ function AboutUs(){
     //添加浏览器滚动监听事件
     window.addEventListener('scroll', scrollListener);
     //请求topics.json接口获取合作单位信息
-    axios.get(`/topics.json`, { params: { topic_type: "cooperator", limit: 20, group_size: 5}}).then(response=>{
+    axios.get(`/topics.json`, { params: { topic_type: "cooperator", limit: 30, group_size: 5}}).then(response=>{
       response && setUnits(response.data.topics);
     });
     return ()=>window.removeEventListener('scroll', scrollListener);
@@ -265,7 +265,7 @@ function AboutUs(){
                 <tr>
                   {group.map(item =>{
                     return(
-                      <td><a href={item.url} target="_blank"><img src={getImageUrl(item.image)}></img></a></td>
+                      <td><a href={item.url} target="_blank"><img src={getImageUrl(item.image)} className='unitImg' alt='合作单位'></img></a></td>
                     )
                   })}
                 </tr>

src/forge/AboutUs/AboutUs.scss

@@ -329,6 +329,10 @@
       border: 2px solid #FFFFFF;
       &:hover{ border: 1px solid #466AFF;}
     }
+    .unitImg{
+      max-width: 90%;
+      max-height: 100%;
+    }
   }
 }
 .au_cont{

src/forge/Main/CoderDepotReadme.jsx

@@ -66,7 +66,7 @@ function CoderDepotReadme({ operate , history , readme , ChangeFile }){
       {
         content && 
         <div className="commonBox-info">
-          <RenderHtml className="break_word_comments imageLayerParent" value={content} url={history.location}/>
+          <RenderHtml className="break_word_comments imageLayerParent readmeFile" value={content} url={history.location}/>
         </div>
       }
     </div>

src/forge/Main/Index.scss

@@ -522,6 +522,6 @@
   }
 }
 
-
-
-
+.readmeFile p{
+  white-space: normal;
+}

src/forge/Team/List.jsx

@@ -106,7 +106,7 @@ function List(props){
           {
             totalCount > limit &&
             <div className="mb20 mt20" style={{textAlign:"center"}}>
-              <Pagination simple current={page} total={totalCount} onChange={(page)=>setPage(page)}/>
+              <Pagination simple current={page} total={totalCount} pageSize={limit} onChange={(page)=>setPage(page)}/>
             </div>
           }
         </div>

src/modules/tpm/challengesnew/tpm-md-editor.js

@@ -289,8 +289,6 @@ export default ({ mdID, onChange, onCMBeforeChange, onCMBlur, error = false, cla
         setEditorInstance(this)
       }
     })
-    console.log('editor_instance');
-    console.log(editor_instance);
 
   }, [containerId, editorInstance, startInit])