merge 969

src/Collections/RecentInfo.tsx

@@ -78,12 +78,7 @@ const RecentInfo: React.FC<IRecentInfoProps> = props => {
           })
     }
   })
-  useTimeCount(
-    ArticleID || data?.Detail.ArticleId || 0,
-    'report',
-    (data?.HasPermission && data?.HasPermission === INewPermissionType.OK) || false,
-    1
-  )
+  useTimeCount(ArticleID || data?.Detail.ArticleId || 0, 'report', true, 1)
 
   // 补足表格
   const formatTable = (list: IListSubject[], index: number) => {

src/Collections/ResearchSummary.tsx

@@ -88,12 +88,7 @@ const ResearchSummary: React.FC<IResearchSummaryProps> = props => {
       setDataDetail(res)
     }
   })
-  useTimeCount(
-    ArticleID || data?.List[0]?.ArticleId || 0,
-    'report',
-    (dataDetail?.HasPermission && dataDetail?.HasPermission === INewPermissionType.OK) || false,
-    menuID
-  )
+  useTimeCount(ArticleID || data?.List[0]?.ArticleId || 0, 'report', true, menuID)
 
   // 本周/上周切换
   const handleChangeSecondMenu = (key: string | number) => {

src/Column/ColumnDetail.tsx

@@ -39,11 +39,7 @@ const ColumnDetail: React.FC<IColumnDetailProps> = props => {
     }
   })
   const media = useMedia()
-  useTimeCount(
-    props.articleId,
-    'column',
-    (data?.HasPermission && data?.HasPermission === INewPermissionType.OK) || false
-  )
+  useTimeCount(props.articleId, 'column', true)
   const handleToRefresh = () => {
     refreshArcticleDetail()
   }

src/Column/components/ColumnContent.tsx

@@ -3,8 +3,9 @@ import useRequest from '@ahooksjs/use-request/es'
 import { useHistory } from 'react-router-dom'
 import dayjs from 'dayjs'
 
-import { Modal, message, Watermark } from 'antd'
+import { Modal, message, Watermark, Image } from 'antd'
 import { StarFilled, StarOutlined, EyeOutlined, LikeOutlined, LikeFilled } from '@ant-design/icons'
+
 import { ReactComponent as Close } from 'assets/close.svg'
 
 import { useLogin2p } from 'Login2p/Login2pContext'
@@ -346,15 +347,17 @@ const ColumnContent: React.FC<IColumnContentProps> = props => {
                 ))}
               </div>
               <div className="operate-file-wrapper">
-                {detail?.ImgUrlList?.map((item, index) => (
-                  <React.Fragment key={index}>
-                    {item && (
-                      <div className="operate-image-item" key={item} onClick={handleOnClickPicture.bind(this, item)}>
-                        <img src={item} alt={'图片' + item} className="operate-image" />
-                      </div>
-                    )}
-                  </React.Fragment>
-                ))}
+                <Image.PreviewGroup>
+                  {detail?.ImgUrlList?.map((item, index) => (
+                    <React.Fragment key={index}>
+                      {item && (
+                        <div className="operate-image-item" key={item}>
+                          <Image width={112} height={112} src={item} />
+                        </div>
+                      )}
+                    </React.Fragment>
+                  ))}
+                </Image.PreviewGroup>
               </div>
               <div className="columndetail-category-label g-flex g-flex-v-center g-flex-wap">
                 {type !== 'list' ? (

src/Material/MaterialInfo.tsx

@@ -85,11 +85,7 @@ const MaterialInfo: React.FC<IMaterialInfoProps> = props => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [])
 
-  useTimeCount(
-    props.articleID,
-    'article',
-    (data?.HasPermission && data?.HasPermission === INewPermissionType.OK) || false
-  )
+  useTimeCount(props.articleID, 'article', true)
 
   const handleToApplyCollect = () => {
     applyCollect(props.articleID)

src/Material/hooks/useTimeCount.tsx

@@ -99,6 +99,8 @@ const useTimeCount = (
   })
 
   useEffect(() => {
+    console.log(isOpenTimer, 'isOpenTimer')
+
     if (isOpenTimer) {
       handleCountTime()
       document.addEventListener('visibilitychange', handleChangeVisibility, false)