fix

src/components/QueryForm/index.tsx

@@ -249,12 +249,6 @@ const QueryForm: React.FC<Props> = (props) => {
         }
     }, [isCustomerServerId, isOperatorId, isGsId])
 
-    useEffect(() => {
-        if (isServerIds && parentId) {
-            getGameServerList.run({ gameId: parentId })
-        }
-    }, [isServerIds, parentId])
-
     useEffect(() => {
         if (isAccountId) {
             // 请求广告账号列表
@@ -658,8 +652,18 @@ const QueryForm: React.FC<Props> = (props) => {
                     filterOption={(input, option) =>
                         (option?.children as any)?.toLowerCase().indexOf(input.toLowerCase()) >= 0
                     }
+                    onChange={(e, option) => {
+                        if (isServerIds) {
+                            form.setFieldsValue({ serverIds: undefined })
+                            if (option?.['data-super-id']) {
+                                getGameServerList.run({ gameId: option['data-super-id'] })
+                            } else {
+                                getGameServerList?.data && getGameServerList.mutate([])
+                            }
+                        }
+                    }}
                 >
-                    {getGameChoiceList?.data?.map((item: any) => <Select.Option value={item.id} key={item.id}>{item.name}</Select.Option>)}
+                    {getGameChoiceList?.data?.map((item: any) => <Select.Option value={item.id} key={item.id} data-super-id={item.superGameId}>{item.name}</Select.Option>)}
                 </Select>
             </Form.Item></Col>}
 
@@ -676,6 +680,7 @@ const QueryForm: React.FC<Props> = (props) => {
                         filterOption={(input, option) =>
                             (option?.children as any)?.toLowerCase().indexOf(input.toLowerCase()) >= 0
                         }
+                        loading={getGameServerList.loading}
                     >
                         {getGameServerList?.data?.filter((item: { isSourceServer: any }) => (isIsMergeServer && ((!isMergeServer && item.isSourceServer) || (isMergeServer && !item.isSourceServer))) || !isIsMergeServer)?.map((item: any) => <Select.Option value={item.serverId} key={item.serverId}>{item.serverName}</Select.Option>)}
                     </Select>

src/pages/gameDataStatistics/components/TableData/index.tsx

@@ -16,7 +16,7 @@ interface Prosp {
     tableTotal?: { [key: string]: string },//是个开启总计
     scroll?: { x?: number, y?: number },//开启行滑动并设置容器最大宽度
     title?: string,//tabel的标题
-    tips?: string, // 提示
+    tips?: JSX.Element, // 提示
     tooltip?: JSX.Element,//是否在标题后加问号展示说明
     dataSource: any[],//table的数据
     expandedRowRender?: (data: any) => JSX.Element,

src/pages/gameDataStatistics/roleOperate/roleFightingRanking/tableConfig.tsx

@@ -19,36 +19,72 @@ function columns12() {
             label: '区服信息',
             data: [
                 {
-                    title: '区服名称', dataIndex: 'server_name', label: '区服信息', align: 'center', width: 70, default: 2,
+                    title: '主服名称', dataIndex: 'main_server_name', label: '区服信息', align: 'center', width: 70, default: 2,
                     render: (a: string, b: any) => (<WidthEllipsis value={a} />)
                 },
                 {
-                    title: '开服时间', dataIndex: 'dt', label: '区服信息', align: 'center', width: 140, default: 3,
+                    title: '合服的子服ID列表', dataIndex: 'son_server_ids', label: '区服信息', align: 'center', width: 70,
                     render: (a: string, b: any) => (<WidthEllipsis value={a} />)
                 },
                 {
-                    title: '开服天数', dataIndex: 'start_day', label: '区服信息', align: 'center', width: 60, default: 4,
+                    title: '最原始子服名称列表', dataIndex: 'source_server_ids_name', label: '区服信息', align: 'center', width: 70,
+                    render: (a: string, b: any) => (<WidthEllipsis value={a} />)
+                },
+                {
+                    title: '最原始子服ID列表', dataIndex: 'source_server_ids', label: '区服信息', align: 'center', width: 70,
+                    render: (a: string, b: any) => (<WidthEllipsis value={a} />)
+                },
+                {
+                    title: '区服名称', dataIndex: 'server_name', label: '区服信息', align: 'center', width: 70, default: 3,
+                    render: (a: string, b: any) => (<WidthEllipsis value={a} />)
+                },
+                {
+                    title: '区服ID', dataIndex: 'server_id', label: '区服信息', align: 'center', width: 70,
+                    render: (a: string, b: any) => (<WidthEllipsis value={a} />)
+                },
+                {
+                    title: '开服时间', dataIndex: 'dt', label: '区服信息', align: 'center', width: 140, default: 5,
+                    render: (a: string, b: any) => (<WidthEllipsis value={a} />)
+                },
+                {
+                    title: '开服天数', dataIndex: 'start_day', label: '区服信息', align: 'center', width: 60, default: 6,
                     render: (a: string) => <Statistic value={a || 0} />
                 },
                 {
-                    title: '区服战力', dataIndex: 'server_combat_num', label: '区服信息', align: 'center', width: 90, default: 5,
+                    title: '区服战力', dataIndex: 'server_combat_num', label: '区服信息', align: 'center', width: 90, default: 7,
                     render: (a: string) => <Statistic value={a || 0} />
-                }
+                },
+                {
+                    title: '合服名称', dataIndex: 'boss_server_name', label: '区服信息', align: 'center', width: 70, default: 4,
+                    render: (a: string, b: any) => (<WidthEllipsis value={a} />)
+                },
+                {
+                    title: '合服ID', dataIndex: 'boss_server_id', label: '区服信息', align: 'center', width: 70,
+                    render: (a: string, b: any) => (<WidthEllipsis value={a} />)
+                },
+                {
+                    title: '合服时间', dataIndex: 'merge_time', label: '区服信息', align: 'center', width: 140,
+                    render: (a: string, b: any) => (<WidthEllipsis value={a} />)
+                },
+                {
+                    title: '合服次数', dataIndex: 'sum_server_count', label: '区服信息', align: 'center', width: 60, 
+                    render: (a: string) => <Statistic value={a || 0} />
+                },
             ]
         },
         {
             label: '用户信息',
             data: [
                 {
-                    title: '新用户人数', dataIndex: 'new_user_count', label: '用户信息', align: 'center', width: 70, default: 6,
+                    title: '新用户人数', dataIndex: 'new_user_count', label: '用户信息', align: 'center', width: 70, default: 8,
                     render: (a: string) => <Statistic value={a || 0} />
                 },
                 {
-                    title: '创角人数', dataIndex: 'create_role_count', label: '用户信息', align: 'center', width: 70, default: 7,
+                    title: '创角人数', dataIndex: 'create_role_count', label: '用户信息', align: 'center', width: 70, default: 9,
                     render: (a: string) => <Statistic value={a || 0} />
                 },
                 {
-                    title: '角色数量', dataIndex: 'role_count', label: '用户信息', align: 'center', width: 70, default: 8,
+                    title: '角色数量', dataIndex: 'role_count', label: '用户信息', align: 'center', width: 70, default: 10,
                     render: (a: string) => <Statistic value={a || 0} />
                 },
             ]
@@ -57,55 +93,55 @@ function columns12() {
             label: '付费数据',
             data: [
                 {
-                    title: '总付费人数', dataIndex: 'total_num', label: '付费数据', align: 'center', width: 80, default: 9,
+                    title: '总付费人数', dataIndex: 'total_num', label: '付费数据', align: 'center', width: 80, default: 11,
                     render: (a: string) => <Statistic value={a || 0} />
                 },
                 {
-                    title: '总付费金额', dataIndex: 'total_amount', label: '付费数据', align: 'center', width: 85, default: 10,
+                    title: '总付费金额', dataIndex: 'total_amount', label: '付费数据', align: 'center', width: 85, default: 12,
                     render: (a: string) => <Statistic value={a || 0} />
                 },
                 {
-                    title: '付费ARPPU', dataIndex: 'total_arppu', label: '付费数据', align: 'center', width: 80, default: 11,
+                    title: '付费ARPPU', dataIndex: 'total_arppu', label: '付费数据', align: 'center', width: 80, default: 13,
                     render: (a: string) => <Statistic value={a || 0} />
                 },
                 {
-                    title: '付费率', dataIndex: 'amount_rate', label: '付费数据', align: 'center', width: 80, default: 12,
+                    title: '付费率', dataIndex: 'amount_rate', label: '付费数据', align: 'center', width: 80, default: 14,
                     render: (a: number) => <Statistic value={a ? a * 100 : 0} precision={2} valueStyle={!a ? {} : a >= 1 ? { color: 'red' } : { color: '#0f990f' }} suffix="%" />
                 },
                 {
-                    title: '今天付费人数', dataIndex: 'ba1_num', label: '付费数据', align: 'center', width: 70, default: 13, className: "redColorClass",
+                    title: '今天付费人数', dataIndex: 'ba1_num', label: '付费数据', align: 'center', width: 70, default: 15, className: "redColorClass",
                     render: (a: string) => <Statistic value={a || 0} />
                 },
                 {
-                    title: '今天付费次数', dataIndex: 'ba1_count', label: '付费数据', align: 'center', width: 65, default: 14, className: "redColorClass",
+                    title: '今天付费次数', dataIndex: 'ba1_count', label: '付费数据', align: 'center', width: 65, default: 16, className: "redColorClass",
                     render: (a: string) => <Statistic value={a || 0} />
                 },
                 {
-                    title: '今天付费金额', dataIndex: 'ba1', label: '付费数据', align: 'center', width: 75, default: 15, className: "redColorClass",
+                    title: '今天付费金额', dataIndex: 'ba1', label: '付费数据', align: 'center', width: 75, default: 17, className: "redColorClass",
                     render: (a: string) => <Statistic value={a || 0} />
                 },
                 {
-                    title: '昨天付费人数', dataIndex: 'ba2_num', label: '付费数据', align: 'center', width: 70, default: 16, className: "orangeColorClass",
+                    title: '昨天付费人数', dataIndex: 'ba2_num', label: '付费数据', align: 'center', width: 70, default: 18, className: "orangeColorClass",
                     render: (a: string) => <Statistic value={a || 0} />
                 },
                 {
-                    title: '昨天付费次数', dataIndex: 'ba2_count', label: '付费数据', align: 'center', width: 65, default: 17, className: "orangeColorClass",
+                    title: '昨天付费次数', dataIndex: 'ba2_count', label: '付费数据', align: 'center', width: 65, default: 19, className: "orangeColorClass",
                     render: (a: string) => <Statistic value={a || 0} />
                 },
                 {
-                    title: '昨天付费金额', dataIndex: 'ba2', label: '付费数据', align: 'center', width: 75, default: 18, className: "orangeColorClass",
+                    title: '昨天付费金额', dataIndex: 'ba2', label: '付费数据', align: 'center', width: 75, default: 20, className: "orangeColorClass",
                     render: (a: string) => <Statistic value={a || 0} />
                 },
                 {
-                    title: '前天付费人数', dataIndex: 'ba3_num', label: '付费数据', align: 'center', width: 65, default: 19, className: 'volcanoColorClass',
+                    title: '前天付费人数', dataIndex: 'ba3_num', label: '付费数据', align: 'center', width: 65, default: 21, className: 'volcanoColorClass',
                     render: (a: string) => <Statistic value={a || 0} />
                 },
                 {
-                    title: '前天付费次数', dataIndex: 'ba3_count', label: '付费数据', align: 'center', width: 65, default: 20, className: 'volcanoColorClass',
+                    title: '前天付费次数', dataIndex: 'ba3_count', label: '付费数据', align: 'center', width: 65, default: 22, className: 'volcanoColorClass',
                     render: (a: string) => <Statistic value={a || 0} />
                 },
                 {
-                    title: '前天付费金额', dataIndex: 'ba3', label: '付费数据', align: 'center', width: 75, default: 21, className: 'volcanoColorClass',
+                    title: '前天付费金额', dataIndex: 'ba3', label: '付费数据', align: 'center', width: 75, default: 23, className: 'volcanoColorClass',
                     render: (a: string) => <Statistic value={a || 0} />
                 },
             ]
@@ -114,15 +150,15 @@ function columns12() {
             label: '活跃数据',
             data: [
                 {
-                    title: '今日活跃人数', dataIndex: 'ba1_active_num', label: '活跃数据', align: 'center', width: 65, default: 22,
+                    title: '今日活跃人数', dataIndex: 'ba1_active_num', label: '活跃数据', align: 'center', width: 65, default: 24,
                     render: (a: string) => <Statistic value={a || 0} />
                 },
                 {
-                    title: '昨天活跃人数', dataIndex: 'ba2_active_num', label: '活跃数据', align: 'center', width: 65, default: 23,
+                    title: '昨天活跃人数', dataIndex: 'ba2_active_num', label: '活跃数据', align: 'center', width: 65, default: 25,
                     render: (a: string) => <Statistic value={a || 0} />
                 },
                 {
-                    title: '前天活跃人数', dataIndex: 'ba3_active_num', label: '活跃数据', align: 'center', width: 65, default: 24,
+                    title: '前天活跃人数', dataIndex: 'ba3_active_num', label: '活跃数据', align: 'center', width: 65, default: 26,
                     render: (a: string) => <Statistic value={a || 0} />
                 },
             ]
@@ -131,11 +167,11 @@ function columns12() {
             label: '角色信息',
             data: [
                 {
-                    title: '充值模板',
+                    title: '角色信息',
                     dataIndex: 'roleInfo',
                     label: '角色信息',
                     align: 'center',
-                    default: 25,
+                    default: 27,
                     children: [
                         {
                             title: '角色排名',

src/pages/gameDataStatistics/roleOperate/roleRechargeRanking/index.tsx

@@ -146,15 +146,15 @@ const RoleRechargeRanking: React.FC = () => {
             pageSize={getRoleRechargeRankingList?.data?.size || 20}
             total={getRoleRechargeRankingList?.data?.total || 0}
             title='角色充值排行榜'
-            tips={`
+            tips={<div>
                 角色VIP等级档位：(根据角色累计充值划分等级，上限不包含原则)
-                1档——【0，2000】
-                2档——【2000，5000】
-                3档——【5000，10000】
-                4档——【10000，20000】
-                5档——【20000，50000】
-                6档——【50000，+∞】
-            `}
+                <div>1档——【0，2000】</div>
+                <div>2档——【2000，5000】</div>
+                <div>3档——【5000，10000】</div>
+                <div>4档——【10000，20000】</div>
+                <div>5档——【20000，50000】</div>
+                <div>6档——【50000，+∞】</div>
+            </div>}
             onChange={(props: any) => {
                 let { pagination, sortData } = props
                 let { current, pageSize } = pagination