Merge branch 'develop' of http://git.zanxiangnet.com/wjx/ad-manage

src/pages/launchSystemNew/adq/ad/tableConfig.tsx

@@ -1,6 +1,6 @@
 import { AdStatusEnum, BidModeEnum, BidStrategyEnum, OptimizationGoalEnum, PromotedObjectType } from '@/services/launchAdq/enum'
 import React from 'react'
-import { Badge, Space, Tooltip, Typography } from 'antd'
+import { Badge, Popover, Space, Tooltip, Typography } from 'antd'
 import Box from '@/pages/adMonitor/adMonitorList/components/box'
 import SwitchStatus from './switchStatus'
 import TimeSeriesLook from './timeSeriesLook'
@@ -22,7 +22,7 @@ function tableConfig(
             adcreativeId?: string,//创意ID
             pageId?: string,//落地页ID
             targetingId?: string,//定向ID
-            
+
         }
     }) => void): any {
     return [
@@ -262,10 +262,14 @@ function tableConfig(
             width: 70,
             fixed: 'right',
             ellipsis: true,
-            render: (a: string,b:any) => {
-                return b?.rejectMessageList ?<Tooltip title={b?.rejectMessageList?.map((str: string)=>{
-                    return <>{str}<br/></>
-                })}>{ AdStatusEnum[a]}</Tooltip> :  AdStatusEnum[a]
+            render: (a: string, b: any) => {
+                return b?.rejectMessageList?.filter((str: any) => str)?.length > 0 ? <Popover
+                    style={{ width: 500 }}
+                    overlayStyle={{ width: 500,fontSize:12 }}
+                    placement="left"
+                    content={b?.rejectMessageList?.map((str: string,eq:number) => {
+                        return str ? <><strong style={{fontSize:13}}>{eq+1}:</strong>{str}<br /></> : ""
+                    })}>{AdStatusEnum[a]}</Popover> : AdStatusEnum[a]
             }
         },
         {