wjx hai 1 ano
pai
achega
fd9c9c1d24

+ 17 - 4
src/components/QueryForm/index.tsx

@@ -745,8 +745,21 @@ const QueryForm: React.FC<Props> = (props) => {
                 <Input placeholder="游戏名" allowClear style={{ width: 140 }} />
             </Form.Item></Col>}
             {/* 是否 开启 添加父游戏维度筛选 */}
-            {isGameDimension && <Col><Form.Item name='gameDimension' valuePropName="checked">
-                <Checkbox onChange={() => form.setFieldsValue({ gameId: undefined })}>是否父游戏</Checkbox>
+            {isGameDimension && <Col><Form.Item name='gameDimension'>
+                <Select
+                    maxTagCount={1}
+                    showSearch
+                    style={{ width: 110 }}
+                    allowClear
+                    placeholder={'游戏维度'}
+                    filterOption={(input, option) =>
+                        (option?.children as any)?.toLowerCase().indexOf(input.toLowerCase()) >= 0
+                    }
+                    onChange={() => form.setFieldsValue({ gameId: undefined })}
+                >
+                    <Select.Option value={1}>子游戏维度</Select.Option>
+                    <Select.Option value={2}>父游戏维度</Select.Option>
+                </Select>
             </Form.Item></Col>}
             {/* 游戏ID搜索 */}
             {isGameId && <Col><Form.Item name='gameId'>
@@ -777,7 +790,7 @@ const QueryForm: React.FC<Props> = (props) => {
                         (option?.children as any)?.toLowerCase().indexOf(input.toLowerCase()) >= 0
                     }
                 >
-                    {gameDimension ? parentGameList?.map((item: any) => <Select.Option value={item.parent_game_id} key={item.parent_game_id} data-super-id={item.super_game_id}>{item.parent_game_name}</Select.Option>) : getGameChoiceList?.data?.map((item: any) => <Select.Option value={item.id} key={item.id}>{item.name}</Select.Option>)}
+                    {gameDimension === 2 ? parentGameList?.map((item: any) => <Select.Option value={item.parent_game_id} key={item.parent_game_id} data-super-id={item.super_game_id}>{item.parent_game_name}</Select.Option>) : getGameChoiceList?.data?.map((item: any) => <Select.Option value={item.id} key={item.id}>{item.name}</Select.Option>)}
                 </Select>
             </Form.Item></Col>}
             {/* 充值游戏ID */}
@@ -1039,7 +1052,7 @@ const QueryForm: React.FC<Props> = (props) => {
                     {Object.keys(PayStatus).map(key => <Select.Option value={key} key={key}>{PayStatus[key]}</Select.Option>)}
                 </Select>
             </Form.Item></Col>}
-            
+
             {/* 支付方式 */}
             {isPayWay && <Col><Form.Item name='payWay'>
                 <Select

+ 0 - 1
src/pages/gameDataStatistics/gameData/active/index.tsx

@@ -48,7 +48,6 @@ const Active: React.FC = () => {
                     const { regStartDay, gameClassify, regEndDay, rechargeDay, gameDimension, ...params } = data
                     let newQueryForm = JSON.parse(JSON.stringify(queryForm))
                     newQueryForm.pageNum = 1
-                    newQueryForm.gameDimension = gameDimension ? 2 : 1
                     if (regStartDay && regEndDay) {
                         newQueryForm.registeredBeginDate = regStartDay
                         newQueryForm.registeredEndDate = regEndDay

+ 0 - 1
src/pages/gameDataStatistics/gameData/again/index.tsx

@@ -43,7 +43,6 @@ const Again: React.FC = () => {
                     const { regStartDay, gameClassify, regEndDay, rechargeDay, gameDimension, ...params } = data
                     let newQueryForm = JSON.parse(JSON.stringify(queryForm))
                     newQueryForm.pageNum = 1
-                    newQueryForm.gameDimension = gameDimension ? 2 : 1
                     if (regStartDay && regEndDay) {
                         newQueryForm.registeredBeginDate = regStartDay
                         newQueryForm.registeredEndDate = regEndDay

+ 0 - 1
src/pages/gameDataStatistics/gameData/everyday/index.tsx

@@ -53,7 +53,6 @@ const Everyday: React.FC = () => {
                     const { regStartDay, regEndDay, rechargeDay, gameDimension, ...params } = data
                     let newQueryForm = JSON.parse(JSON.stringify(queryForm))
                     newQueryForm.pageNum = 1
-                    newQueryForm.gameDimension = gameDimension ? 2 : 1
                     if (regStartDay && regEndDay) {
                         newQueryForm.registeredBeginDate = regStartDay
                         newQueryForm.registeredEndDate = regEndDay

+ 0 - 1
src/pages/gameDataStatistics/gameData/ltv/index.tsx

@@ -52,7 +52,6 @@ const Ltv: React.FC = () => {
                     const { regStartDay, gameClassify, regEndDay, rechargeDay, gameDimension, ...params } = data
                     let newQueryForm = JSON.parse(JSON.stringify(queryForm))
                     newQueryForm.pageNum = 1
-                    newQueryForm.gameDimension = gameDimension ? 2 : 1
                     if (regStartDay && regEndDay) {
                         newQueryForm.registeredBeginDate = regStartDay
                         newQueryForm.registeredEndDate = regEndDay