Merge pull request 'issue任务上线测试版' (#55) from caishi/forgeplus-react:pre_develop_dev into pre_develop_dev

src/forge/Main/Detail.js

@@ -6,6 +6,9 @@ import DetailBanner from './sub/DetailBanner';
 import '../css/index.scss'
 import './list.css';
 
+import { ImageLayerOfCommentHOC } from "../../modules/page/layers/ImageLayerOfCommentHOC";
+
+
 import Loadable from 'react-loadable';
 import Loading from '../../Loading';
 
@@ -142,7 +145,7 @@ const WikiEdit = Loadable({
 function checkPathname(projectsId, owner, pathname) {
   let name = "";
   if (pathname && pathname !== `/${owner}/${projectsId}`) {
-    let url = pathname.split(`/${owner}/${projectsId}`)[1] || '';
+    let url = pathname.split(`/${owner}/${projectsId}`)[1] || "";
     if (url.indexOf("/about") > -1) {
       name = "about"
     } else if (url.indexOf("/issues") > -1 || url.indexOf("Milepost") > 0) {
@@ -780,4 +783,7 @@ class Detail extends Component {
   }
 }
 
-export default Detail;
+export default ImageLayerOfCommentHOC({
+  imgSelector: ".imageLayerParent img, .imageLayerParent .imageTarget",
+  parentSelector: ".newContainer",
+})(Detail);

src/forge/UsersList/common_users.js

@@ -93,7 +93,13 @@ class CommonUsers extends Component {
                 {count === 0 ? (
                   <NoneData _html="暂时还没有相关数据!" />
                 ) : (
-                  <UserList users={users} userClass={'w-25'} successFunc={this.getUsersList} {...this.props}></UserList>
+                  <UserList 
+                    users={users} 
+                    userClass={'w-25'} 
+                    successFunc={this.getUsersList} 
+                    notReset={true}
+                    {...this.props}
+                  ></UserList>
                 )}
               </div>
             </Spin>