fix

src/components/XForm/ImageListUpload.jsx

@@ -15,55 +15,68 @@ class ImageListUpload extends React.Component {
   };
 
   getFileList = () => {
-    return (this.props.value || []).map((img, inx) => ({ uid: inx, url: getImgURL(img), status: 'done' }))
-  }
+    return (this.props.value || []).map((img, inx) => ({
+      uid: inx,
+      url: getImgURL(img),
+      status: 'done',
+    }));
+  };
 
   handleCancel = () => this.setState({ previewVisible: false });
 
   handlePreview = async file => {
     this.setState({
-      previewImage: file.url ,
+      previewImage: file.url,
       previewVisible: true,
     });
   };
 
-  handleChange = (e) => {
-    if (e.file.status === "uploading") {
+  handleChange = e => {
+    if (e.file.status === 'uploading') {
       this.setState({ loading: true });
       return;
     }
-console.log(e,'handleChange')
+    console.log(e, 'handleChange');
     // const fileList = (this.props.value || []).filter(x => x != e.file.url);
     // this.props.onChange(fileList);
 
     // console.log('删除图片触发了', e.file)
     if (e.file.status === 'removed') {
-      console.log(e,'handleChange22')
-      const fileList = (this.props.value || []).filter(x => getImgURL(x) != e.file.url);
-      this.props.onChange(fileList);
+      console.log(e, 'handleChange22');
+
+      Modal.confirm({
+        title: '确认要删除该图片吗？',
+        okText: '确认',
+        okType: 'danger',
+        cancelText: '取消',
+        onOk() {
+          const fileList = (this.props.value || []).filter(x => getImgURL(x) != e.file.url);
+          this.props.onChange(fileList);
+        },
+      });
     }
 
-    if (e.file.status === "done") {
+    if (e.file.status === 'done') {
       this.setState({
         loading: false,
-      })
+      });
 
       if (e.file.response && e.file.response.url) {
         if (typeof this.props.onChange === 'function') {
-          const fileList = this.getFileList()
-          this.props.onChange([...fileList || [], e.file.response.url]);
+          const fileList = this.getFileList();
+          this.props.onChange([...(fileList || []), e.file.response.url]);
         }
       }
     }
   };
 
-  handleUploadSucess = (url) => {
+  handleUploadSucess = url => {
     this.setState({ loading: false });
     if (typeof this.props.onChange === 'function') {
       const fileList = this.props.value || [];
       this.props.onChange([...fileList, url]);
     }
-  }
+  };
 
   render() {
     const { previewVisible, previewImage } = this.state;
@@ -71,7 +84,10 @@ console.log(e,'handleChange')
 
     const uploadButton = (
       <div>
-        <Icon style={{ fontSize: '2em', color: '#aaa' }} type={this.state.loading ? "loading" : "plus"}  />
+        <Icon
+          style={{ fontSize: '2em', color: '#aaa' }}
+          type={this.state.loading ? 'loading' : 'plus'}
+        />
       </div>
     );
     return (
@@ -82,13 +98,14 @@ console.log(e,'handleChange')
           fileList={fileList}
           onPreview={this.handlePreview}
           onChange={this.handleChange}
-          { ...uploaderProps }
+          {...uploaderProps}
           onSuccess={this.handleUploadSucess}
         >
           {/* unlimited 表示上传无限制数量 */}
-          {(this.props.unlimited && uploadButton) || ((fileList || images).length >= 8 ? null : uploadButton)}
+          {(this.props.unlimited && uploadButton) ||
+            ((fileList || images).length >= 8 ? null : uploadButton)}
         </Upload>
-        <Modal visible={previewVisible} footer={null} onCancel={this.handleCancel}>
+        <Modal id={'ImageListUpload-preview'} visible={previewVisible} footer={null} onCancel={this.handleCancel}>
           <img alt="example" style={{ width: '100%' }} src={getImgURL(previewImage)} />
         </Modal>
       </div>

src/pages/staff/staff/Edit/index.jsx

@@ -74,7 +74,7 @@ const StaffEdit = props => {
     console.log(val, userId, '----------111------------');
     // val.institutionIdLis =  val?.institutionIdLis?.split(',')
     // console.log(val,userId,'----------------------')
-    if (val.loginName) {
+    if (!val.loginName) {
       val.loginName = val.phone;
     }