Merge branch 'master' of http://git.ycjcjy.com/zhiyuxing/estateagents-admin-manager

src/components/SelectButton/NewTypeSelect.jsx

-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useRef } from 'react';
 import { Select } from 'antd';
 
 import request from '../../utils/request'
 
 const { Option } = Select;
 
+function usePrevious(props) {
+  const ref = useRef();
+  useEffect(() => {
+    ref.current = props;
+  });
+  return ref.current;
+}
+
 /**
  *
  *
  */
 const NewsTypeSelect = (props) => {
   const [ data, setData ] = useState([])
+  const [ value, setValue ] = useState('')
+  const preProps = usePrevious(props)
+
+  if ((!preProps || !preProps.value) && props.value && !value) {
+    setValue(props.value)
+  }
 
   useEffect(() => {
-    getCityList();
+    getNewsTypeList();
   },[])
 
-  const getCityList = (e) => {
+  const getNewsTypeList = (e) => {
     request({
         url: '/api/admin/taNewsType',
         method: 'GET',
     })
   }
 
+  const handleChange = (e) => {
+    setValue(e)
+    props.onChange(e)
+  }
+
   return (
-      <Select value={props.value} style={{ width: '180px' }} placeholder="请选择资讯类型" onChange={props.onChange}>
+      <Select value={'' === value ? undefined : value} style={{ width: '180px' }} placeholder="请选择资讯类型" onChange={handleChange}>
           {data.map(type => (
-            <Option key={type.newsTypeId}>{type.newsTypeName}</Option>
+            <Option key={type.newsTypeId} value={type.newsTypeId}>{type.newsTypeName}</Option>
           ))}
       </Select>
   )

src/components/XForm/ImageListUpload.jsx

       return;
     }
 
-    if (e.file.state === 'removed') {
-      const fileList = (this.props.value || []).filter(x => x != e.file.url);
-      this.props.onChange(fileList);
-    }
+    const fileList = (this.props.value || []).filter(x => x != e.file.url);
+    this.props.onChange(fileList);
+
+    // console.log('删除图片触发了', e.file)
+    // if (e.file.state === 'removed') {
+    //   const fileList = (this.props.value || []).filter(x => x != e.file.url);
+    //   this.props.onChange(fileList);
+    // }
 
     // if (e.file.status === "done") {
     //   this.setState({

src/pages/carouselFigure/advertisingList.jsx

             </Select>,
           )}
         </Form.Item>
-        <Form.Item>
+        {/* <Form.Item>
           {getFieldDecorator('showPosition')(
             <Select style={{ width: '180px' }} placeholder="发布位置">
               <Option value="mall">商城</Option>
               <Option value="index">首页</Option>
             </Select>,
           )}
-        </Form.Item>
+        </Form.Item> */}
         <Form.Item>
           {getFieldDecorator('status')(
             <Select style={{ width: '180px' }} placeholder="状态">