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

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) || [])

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({