outaozhen 4 gadi atpakaļ
vecāks
revīzija
ebd20b3cfa

+ 19 - 19
src/pages/Product/Road/Enterprise/components/AddEnterprise/EnterpriseSearchSelect.jsx

@@ -9,13 +9,12 @@ const EnterpriseSearchSelect = ({ value, onChange, disabled, validateFn }) => {
   const { Option } = Select
   const [state, setState] = useState({
     inputVal: value,
-    visible: false,
     roadlist: null
   })
   const triggerChange = changedValue => {
     onChange?.(changedValue)
   }
-  const { visible, roadlist, inputVal } = state
+  const { roadlist, inputVal } = state
   const queryRoadList = async search => {
     if (!search) return
     const { code = -1, data } = await queryRoadpricingListV2({
@@ -26,7 +25,7 @@ const EnterpriseSearchSelect = ({ value, onChange, disabled, validateFn }) => {
     })
     if (code === consts.RET_CODE.SUCCESS) {
       const { list = [] } = data
-      setState({ ...state, roadlist: list, visible: !!list?.length })
+      setState({ ...state, roadlist: list })
       if (list?.length) {
         validateFn(validateEnum.Success)
       } else {
@@ -38,9 +37,11 @@ const EnterpriseSearchSelect = ({ value, onChange, disabled, validateFn }) => {
     wait: 600
   })
 
-  const handleSearch = value => {
+  const handleSearch = async value => {
     if (value) {
-      fetch(value, roadlist => setState({ ...state, roadlist }))
+      handleQueryList(value)
+      setState({ ...state, roadlist: value })
+      // fetch(value, roadlist => setState({ ...state, roadlist }))
     } else {
       setState({ ...state, roadlist: [] })
     }
@@ -48,19 +49,18 @@ const EnterpriseSearchSelect = ({ value, onChange, disabled, validateFn }) => {
 
   const handleOnInputChange = async e => {
     const val = e.target.value || ''
-    if (!val) {
-      cancelQuerying()
-      setState({ ...state, inputVal: val, roadlist: null, visible: false })
-      validateFn(validateEnum.Error)
-    } else {
-      setState({ ...state, inputVal: val })
-      validateFn(validateEnum.Validating)
-      handleQueryList(val)
-    }
+    // if (!val) {
+    //   cancelQuerying()
+    //   setState({ ...state, inputVal: val, roadlist: null, visible: false })
+    //   validateFn(validateEnum.Error)
+    // } else {
+    //   setState({ ...state, inputVal: val })
+    //   validateFn(validateEnum.Validating)
+    //   handleQueryList(val)
+    // }
     triggerChange(val)
   }
-  const options = roadlist?.map(item => <Option key={item.ID}>{{ value: item.realName }}</Option>)
-  console.log(options)
+  const options = roadlist?.map(item => ({ value: item.realName }))
   return (
     <Select
       showSearch
@@ -69,12 +69,12 @@ const EnterpriseSearchSelect = ({ value, onChange, disabled, validateFn }) => {
       filterOption={false}
       placeholder="请输入企业名称"
       value={inputVal}
+      options={options}
       disabled={disabled}
       onSearch={handleSearch}
       onChange={handleOnInputChange}
-      notFoundContent={null}>
-      {options}
-    </Select>
+      notFoundContent={null}
+    />
   )
 }