fix

src/components/QueryForm/index.tsx

@@ -194,6 +194,8 @@ interface Props {
     isGsId?: boolean
     /** 是否开启多个区服id搜索 */
     isServerIds?: boolean
+    /** 是否开启 游戏区服 搜索 */
+    isGameServerName?: boolean
     /** 是否开启多个区服id搜索 */
     isRankingNum?: boolean
 }
@@ -209,12 +211,14 @@ const QueryForm: React.FC<Props> = (props) => {
         isGameRoleName, isFirstRecharge, isSwitch, isMerchantNo, isOrderId, isMerchantOrderNo, isPayStatus, isPayWay, isProductName, isRegAgent, isAgentId, isPutAgent, isRegDay, isOs, isParentId, isProjectId, isProjectName, isPromotionId, isPromotionName,
         isSysUserName, isRechargeDate, isBGGameClassify, isGameUserId, isSysUserId, isUserName, isUserId, isSelectRanking, isGameType, isConsumeDay, rechargeDay, isBeginDay, isType, isAdTTStatus, isUserEnterType, isServerName, isServerId, isServerDay, isAdTXStatus,
         payTimeDay, placeAnOrderDay, isPayIntervalTime, isActiveTypes, isNickname, isMobile, isRegIp, isIsAuth, isIsBindMobile, isIsRecharge, isUserStatus, isCreateRole, isRoleCount, isVipLevel, isCreateRoleDay, isIsChange, isIsSendMail, isWeChatCompany, isWeChat,
-        isCustomerServerId, isOperatorId, isGsId, isServerIds, isRankingNum, isIsMergeServer, isSuperParentGameId
+        isCustomerServerId, isOperatorId, isGsId, isServerIds, isRankingNum, isIsMergeServer, isSuperParentGameId, isGameServerName
     } = props
     const [form] = Form.useForm()
     const parentId = Form.useWatch('parentId', form)
     const superParentGameId = Form.useWatch('superParentGameId', form)
     const isMergeServer = Form.useWatch('isMergeServer', form)
+    const serverName = Form.useWatch('serverName', form)
+    const serverIds = Form.useWatch('serverIds', form)
     const [accountList, setAccountList] = useState<any[]>([])
     const [userIdList, setUserIdList] = useState<any[]>([])
     const [gsList, setGsList] = useState<any[]>([])
@@ -709,12 +713,18 @@ const QueryForm: React.FC<Props> = (props) => {
             </Form.Item></Col>}
 
             {(parentId || superParentGameId) && <>
+                {/* 广告区服名称 */}
+                {isGameServerName && <Col><Form.Item name='serverName'>
+                    <Input placeholder="区服名称" allowClear style={{ width: 140 }} disabled={serverIds?.length > 0}/>
+                </Form.Item></Col>}
+
                 {/* 区服id */}
                 {isServerIds && <Col><Form.Item name='serverIds'>
                     <Select
                         maxTagCount={1}
                         mode="multiple"
                         showSearch
+                        disabled={serverName}
                         style={{ minWidth: 140 }}
                         allowClear
                         placeholder={'请选择区服'}

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

@@ -49,6 +49,7 @@ const RoleFightingRanking: React.FC = () => {
                 isParentId
                 isIsMergeServer
                 isServerIds
+                isGameServerName
                 isRankingNum
             />}
             isVirtually={false}