From 076cc1bae9f9b809f63076965277252bbc4eb05e Mon Sep 17 00:00:00 2001
From: caicai8 <1149225589@qq.com>
Date: Wed, 11 Mar 2020 16:31:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=94=BE=E5=A4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/common/hooks/ImageLayer2.js       | 2 +-
 public/react/src/modules/page/layers/ImageLayer.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/react/src/common/hooks/ImageLayer2.js b/public/react/src/common/hooks/ImageLayer2.js
index 2b1979c74..202a7f343 100644
--- a/public/react/src/common/hooks/ImageLayer2.js
+++ b/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 ) {  
diff --git a/public/react/src/modules/page/layers/ImageLayer.js b/public/react/src/modules/page/layers/ImageLayer.js
index 921a47d8c..b1adc5b6b 100644
--- a/public/react/src/modules/page/layers/ImageLayer.js
+++ b/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>
 		      	: