提交

package.json

@@ -43,7 +43,7 @@
   "dependencies": {
     "@ant-design/pro-layout": "^4.5.9",
     "@antv/data-set": "^0.10.2",
-    "antd": "^3.20.0",
+    "antd": "^3.25.0",
     "classnames": "^2.2.6",
     "dayjs": "^1.8.16",
     "dva": "^2.4.1",

src/components/SelectButton/BuildSelect.jsx

@@ -19,9 +19,10 @@ function usePrevious(props) {
  * @param {*} props
  * @returns
  */
-const BuildingSelect = (props) => {
-  const [ data, setData ] = useState([])
-  const [ value, setValue ] = useState('')
+const BuildingSelect = props => {
+  const [data, setData] = useState([])
+  const [value, setValue] = useState('')
+  const [disabled, setDisabled] = useState(false)
   // const preProps = usePrevious(props)
 
   // if ((!preProps) && props.value != value) {
@@ -34,10 +35,11 @@ const BuildingSelect = (props) => {
 
   useEffect(() => {
     getCityList();
-  },[])
+    setDisabledValue();
+  }, [])
 
-  const getCityList = (e) => {
-    request({ ...apis.building.getList, params: {pageNum: 1,pageSize: 999}, }).then((data) => {
+  const getCityList = e => {
+    request({ ...apis.building.getList, params: { pageNum: 1, pageSize: 999 } }).then(data => {
         setData(data.records)
         // 默认选中第一个
         if (props.checkFirst) {
@@ -47,7 +49,13 @@ const BuildingSelect = (props) => {
     })
   }
 
-  const handleChange = (e) => {
+  const setDisabledValue = () => {
+    if (props.disabled) {
+      setDisabled(props.disabled === true)
+    }
+  }
+
+  const handleChange = e => {
     setValue(e)
     props.onChange(e)
   }
@@ -56,9 +64,10 @@ const BuildingSelect = (props) => {
       <Select
       showSearch
       value={value}
-      style={{ width: '180px' }} 
-      placeholder="请选择项目" 
+      style={{ width: '180px' }}
+      placeholder="请选择项目"
       onChange={handleChange}
+      disabled={disabled}
       filterOption={(input, option) =>
         option.props.children && option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
       }>

src/pages/building/list/add/components/buildingImage.jsx

@@ -1,14 +1,22 @@
-import React from 'react';
+import React, { useState } from 'react';
 import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Radio, Tag, Tooltip, Tabs, Table, notification, Modal, Layout } from 'antd';
+import ImageListUpload from '../../../../../components/XForm/ImageListUpload';
 
 const { Header, Footer, Sider, Content } = Layout;
 
 function BuildingImageModel() {
+  const [imageList, setImageList] = useState([])
+
+  function onImageChange(e) {
+    setImageList(e)
+  }
+
   return (
     <>
       <span>效果图（10）</span>
       <Button type="link" style={{ color: 'blue' }}>重命名</Button>
       <Button type="link" style={{ color: 'blue' }}>删除相册</Button>
+      <ImageListUpload value={imageList} onChange={onImageChange}/>
     </>
   )
 }