Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

public/react/src/modules/paths/PathDetail/Modifytext.js

@@ -54,6 +54,12 @@ class Modifytext extends Component {
 
 	}
 
+	//取消
+	hideUpdating = () => {
+		this.props.modifysy(3);
+
+	}
+
 
 	render() {
 		const {getFieldDecorator} = this.props.form;
@@ -96,7 +102,7 @@ class Modifytext extends Component {
             
             }
             .settingFormsy input {
-              width: 275px;
+              width: 200px;
                   height: 32px;
             }
             .settingFormsy input.validateInput  {
@@ -147,9 +153,18 @@ class Modifytext extends Component {
 									</Form.Item>
 									<div className="flexdirections yslzxueshi ml38 ">
 										<p className="fontcolorsyslhui1 font-14  myysllineheight myyslminwidth"></p>
-										<div className=" flexdirections ml10">
+										<div className=" flexdirections ml10" style={{
-											{/*<div  className="buttongo mycompitcursor" onClick={()=>this.yhBanksfalse()}><p className="fontwenzi mycompitcursor" >取消</p></div>*/}
+											display: "flex",
-											<Button type="primary" onClick={() => this.Modifytext()}>确定</Button>
+											flexDirection: "initial",
+											marginTop: "24px",
+										}}>
+											<Button style={{
+												background: "#CDCDCD !important",
+												border: "0.5px solid #CDCDCD"
+											}} type="primary grayBtn " onClick={() => this.hideUpdating()}>取消</Button>
+											<Button style={{
+												marginLeft: "10px",
+											}} type="primary" onClick={() => this.Modifytext()}>确定</Button>
 										</div>
 									</div>
 								</div>

public/react/src/modules/paths/PathDetail/PathDetailIndex.js

@@ -3,7 +3,7 @@ import {getImageUrl,markdownToHTML, configShareForCustom} from 'educoder';
 import DetailTop from './DetailTop.js';
 import DetailCards from './DetailCards.js'
 import AddCollaborators from "./addCollaborators.js";
-import {Icon,Tooltip} from 'antd';
+import {Icon, Tooltip, Popover} from 'antd';
 import { BrowserRouter as Router, Route, Link } from "react-router-dom";
 import { DragDropContext ,  Draggable, Droppable} from 'react-beautiful-dnd';
 import '../../paths/ShixunPaths.css';
@@ -498,6 +498,10 @@ class PathDetailIndex extends Component{
 			}).catch((error) => {
 				console.log(error);
 			})
+		} else if (i === 3) {
+			this.setState({
+				modify: false
+			})
 		}
 	}
 
@@ -506,6 +510,12 @@ class PathDetailIndex extends Component{
 			team_title: name
 		})
 	}
+
+	maincontent = () => {
+		return (<div className={"sandianbox"}>
+			<div onClick={() => this.modifysy(1)}>重命名</div>
+		</div>)
+	}
 	render(){
 
 		this.updatamakedown("shixuns_propaedeutics");
@@ -664,17 +674,24 @@ class PathDetailIndex extends Component{
 								members ===undefined ?"":members === null ?"":
 									<div className="teacherTeam edu-back-white clearfix" id="subject_members">
 										{
-											detailInfoList === undefined ? "" : detailInfoList.allow_add_member === true ?
+											detailInfoList === undefined ?
+												<p className="font-16 clearfix">{team_title}</p> : detailInfoList.allow_add_member === true ?
 												(
 													modify === false ?
-														<p className="font-16 clearfix" onDoubleClick={() => this.modifysy(1)}>{team_title}</p>
+
+														<div>
+															<p className="font-16 clearfix fl" onDoubleClick={() => this.modifysy(1)}>{team_title}</p>
+															<Popover placement="right" content={this.maincontent()} trigger="hover">
+																<i className={"iconfont icon-sandian  fr color999"}></i>
+															</Popover>
+														</div>
 														:
 														<Modifytext {...this.props} {...this.state} pathid={this.props.match.params.pathId}
 																				modifysy={(i) => this.modifysy(i)}
 																				setteam_title={(name) => this.setteam_title(name)}></Modifytext>
 												)
 
-												: ""
+												: <p className="font-16 clearfix">{team_title}</p>
 										}
 
 										{ members===undefined?