feats

src/pages/building/Edit/components/BuildingTypeDetail.jsx

@@ -1,4 +1,4 @@
-import React, { useState } from 'react'
+import React, { useEffect, useState } from 'react'
 import { Button, Drawer, Form, Radio, Input, Select } from 'antd'
 import { formItemLayout } from '../utils'
 import styles from '../style.less'
@@ -31,14 +31,18 @@ const BuildingTypeDetail = (props) => {
       };
 
       const data = {
-        ...values,
         ...dataset || {},
+        ...values,
       }
 
       onSubmit(data)
     })
   }
 
+  useEffect(() => {
+    form.setFieldsValue(dataset)
+  }, [dataset])
+
   return (
     <Drawer
       width={600}

src/pages/building/Edit/components/BuildingTypeSelect.jsx

@@ -33,7 +33,7 @@ export default React.forwardRef((props, ref) => {
 
   const handleClick = (buildingType) => () => {
     const current = (value || []).filter((it) => it.buildingTypeId === buildingType.buildingTypeId)[0] || {buildingTypeId: buildingType.buildingTypeId}
-    
+    console.log('-------------->', current)
     setCurRow(current)
     setBuildingType(buildingType)
     setShowDrawer(true)
@@ -84,9 +84,8 @@ export default React.forwardRef((props, ref) => {
               <Checkbox
                 checked={checked}
                 onChange={handleChange(it)}
-              >
-                {it.buildingTypeName}
-              </Checkbox>
+              />
+              <span style={{display: 'inline-block', margin: '0 .5em'}}>{it.buildingTypeName}</span>
               {checked && <a href="#" onClick={handleClick(it)}><Icon type="edit" /></a>}              
             </Card.Grid>
           )