lf

src/components/SelectButton/BuildSelect.jsx

@@ -21,58 +21,36 @@ function usePrevious(props) {
  */
 const BuildingSelect = props => {
   const [data, setData] = useState([])
-  const [value, setValue] = useState('')
-
-  useEffect(() => {
-    setValue(props.value)
-  }, [props.value])
-
+  const [value, setValue] = useState([])
   useEffect(() => {
     getCityList();
-  }, [])
+  }, [props.value])
 
-  // const checkValue = data.filter(e => {
-  //   return e.buildingId == value
-  // })
-  // console.log(checkValue,"checkValuecheckValue")
-  // console.log(value,"valuevaluevalue")
-  // if(checkValue.length < 1 ){
-  //   console.log("111")
-  //   setValue("");
-  // }
 
   const getCityList = e => {
     request({ ...apis.building.buildingSelect, params: { pageNum: 1, pageSize: 999 } }).then(data => {
         setData(data.records)
+        checkValue(data.records)
         // 默认选中第一个
-        if (props.checkFirst) {
-          setValue(data.records[0].buildingId)
-          props.onChange(data.records[0].buildingId)
-        }
     })
   }
 
-  const checkValue = data.filter(e => {
-    return e.buildingId == value
-  })
- 
-  if(checkValue.length < 1 && value == props.value){
-    setValue("");
-  }
+  const checkValue = (data) => {
+    if (props.value) {
+      const tempData = data.filter(f => f.buildingId == props.value)
+      const va = (tempData.length > 0) ? props.value : '项目已下线，请重新选择项目'
+      props.onChange(va)
 
-  const handleChange = e => {
-    setValue(e)
-    props.onChange(e)
+    }
   }
-  // '' === value ? undefined : value
+
   return (
       <Select
-      {...props} 
       showSearch
-      value={value}
+      value={props.value}
       style={{ width: '300px' }}
       placeholder="请选择项目"
-      onChange={handleChange}
+      onChange={props.onChange}
       filterOption={(input, option) =>
         option.props.children && option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
       }>

src/pages/carouselFigure/editAdvertising.jsx

@@ -114,7 +114,7 @@ import SelectH5 from './SelectH5';
         label: '所属项目',
         name: 'buildingId',
         render: <BuildSelect />,
-        value: data.buildingStatus === 2 ? '':data.buildingId,
+        value: data.buildingId,
         hidden: () => !isHaveActive,
         rules: [
           { required: true, message: '请选择所属项目' },

src/pages/carouselFigure/editCarousel.jsx

@@ -127,7 +127,7 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
           name: 'buildingId',
           render: <BuildSelect />,
           hidden: () => !isHaveActive,
-          value: data.buildingStatus === 2 ? '':data.buildingId,
+          value: data.buildingId,
           rules: [
             { required: true, message: '请选择所属项目' },
           ],