图片设置修复 弹框问题

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

@@ -61,6 +61,15 @@ function imageSet(props) {
     })
   }
 
+  /**
+   *回调事件
+   *
+   */
+  function onModalChange() {
+    getList()
+    setVisibleData({ visible: false, apartmentId: '', buildingId: '' })
+  }
+
   /**
    *打开编辑页
    *
@@ -138,7 +147,7 @@ function imageSet(props) {
 
       {/* 编辑页 */}
       {/*  onSuccess是子组件传递事件信息  */}
-      <ModalImage visibleData={visibleData} key={1} onSuccess={getList}/>
+      <ModalImage visibleData={visibleData} key={1} onSuccess={() => onModalChange()}/>
     </>
   )
 }

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

@@ -5,6 +5,7 @@ import request from '../../../../../utils/request';
 import apis from '../../../../../services/apis';
 import Styles from '../style.less';
 import ImageUpload from '../../../../../components/XForm/ImageUpload'
+import ImageListUpload from '../../../../../components/XForm/ImageListUpload'
 import Wangedit from '../../../../../components/Wangedit/Wangedit'
 
 
@@ -61,8 +62,8 @@ class ModalImage extends React.Component {
   // }
 
   componentDidUpdate(preProps, preState) {
-    console.log(this.props.visibleData)
     if (this.props.visibleData.visible !== preState.visibleData.visible) {
+      console.log(this.props.visibleData)
       this.getById()
       this.setState({ visibleData: this.props.visibleData });
     }
@@ -91,7 +92,7 @@ class ModalImage extends React.Component {
 
     request({ url: tempUrl, method, params: { ...params } }).then(res => {
       // res.img = res.buildingImgList.map((item, _) => item.url)
-      res.img = res.buildingImgList[0].url
+      res.img = res.buildingImgList.map(item => item.url)
       this.props.form.setFieldsValue(res)
     }).catch(err => {
      this.openNotificationWithIcon('error', err)
@@ -118,7 +119,7 @@ class ModalImage extends React.Component {
 
   submitData(data) {
     // TODO 这里应该是要支持多图，但是封装的控件没有
-    data.img = [{ imgType: 'aparment', url: data.img, orderNo: 1 }]
+    data.img = data.img.map((item, index) => ({ imgType: 'aparment', url: item, orderNo: index }))
     data.buildingId = this.props.visibleData.buildingId;
     const api = data.apartmentId !== undefined ? apis.building.buildingApartmentUpdate : apis.building.buildingApartmentAdd;
 
@@ -131,7 +132,7 @@ class ModalImage extends React.Component {
       // onSuccess() 是自定义
       this.props.onSuccess()
 
-      this.handleCancel()
+      // this.setState({ visibleData: { visible: false, apartmentId: '', buildingId: '' } }, () => console.log('回调：', this.state.visibleData))
     }).catch(err => {
       // eslint-disable-next-line no-unused-expressions
       this.openNotificationWithIcon('error', err)
@@ -186,7 +187,7 @@ class ModalImage extends React.Component {
               </Form.Item>
               <Form.Item label="图片">
               {getFieldDecorator('img')(
-                <ImageUpload />,
+                <ImageListUpload />,
               )}
               </Form.Item>
               <Form.Item label="面积">