feats

src/components/SelectButton/InstitutionSelect.jsx

@@ -0,0 +1,61 @@
+import React, { useEffect, useMemo, useRef, useState } from 'react'
+import { TreeSelect } from 'antd'
+import { connect } from 'dva'
+
+const getTreeFrom = (arr) => {
+  const copy = (arr || []).map((it) => ({ ...it, children: undefined }))
+
+  const tree = []
+  for (let inx in copy) {
+    const it = copy[inx]
+    const key = it.institutionCode
+    const node = {
+      key,
+      value: key,
+      title: it.institutionName,
+      children: it.children,
+      parent: it.parent,
+    }
+    const parent = key.length === 2 ? undefined : key.substring(0, key.length - 2)
+
+    if (parent) {
+      for (let cur of copy) {
+        if ((cur.institutionCode || cur.key) === parent) {
+          node.parent = cur
+          cur.children = [
+            ...(cur.children || []),
+            node,
+          ]
+          break
+        }
+      }
+    }
+
+    copy[inx] = node
+    tree.push(node)
+  }
+  return tree.filter(x => !x.parent)
+}
+
+const InstitutionSelect = React.forwardRef((props, ref) => {
+
+  const { user, ...leftProps } = props
+
+  const [expandedKeys, setExpandedKeys] = useState([])
+
+  const treeData = useMemo(() => {
+    return getTreeFrom(user.institutionList) || []
+  }, [user.institutionList])
+
+  useEffect(() => {
+    setExpandedKeys((user.institutionList || []).map((x) => x.institutionCode))
+  }, [user.institutionList])
+
+  return (
+    <TreeSelect allowClear treeExpandedKeys={expandedKeys} onTreeExpand={setExpandedKeys} {...leftProps} treeData={treeData} />
+  )
+})
+
+export default connect(({ user }) => ({
+  user: user.currentUser,
+}))(InstitutionSelect)

src/pages/building/Edit/Basic/index.jsx

@@ -6,6 +6,7 @@ import ImageUpload from '@/components/XForm/ImageUpload'
 import ImageListUpload from '@/components/XForm/ImageListUpload'
 import SelectCity from '@/components/SelectButton/CitySelect'
 import AreaSelect from '@/components/SelectButton/AreaSelect'
+import InstitutionSelect from '@/components/SelectButton/InstitutionSelect'
 import { POI_TYPES_KETY, POI_TYPES, getPoiData } from '@/utils/map'
 import Amap from '../components/Amap'
 import BuildingType from '../components/BuildingTypeSelect'
@@ -130,15 +131,7 @@ const BuildingBasic = React.forwardRef((props, ref) => {
         </Item>
         <Item label="城市公司">
           {getFieldDecorator('institutionId')(
-            <Select placeholder="所属城市公司" style={fullWidth}>
-              {
-                (user.institutionList || []).map((item) => (
-                  <Select.Option key={item.institutionId} value={item.institutionId}>
-                    {item.institutionName}
-                  </Select.Option>
-                ))
-              }
-            </Select>
+            <InstitutionSelect />
           )}
         </Item>
         <Item label="楼盘编号" >

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

@@ -31,6 +31,7 @@ const BuildingTypeDetail = (props) => {
       };
 
       const data = {
+        status: 1,
         ...dataset || {},
         ...values,
       }
@@ -43,6 +44,9 @@ const BuildingTypeDetail = (props) => {
   }
 
   useEffect(() => {
+    if (!dataset.rightsYear) {
+      dataset.rightsYear = 70
+    }
     form.setFieldsValue(dataset)
   }, [dataset])
 
@@ -88,9 +92,7 @@ const BuildingTypeDetail = (props) => {
           {getFieldDecorator('decoration')(<Input />)}
         </Item>
         <Item label="产权年限" {...formItemLayout}>
-          {getFieldDecorator('rightsYear', {
-            initialValue: 70,
-          })(<Input />)}
+          {getFieldDecorator('rightsYear')(<Input />)}
         </Item>
       </Form>
       <div className={styles['drawer-form-action']}>

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

@@ -16,6 +16,14 @@ const gridBtn = {
   padding: '0',
 }
 
+const fillTypeName = (data, typeList) => (data || []).map((it) => {
+  const typ = typeList.filter((x) => x.buildingTypeId === it.buildingTypeId)[0]
+  return {
+    ...it,
+    buildingTypeName: typ ? typ.buildingTypeName : it.buildingTypeName
+  }
+})
+
 export default React.forwardRef((props, ref) => {
   const {value, onChange} = props;
   const [showDrawer, setShowDrawer] = useState(false)
@@ -35,7 +43,7 @@ export default React.forwardRef((props, ref) => {
     } else {
       // 取消选择
       const data = (value || []).filter((it) => it.buildingTypeId !== buildingType.buildingTypeId)
-      onChange(data)
+      onChange(fillTypeName(data, typeList))
     }
   }
 
@@ -68,7 +76,7 @@ export default React.forwardRef((props, ref) => {
       data.push(val)
     }
 
-    onChange(data)
+    onChange(fillTypeName(data, typeList))
     setShowDrawer(false)
   }