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

src/components/EarlyWarning/tableConfig.tsx

@@ -33,7 +33,7 @@ function tableConfig(edit: (data: any) => void, del: (id: number) => void): any
             dataIndex: 'warningType',
             key: 'warningType',
             align: 'center',
-            width: 100,
+            width: 115,
             render: (a: string[], b: any) => {
                 return a?.map((item, index) => <Tag color={['#f50', '#2db7f5'][index]} key={index}>{WarningTypeEnum[item]}</Tag>)
             }

src/components/Tables/index.tsx

@@ -145,7 +145,7 @@ function Tables(props: Props) {
             className={className}
             expandable={expandedRowRender ? {
                 defaultExpandedRowKeys: ['0'],
-                expandRowByClick: true, 
+                expandRowByClick: false, 
                 expandedRowRender: (data) => {
                     return expandedRowRender(data)
                 }

src/pages/launchSystemNew/launchManage/createAd/index.tsx

@@ -566,6 +566,8 @@ const CreateAd: React.FC = () => {
                 data.push(obj)
             })
         })
+        console.log(data);
+        
         setTableData(data)
     }
 

src/pages/launchSystemNew/launchManage/createAd/tableConfig.tsx

@@ -1,4 +1,4 @@
-import { Tooltip } from "antd"
+import { Space, Tooltip } from "antd"
 import React from "react"
 import style from './index.less'
 import { BidModeEnum, OptimizationGoalEnum, PromotedObjectType, SiteSetEnum } from "@/services/launchAdq/enum";
@@ -60,9 +60,9 @@ let columns = () => {
             width: 100,
             render: (a: any, b: any) => {
                 if (a) {
-                    return <span style={{ fontSize: "12px" }}>{b?.endDate ? b?.beginDate + '~' + b?.endDate : b?.beginDate + '~ 长期投放'}</span> 
+                    return <span style={{ fontSize: "12px" }}>{b?.endDate ? b?.beginDate + '~' + b?.endDate : b?.beginDate + '~ 长期投放'}</span>
                 }
-                return <span style={{ fontSize: "12px" }}>{b?.sysAdGroupData?.endDate ? b?.sysAdGroupData?.beginDate + '~' + b?.sysAdGroupData?.endDate : b?.sysAdGroupData?.beginDate + '~ 长期投放'}</span> 
+                return <span style={{ fontSize: "12px" }}>{b?.sysAdGroupData?.endDate ? b?.sysAdGroupData?.beginDate + '~' + b?.sysAdGroupData?.endDate : b?.sysAdGroupData?.beginDate + '~ 长期投放'}</span>
             }
         },
         {
@@ -156,6 +156,34 @@ let columns = () => {
                 return <span style={{ fontSize: "12px" }}>{b?.sysAdcreativeData?.adcreativeTemplateAppellation}</span>
             }
         },
+        {
+            title: '创意素材',
+            dataIndex: 'mediaData',
+            key: 'mediaData',
+            width: 140,
+            render: (a: any, b: any) => {
+                let adcreativeElements = b?.sysAdcreativeData?.adcreativeElements
+                if (adcreativeElements) {
+                    let keys = Object.keys(adcreativeElements)
+                    if (keys.includes('imageUrlList')) {
+                        return <Space wrap>{adcreativeElements.imageUrlList.map((url: string, index: number) => <img key={index} src={url} height={25} />)}</Space>
+                    } else if (keys.includes('elementStory')) {
+                        return <Space wrap>{adcreativeElements.elementStory.map((url: string, index: number) => <img key={index} src={url} height={25} />)}</Space>
+                    } else {
+                        if (keys.includes('videoUrl') || keys.includes('shortVideo1Url')) {
+                            return <Space>
+                                {keys?.includes('imageUrl') && <img src={adcreativeElements.imageUrl} height={25}/>}
+                                {keys?.includes('videoUrl') && <video src={adcreativeElements.videoUrl} style={{ height: 25 }}/>}
+                                {keys?.includes('shortVideo1Url') && <video src={adcreativeElements.shortVideo1Url} style={{ height: 25 }}/>}
+                            </Space>
+                        } else {
+                            return keys?.includes('imageUrl') ? <img src={adcreativeElements.imageUrl} height={25}/> : '无'
+                        }
+                    }
+                }
+                return <span style={{ fontSize: "12px" }}>无</span>
+            }
+        },
         {
             title: '创意文案',
             dataIndex: 'description',