Merge branch 'v3.5.1' into dev

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

@@ -125,7 +125,7 @@ function AddBuilding(props) {
   }
 
   /**
-   * 把 xxx,xxx,xxx  这样的格式转换成 [{ tagName: xxx, delete: true }, { tagName: xxx, delete: true }]
+   * 把 xxx,xxx,xxx  这样的格式转换成 [{ tagName: xxx, delete: true, automatic: false }, { tagName: xxx, delete: true, automatic: false }]
    * @param {*} str
    * @return 如果返回 str 为空 或者 非 string，则返回 str 本身，否则返回转换成功的数组
    */
@@ -139,11 +139,11 @@ function AddBuilding(props) {
   }
 
   /**
-   * 把 [xxx,xxx,xxx]  这样的格式转换成 [{ tagName: xxx, delete: true }, { tagName: xxx, delete: true }]
+   * 把 [xxx,xxx,xxx]  这样的格式转换成 [{ tagName: xxx, delete: true, automatic: false }, { tagName: xxx, delete: true, automatic: false }]
    * @param {*} arr
    */
   function arrayTransition(arr) {
-    return arr.map(x => ({ tagName: x, delete: true }))
+    return arr.map(x => ({ tagName: x, delete: true, automatic: false }))
   }
 
   function handleSubmit(e) {
@@ -181,22 +181,22 @@ function AddBuilding(props) {
     }
 
     if (data.buildingTransport) {
-      data.buildingTransport = data.buildingTransport.filter(f => f.delete === true).map(x => x.tagName).join(',')
+      data.buildingTransport = tagFilter(data.buildingTransport, 'Transport')
     }
     if (data.buildingMall) {
-      data.buildingMall = data.buildingMall.filter(f => f.delete === true).map(x => x.tagName).join(',')
+      data.buildingMall = tagFilter(data.buildingMall, 'Mall')
     }
     if (data.buildingEdu) {
-      data.buildingEdu = data.buildingEdu.filter(f => f.delete === true).map(x => x.tagName).join(',')
+      data.buildingEdu = tagFilter(data.buildingEdu, 'Edu')
     }
     if (data.buildingHospital) {
-      data.buildingHospital = data.buildingHospital.filter(f => f.delete === true).map(x => x.tagName).join(',')
+      data.buildingHospital = tagFilter(data.buildingHospital, 'Hospital')
     }
     if (data.buildingBank) {
-      data.buildingBank = data.buildingBank.filter(f => f.delete === true).map(x => x.tagName).join(',')
+      data.buildingBank = tagFilter(data.buildingBank, 'Bank')
     }
     if (data.buildingRestaurant) {
-      data.buildingRestaurant = data.buildingRestaurant.filter(f => f.delete === true).map(x => x.tagName).join(',')
+      data.buildingRestaurant = tagFilter(data.buildingRestaurant, 'Restaurant')
     }
 
     const api = data.buildingId === undefined ? apis.building.addBuilding : apis.building.updateBuilding
@@ -209,6 +209,33 @@ function AddBuilding(props) {
     })
   }
 
+  /**
+   * 过滤 tag
+   * @param {*} tags 
+   */
+  function tagFilter(tags, keyType) {
+    console.log(tags)
+    if (!tags) {
+      return null
+    }
+
+    // 过滤 tag 更新 useState()
+
+    // 获取地图周边
+    const automaticTag = tags.filter(f => f.automatic === true).map(x => x.tagName)
+    const determineTag = poi.map(p => {
+      if (p.key === keyType) {
+        if (typeof p.data === 'string') {
+          p.data = JSON.parse(p.data).filter(f => automaticTag.includes(f.name))
+        }
+      }
+      return p
+    })
+
+    setPoi(determineTag)
+    return tags.filter(f => f.automatic === false).map(x => x.tagName).join(',')
+  }
+
   // 视频文件上传前 回调
   function fileUploadBeforeUpload(file, fileList) {
     // console.log('视频文件上传前 回调: ', file, fileList)
@@ -274,7 +301,7 @@ function AddBuilding(props) {
   }
 
   function setFormMapScopeTagValue(keyType, item) {
-    const tag = item.data.map(t => ({ tagName: t.name, delete: false }))
+    const tag = item.data.map(t => ({ tagName: t.name, delete: true, automatic: true }))
     switch (keyType) {
       case POI_TYPES_KETY.Transport:
         const buildingTransportValue = (stringHandleTag(buildingData.buildingTransport) || [])
@@ -345,8 +372,8 @@ function AddBuilding(props) {
               ],
             })(<Input />)}
           </Form.Item>
