From f8665b8a1fca90ea67f0e9ed1be8f45a7f7a8835 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Sat, 21 Sep 2019 16:23:14 +0800
Subject: [PATCH] https://www.trustie.net/issues/24302

---
 public/react/src/App.css                                   | 7 +++++++
 .../src/modules/courses/common/comments/CommonReply.js     | 2 +-
 public/react/src/modules/forums/MemoDetailMDEditor.js      | 5 +++--
 public/react/src/modules/tpm/challengesnew/TPMMDEditor.js  | 4 ++--
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/public/react/src/App.css b/public/react/src/App.css
index 557768eef..1c8ce15e1 100644
--- a/public/react/src/App.css
+++ b/public/react/src/App.css
@@ -72,6 +72,13 @@ html, body {
   /* 某些情况下，被cm盖住了 */
   z-index: 99;
 }
+/* 图片点击放大的场景，隐藏图片链接 */
+.editormd-image-click-expand .editormd-image-dialog {
+  height: 234px !important;
+}
+  .editormd-image-click-expand .editormd-image-dialog .image-link {
+    display: none;
+  }
 /* 解决鼠标框选时，左边第一列没高亮的问题 */
 .CodeMirror .CodeMirror-lines pre.CodeMirror-line, .CodeMirror .CodeMirror-lines pre.CodeMirror-line-like {
   padding: 0 12px ;
diff --git a/public/react/src/modules/courses/common/comments/CommonReply.js b/public/react/src/modules/courses/common/comments/CommonReply.js
index dae21949c..8b7817e85 100644
--- a/public/react/src/modules/courses/common/comments/CommonReply.js
+++ b/public/react/src/modules/courses/common/comments/CommonReply.js
@@ -250,7 +250,7 @@ class CommonReply extends Component{
           }
         `}</style>
         <MemoDetailMDEditor ref="editor" memo={memo} usingMockInput={true} placeholder="说点什么" 
-            height={160} showError={true}
+            height={160} showError={true} imageExpand={true}
             replyComment={this.replyComment}
             commentsLength={comments ? comments.length : 0}
         ></MemoDetailMDEditor>
diff --git a/public/react/src/modules/forums/MemoDetailMDEditor.js b/public/react/src/modules/forums/MemoDetailMDEditor.js
index 78aa54182..6e2563b9b 100644
--- a/public/react/src/modules/forums/MemoDetailMDEditor.js
+++ b/public/react/src/modules/forums/MemoDetailMDEditor.js
@@ -130,7 +130,7 @@ class MemoDetailMDEditor extends Component {
 		}
 	}
 	render() {
-		const { match, history, memo, placeholder, className } = this.props
+		const { match, history, memo, placeholder, className, imageExpand } = this.props
 		const { isInited, errorMsg } = this.state
 		if (!memo) {
 			return <div></div>
@@ -185,7 +185,8 @@ class MemoDetailMDEditor extends Component {
 							`
 						} */}
 					</style>
-					<div nhname={`new_message_${memo.id}`} className={`commentInput  commentInputs ${className}`}
+					<div nhname={`new_message_${memo.id}`} 
+						className={`commentInput  commentInputs ${className} ${imageExpand && 'editormd-image-click-expand' }`}
 							style={{ padding: '30px',boxSizing:"border-box", display: isInited ? '' : 'none', paddingBottom: '40px' }} >
 						<div id="memo_comment_editorMd" className="editorMD" style={{ marginBottom: '0px'
 								, border: errorMsg ? '1px solid red' : '1px solid #ddd'}}>
diff --git a/public/react/src/modules/tpm/challengesnew/TPMMDEditor.js b/public/react/src/modules/tpm/challengesnew/TPMMDEditor.js
index c4a08e171..91cb34954 100644
--- a/public/react/src/modules/tpm/challengesnew/TPMMDEditor.js
+++ b/public/react/src/modules/tpm/challengesnew/TPMMDEditor.js
@@ -317,14 +317,14 @@ export default class TPMMDEditor extends Component {
         let {
             showError
         } = this.state;
-        let { mdID, className, noStorage } = this.props;
+        let { mdID, className, noStorage, imageExpand } = this.props;
         let _style = {}
         if (showError) {
             _style.border = '1px solid red'
         }
         return (
             <React.Fragment>
-                <div className={`df ${className}`} >
+                <div className={`df ${className} ${imageExpand && 'editormd-image-click-expand' }`} >
                 {/* padding10-20  */}
                     <div className="edu-back-greyf5 radius4" id={`mdEditor_${mdID}`} style={{..._style}}>
                         <textarea style={{display: 'none'}}   id={`mdEditors_${mdID}`} name="content"></textarea>