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

src/pages/adMonitor/adMonitorList/components/FilterQuery.tsx

@@ -3,7 +3,7 @@ import { Button, DatePicker, Form, Input, InputNumber, Popover, Space } from "an
 import React, { useEffect, useState } from "react"
 import './filterQuery.less'
 import moment from "moment"
-import { useLocalStorageState, useUpdateEffect } from "ahooks"
+import { useLocalStorageState } from "ahooks"
 
 type TypeProps = 'DatePicker' | 'Input' | 'InputNumber' | 'Select'
 interface QueryProps {
@@ -95,7 +95,10 @@ const FilterQuery: React.FC<Props> = ({ onChange }) => {
         if (message) {
             let newFiter: any = []
             message.split(',').forEach(key => {
-                newFiter.push(queryList.find(item => item.name === key))
+                let data = queryList.find(item => item.name === key)
+                if (data) {
+                    newFiter.push(data)
+                }
             })
             console.log('==========>', newFiter)
             setFilterTrueList(newFiter)

src/pages/launchSystemNew/adq/ad/FilterQuery.tsx

@@ -203,36 +203,36 @@ const FilterQuery: React.FC<Props> = ({ onChange, initialValues, queryForm, setQ
         //         })}
         //     </Select>
         // },
-        {
-            lable: '最低今日转化数',
-            name: 'conversionsCountDayMin',
-            type: 'InputNumber',
-            value: (params) => <InputNumber placeholder="请输入最低今日转化数" style={{ width: '100%' }} {...params} />
-        },
+        // {
+        //     lable: '最低今日转化数',
+        //     name: 'conversionsCountDayMin',
+        //     type: 'InputNumber',
+        //     value: (params) => <InputNumber placeholder="请输入最低今日转化数" style={{ width: '100%' }} {...params} />
+        // },
         {
             lable: '最低总转化数',
             name: 'conversionsCountTotalMin',
             type: 'InputNumber',
             value: (params) => <InputNumber placeholder="请输入最低总转化数" style={{ width: '100%' }} {...params} />
         },
-        {
-            lable: '最低今日消耗',
-            name: 'costDayMin',
-            type: 'InputNumber',
-            value: (params) => <InputNumber placeholder="请输入最低今日消耗" style={{ width: '100%' }} {...params} />
-        },
+        // {
+        //     lable: '最低今日消耗',
+        //     name: 'costDayMin',
+        //     type: 'InputNumber',
+        //     value: (params) => <InputNumber placeholder="请输入最低今日消耗" style={{ width: '100%' }} {...params} />
+        // },
         {
             lable: '最小总消耗',
             name: 'costTotalMin',
             type: 'InputNumber',
             value: (params) => <InputNumber placeholder="请输入最小总消耗" style={{ width: '100%' }} {...params} />
         },
-        {
-            lable: '最低今日千次曝光成本',
-            name: 'thousandDisplayPriceDayMin',
-            type: 'InputNumber',
-            value: (params) => <InputNumber placeholder="请输入最低今日千次曝光成本" style={{ width: '100%' }} {...params} />
-        },
+        // {
+        //     lable: '最低今日千次曝光成本',
+        //     name: 'thousandDisplayPriceDayMin',
+        //     type: 'InputNumber',
+        //     value: (params) => <InputNumber placeholder="请输入最低今日千次曝光成本" style={{ width: '100%' }} {...params} />
+        // },
         {
             lable: '最低总千次曝光成本',
             name: 'thousandDisplayPriceTotalMin',
@@ -249,7 +249,10 @@ const FilterQuery: React.FC<Props> = ({ onChange, initialValues, queryForm, setQ
         if (message) {
             let newFiter: any = []
             message.split(',').forEach(key => {
-                newFiter.push(queryList.find(item => item.name === key))
+                let data = queryList.find(item => item.name === key)
+                if (data) {
+                    newFiter.push(data)
+                }
             })
             console.log('==========>', newFiter)
             setFilterTrueList(newFiter)