wjx 1 year ago
parent
commit
90f2b4031b

+ 2 - 0
src/components/CustomList/index.tsx

@@ -249,8 +249,10 @@ function CustomListModel(props: customProps) {
     }, [serverData, selectData, fixed, fieldData])
     }, [serverData, selectData, fixed, fieldData])
     // 恢复默认
     // 恢复默认
     const defaultConfig = useCallback(() => {
     const defaultConfig = useCallback(() => {
+        localStorage.setItem('REFRESH', new Date().getTime().toString())
         localStorage.removeItem(`myAdMonitorConfig${version}_` + configName)
         localStorage.removeItem(`myAdMonitorConfig${version}_` + configName)
         localStorage.removeItem(`myAdMonitorConfigFixed${version}_` + configName)
         localStorage.removeItem(`myAdMonitorConfigFixed${version}_` + configName)
+        localStorage.removeItem(`myAdFieldConfig${version}_` + configName)
         setFixed({ ...sysFixed })
         setFixed({ ...sysFixed })
         getUserList()
         getUserList()
         message.success('恢复默认成功')
         message.success('恢复默认成功')

+ 2 - 3
src/pages/gameDataStatistics/allSurvey/index.tsx

@@ -87,9 +87,8 @@ const AllSurvey: React.FC = () => {
                     <QueryForm
                     <QueryForm
                         onChange={(data: any) => {
                         onChange={(data: any) => {
                             console.log(data)
                             console.log(data)
-                            const { beginDay } = data
+                            const { beginDay, ...par } = data
                             let newQueryForm = JSON.parse(JSON.stringify(queryForm))
                             let newQueryForm = JSON.parse(JSON.stringify(queryForm))
-                            newQueryForm.pageNum = 1
                             if (beginDay && beginDay?.length === 2) {
                             if (beginDay && beginDay?.length === 2) {
                                 newQueryForm['beginDate'] = moment(beginDay[0]).format('YYYY-MM-DD')
                                 newQueryForm['beginDate'] = moment(beginDay[0]).format('YYYY-MM-DD')
                                 newQueryForm['endDate'] = moment(beginDay[1]).format('YYYY-MM-DD')
                                 newQueryForm['endDate'] = moment(beginDay[1]).format('YYYY-MM-DD')
@@ -97,7 +96,7 @@ const AllSurvey: React.FC = () => {
                                 delete newQueryForm['beginDate']
                                 delete newQueryForm['beginDate']
                                 delete newQueryForm['endDate']
                                 delete newQueryForm['endDate']
                             }
                             }
-                            setQueryForm(newQueryForm)
+                            setQueryForm({ ...newQueryForm, ...par })
                         }}
                         }}
                         isAccountId
                         isAccountId
                         isGameId
                         isGameId

+ 1 - 1
src/pages/gameDataStatistics/allSurvey/lineC.tsx

@@ -49,7 +49,7 @@ const LineC: React.FC<Props> = (props) => {
                 d: [d1Data]
                 d: [d1Data]
             })
             })
         })
         })
-    }, [queryForm, type])
+    }, [queryForm])
 
 
     return <div className={style.lineCont} ref={ref} style={{ height: `calc(100% - ${145.43 + height}px)` }}>
     return <div className={style.lineCont} ref={ref} style={{ height: `calc(100% - ${145.43 + height}px)` }}>
         <Spin wrapperClassName={'spin_100'} spinning={getAllSurveyLineData.loading}>
         <Spin wrapperClassName={'spin_100'} spinning={getAllSurveyLineData.loading}>

+ 64 - 52
src/pages/gameDataStatistics/extensionData/everyday/tableConfig.tsx

@@ -11,14 +11,18 @@ function columns12(gameType: any): { label: string, fieldSHow?: { label: string,
         { label: '回', key: 'payBack', type: '付费趋势' },
         { label: '回', key: 'payBack', type: '付费趋势' },
         { label: '倍', key: 'newUserRechargeRate', type: '付费趋势' },
         { label: '倍', key: 'newUserRechargeRate', type: '付费趋势' },
     ]
     ]
-    let mySelectFieldData = localStorage.getItem('myAdFieldConfig1.0.0_推广每日数据')
-    let newSelectFieldData: any = {}
-    if (mySelectFieldData) {
-        newSelectFieldData = JSON.parse(mySelectFieldData).date_field
-    } else {
-        newSelectFieldData = defaultValue
+    const getFieldDta = () => {
+        let mySelectFieldData = localStorage.getItem('myAdFieldConfig1.0.0_推广每日数据')
+        let newSelectFieldData: any = {}
+        if (mySelectFieldData) {
+            newSelectFieldData = JSON.parse(mySelectFieldData).date_field
+        } else {
+            newSelectFieldData = defaultValue
+        }
+        return newSelectFieldData
     }
     }
 
 