-          <Form.Item label="项目动态" >
-            {getFieldDecorator('dynamic')(<Input />)}
+          <Form.Item label="项目说明" >
+            {getFieldDecorator('dynamic')(<Input placeholder="项目动态等，不超过15个字" maxLength = "15"/>)}
           </Form.Item>
           <Form.Item label="物业类型" >
             {getFieldDecorator('propertyType')(
@@ -377,7 +404,7 @@ function AddBuilding(props) {
               </Select>,
             )}
           </Form.Item>
-          <Form.Item label="项目视频" help="视频仅支持mp4格式，建议图片尺寸：750*600，比例5:4，用于楼盘详情">
+          <Form.Item label="项目视频" help="视频仅支持mp4格式，建议尺寸：750*600，比例5:4，用于楼盘详情">
             {getFieldDecorator('videoUrl')(
               // disabled={fileUploadDisabled}
               <FileUpload accept=".mp4" beforeUpload={fileUploadBeforeUpload} label="上传视频" size={1} />,
@@ -417,9 +444,9 @@ function AddBuilding(props) {
           <Form.Item label="排序" >
             {getFieldDecorator('orderNo')(<Input />)}
           </Form.Item>
-          <Form.Item label="优惠信息" >
+          {/* <Form.Item label="优惠信息" >
             {getFieldDecorator('discount')(<Input />)}
-          </Form.Item>
+          </Form.Item> */}
           <Form.Item label="首页推荐" >
             {getFieldDecorator('isMain', {
               initialValue: 1,
@@ -437,11 +464,11 @@ function AddBuilding(props) {
               <SelectCity />,
             )}
           </Form.Item>
-          <Form.Item label="楼盘区域" >
+          {/* <Form.Item label="楼盘区域" >
             {getFieldDecorator('buildingArea', {
               rules: [{ required: true, message: '请输入楼盘区域' }],
             })(<Input />)}
-          </Form.Item>
+          </Form.Item> */}
           <Form.Item label="项目地址" >
             {getFieldDecorator('address', {
               rules: [{ required: true, message: '请输入项目地址' }],
@@ -518,13 +545,13 @@ function AddBuilding(props) {
           <Form.Item label="装修标准" >
             {getFieldDecorator('decoration')(<Input />)}
           </Form.Item>
-          <Form.Item label="交房时间" >
+          {/* <Form.Item label="交房时间" >
             {getFieldDecorator('receivedDate')(<DatePicker />)}
-          </Form.Item>
-          <Form.Item label="产权年限" >
+          </Form.Item> */}
+          {/* <Form.Item label="产权年限" >
             {getFieldDecorator('rightsYear')(<InputNumber />)}
-          </Form.Item>
-          <Form.Item label="预售许可证" >
+          </Form.Item> */}
+          {/* <Form.Item label="预售许可证" >
             {getFieldDecorator('preSalePermit')(
               <ImageUpload />,
             )}
@@ -533,7 +560,7 @@ function AddBuilding(props) {
             {getFieldDecorator('remark')(
               <Wangedit />,
             )}
-          </Form.Item>
+          </Form.Item> */}
           <Form.Item style={{ width: '400px', margin: 'auto', display: 'flex', justifyContent: 'space-between' }}>
             <Button type="primary" htmlType="submit">
                 确定

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

@@ -206,7 +206,8 @@ class ModalImage extends React.Component {
               </Form.Item>
               <Form.Item label="套内面积" help="单位 ㎡">
                 {getFieldDecorator('insideArea', {
-                  rules: [{ required: true, message: '请填写套内面积' },
+                  rules: [
+                    // { required: true, message: '请填写套内面积' },
                           {
                             pattern: new RegExp('^[0-9]*$'),
                             message: '只允许输入数字',

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

@@ -1,6 +1,11 @@
 import React from 'react'
 import { Tag, Input, Tooltip, Icon } from 'antd';
 
+/**
+ * 数据格式：[{ tagName: inputValue, delete: true, automatic: false }]
+ * @param delete 是否删除
+ * @param automatic 是否自动数据（比如获取地图数据就是自动的true，手动输入的是手动false）
+ */
 class EditableTagGroup extends React.Component {
   state = {
     inputVisible: false,
@@ -46,8 +51,7 @@ class EditableTagGroup extends React.Component {
     const tagList = tags.map(x => x.tagName)
     if (inputValue && tagList.indexOf(inputValue) === -1) {
       // 如果有新的值，就把这个值追加到 tags 原本值的后面，在通过onChange事件传递出去
-      console.log(tags.concat([{ tagName: inputValue, delete: true }]))
-      this.toggleOnChange(tags.concat([{ tagName: inputValue, delete: true }]))
+      this.toggleOnChange(tags.concat([{ tagName: inputValue, delete: true, automatic: false }]))
     }
 
     this.setState({

src/pages/staff/list/editStaff.jsx

@@ -174,16 +174,16 @@ const Edit = (props) => {
     //   </Select>,
     //   value: userData.taTags,
     // },
-    {
-      label: '地址',
-      name: 'address',
-      type: FieldTypes.Text,
-      placeholder: '请输入地址',
-      value: userData.address,
-      rules: [
-        { required: true, message: '请输入地址' },
-      ]
-    },
+    // {
+    //   label: '地址',
+    //   name: 'address',
+    //   type: FieldTypes.Text,
+    //   placeholder: '请输入地址',
+    //   value: userData.address,
+    //   rules: [
+    //     { required: true, message: '请输入地址' },
+    //   ]
+    // },
     {
       label: '授权项目',
       name: 'buildingId',