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

src/components/Wangedit/Wangedit.jsx

       }
     }
   }
+
+  /**
+   *增加这个 shouldComponentUpdate 生命函数
+    处理自动聚焦到富文本上
+   *
+   * @param {*} nextProps
+   * @returns
+   * @memberof Wangedit
+   */
+  shouldComponentUpdate(nextProps) {
+    return nextProps.value !== this.editor.txt.html()
+  }
 }
 
 export default Wangedit

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

           position: 'relative',
           border: '1px solid #eee',
           borderRadius: '4px',
-          marginTop:'16px'
+          marginTop: '16px',
         }}>
 
           <p style={{ padding: '20px', borderBottom: '1px solid #eee' }}>{this.props.type.buildingTypeName || ''}  <Button type="link" style={{ position: 'absolute', right: '16px' }} icon="close" onClick={() => this.close()} /></p>
     const updateProjectDate = this.updateProjectType(tempDate)
     console.log('updateProjectDate: ', updateProjectDate)
     this.setState({ data: updateProjectDate })
+    this.setState({ defaultCheckboxValue: updateProjectDate.map(item => item.buildingTypeId) })
   }
 
   onClose = e => {
           onOk={this.handleOk}
           onCancel={this.handleCancel}
         >
-          <Checkbox.Group options={this.state.projectType.map(item => ({ label: item.buildingTypeName, value: item.buildingTypeId }))} defaultValue={this.state.defaultCheckboxValue} onChange={e => this.onCheckboxChange(e)} />
+          <Checkbox.Group options={this.state.projectType.map(item => ({ label: item.buildingTypeName, value: item.buildingTypeId }))} onChange={e => this.onCheckboxChange(e)} value={this.state.defaultCheckboxValue}/>
         </Modal>
         <Row type="flex" justify="space-between">
           {