From 8120a2d4e2689fcb95e6057fe5c8cc2fe49084f6 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Tue, 18 Aug 2020 09:55:20 +0800
Subject: [PATCH] renderHtml

---
 src/forge/Main/CoderRootDirectory.js              | 2 +-
 src/forge/Main/CoderRootFileDetail.js             | 2 +-
 src/forge/Main/IndexItem.js                       | 5 +++--
 src/forge/Merge/MessageCount.js                   | 2 +-
 src/forge/Merge/merge_form.js                     | 8 +++-----
 src/forge/Order/Detail.js                         | 2 +-
 src/forge/comments/children_comments.js           | 2 +-
 src/forge/comments/children_journals.js           | 2 +-
 src/forge/comments/comments.js                    | 2 +-
 src/modules/page/layers/ImageLayerOfCommentHOC.js | 5 +++--
 10 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/forge/Main/CoderRootDirectory.js b/src/forge/Main/CoderRootDirectory.js
index 28876b883..0d79eaa1c 100644
--- a/src/forge/Main/CoderRootDirectory.js
+++ b/src/forge/Main/CoderRootDirectory.js
@@ -289,7 +289,7 @@ class CoderRootDirectory extends Component {
           <div className="commonBox-info">
             {readMeContent[0].content ? (
               <RenderHtml
-                className="break_word_comments"
+                className="break_word_comments imageLayerParent"
                 value={readMeContent[0].content}
               />
             ) : (
diff --git a/src/forge/Main/CoderRootFileDetail.js b/src/forge/Main/CoderRootFileDetail.js
index 2af19867b..a12375c4f 100644
--- a/src/forge/Main/CoderRootFileDetail.js
+++ b/src/forge/Main/CoderRootFileDetail.js
@@ -246,7 +246,7 @@ class CoderRootFileDetail extends Component {
           ) : (
             md && readOnly ?
             <div className="files-md">
-              <RenderHtml className="file-md" value={description} />
+              <RenderHtml className="file-md imageLayerParent" value={description} />
             </div>
             :
             <Meditor
diff --git a/src/forge/Main/IndexItem.js b/src/forge/Main/IndexItem.js
index bf37f26ae..3c76e16ab 100644
--- a/src/forge/Main/IndexItem.js
+++ b/src/forge/Main/IndexItem.js
@@ -2,7 +2,8 @@ import React, { Component } from 'react';
 import { Tooltip } from 'antd';
 import { getImageUrl } from 'educoder';
 import { Link } from 'react-router-dom';
-import '../css/index.scss'
+import '../css/index.scss';
+import Nodata from '../Nodata';
 import './list.css';
 import img_parise from '../Images/parise.png';
 
@@ -62,7 +63,7 @@ class IndexItem extends Component {
             </div>
           </div>
         )
-      }) : ""
+      }) : <Nodata _html="暂无数据~"></Nodata>
     )
     return (
       <div className="project-list minH-670">
diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js
index c9f26b737..12432313c 100644
--- a/src/forge/Merge/MessageCount.js
+++ b/src/forge/Merge/MessageCount.js
@@ -195,7 +195,7 @@ class MessageCount extends Component {
   };
 
   commentCtx = (v) => {
-    return <RenderHtml className="break_word_comments" value={v} />;
+    return <RenderHtml className="break_word_comments imageLayerParent" value={v} />;
   };
 
   render() {
diff --git a/src/forge/Merge/merge_form.js b/src/forge/Merge/merge_form.js
index 87bdc8b49..5c1b17c66 100644
--- a/src/forge/Merge/merge_form.js
+++ b/src/forge/Merge/merge_form.js
@@ -282,11 +282,9 @@ class MergeForm extends Component {
                   <Button
                     type="default"
                     className="ml30"
-                    href={
-                      merge_type === "new"
-                        ? `/projects/${owner}/${projectsId}/pulls`
-                        : `/projects/${owner}/${projectsId}/pulls/${mergeId}/detail`
-                    }
+                    onClick={()=>{
+                      this.props.history.push(merge_type === "new" ? `/projects/${owner}/${projectsId}/pulls` : `/projects/${owner}/${projectsId}/pulls/${mergeId}/detail`)
+                    }}
                   >
                     <span className="plr10">取消</span>
                   </Button>
diff --git a/src/forge/Order/Detail.js b/src/forge/Order/Detail.js
index 9d93c9cce..f1453f358 100644
--- a/src/forge/Order/Detail.js
+++ b/src/forge/Order/Detail.js
@@ -182,7 +182,7 @@ class Detail extends Component {
   };
 
   commentCtx = (v) => {
-    return <RenderHtml className="break_word_comments markdownsContent" value={v} />;
+    return <RenderHtml className="break_word_comments imageLayerParent" value={v} />;
   };
 
   render() {
diff --git a/src/forge/comments/children_comments.js b/src/forge/comments/children_comments.js
index aca7b83c7..d1e228155 100644
--- a/src/forge/comments/children_comments.js
+++ b/src/forge/comments/children_comments.js
@@ -86,7 +86,7 @@ class children_comments extends Component {
   };
 
   commentCtx = (v) => {
-    return <RenderHtml className="break_word_comments" value={v} />;
+    return <RenderHtml className="break_word_comments imageLayerParent" value={v} />;
   };
 
   Paginations =()=> {
diff --git a/src/forge/comments/children_journals.js b/src/forge/comments/children_journals.js
index 92ecde737..cb9756ff6 100644
--- a/src/forge/comments/children_journals.js
+++ b/src/forge/comments/children_journals.js
@@ -51,7 +51,7 @@ class children_journals extends Component {
   };
 
   commentCtx = (v) => {
-    return <RenderHtml className="break_word_comments" value={v} />;
+    return <RenderHtml className="break_word_comments imageLayerParent" value={v} />;
   };
 
   Paginations =()=> {
diff --git a/src/forge/comments/comments.js b/src/forge/comments/comments.js
index bd6fd7481..8bff143cb 100644
--- a/src/forge/comments/comments.js
+++ b/src/forge/comments/comments.js
@@ -263,7 +263,7 @@ class comments extends Component {
   }
 
   commentCtx = (v) => {
-    return <RenderHtml className="break_word_comments" value={v} />;
+    return <RenderHtml className="break_word_comments imageLayerParent" value={v} />;
   };
   Paginations = ()=>{
     const { page, limit, search_count } = this.state;
diff --git a/src/modules/page/layers/ImageLayerOfCommentHOC.js b/src/modules/page/layers/ImageLayerOfCommentHOC.js
index 34fc6a791..7745c2d6b 100644
--- a/src/modules/page/layers/ImageLayerOfCommentHOC.js
+++ b/src/modules/page/layers/ImageLayerOfCommentHOC.js
@@ -16,6 +16,7 @@ export function ImageLayerOfCommentHOC(options = {}) {
       }
 
       onDelegateClick = (event) => {
+        console.log("imgclick",event);
         const imageSrc = event.target.src || event.target.getAttribute('src') || event.target.getAttribute('href')
         // 判断imageSrc是否是图片
         const fileName = event.target.innerHTML.trim()
@@ -37,8 +38,8 @@ export function ImageLayerOfCommentHOC(options = {}) {
 
       componentDidMount() {
         this.props.wrappedComponentRef && this.props.wrappedComponentRef(this.refs['wrappedComponentRef'])
-
-        setTimeout(() => {
+        
+        setTimeout(() => { 
           $(options.parentSelector || ".commentsDelegateParent")
             .delegate(options.imgSelector || ".J_Comment_Reply .comment_content img, .J_Comment_Reply .childrenCommentsView img", "click", this.onDelegateClick);
         }, 1200)