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

src/pages/launchSystemV3/tencentAdPutIn/create/Dynamic/index.tsx

@@ -5,7 +5,7 @@ import { EditOutlined } from "@ant-design/icons"
 import { DispatchAddelivery } from ".."
 import NewDynamic from "./newDynamic"
 import { AD_STATUS_ENUM, CONVERSION_DATA_ENUM, CONVERSION_TARGET_ENUM, DELIVERY_MODE_ENUM, PAGE_TYPE_ENUM, TEXT_LINK_TYPE_ENUM, pageSpecFieldConVertUn } from "../../const"
-import { getCreativeDetailsApi, getProfilesApi } from "@/services/adqV3/global"
+import { getProfilesApi } from "@/services/adqV3/global"
 import { useAjax } from "@/Hook/useAjax"
 import { arraysHaveSameValues } from "@/utils/utils"
 
@@ -47,7 +47,7 @@ const Dynamic: React.FC<{ creativeTemplateAppellation?: string, creativeTemplate
                     <p style={{ fontWeight: 'bold', color: configuredStatus === 'AD_STATUS_NORMAL' ? '#52c41a' : '#FF4D4F' }}>创意状态：{AD_STATUS_ENUM[configuredStatus as keyof typeof AD_STATUS_ENUM]}</p>
                     <p>创意名称：{dynamicCreativeName}</p>
                     <p style={{ fontWeight: 'bold', color: '#000' }}>投放模式：{DELIVERY_MODE_ENUM[deliveryMode as keyof typeof DELIVERY_MODE_ENUM]}</p>
-                    <p>{(creativeTemplateAppellation || creativeTemplateId) && `创意形式：${creativeTemplateAppellation || creativeTemplateId}`}</p>
+                    <p>{((creativeTemplateId && creativeTemplateAppellation) || creativeTemplateId) && `创意形式：${creativeTemplateAppellation || creativeTemplateId}`}</p>
                     {brand?.length > 0 && <>
                         <p style={{ fontWeight: 'bold', color: '#000' }}>品牌形象跳转：{PAGE_TYPE_ENUM[brand?.[0]?.value?.jumpInfo?.pageType as keyof typeof PAGE_TYPE_ENUM]}</p>
                         {['PAGE_TYPE_H5_PROFILE'].includes(brand?.[0]?.value?.jumpInfo?.pageType) ? <>

src/pages/launchSystemV3/tencentAdPutIn/create/Material/addMaterial.tsx

@@ -1,11 +1,11 @@
 import { CloseCircleOutlined, DeleteOutlined, PlusOutlined } from "@ant-design/icons"
-import { Button, Card, Dropdown, Empty, Form, Menu, Modal, Popconfirm, Space, message } from "antd"
+import { Button, Card, Dropdown, Empty, Form, InputNumber, Menu, Modal, Popconfirm, Space, message } from "antd"
 import React, { useEffect, useState } from "react"
 import styles from './index.less'
 import VideoNews from "@/pages/launchSystemNew/components/newsModal/videoNews"
 import { useModel } from "umi"
 import SelectCloud from "@/pages/launchSystemNew/components/selectCloud"
-import { getVideoImgUrl } from "@/utils/utils"
+import { chunkArray, chunkArray1, getVideoImgUrl } from "@/utils/utils"
 import VideoFrameSelect from "@/pages/launchSystemV3/components/VideoFrameSelect"
 import New1Radio from "@/pages/launchSystemV3/components/New1Radio"
 
@@ -51,6 +51,7 @@ const AddMaterial: React.FC<Props> = ({ creativeTemplateId, materialData, delive
     const [videoUploads, setVideoUploads] = useState<any>()
     const [imgUploads, setImgUploads] = useState<any>()
     const [minNumber, setMinNumber] = useState<number>(3)
+    const [mCount, setMCount] = useState<number>(1)
     /*********************************/
 
     useEffect(() => {
@@ -156,7 +157,7 @@ const AddMaterial: React.FC<Props> = ({ creativeTemplateId, materialData, delive
     return <Modal
         title={<Space>
             <strong style={{ fontSize: 20 }}>创意素材</strong>
-            {deliveryMode === 'DELIVERY_MODE_CUSTOMIZE' && <>
+            {deliveryMode === 'DELIVERY_MODE_CUSTOMIZE' ? <>
                 {videoUploads && Object.keys(videoUploads)?.length > 0 && <Button type="link" onClick={() => {
                     init({ mediaType: 'VIDEO', num: 100, cloudSize: creativeTemplateId === 1708 ? [[{ relation: '=', width: 1280, height: 720 }]] : [[{ relation: '=', width: videoUploads.restriction.videoRestriction.minWidth, height: videoUploads.restriction.videoRestriction.minHeight }]], maxSize: videoUploads.restriction.videoRestriction.fileSize * 1024 })
                     setMaterialConfig({
@@ -183,6 +184,49 @@ const AddMaterial: React.FC<Props> = ({ creativeTemplateId, materialData, delive
                         setSelectVideoVisible(true)
                     }, 100)
                 }}>批量添加图片素材</Button>}
+            </> : <>
+                <InputNumber placeholder="分配数量" value={mCount} max={15} onChange={(e) => setMCount(e)} />
+                <Button type="link" onClick={() => {
+                    init({
+                        mediaType: 'IMG', num: 100, cloudSize: [[
+                            { relation: '=', width: 800, height: 800 },
+                            { relation: '=', width: 1280, height: 720 },
+                            { relation: '=', width: 720, height: 1280 },
+                            { relation: '=', width: 960, height: 334 },
+                            { relation: '=', width: 480, height: 320 },
+                        ]], maxSize: 400 * 1024
+                    })
+                    setMaterialConfig({
+                        ...materialConfig,
+                        type: 'image',
+                        max: 100,
+                        index: 20000,
+                        adcreativeTemplateId: creativeTemplateId,
+                        isGroup: false
+                    })
+                    setTimeout(() => {
+                        setSelectVideoVisible(true)
+                    }, 100)
+                }}>批量添加图片素材</Button>
+                <Button type="link" onClick={() => {
+                    init({
+                        mediaType: 'VIDEO', num: 100, cloudSize: [[
+                            { relation: '=', width: 1280, height: 720 },
+                            { relation: '=', width: 720, height: 1280 }
+                        ]], maxSize: 512000 * 1024
+                    })
+                    setMaterialConfig({
+                        ...materialConfig,
+                        type: 'video',
+                        max: 100,
+                        index: 20000,
+                        adcreativeTemplateId: creativeTemplateId,
+                        isGroup: false
+                    })
+                    setTimeout(() => {
+                        setSelectVideoVisible(true)
+                    }, 100)
+                }}>批量添加视频素材</Button>
             </>}
             {(dynamicGroup && dynamicGroup?.length > 1) && <Popconfirm
                 title="是否清空?"
@@ -226,6 +270,7 @@ const AddMaterial: React.FC<Props> = ({ creativeTemplateId, materialData, delive
                         data={[{ label: '全账号复用', value: 0 }, { label: '平均分配到广告', value: 1 }, { label: '顺序分配到广告', value: 2 }]}
                         onChange={(e) => {
                             if (e === 2 && dynamicGroup?.length > adLength) {
+                                console.log('11111111-->', dynamicGroup?.length, adLength)
                                 form.setFieldsValue({ dynamicGroup: dynamicGroup.slice(0, adLength) })
                             }
                         }}
@@ -454,7 +499,7 @@ const AddMaterial: React.FC<Props> = ({ creativeTemplateId, materialData, delive
                                                     return <div className={styles.boxList_body_item} key={index}>
                                                         <div className={styles.tag}>{length}图</div>
                                                         <div className={styles.content}>
-                                                            {item.map((l, i) => <img src={l?.url} key={i} style={{width: length === 6 ? 33.3 : 49.9}}/>)}
+                                                            {item.map((l, i) => <img src={l?.url} key={i} style={{ width: length === 6 ? 33.3 : 49.9 }} />)}
                                                         </div>
                                                         <div className={styles.clear} onClick={() => { clearTem(num, index) }}><CloseCircleOutlined /></div>
                                                     </div>
@@ -509,20 +554,33 @@ const AddMaterial: React.FC<Props> = ({ creativeTemplateId, materialData, delive
             onChange={(content: any) => {
                 if (content.length > 0) {
                     if (deliveryMode === 'DELIVERY_MODE_COMPONENT') { // 组件化创意
-                        let newDynamicGroup = dynamicGroup?.map((item: any, index: number) => {
-                            if (materialConfig.index === index) {
-                                let oldList = item?.list || []
-                                if (materialConfig.isGroup) {
-                                    oldList = oldList.concat([content.map((m: any) => ({ id: m?.id, url: m?.url, materialType: 0 }))])
-                                    return { list: oldList }
-                                } else {
-                                    oldList = oldList.concat(content.map((m: any) => ({ id: m?.id, url: m?.url, materialType: 0 })))
-                                    return { list: oldList }
-                                }
+                        if (materialConfig.index === 20000) {
+                            if (materialConfig.isGroup) {
+
+                            } else {
+                                let newSc = chunkArray1(content.map((m: any) => ({ id: m?.id, url: m?.url, materialType: 0 })), mCount)
+                                let newList: any[] = newSc.map((item: any) => {
+                                    return { list: item }
+                                })
+                                let newDynamicGroup = (dynamicGroup || []).concat(newList)
+                                form.setFieldsValue({ dynamicGroup: newDynamicGroup })
                             }
-                            return item
-                        })
-                        form.setFieldsValue({ dynamicGroup: newDynamicGroup })
+                        } else {
+                            let newDynamicGroup = dynamicGroup?.map((item: any, index: number) => {
+                                if (materialConfig.index === index) {
+                                    let oldList = item?.list || []
+                                    if (materialConfig.isGroup) {
+                                        oldList = oldList.concat([content.map((m: any) => ({ id: m?.id, url: m?.url, materialType: 0 }))])
+                                        return { list: oldList }
+                                    } else {
+                                        oldList = oldList.concat(content.map((m: any) => ({ id: m?.id, url: m?.url, materialType: 0 })))
+                                        return { list: oldList }
+                                    }
+                                }
+                                return item
+                            })
+                            form.setFieldsValue({ dynamicGroup: newDynamicGroup })
+                        }
                     } else { // 自定义创意
                         if (materialConfig.index === 99999) {
                             if (materialConfig.type === 'image_list' || materialConfig.type === 'element_story') {

src/pages/launchSystemV3/tencentAdPutIn/create/Material/index.tsx

@@ -2,7 +2,7 @@ import React, { useContext, useEffect, useState } from "react"
 import style from '../index.less'
 import styles from './index.less'
 import { DispatchAddelivery } from "..";
-import { Button, Empty, Tooltip, Typography } from "antd";
+import { Button, Empty, message, Tooltip, Typography } from "antd";
 import { FolderOpenOutlined, RedoOutlined, SyncOutlined } from "@ant-design/icons";
 import AddMaterial from "./addMaterial";
 import VideoNews from "@/pages/launchSystemNew/components/newsModal/videoNews";
@@ -13,7 +13,7 @@ const Material: React.FC<{ adData?: any[] }> = ({ adData }) => {
 
     /***************************************/
     const { materialData, addelivery, setAddelivery, clearData, accountCreateLogs } = useContext(DispatchAddelivery)!;
-    const { dynamic, dynamicMaterialDTos, mediaType, targeting, adgroups: { marketingAssetOuterSpec }, dynamicCreativesTextDTOS } = addelivery
+    const { dynamic, dynamicMaterialDTos, mediaType, targeting, adgroups: { marketingAssetOuterSpec, marketingCarrierType }, dynamicCreativesTextDTOS } = addelivery
     const { creativeTemplateId, deliveryMode } = dynamic
     const [adLength, setAdLength] = useState<number>(0)
 
@@ -152,7 +152,24 @@ const Material: React.FC<{ adData?: any[] }> = ({ adData }) => {
                 </div>}
             </div>
             <div className={style.detail_footer}>
-                <Button disabled={!(dynamic && Object.keys(dynamic)?.length > 0)} type="link" icon={<FolderOpenOutlined />} style={{ padding: 0, fontSize: 12 }} onClick={() => setNewVisible(true)}>选择素材</Button>
+                <Button
+                    disabled={!(dynamic && Object.keys(dynamic)?.length > 0)}
+                    type="link" icon={<FolderOpenOutlined />}
+                    style={{ padding: 0, fontSize: 12 }}
+                    onClick={() => {
+                        if (['MARKETING_TARGET_TYPE_FICTION'].includes(marketingAssetOuterSpec?.marketingTargetType) && !accountCreateLogs?.some(item => item?.productList?.length)) {
+                            message.error('请先选择小说')
+                            return
+                        }
+                        if ((['MARKETING_TARGET_TYPE_WECHAT_OFFICIAL_ACCOUNT'].includes(marketingAssetOuterSpec?.marketingTargetType) || marketingCarrierType === 'MARKETING_CARRIER_TYPE_WECHAT_OFFICIAL_ACCOUNT') && !accountCreateLogs?.some(item => item?.wechatChannelList?.length)) {
+                            message.error('请先选择公众号')
+                            return
+                        }
+                        setNewVisible(true)
+                    }}
+                >
+                    选择素材
+                </Button>
             </div>
 
         </div>

src/utils/utils.ts

@@ -473,14 +473,26 @@ export function shuffleArray<T>(array: T[]): T[] {
   return shuffled;
 }
 
-function chunkArray<T>(array: T[], numChunks: number): T[][] {
+export function chunkArray<T>(array: T[], numChunks: number): T[][] {
   const chunks: T[][] = Array.from({ length: numChunks }, () => []);
   array.forEach((item, index) => {
     chunks[index % numChunks].push(item);
   });
   return chunks;
 }
-
+/**
+ * 按多少个一组分组
+ * @param array 
+ * @param chunkSize 
+ * @returns 
+ */
+export function chunkArray1<T>(array: T[], chunkSize: number): T[][] {
+  const result: T[][] = [];
+  for (let i = 0; i < array.length; i += chunkSize) {
+      result.push(array.slice(i, i + chunkSize));
+  }
+  return result;
+}
 /**
  * 打乱随机分配数组
  * @param array