+
     return [
     return [
         {
         {
             label: '推广账号信息',
             label: '推广账号信息',
@@ -48,7 +52,7 @@ function columns12(gameType: any): { label: string, fieldSHow?: { label: string,
                     title: '推广游戏应用类型', dataIndex: 'gameType', key: 'gameType', label: '推广内容信息', align: 'center', width: 70, default: 6, render: (a: string) => {
                     title: '推广游戏应用类型', dataIndex: 'gameType', key: 'gameType', label: '推广内容信息', align: 'center', width: 70, default: 6, render: (a: string) => {
                         if (a) {
                         if (a) {
                             let one = a.charAt(0)
                             let one = a.charAt(0)
-                            switch(one) {
+                            switch (one) {
                                 case '3':
                                 case '3':
                                     return 'Android'
                                     return 'Android'
                                 case '4':
                                 case '4':
@@ -75,15 +79,15 @@ function columns12(gameType: any): { label: string, fieldSHow?: { label: string,
         {
         {
             label: '广告曝光数据',
             label: '广告曝光数据',
             data: [
             data: [
-                { title: '曝光量', dataIndex: 'viewCount', label: '广告曝光数据', align: 'center', width: 90, default: 9, sorter: true, render: (a: string) => <Statistic value={a || 0}  /> },
-                { title: '点击量', dataIndex: 'clickCount', label: '广告曝光数据', align: 'center', width: 80, default: 10, sorter: true, render: (a: string) => <Statistic value={a || 0}  /> },
-                { title: '转化量', dataIndex: 'convertCount', label: '广告曝光数据', align: 'center', width: 80, default: 11, sorter: true, render: (a: string) => <Statistic value={a || 0}  /> },
+                { title: '曝光量', dataIndex: 'viewCount', label: '广告曝光数据', align: 'center', width: 90, default: 9, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
+                { title: '点击量', dataIndex: 'clickCount', label: '广告曝光数据', align: 'center', width: 80, default: 10, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
+                { title: '转化量', dataIndex: 'convertCount', label: '广告曝光数据', align: 'center', width: 80, default: 11, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
                 {
                 {
                     title: '转化率', dataIndex: 'convertRate', label: '广告曝光数据', align: 'center', width: 70, default: 12, sorter: true,
                     title: '转化率', dataIndex: 'convertRate', label: '广告曝光数据', align: 'center', width: 70, default: 12, sorter: true,
                     render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={a >= 1 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
                     render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={a >= 1 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
                 },
                 },
                 { title: '平均转化成本', dataIndex: 'avgConvertCost', label: '广告曝光数据', align: 'center', width: 70, default: 13, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
                 { title: '平均转化成本', dataIndex: 'avgConvertCost', label: '广告曝光数据', align: 'center', width: 70, default: 13, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
-                { title: '深度转化量', dataIndex: 'deepConvertCount', label: '广告曝光数据', align: 'center', width: 70, default: 14, sorter: true, render: (a: string) => <Statistic value={a || 0}  /> },
+                { title: '深度转化量', dataIndex: 'deepConvertCount', label: '广告曝光数据', align: 'center', width: 70, default: 14, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
                 { title: '深度转化成本', dataIndex: 'deepConvertCost', label: '广告曝光数据', align: 'center', width: 70, default: 15, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
                 { title: '深度转化成本', dataIndex: 'deepConvertCost', label: '广告曝光数据', align: 'center', width: 70, default: 15, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
                 {
                 {
                     title: '深度转化率', dataIndex: 'deepConvertRate', label: '广告曝光数据', align: 'center', width: 70, default: 16, sorter: true,
                     title: '深度转化率', dataIndex: 'deepConvertRate', label: '广告曝光数据', align: 'center', width: 70, default: 16, sorter: true,
@@ -91,25 +95,25 @@ function columns12(gameType: any): { label: string, fieldSHow?: { label: string,
                 },
                 },
                 { title: '千次曝光成本', dataIndex: 'thousandViewCost', label: '广告曝光数据', align: 'center', width: 70, default: 17, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
                 { title: '千次曝光成本', dataIndex: 'thousandViewCost', label: '广告曝光数据', align: 'center', width: 70, default: 17, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
                 { title: '平均点击均价', dataIndex: 'avgClickCost', label: '广告曝光数据', align: 'center', width: 70, default: 18, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
                 { title: '平均点击均价', dataIndex: 'avgClickCost', label: '广告曝光数据', align: 'center', width: 70, default: 18, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
-                { title: '应用下载开始量', dataIndex: 'appDownloadCount', label: '广告曝光数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0}  /> },
+                { title: '应用下载开始量', dataIndex: 'appDownloadCount', label: '广告曝光数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
                 { title: '应用下载开始成本', dataIndex: 'appDownloadCost', label: '广告曝光数据', align: 'center', width: 90, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
                 { title: '应用下载开始成本', dataIndex: 'appDownloadCost', label: '广告曝光数据', align: 'center', width: 90, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
                 {
                 {
                     title: '应用下载开始率', dataIndex: 'appDownloadRate', label: '广告曝光数据', align: 'center', width: 70, sorter: true,
                     title: '应用下载开始率', dataIndex: 'appDownloadRate', label: '广告曝光数据', align: 'center', width: 70, sorter: true,
                     render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={a >= 1 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
                     render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={a >= 1 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
                 },
                 },
-                { title: '应用下载完成量', dataIndex: 'downloadFinish', label: '广告曝光数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0}  /> },
+                { title: '应用下载完成量', dataIndex: 'downloadFinish', label: '广告曝光数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
                 { title: '应用下载完成成本', dataIndex: 'downloadFinishCost', label: '广告曝光数据', align: 'center', width: 90, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
                 { title: '应用下载完成成本', dataIndex: 'downloadFinishCost', label: '广告曝光数据', align: 'center', width: 90, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
                 {
                 {
                     title: '应用下载完成率', dataIndex: 'downloadFinishRate', label: '广告曝光数据', align: 'center', width: 70, sorter: true,
                     title: '应用下载完成率', dataIndex: 'downloadFinishRate', label: '广告曝光数据', align: 'center', width: 70, sorter: true,
                     render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={a >= 1 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
                     render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={a >= 1 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
                 },
                 },
-                { title: '应用安装量', dataIndex: 'appInstallCount', label: '广告曝光数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0}  /> },
+                { title: '应用安装量', dataIndex: 'appInstallCount', label: '广告曝光数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
                 { title: '应用安装成本', dataIndex: 'appInstallCost', label: '广告曝光数据', align: 'center', width: 90, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
                 { title: '应用安装成本', dataIndex: 'appInstallCost', label: '广告曝光数据', align: 'center', width: 90, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
                 {
                 {
                     title: '应用安装完成率', dataIndex: 'appInstallRate', label: '广告曝光数据', align: 'center', width: 70, sorter: true,
                     title: '应用安装完成率', dataIndex: 'appInstallRate', label: '广告曝光数据', align: 'center', width: 70, sorter: true,
                     render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={a >= 1 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
                     render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={a >= 1 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
                 },
                 },
-                { title: '应用激活量', dataIndex: 'appActiveCount', label: '广告曝光数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0}  /> },
+                { title: '应用激活量', dataIndex: 'appActiveCount', label: '广告曝光数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
                 { title: '应用激活成本', dataIndex: 'appActiveCost', label: '广告曝光数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
                 { title: '应用激活成本', dataIndex: 'appActiveCost', label: '广告曝光数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
                 {
                 {
                     title: '应用激活率', dataIndex: 'appActiveRate', label: '广告曝光数据', align: 'center', width: 70, sorter: true,
                     title: '应用激活率', dataIndex: 'appActiveRate', label: '广告曝光数据', align: 'center', width: 70, sorter: true,
@@ -126,17 +130,17 @@ function columns12(gameType: any): { label: string, fieldSHow?: { label: string,
         {
         {
             label: '付费数据',
             label: '付费数据',
             data: [
             data: [
-                { title: '首日新用户充值次数', dataIndex: 'firstUserRechargeCount', label: '付费数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0}  /> },
-                { title: '首日新用户充值人数', dataIndex: 'firstUserRechargeUser', label: '付费数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0}  /> },
+                { title: '首日新用户充值次数', dataIndex: 'firstUserRechargeCount', label: '付费数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
+                { title: '首日新用户充值人数', dataIndex: 'firstUserRechargeUser', label: '付费数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
                 { title: '首日新用户充值金额', dataIndex: 'firstUserRechargeMoney', label: '付费数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
                 { title: '首日新用户充值金额', dataIndex: 'firstUserRechargeMoney', label: '付费数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
-                { title: '老用户充值次数', dataIndex: 'oldUserRechargeCount', label: '付费数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0}  /> },
-                { title: '老用户充值人数', dataIndex: 'oldUserRechargeUser', label: '付费数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0}  /> },
+                { title: '老用户充值次数', dataIndex: 'oldUserRechargeCount', label: '付费数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
+                { title: '老用户充值人数', dataIndex: 'oldUserRechargeUser', label: '付费数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
                 { title: '老用户充值金额', dataIndex: 'oldUserRechargeMoney', label: '付费数据', align: 'center', width: 80, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
                 { title: '老用户充值金额', dataIndex: 'oldUserRechargeMoney', label: '付费数据', align: 'center', width: 80, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
-                { title: '账面充值次数', dataIndex: 'showRechargeCount', label: '付费数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0}  /> },
-                { title: '账面充值人数', dataIndex: 'showRechargeUser', label: '付费数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0}  /> },
+                { title: '账面充值次数', dataIndex: 'showRechargeCount', label: '付费数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
+                { title: '账面充值人数', dataIndex: 'showRechargeUser', label: '付费数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
                 { title: '账面充值金额', dataIndex: 'showRechargeMoney', label: '付费数据', align: 'center', width: 80, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
                 { title: '账面充值金额', dataIndex: 'showRechargeMoney', label: '付费数据', align: 'center', width: 80, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
-                { title: '新用户累计充值次数', dataIndex: 'newUserRechargeCount', label: '付费数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0}  /> },
-                { title: '新用户累计充值人数', dataIndex: 'newUserRechargeUser', label: '付费数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0}  /> },
+                { title: '新用户累计充值次数', dataIndex: 'newUserRechargeCount', label: '付费数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
+                { title: '新用户累计充值人数', dataIndex: 'newUserRechargeUser', label: '付费数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
                 { title: '新用户累计充值金额', dataIndex: 'newUserRechargeMoney', label: '付费数据', align: 'center', width: 80, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
                 { title: '新用户累计充值金额', dataIndex: 'newUserRechargeMoney', label: '付费数据', align: 'center', width: 80, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
                 {
                 {
                     title: '首日回收率', dataIndex: 'todayRecoveryRate', label: '付费数据', align: 'center', width: 70, sorter: true,
                     title: '首日回收率', dataIndex: 'todayRecoveryRate', label: '付费数据', align: 'center', width: 70, sorter: true,
@@ -183,7 +187,7 @@ function columns12(gameType: any): { label: string, fieldSHow?: { label: string,
                     title: '买量用户付费率', dataIndex: 'buyUserRechargeRate', label: '付费数据', align: 'center', width: 70, sorter: true,
                     title: '买量用户付费率', dataIndex: 'buyUserRechargeRate', label: '付费数据', align: 'center', width: 70, sorter: true,
                     render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={a >= 1 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
                     render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={a >= 1 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
                 },
                 },
-                { title: '新用户付费比', dataIndex: 'newUserRechargeRate', label: '付费数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0}  /> },
+                { title: '新用户付费比', dataIndex: 'newUserRechargeRate', label: '付费数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
                 { title: '首日客单价', dataIndex: 'avgFirstUserRecharge', label: '付费数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
                 { title: '首日客单价', dataIndex: 'avgFirstUserRecharge', label: '付费数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
                 { title: '买量客单价', dataIndex: 'avgBuyUserRecharge', label: '付费数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
                 { title: '买量客单价', dataIndex: 'avgBuyUserRecharge', label: '付费数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
                 { title: '账面客单价', dataIndex: 'avgShowUserRecharge', label: '付费数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
                 { title: '账面客单价', dataIndex: 'avgShowUserRecharge', label: '付费数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
@@ -193,10 +197,10 @@ function columns12(gameType: any): { label: string, fieldSHow?: { label: string,
                     title: '复充率', dataIndex: 'repeatRechargeRate', label: '付费数据', align: 'center', width: 70, sorter: true,
                     title: '复充率', dataIndex: 'repeatRechargeRate', label: '付费数据', align: 'center', width: 70, sorter: true,
                     render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={a >= 1 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
                     render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={a >= 1 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
                 },
                 },
-                { title: '新增注册ARPU', dataIndex: 'newRegARPU', label: '付费数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0}  /> },
-                { title: '首日付费ARPU', dataIndex: 'firstRechargeARPU', label: '付费数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0}  /> },
-                { title: '当天付费ARPU', dataIndex: 'todayRechargeArpu', label: '付费数据', align: 'center', width: 80, sorter: true, render: (a: string) => <Statistic value={a || 0}  /> },
-                { title: '账面ARPU', dataIndex: 'showRechargeARPU', label: '付费数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0}  /> }
+                { title: '新增注册ARPU', dataIndex: 'newRegARPU', label: '付费数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
+                { title: '首日付费ARPU', dataIndex: 'firstRechargeARPU', label: '付费数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
+                { title: '当天付费ARPU', dataIndex: 'todayRechargeArpu', label: '付费数据', align: 'center', width: 80, sorter: true, render: (a: string) => <Statistic value={a || 0} /> },
+                { title: '账面ARPU', dataIndex: 'showRechargeARPU', label: '付费数据', align: 'center', width: 70, sorter: true, render: (a: string) => <Statistic value={a || 0} /> }
             ]
             ]
         },
         },
         {
         {
@@ -225,10 +229,11 @@ function columns12(gameType: any): { label: string, fieldSHow?: { label: string,
                 width: 110,
                 width: 110,
                 default: 19,
                 default: 19,
                 render: (a: any, b: any) => {
                 render: (a: any, b: any) => {
-                    if (newSelectFieldData?.length > 0) {
+                    let fieldData = getFieldDta()
+                    if (fieldData?.length > 0) {
                         let data: any = {}
                         let data: any = {}
-                        let keyS: string[] = newSelectFieldData?.map((item: any) => item.key)
-                        switch (newSelectFieldData[0].type) {
+                        let keyS: string[] = fieldData?.map((item: any) => item.key)
+                        switch (fieldData[0].type) {
                             case '付费趋势':
                             case '付费趋势':
                                 if (b?.rechargeTrendDay1) {
                                 if (b?.rechargeTrendDay1) {
                                     data = b?.rechargeTrendDay1
                                     data = b?.rechargeTrendDay1
@@ -252,10 +257,11 @@ function columns12(gameType: any): { label: string, fieldSHow?: { label: string,
                 width: 110,
                 width: 110,
                 default: 20,
                 default: 20,
                 render: (a: any, b: any) => {
                 render: (a: any, b: any) => {
-                    if (newSelectFieldData?.length > 0) {
+                    let fieldData = getFieldDta()
+                    if (fieldData?.length > 0) {
                         let data: any = {}
                         let data: any = {}
-                        let keyS: string[] = newSelectFieldData?.map((item: any) => item.key)
-                        switch (newSelectFieldData[0].type) {
+                        let keyS: string[] = fieldData?.map((item: any) => item.key)
+                        switch (fieldData[0].type) {
                             case '付费趋势':
                             case '付费趋势':
                                 if (b?.rechargeTrendDay3) {
                                 if (b?.rechargeTrendDay3) {
                                     data = b?.rechargeTrendDay3
                                     data = b?.rechargeTrendDay3
@@ -279,10 +285,11 @@ function columns12(gameType: any): { label: string, fieldSHow?: { label: string,
                 width: 110,
                 width: 110,
                 default: 21,
                 default: 21,
                 render: (a: any, b: any) => {
                 render: (a: any, b: any) => {
-                    if (newSelectFieldData?.length > 0) {
+                    let fieldData = getFieldDta()
+                    if (fieldData?.length > 0) {
                         let data: any = {}
                         let data: any = {}
-                        let keyS: string[] = newSelectFieldData?.map((item: any) => item.key)
-                        switch (newSelectFieldData[0].type) {
+                        let keyS: string[] = fieldData?.map((item: any) => item.key)
+                        switch (fieldData[0].type) {
                             case '付费趋势':
                             case '付费趋势':
                                 if (b?.rechargeTrendDay7) {
                                 if (b?.rechargeTrendDay7) {
                                     data = b?.rechargeTrendDay7
                                     data = b?.rechargeTrendDay7
@@ -306,10 +313,11 @@ function columns12(gameType: any): { label: string, fieldSHow?: { label: string,
                 width: 110,
                 width: 110,
                 default: 22,
                 default: 22,
                 render: (a: any, b: any) => {
                 render: (a: any, b: any) => {
-                    if (newSelectFieldData?.length > 0) {
+                    let fieldData = getFieldDta()
+                    if (fieldData?.length > 0) {
                         let data: any = {}
                         let data: any = {}
-                        let keyS: string[] = newSelectFieldData?.map((item: any) => item.key)
-                        switch (newSelectFieldData[0].type) {
+                        let keyS: string[] = fieldData?.map((item: any) => item.key)
+                        switch (fieldData[0].type) {
                             case '付费趋势':
                             case '付费趋势':
                                 if (b?.rechargeTrendDay15) {
                                 if (b?.rechargeTrendDay15) {
                                     data = b?.rechargeTrendDay15
                                     data = b?.rechargeTrendDay15
@@ -333,10 +341,11 @@ function columns12(gameType: any): { label: string, fieldSHow?: { label: string,
                 width: 110,
                 width: 110,
                 default: 23,
                 default: 23,
                 render: (a: any, b: any) => {
                 render: (a: any, b: any) => {
-                    if (newSelectFieldData?.length > 0) {
+                    let fieldData = getFieldDta()
+                    if (fieldData?.length > 0) {
                         let data: any = {}
                         let data: any = {}
-                        let keyS: string[] = newSelectFieldData?.map((item: any) => item.key)
-                        switch (newSelectFieldData[0].type) {
+                        let keyS: string[] = fieldData?.map((item: any) => item.key)
+                        switch (fieldData[0].type) {
                             case '付费趋势':
                             case '付费趋势':
                                 if (b?.rechargeTrendMonth1) {
                                 if (b?.rechargeTrendMonth1) {
                                     data = b?.rechargeTrendMonth1
                                     data = b?.rechargeTrendMonth1
@@ -360,10 +369,11 @@ function columns12(gameType: any): { label: string, fieldSHow?: { label: string,
                 width: 110,
                 width: 110,
                 default: 24,
                 default: 24,
                 render: (a: any, b: any) => {
                 render: (a: any, b: any) => {
-                    if (newSelectFieldData?.length > 0) {
+                    let fieldData = getFieldDta()
+                    if (fieldData?.length > 0) {
                         let data: any = {}
                         let data: any = {}
-                        let keyS: string[] = newSelectFieldData?.map((item: any) => item.key)
-                        switch (newSelectFieldData[0].type) {
+                        let keyS: string[] = fieldData?.map((item: any) => item.key)
+                        switch (fieldData[0].type) {
                             case '付费趋势':
                             case '付费趋势':
                                 if (b?.rechargeTrendMonth2) {
                                 if (b?.rechargeTrendMonth2) {
                                     data = b?.rechargeTrendMonth2
                                     data = b?.rechargeTrendMonth2
@@ -387,10 +397,11 @@ function columns12(gameType: any): { label: string, fieldSHow?: { label: string,
                 width: 110,
                 width: 110,
                 default: 25,
                 default: 25,
                 render: (a: any, b: any) => {
                 render: (a: any, b: any) => {
-                    if (newSelectFieldData?.length > 0) {
+                    let fieldData = getFieldDta()
+                    if (fieldData?.length > 0) {
                         let data: any = {}
                         let data: any = {}
-                        let keyS: string[] = newSelectFieldData?.map((item: any) => item.key)
-                        switch (newSelectFieldData[0].type) {
+                        let keyS: string[] = fieldData?.map((item: any) => item.key)
+                        switch (fieldData[0].type) {
                             case '付费趋势':
                             case '付费趋势':
                                 if (b?.rechargeTrendMonth3) {
                                 if (b?.rechargeTrendMonth3) {
                                     data = b?.rechargeTrendMonth3
                                     data = b?.rechargeTrendMonth3
@@ -415,10 +426,11 @@ function columns12(gameType: any): { label: string, fieldSHow?: { label: string,
                 align: "center",
                 align: "center",
                 width: 110,
                 width: 110,
                 render: (a: any, b: any) => {
                 render: (a: any, b: any) => {
-                    if (newSelectFieldData?.length > 0) {
+                    let fieldData = getFieldDta()
+                    if (fieldData?.length > 0) {
                         let data: any = {}
                         let data: any = {}
-                        let keyS: string[] = newSelectFieldData?.map((item: any) => item.key)
-                        switch (newSelectFieldData[0].type) {
+                        let keyS: string[] = fieldData?.map((item: any) => item.key)
+                        switch (fieldData[0].type) {
                             case '付费趋势':
                             case '付费趋势':
                                 if (b?.rechargeTrendTotal) {
                                 if (b?.rechargeTrendTotal) {
                                     data = b?.rechargeTrendTotal
                                     data = b?.rechargeTrendTotal

+ 112 - 85
src/pages/gameDataStatistics/gameData/everyday/tableConfig.tsx

@@ -4,19 +4,22 @@ import { Statistic } from "antd"
 
 
 function columns12(): { label: string, fieldSHow?: { label: string, saveField: string, defaultValue: any[], data: any[] }, data: any[] }[] {
 function columns12(): { label: string, fieldSHow?: { label: string, saveField: string, defaultValue: any[], data: any[] }, data: any[] }[] {
 
 
-    let defaultValue = [  // 默认展示字段
-        { label: '充值人数', key: 'rechargeUserCount', type: '付费趋势' },
-        { label: '充值金额', key: 'rechargeMoney', type: '付费趋势' },
-        { label: '增', key: 'increase', type: '付费趋势' },
-        { label: '回', key: 'back', type: '付费趋势' },
-        { label: '倍', key: 'multiples', type: '付费趋势' },
-    ]
-    let mySelectFieldData = localStorage.getItem('myAdFieldConfig1.0.0_推广每日数据')
-    let newSelectFieldData: any = {}
-    if (mySelectFieldData) {
-        newSelectFieldData = JSON.parse(mySelectFieldData).date_field
-    } else {
-        newSelectFieldData = defaultValue
+    const getFieldDta = () => {
+        let defaultValue = [  // 默认展示字段
+            { label: '充值人数', key: 'rechargeUserCount', type: '付费趋势' },
+            { label: '充值金额', key: 'rechargeMoney', type: '付费趋势' },
+            { label: '增', key: 'increase', type: '付费趋势' },
+            { label: '回', key: 'back', type: '付费趋势' },
+            { label: '倍', key: 'multiples', type: '付费趋势' },
+        ]
+        let mySelectFieldData = localStorage.getItem('myAdFieldConfig1.0.0_游戏每日数据')
+        let newSelectFieldData: any = {}
+        if (mySelectFieldData) {
+            newSelectFieldData = JSON.parse(mySelectFieldData).date_field
+        } else {
+            newSelectFieldData = defaultValue
+        }
+        return newSelectFieldData
     }
     }
 
 
     return [
     return [
@@ -322,10 +325,11 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                 width: 110,
                 width: 110,
                 default: 31,
                 default: 31,
                 render: (a: any, b: any) => {
                 render: (a: any, b: any) => {
-                    if (newSelectFieldData?.length > 0) {
+                    let fieldData = getFieldDta()
+                    if (fieldData?.length > 0) {
                         let data: any = {}
                         let data: any = {}
-                        let keyS: string[] = newSelectFieldData?.map((item: any) => item.key)
-                        switch (newSelectFieldData[0].type) {
+                        let keyS: string[] = fieldData?.map((item: any) => item.key)
+                        switch (fieldData[0].type) {
                             case '付费趋势':
                             case '付费趋势':
                                 if (b?.buyAmountD1Trend) {
                                 if (b?.buyAmountD1Trend) {
                                     data = b?.buyAmountD1Trend
                                     data = b?.buyAmountD1Trend
@@ -350,10 +354,11 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                 width: 110,
                 width: 110,
                 default: 32,
                 default: 32,
                 render: (a: any, b: any) => {
                 render: (a: any, b: any) => {
-                    if (newSelectFieldData?.length > 0) {
+                    let fieldData = getFieldDta()
+                    if (fieldData?.length > 0) {
                         let data: any = {}
                         let data: any = {}
-                        let keyS: string[] = newSelectFieldData?.map((item: any) => item.key)
-                        switch (newSelectFieldData[0].type) {
+                        let keyS: string[] = fieldData?.map((item: any) => item.key)
+                        switch (fieldData[0].type) {
                             case '付费趋势':
                             case '付费趋势':
                                 if (b?.buyAmountD3Trend) {
                                 if (b?.buyAmountD3Trend) {
                                     data = b?.buyAmountD3Trend
                                     data = b?.buyAmountD3Trend
@@ -378,10 +383,11 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                 width: 110,
                 width: 110,
                 default: 33,
                 default: 33,
                 render: (a: any, b: any) => {
                 render: (a: any, b: any) => {
-                    if (newSelectFieldData?.length > 0) {
+                    let fieldData = getFieldDta()
+                    if (fieldData?.length > 0) {
                         let data: any = {}
                         let data: any = {}
-                        let keyS: string[] = newSelectFieldData?.map((item: any) => item.key)
-                        switch (newSelectFieldData[0].type) {
+                        let keyS: string[] = fieldData?.map((item: any) => item.key)
+                        switch (fieldData[0].type) {
                             case '付费趋势':
                             case '付费趋势':
                                 if (b?.buyAmountD7Trend) {
                                 if (b?.buyAmountD7Trend) {
                                     data = b?.buyAmountD7Trend
                                     data = b?.buyAmountD7Trend
@@ -406,10 +412,11 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                 width: 110,
                 width: 110,
                 default: 34,
                 default: 34,
                 render: (a: any, b: any) => {
                 render: (a: any, b: any) => {
-                    if (newSelectFieldData?.length > 0) {
+                    let fieldData = getFieldDta()
+                    if (fieldData?.length > 0) {
                         let data: any = {}
                         let data: any = {}
-                        let keyS: string[] = newSelectFieldData?.map((item: any) => item.key)
-                        switch (newSelectFieldData[0].type) {
+                        let keyS: string[] = fieldData?.map((item: any) => item.key)
+                        switch (fieldData[0].type) {
                             case '付费趋势':
                             case '付费趋势':
                                 if (b?.buyAmountD15Trend) {
                                 if (b?.buyAmountD15Trend) {
                                     data = b?.buyAmountD15Trend
                                     data = b?.buyAmountD15Trend
@@ -434,10 +441,11 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                 width: 110,
                 width: 110,
                 default: 35,
                 default: 35,
                 render: (a: any, b: any) => {
                 render: (a: any, b: any) => {
-                    if (newSelectFieldData?.length > 0) {
+                    let fieldData = getFieldDta()
+                    if (fieldData?.length > 0) {
                         let data: any = {}
                         let data: any = {}
-                        let keyS: string[] = newSelectFieldData?.map((item: any) => item.key)
-                        switch (newSelectFieldData[0].type) {
+                        let keyS: string[] = fieldData?.map((item: any) => item.key)
+                        switch (fieldData[0].type) {
                             case '付费趋势':
                             case '付费趋势':
                                 if (b?.buyAmountM1Trend) {
                                 if (b?.buyAmountM1Trend) {
                                     data = b?.buyAmountM1Trend
                                     data = b?.buyAmountM1Trend
@@ -462,10 +470,11 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                 width: 110,
                 width: 110,
                 default: 36,
                 default: 36,
                 render: (a: any, b: any) => {
                 render: (a: any, b: any) => {
-                    if (newSelectFieldData?.length > 0) {
+                    let fieldData = getFieldDta()
+                    if (fieldData?.length > 0) {
                         let data: any = {}
                         let data: any = {}
-                        let keyS: string[] = newSelectFieldData?.map((item: any) => item.key)
-                        switch (newSelectFieldData[0].type) {
+                        let keyS: string[] = fieldData?.map((item: any) => item.key)
+                        switch (fieldData[0].type) {
                             case '付费趋势':
                             case '付费趋势':
                                 if (b?.buyAmountM2Trend) {
                                 if (b?.buyAmountM2Trend) {
                                     data = b?.buyAmountM2Trend
                                     data = b?.buyAmountM2Trend
@@ -490,10 +499,11 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                 width: 110,
                 width: 110,
                 default: 37,
                 default: 37,
                 render: (a: any, b: any) => {
                 render: (a: any, b: any) => {
-                    if (newSelectFieldData?.length > 0) {
+                    let fieldData = getFieldDta()
+                    if (fieldData?.length > 0) {
                         let data: any = {}
                         let data: any = {}
-                        let keyS: string[] = newSelectFieldData?.map((item: any) => item.key)
-                        switch (newSelectFieldData[0].type) {
+                        let keyS: string[] = fieldData?.map((item: any) => item.key)
+                        switch (fieldData[0].type) {
                             case '付费趋势':
                             case '付费趋势':
                                 if (b?.buyAmountM3Trend) {
                                 if (b?.buyAmountM3Trend) {
                                     data = b?.buyAmountM3Trend
                                     data = b?.buyAmountM3Trend
@@ -518,10 +528,11 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                 width: 110,
                 width: 110,
                 default: 38,
                 default: 38,
                 render: (a: any, b: any) => {
                 render: (a: any, b: any) => {
-                    if (newSelectFieldData?.length > 0) {
+                    let fieldData = getFieldDta()
+                    if (fieldData?.length > 0) {
                         let data: any = {}
                         let data: any = {}
-                        let keyS: string[] = newSelectFieldData?.map((item: any) => item.key)
-                        switch (newSelectFieldData[0].type) {
+                        let keyS: string[] = fieldData?.map((item: any) => item.key)
+                        switch (fieldData[0].type) {
                             case '付费趋势':
                             case '付费趋势':
                                 if (b?.buyAmountSumTrend) {
                                 if (b?.buyAmountSumTrend) {
                                     data = b?.buyAmountSumTrend
                                     data = b?.buyAmountSumTrend
@@ -550,10 +561,11 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                 width: 110,
                 width: 110,
                 default: 39,
                 default: 39,
                 render: (a: any, b: any) => {
                 render: (a: any, b: any) => {
-                    if (newSelectFieldData?.length > 0) {
+                    let fieldData = getFieldDta()
+                    if (fieldData?.length > 0) {
                         let data: any = {}
                         let data: any = {}
-                        let keyS: string[] = newSelectFieldData?.map((item: any) => item.key)
-                        switch (newSelectFieldData[0].type) {
+                        let keyS: string[] = fieldData?.map((item: any) => item.key)
+                        switch (fieldData[0].type) {
                             case '付费趋势':
                             case '付费趋势':
                                 if (b?.natureAmountD1Trend) {
                                 if (b?.natureAmountD1Trend) {
                                     data = b?.natureAmountD1Trend
                                     data = b?.natureAmountD1Trend
@@ -578,10 +590,11 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                 width: 110,
                 width: 110,
                 default: 40,
                 default: 40,
                 render: (a: any, b: any) => {
                 render: (a: any, b: any) => {
-                    if (newSelectFieldData?.length > 0) {
+                    let fieldData = getFieldDta()
+                    if (fieldData?.length > 0) {
                         let data: any = {}
                         let data: any = {}
-                        let keyS: string[] = newSelectFieldData?.map((item: any) => item.key)
-                        switch (newSelectFieldData[0].type) {
+                        let keyS: string[] = fieldData?.map((item: any) => item.key)
+                        switch (fieldData[0].type) {
                             case '付费趋势':
                             case '付费趋势':
                                 if (b?.natureAmountD3Trend) {
                                 if (b?.natureAmountD3Trend) {
                                     data = b?.natureAmountD3Trend
                                     data = b?.natureAmountD3Trend
@@ -606,10 +619,11 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                 width: 110,
                 width: 110,
                 default: 41,
                 default: 41,
                 render: (a: any, b: any) => {
                 render: (a: any, b: any) => {
-                    if (newSelectFieldData?.length > 0) {
+                    let fieldData = getFieldDta()
+                    if (fieldData?.length > 0) {
                         let data: any = {}
                         let data: any = {}
-                        let keyS: string[] = newSelectFieldData?.map((item: any) => item.key)
-                        switch (newSelectFieldData[0].type) {
+                        let keyS: string[] = fieldData?.map((item: any) => item.key)
+                        switch (fieldData[0].type) {
                             case '付费趋势':
                             case '付费趋势':
                                 if (b?.natureAmountD7Trend) {
                                 if (b?.natureAmountD7Trend) {
                                     data = b?.natureAmountD7Trend
                                     data = b?.natureAmountD7Trend
@@ -634,10 +648,11 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                 width: 110,
                 width: 110,
                 default: 42,
                 default: 42,
                 render: (a: any, b: any) => {
                 render: (a: any, b: any) => {
-                    if (newSelectFieldData?.length > 0) {
+                    let fieldData = getFieldDta()
+                    if (fieldData?.length > 0) {
                         let data: any = {}
                         let data: any = {}
-                        let keyS: string[] = newSelectFieldData?.map((item: any) => item.key)
-                        switch (newSelectFieldData[0].type) {
+                        let keyS: string[] = fieldData?.map((item: any) => item.key)
+                        switch (fieldData[0].type) {
                             case '付费趋势':
                             case '付费趋势':
                                 if (b?.natureAmountD15Trend) {
                                 if (b?.natureAmountD15Trend) {
                                     data = b?.natureAmountD15Trend
                                     data = b?.natureAmountD15Trend
@@ -662,10 +677,11 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                 width: 110,
                 width: 110,
                 default: 43,
                 default: 43,
                 render: (a: any, b: any) => {
                 render: (a: any, b: any) => {
-                    if (newSelectFieldData?.length > 0) {
+                    let fieldData = getFieldDta()
+                    if (fieldData?.length > 0) {
                         let data: any = {}
                         let data: any = {}
-                        let keyS: string[] = newSelectFieldData?.map((item: any) => item.key)
-                        switch (newSelectFieldData[0].type) {
+                        let keyS: string[] = fieldData?.map((item: any) => item.key)
+                        switch (fieldData[0].type) {
                             case '付费趋势':
                             case '付费趋势':
                                 if (b?.natureAmountM1Trend) {
                                 if (b?.natureAmountM1Trend) {
                                     data = b?.natureAmountM1Trend
                                     data = b?.natureAmountM1Trend
@@ -690,10 +706,11 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                 width: 110,
                 width: 110,
                 default: 44,
                 default: 44,
                 render: (a: any, b: any) => {
                 render: (a: any, b: any) => {
-                    if (newSelectFieldData?.length > 0) {
+                    let fieldData = getFieldDta()
+                    if (fieldData?.length > 0) {
                         let data: any = {}
                         let data: any = {}
-                        let keyS: string[] = newSelectFieldData?.map((item: any) => item.key)
-                        switch (newSelectFieldData[0].type) {
+                        let keyS: string[] = fieldData?.map((item: any) => item.key)
+                        switch (fieldData[0].type) {
                             case '付费趋势':
                             case '付费趋势':
                                 if (b?.natureAmountM2Trend) {
                                 if (b?.natureAmountM2Trend) {
                                     data = b?.natureAmountM2Trend
                                     data = b?.natureAmountM2Trend
@@ -718,10 +735,11 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                 width: 110,
                 width: 110,
                 default: 45,
                 default: 45,
                 render: (a: any, b: any) => {
                 render: (a: any, b: any) => {
-                    if (newSelectFieldData?.length > 0) {
+                    let fieldData = getFieldDta()
+                    if (fieldData?.length > 0) {
                         let data: any = {}
                         let data: any = {}
-                        let keyS: string[] = newSelectFieldData?.map((item: any) => item.key)
-                        switch (newSelectFieldData[0].type) {
+                        let keyS: string[] = fieldData?.map((item: any) => item.key)
+                        switch (fieldData[0].type) {
                             case '付费趋势':
                             case '付费趋势':
                                 if (b?.natureAmountM3Trend) {
                                 if (b?.natureAmountM3Trend) {
                                     data = b?.natureAmountM3Trend
                                     data = b?.natureAmountM3Trend
@@ -746,10 +764,11 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                 width: 110,
                 width: 110,
                 default: 46,
                 default: 46,
                 render: (a: any, b: any) => {
                 render: (a: any, b: any) => {
-                    if (newSelectFieldData?.length > 0) {
+                    let fieldData = getFieldDta()
+                    if (fieldData?.length > 0) {
                         let data: any = {}
                         let data: any = {}
-                        let keyS: string[] = newSelectFieldData?.map((item: any) => item.key)
-                        switch (newSelectFieldData[0].type) {
+                        let keyS: string[] = fieldData?.map((item: any) => item.key)
+                        switch (fieldData[0].type) {
                             case '付费趋势':
                             case '付费趋势':
                                 if (b?.natureAmountSumTrend) {
                                 if (b?.natureAmountSumTrend) {
                                     data = b?.natureAmountSumTrend
                                     data = b?.natureAmountSumTrend
@@ -778,10 +797,11 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                 width: 110,
                 width: 110,
                 default: 47,
                 default: 47,
                 render: (a: any, b: any) => {
                 render: (a: any, b: any) => {
-                    if (newSelectFieldData?.length > 0) {
+                    let fieldData = getFieldDta()
+                    if (fieldData?.length > 0) {
                         let data: any = {}
                         let data: any = {}
-                        let keyS: string[] = newSelectFieldData?.map((item: any) => item.key)
-                        switch (newSelectFieldData[0].type) {
+                        let keyS: string[] = fieldData?.map((item: any) => item.key)
+                        switch (fieldData[0].type) {
                             case '付费趋势':
                             case '付费趋势':
                                 if (b?.amountD1Trend) {
                                 if (b?.amountD1Trend) {
                                     data = b?.amountD1Trend
                                     data = b?.amountD1Trend
@@ -806,10 +826,11 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                 width: 110,
                 width: 110,
                 default: 48,
                 default: 48,
                 render: (a: any, b: any) => {
                 render: (a: any, b: any) => {
-                    if (newSelectFieldData?.length > 0) {
+                    let fieldData = getFieldDta()
+                    if (fieldData?.length > 0) {
                         let data: any = {}
                         let data: any = {}
-                        let keyS: string[] = newSelectFieldData?.map((item: any) => item.key)
-                        switch (newSelectFieldData[0].type) {
+                        let keyS: string[] = fieldData?.map((item: any) => item.key)
+                        switch (fieldData[0].type) {
                             case '付费趋势':
                             case '付费趋势':
                                 if (b?.amountD3Trend) {
                                 if (b?.amountD3Trend) {
                                     data = b?.amountD3Trend
                                     data = b?.amountD3Trend
@@ -834,10 +855,11 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                 width: 110,
                 width: 110,
                 default: 49,
                 default: 49,
                 render: (a: any, b: any) => {
                 render: (a: any, b: any) => {
-                    if (newSelectFieldData?.length > 0) {
+                    let fieldData = getFieldDta()
+                    if (fieldData?.length > 0) {
                         let data: any = {}
                         let data: any = {}
-                        let keyS: string[] = newSelectFieldData?.map((item: any) => item.key)
-                        switch (newSelectFieldData[0].type) {
+                        let keyS: string[] = fieldData?.map((item: any) => item.key)
+                        switch (fieldData[0].type) {
                             case '付费趋势':
                             case '付费趋势':
                                 if (b?.amountD7Trend) {
                                 if (b?.amountD7Trend) {
                                     data = b?.amountD7Trend
                                     data = b?.amountD7Trend
@@ -862,10 +884,11 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                 width: 110,
                 width: 110,
                 default: 50,
                 default: 50,
                 render: (a: any, b: any) => {
                 render: (a: any, b: any) => {
-                    if (newSelectFieldData?.length > 0) {
+                    let fieldData = getFieldDta()
+                    if (fieldData?.length > 0) {
                         let data: any = {}
                         let data: any = {}
-                        let keyS: string[] = newSelectFieldData?.map((item: any) => item.key)
-                        switch (newSelectFieldData[0].type) {
+                        let keyS: string[] = fieldData?.map((item: any) => item.key)
+                        switch (fieldData[0].type) {
                             case '付费趋势':
                             case '付费趋势':
                                 if (b?.amountD15Trend) {
                                 if (b?.amountD15Trend) {
                                     data = b?.amountD15Trend
                                     data = b?.amountD15Trend
@@ -890,10 +913,11 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                 width: 110,
                 width: 110,
                 default: 51,
                 default: 51,
                 render: (a: any, b: any) => {
                 render: (a: any, b: any) => {
-                    if (newSelectFieldData?.length > 0) {
+                    let fieldData = getFieldDta()
+                    if (fieldData?.length > 0) {
                         let data: any = {}
                         let data: any = {}
-                        let keyS: string[] = newSelectFieldData?.map((item: any) => item.key)
-                        switch (newSelectFieldData[0].type) {
+                        let keyS: string[] = fieldData?.map((item: any) => item.key)
+                        switch (fieldData[0].type) {
                             case '付费趋势':
                             case '付费趋势':
                                 if (b?.amountM1Trend) {
                                 if (b?.amountM1Trend) {
                                     data = b?.amountM1Trend
                                     data = b?.amountM1Trend
@@ -918,10 +942,11 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                 width: 110,
                 width: 110,
                 default: 52,
                 default: 52,
                 render: (a: any, b: any) => {
                 render: (a: any, b: any) => {
-                    if (newSelectFieldData?.length > 0) {
+                    let fieldData = getFieldDta()
+                    if (fieldData?.length > 0) {
                         let data: any = {}
                         let data: any = {}
-                        let keyS: string[] = newSelectFieldData?.map((item: any) => item.key)
-                        switch (newSelectFieldData[0].type) {
+                        let keyS: string[] = fieldData?.map((item: any) => item.key)
+                        switch (fieldData[0].type) {
                             case '付费趋势':
                             case '付费趋势':
                                 if (b?.amountM2Trend) {
                                 if (b?.amountM2Trend) {
                                     data = b?.amountM2Trend
                                     data = b?.amountM2Trend
@@ -946,10 +971,11 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                 width: 110,
                 width: 110,
                 default: 53,
                 default: 53,
                 render: (a: any, b: any) => {
                 render: (a: any, b: any) => {
-                    if (newSelectFieldData?.length > 0) {
+                    let fieldData = getFieldDta()
+                    if (fieldData?.length > 0) {
                         let data: any = {}
                         let data: any = {}
-                        let keyS: string[] = newSelectFieldData?.map((item: any) => item.key)
-                        switch (newSelectFieldData[0].type) {
+                        let keyS: string[] = fieldData?.map((item: any) => item.key)
+                        switch (fieldData[0].type) {
                             case '付费趋势':
                             case '付费趋势':
                                 if (b?.amountM3Trend) {
                                 if (b?.amountM3Trend) {
                                     data = b?.amountM3Trend
                                     data = b?.amountM3Trend
@@ -974,10 +1000,11 @@ function columns12(): { label: string, fieldSHow?: { label: string, saveField: s
                 width: 110,
                 width: 110,
                 default: 54,
                 default: 54,
                 render: (a: any, b: any) => {
                 render: (a: any, b: any) => {
-                    if (newSelectFieldData?.length > 0) {
+                    let fieldData = getFieldDta()
+                    if (fieldData?.length > 0) {
                         let data: any = {}
                         let data: any = {}
-                        let keyS: string[] = newSelectFieldData?.map((item: any) => item.key)
-                        switch (newSelectFieldData[0].type) {
+                        let keyS: string[] = fieldData?.map((item: any) => item.key)
+                        switch (fieldData[0].type) {
                             case '付费趋势':
                             case '付费趋势':
                                 if (b?.amountSumTrend) {
                                 if (b?.amountSumTrend) {
                                     data = b?.amountSumTrend
                                     data = b?.amountSumTrend