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

public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js

@@ -1,6 +1,6 @@
 import React,{ Component } from "react";
 import CoursesListType from '../coursesPublic/CoursesListType';
-import { WordsBtn, getTaskUrlById } from 'educoder';
+import { WordsBtn, getTaskUrlById , ConditionToolTip } from 'educoder';
 import {Tooltip,message,Modal} from 'antd';
 import {Link} from 'react-router-dom';
 import axios from 'axios';
@@ -358,9 +358,14 @@ class ShixunhomeWorkItem extends Component{
                    <span className="mr15 color-grey9">{discussMessage.status_time}</span>
                 }
                 {
-                  discussMessage.upper_category_name && <span className="mr15 color-grey9 task-hide" style={{"maxWidth":"280px"}}>{discussMessage.upper_category_name}</span>
+                  discussMessage && discussMessage.upper_category_name &&
+                  <ConditionToolTip title={discussMessage.upper_category_name} condition={ discussMessage.upper_category_name.title.length > 22 }>
+                    { <span className="mr15 color-grey9 task-hide" style={{"maxWidth":"272px"}}>{discussMessage.upper_category_name}</span>}
+                  </ConditionToolTip>
                 }
                 
+                
+                
 
                 {/* { discussMessage.replies_count != 0 && <span className="mr15 color-grey9">{discussMessage.replies_count} 回复</span> }
                 { discussMessage.praise_num != 0 && <span className="mr15 color-grey9">{discussMessage.praise_num} 点赞</span> }

public/react/src/modules/user/usersInfo/InfosCourse.js

@@ -120,11 +120,12 @@ class InfosCourse extends Component{
             <li className={status=="end" ? "active" : ""}><a href="javascript:void(0)" onClick={()=>this.changeStatus("end")}>已结束</a></li>
           </div>
         }
-        <p className="pl25 pr25 clearfix font-12 mb20 mt20">
+        <p className="pl25 pr25 clearfix font-12 mb20 mt20"> 
           <span className="fl color-grey-9">共参与{totalCount}个{category?category=="manage"?"发布":"学习":"课堂"}</span>
           <span className="fr color-grey-9">时间最新</span>
         </p>
         <div className="square-list clearfix">
+          {/* 289 */}
           {
             page == 1 && is_current && !category &&
 						this.props.current_user && this.props.current_user.user_identity != "学生" ? <Create href={"/courses/new"} name={"新建课堂"} index="1"></Create> : ""
@@ -135,7 +136,7 @@ class InfosCourse extends Component{
           {
             data && data.courses && data.courses.map((item,key)=>{
               return(
-                <div className="square-Item" onClick={()=>this.turnToCourses(`${item.first_category_url}`,item.can_visited)} style={{"cursor": "pointer"}}>
+                <div className="square-Item" onClick={()=>this.turnToCourses(`${item.first_category_url}`,item.can_visited)} style={{"cursor": "pointer",height:"289px"}}>
                   {
                     item.is_public == 1 && 
                     <React.Fragment>

public/react/src/modules/user/usersInfo/InfosPath.js

@@ -147,6 +147,7 @@ class InfosPath extends Component{
           <span className="fr color-grey-9">时间最新</span>
         </div>
         <div className="square-list clearfix">
+          {/* 295 */}
           {
             page == 1 && is_current && !category &&
 						this.props.current_user && this.props.current_user.user_identity != "学生" ? <Create href={"/paths/new"} name={"新建实践课程"} index="3"></Create>:""

public/react/src/modules/user/usersInfo/InfosProject.js

@@ -120,6 +120,7 @@ class InfosProject extends Component{
           <span className="fr color-grey-9">时间最新</span>
         </p>
         <div className="square-list clearfix">
+          {/* 289 */}
           {
             page == 1 && is_current && this.props.current_user && !category && this.props.current_user.user_identity != "学生" ? 
             <Create href={`${this.props.Headertop && this.props.Headertop.old_url}/projects/new`} name={"新建开发项目"} index="4"></Create>:""
@@ -130,7 +131,7 @@ class InfosProject extends Component{
           {
             data && data.projects && data.projects.map((item,key)=>{
               return(
-                <div className="square-Item" onClick={()=>this.turnToCourses(`/projects/${item.id}`,item.can_visited)} style={{"cursor": "pointer"}}>
+                <div className="square-Item" onClick={()=>this.turnToCourses(`/projects/${item.id}`,item.can_visited)} style={{"cursor": "pointer","height":"289px"}}>
                   {
                     item.is_public==1 &&
                     <React.Fragment>

public/react/src/modules/user/usersInfo/InfosShixun.js

@@ -153,6 +153,7 @@ class InfosShixun extends Component{
           </div>
         </div>
         <div className="square-list clearfix">
+          {/* 298 */}
           {
             page == 1 && is_current && !category && this.props.current_user && this.props.current_user.user_identity != "学生" ? 
             <Create href={"/shixuns/new"} name={"新建实训"} index="2"></Create>:""
@@ -163,7 +164,7 @@ class InfosShixun extends Component{
           {
             data && data.shixuns && data.shixuns.map((item,key)=>{
               return(
-                <div className="square-Item" onClick={()=>this.turnToCourses(`/shixuns/${item.identifier}/challenges`)}>
+                <div className="square-Item" style={{"height":"298px"}} onClick={()=>this.turnToCourses(`/shixuns/${item.identifier}/challenges`)}>
                   {
                     item.tag && <div className="tag-green"><span className="tag-name">{item.tag}</span><img className="fl" src={setImagesUrl("images/educoder/tag2.png")}/></div>
                   }

public/react/src/modules/user/usersInfo/publicCreatNew.js

@@ -17,7 +17,7 @@ class publicCreateNew extends Component{
   render() {
     let {href,name,index}=this.props;
     return (
-      <div className="square-Item" style={{"height":`${index=="2"?"298":index=="3"?"295":"289"}px`}}>
+      <div className="square-Item" style={{"height":`${index=="1"?"289":index=="2"?"298":index=="3"?"295":"289"}px`}}>
         <div className="substance substancepad">
           <a href={`${href}`}>
             <div className="substancenenew">

public/react/src/modules/user/usersInfo/usersInfo.css

@@ -227,6 +227,9 @@
   left:0px;
   background: #4CACFF;
 }
+.square-Item{
+  height: 295px;
+}
 
 /* 题库相关 */
 .breadcrumb{