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

src/pages/launchSystemV3/components/PageModal/index.tsx

@@ -190,6 +190,14 @@ const PageModal: React.FC<Props> = (props) => {
                     </Tooltip>
                 </Space>
             </Button>}
+            <Button
+                type="link"
+                danger
+                disabled={!data?.some(item => item.pageList?.length)}
+                onClick={() => {
+                    setData(data => data.map(item => ({ ...item, pageList: [] })))
+                }}
+            >全部清空</Button>
             {![910].includes(creativeTemplateId) && <Text type="warning">{OPTION_ENUM[overrideCanvasHeadOption as keyof typeof OPTION_ENUM]}</Text>}
         </Space>}
         open={visible}

src/pages/launchSystemV3/components/PageModal/indexOfficial.tsx

@@ -194,6 +194,14 @@ const PageOfficialModal: React.FC<Props> = (props) => {
                     </Tooltip>
                 </Space>
             </Button>}
+            <Button
+                type="link"
+                danger
+                disabled={!data?.some(item => item.pageList?.length)}
+                onClick={() => {
+                    setData(data => data.map(item => ({ ...item, pageList: [] })))
+                }}
+            >全部清空</Button>
             <Text type="warning">请确保账号开通了权限</Text>
         </Space>}
         open={visible}

src/pages/launchSystemV3/material/cloudNew/const.ts

@@ -32,5 +32,6 @@ export const showFieldList = [
     { label: '点击率', value: 'material_data_day.ctr' },
     { label: '目标转化率', value: 'material_data_day.conversions_rate' },
     { label: '创意关联数', value: 'material_data_day.adgroup_count' },
-    { label: '创意关联数', value: 'material_data_day.dynamic_creative_count' }
+    { label: '创意关联数', value: 'material_data_day.dynamic_creative_count' },
+    { label: '备注', value: 'description' }
 ]

src/pages/launchSystemV3/material/cloudNew/index.less

@@ -119,7 +119,7 @@
         /* Internet Explorer/Edge */
 
         &:hover .body .detailBt {
-            opacity: 1;
+            display: inline;
         }
     }
 
@@ -174,6 +174,12 @@
                 height: 100%;
             }
         }
+
+        &:hover {
+            .file_info>div {
+                opacity: 0.25;
+            }
+        }
     }
 
     .body {
@@ -194,7 +200,7 @@
 
         .detailBt {
             font-size: 12px;
-            opacity: 0;
+            display: none;
             transition: opacity ease-in-out .2s;
         }
     }
@@ -204,7 +210,7 @@
         padding: 4px 10px;
         display: flex;
         justify-content: space-between;
-        line-height: 22px;
+        line-height: 20px;
     }
 
     .fotter {

src/pages/launchSystemV3/material/cloudNew/material.tsx

@@ -318,7 +318,7 @@ const Material = forwardRef(({ onAddFolder, onUpdateFolder, onDelFolder }: Props
                 {batchType === 'file' && <Popconfirm
                     title="确定删除？"
                     onConfirm={() => {
-                        const hide = message.loading('正在删除...', 0, () => {});
+                        const hide = message.loading('正在删除...', 0, () => { });
                         deleteBatch.run(checkedFolderList).then(res => {
                             hide()
                             if (res) {
@@ -414,12 +414,14 @@ const Material = forwardRef(({ onAddFolder, onUpdateFolder, onDelFolder }: Props
                                     </div>}
                                     onClick={() => { setDetailsData({ visible: true, data: item }) }}
                                 >
-                                    <div className={style.body}>
+                                    <div className={style.body} style={{ paddingBottom: 0 }}>
                                         <div className={style.title}><Text ellipsis>{item?.materialName}</Text></div>
                                         <a className={style.detailBt}>详情</a>
                                     </div>
                                     <div className={style.actions}>
-                                        <div style={{ height: 22 }}></div>
+                                        <div style={{ height: 20, width: 100, flex: '1 0' }}>
+                                            <Text ellipsis={{ tooltip: true }} style={{ fontSize: 11 }}>{item?.description}</Text>
+                                        </div>
                                         {isPermission(item.createBy) ? <Dropdown
                                             menu={{
                                                 items: getItemsFile(item)

src/pages/launchSystemV3/material/cloudNew/search.tsx

@@ -46,11 +46,21 @@ const Search: React.FC<Props> = ({ onSearch }) => {
         >
             <Form.Item>
                 <Input.Group compact>
-                    <Select defaultValue={'file'} style={{ width: 100 }}>
-                        <Select.Option value="file">搜素材</Select.Option>
+                    <Select defaultValue={'file'} style={{ width: 70 }}>
+                        <Select.Option value="file">名称</Select.Option>
                     </Select>
                     <Form.Item name={'materialName'} style={{ marginRight: 0 }}>
-                        <Input style={{ width: 220 }} allowClear placeholder="请输入关键词" />
+                        <Input style={{ width: 180 }} allowClear placeholder="请输入关键词" />
+                    </Form.Item>
+                </Input.Group>
+            </Form.Item>
+            <Form.Item>
+                <Input.Group compact>
+                    <Select defaultValue={'file'} style={{ width: 70 }}>
+                        <Select.Option value="file">备注</Select.Option>
+                    </Select>
+                    <Form.Item name={'description'} style={{ marginRight: 0 }}>
+                        <Input style={{ width: 180 }} allowClear placeholder="请输入关键词" />
                     </Form.Item>
                 </Input.Group>
             </Form.Item>

src/pages/launchSystemV3/material/cloudNew/selectCloudNew.tsx

@@ -119,6 +119,7 @@ const SelectCloudNew: React.FC<CLOUDNEW.SelectCloudNewProps> = ({ visible, defau
         open={visible}
         onCancel={onClose}
         width={1400}
+        maskClosable={false}
         footer={<div className={style.divFooter}>
             {checkedFolderList.length > 0 ? <>
                 <div className={style.selectedCloud}>
@@ -307,6 +308,7 @@ const SelectCloudNew: React.FC<CLOUDNEW.SelectCloudNewProps> = ({ visible, defau
                                                                         return null
                                                                 }
                                                             })}
+                                                            {showField.includes('description') && <Paragraph style={{ fontSize: 12, marginBottom: 1 }} ellipsis={{ tooltip: true }}>备注：{item.description || '--'}</Paragraph>}
                                                         </div>
                                                     </Card>
                                                 </div>

src/pages/launchSystemV3/material/cloudNew/selectSearch.tsx

@@ -54,7 +54,10 @@ const SelectSearch: React.FC<Props> = ({ onSearch }) => {
         >
             <Row gutter={[0, 6]}>
                 <Col><Form.Item name={'materialName'}>
-                    <Input style={{ width: 190 }} allowClear placeholder="请输入关键词" />
+                    <Input style={{ width: 190 }} allowClear placeholder="请输入名称关键词" />
+                </Form.Item></Col>
+                <Col><Form.Item name={'description'}>
+                    <Input style={{ width: 190 }} allowClear placeholder="请输入备注关键词" />
                 </Form.Item></Col>
                 <Col><Form.Item name={'designerIds'}>
                     <Select