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

src/pages/launchSystemV3/tencenTasset/manageComponent/index.tsx

@@ -15,6 +15,7 @@ import TablePro from "@/components/TablePro"
 import columns12 from "./tableConfig"
 import ShareComponent from "./shareComponent"
 import ShareDetails from "./shareDetails"
+import SyncCloudComponent from "../../material/cloudNew/syncCloudComponent"
 
 /**
  * 创意组件
@@ -150,6 +151,10 @@ const ManageComponent: React.FC = () => {
                 >
                     <Button icon={<DeleteOutlined />} type="primary" danger size="small" disabled={selectedRows.length === 0} loading={delComponent.loading}>删除</Button>
                 </Popconfirm>
+                {/* 同步组件 */}
+                <SyncCloudComponent
+                    accountId={queryParams?.adAccountId as number}
+                />
                 <span style={{ color: 'red' }}>平台只支持选择业务单元的组件创建广告</span>
             </Space>
         </Card>
@@ -280,7 +285,7 @@ const ManageComponent: React.FC = () => {
                     page={getCreativeComponentList?.data?.current || 1}
                     pageSize={getCreativeComponentList?.data?.size || 20}
                     total={getCreativeComponentList?.data?.total || 0}
-                    dataSource={getCreativeComponentList.data?.records || []}
+                    dataSource={getCreativeComponentList.data?.records?.map((item: any) => ({ ...item, adUnitAccount: adAccount?.adUnitAccount })) || []}
                     pagination={false}
                     onChange={(pagination: any, _: any, sortData: any) => {
                         let { current, pageSize } = pagination
@@ -380,7 +385,7 @@ const ManageComponent: React.FC = () => {
         />}
 
         {/* 组件共享详情 */}
-        {shareDetailsData?.visible && <ShareDetails 
+        {shareDetailsData?.visible && <ShareDetails
             {...shareDetailsData}
             onClose={() => {
                 setShareDetailsData({ visible: false, data: null })

src/pages/launchSystemV3/tencenTasset/manageComponent/tableConfig.tsx

@@ -7,7 +7,7 @@ import ImageXXX from "../../components/AdsComponent/ImageXXX";
 
 
 function columns12(del: (id: number[], accountId: number) => void, share: (data: any) => void, shareDetails: (data: any) => void): { label: string, fieldSHow?: { label: string, saveField: string, defaultValue: any[], data: any[] }, data: any[] }[] {
-
+    
     return [
         {
             label: '基础字段',
@@ -192,8 +192,10 @@ function columns12(del: (id: number[], accountId: number) => void, share: (data:
                                 >
                                     <a style={{ color: 'red', fontSize: 12 }}>删除</a>
                                 </Popconfirm>
-                                <a style={{ fontSize: 12 }} onClick={() => share(record)}>共享组件</a>
-                                <a style={{ fontSize: 12 }} onClick={() => shareDetails(record)}>共享详情</a>
+                                {record?.adUnitAccount && <>
+                                    <a style={{ fontSize: 12 }} onClick={() => share(record)}>共享组件</a>
+                                    <a style={{ fontSize: 12 }} onClick={() => shareDetails(record)}>共享详情</a>
+                                </>}
                             </Space>
                         }
                         return '--'