Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

public/react/src/common/hooks/ImageLayer2.js

@@ -16,7 +16,7 @@ function ImageLayer2(props) {
         const imageSrc = event.target.src || event.target.getAttribute('src') || event.target.getAttribute('href')
         // 判断imageSrc是否是图片
         const fileName = event.target.innerHTML.trim()
-        if (isImageExtension(imageSrc.trim()) || isImageExtension(fileName) || event.target.tagName == 'IMG' || imageSrc.indexOf('base64,') != -1) {
+        if (isImageExtension((imageSrc && imageSrc.trim())) || isImageExtension(fileName) || event.target.tagName == 'IMG' || (imageSrc && imageSrc.indexOf('base64,')) != -1) {
             // 非回复里的头像图片; 非emoticons
             if (imageSrc.indexOf('/images/avatars/User') === -1 && 
                 imageSrc.indexOf('kindeditor/plugins/emoticons') === -1 ) {  

public/react/src/modules/page/layers/ImageLayer.js

@@ -19,7 +19,7 @@ class ImageLayer extends Component {
 		    	{showImage ? 
   		    	<div className="taskResultLayer" onClick={onImageLayerClose} style={{overflow: 'auto'}}>
   		    		<div className="passContent">
-                		<div><img src={ imageSrc }  className="passImg" unselectable="on"/></div>
+                	<img src={ imageSrc }  className="passImg" unselectable="on" alt=""/>
 	  		      	</div>
 	            </div>
 		      	:

public/react/src/modules/question/Questionitem_banks.js

@@ -22,6 +22,7 @@ import JudquestionEditor from "./component/JudquestionEditor";
 import Bottomsubmit from "../../modules/modals/Bottomsubmit";
 import { connect } from 'react-redux';
 import actions from "../../redux/actions";
+import QuestionModalPicture from "./component/QuestionModalPicture";
 var restricte=false;
 class Questionitem_banks extends Component {
 	constructor(props) {
@@ -38,6 +39,7 @@ class Questionitem_banks extends Component {
 			knowledgepoints: [],
 			disciplmy:[],
 			pages:1,
+			url:''
 
 	}
 
@@ -526,14 +528,32 @@ class Questionitem_banks extends Component {
 		this.scrollToAnchor("Itembankstopid");
 	}
 
+	handleShowUploadImage=(url)=>{
+		this.setState({
+			url:url
+		})
+	}
+	handleClose=()=>{
+		this.setState({
+			url:'',
+		})
+	}
+
+
 	render() {
-		let {page, limit, count, Headertop, visible, placement, modalsType, item_type,restricte} = this.state;
+		let {page, limit, count, Headertop, visible, placement, modalsType, item_type,restricte,url} = this.state;
 		const params = this.props && this.props.match && this.props.match.params;
 		// ////console.log(params);
 		return (
 			<div>
 				<div id={"Itembankstopid"} className="newMain clearfix intermediatecenter "
 				>
+
+					{url?
+						<QuestionModalPicture  {...this.props} {...this.state} handleClose={()=>this.handleClose()}></QuestionModalPicture>
+						:
+						""
+					}
 					{
 						restricte===false?
 							<Prompt
@@ -584,6 +604,7 @@ class Questionitem_banks extends Component {
 										{...this.state}
 										{...this.props}
 										getanswerMdRef={(ref) => this.getanswerMdRef(ref)}
+										handleShowUploadImage={(url)=>this.handleShowUploadImage(url)}
 									>
 
 									</SingleEditor>
@@ -594,6 +615,7 @@ class Questionitem_banks extends Component {
 										{...this.state}
 										{...this.props}
 										getanswerMdRef={(ref) => this.getChoquesEditor(ref)}
+										handleShowUploadImage={(url)=>this.handleShowUploadImage(url)}
 									>
 
 									</ChoquesEditor>

public/react/src/modules/question/component/ChoquesEditor.js

@@ -184,6 +184,12 @@ class ChoquesEditor extends Component{
 			 bindinginputs:i
 		 })
 
+		try {
+			this.props.handleShowUploadImage(url)
+		}catch (e) {
+
+		}
+
 	}
 
 	componentDidMount = () => {

public/react/src/modules/question/component/SingleEditor.js

@@ -258,7 +258,11 @@ class SingleEditor extends Component{
 			url:url,
 			bindinginputs:i
 		})
+		try {
+			this.props.handleShowUploadImage(url)
+		}catch (e) {
 
+		}
 	}
 	bindinginputs=(i)=>{
 		this.setState({