fix: 标签数据刷新问题

src/pages/Customer/Company/index.jsx

@@ -18,7 +18,15 @@ import { IconPark } from '@/components/SvgIcon'
 import { apiBatchLink } from '@/services/customer'
 
 const Company = props => {
-  const { personTagColorMap, teamTagColorMap, personTags, teamTags, dispatch, shouldUpdate } = props
+  const {
+    personTagColorMap,
+    teamTagColorMap,
+    personTags,
+    teamTags,
+    dispatch,
+    shouldUpdate,
+    loading
+  } = props
   const { toggleDrawer, setDrawerProps } = useModal()
   const tRef = useRef(null)
   const [selectKeys, setSelectKeys] = useState([])
@@ -34,35 +42,35 @@ const Company = props => {
     const teamOptions = []
     personTags.forEach(item => {
       personOptions.push({ label: item.name, value: item.id })
-      personTagMap[item.id] = {
-        text: (
-          <>
-            <span
-              className="zh-circle-icon zh-mg-right-3"
-              style={{ backgroundColor: personTagColorMap[item.id] }}
-            />
-            <span>{item.name}</span>
-          </>
-        )
-      }
+      // personTagMap[item.id] = {
+      //   text: (
+      //     <>
+      //       <span
+      //         className="zh-circle-icon zh-mg-right-3"
+      //         style={{ backgroundColor: personTagColorMap[item.id] }}
+      //       />
+      //       <span>{item.name}</span>
+      //     </>
+      //   )
+      // }
     })
     teamTags.forEach(item => {
       teamOptions.push({ label: item.name, value: item.id })
-      teamTagMap[item.id] = {
-        text: (
-          <>
-            <span
-              className="zh-square-icon zh-mg-right-3"
-              style={{ backgroundColor: teamTagColorMap[item.id] }}
-            />
-            <span>{item.name}</span>
-          </>
-        )
-      }
+      // teamTagMap[item.id] = {
+      //   text: (
+      //     <>
+      //       <span
+      //         className="zh-square-icon zh-mg-right-3"
+      //         style={{ backgroundColor: teamTagColorMap[item.id] }}
+      //       />
+      //       <span>{item.name}</span>
+      //     </>
+      //   )
+      // }
     })
 
     return { personTagMap, teamTagMap, personOptions, teamOptions }
-  }, [personTags, teamTags, personTagColorMap, teamTagColorMap])
+  }, [personTags, teamTags, personTagColorMap, teamTagColorMap, loading])
 
   const [state, setState] = useState({
     id: '',
@@ -467,10 +475,11 @@ const Company = props => {
   )
 }
 
-export default connect(({ company, refresh }) => ({
+export default connect(({ company, refresh, loading }) => ({
   personTagColorMap: company.personTagColorMap,
   personTags: company.personTags,
   teamTagColorMap: company.teamTagColorMap,
   teamTags: company.teamTags,
+  loading: loading.models.company,
   shouldUpdate: refresh.company
 }))(Company)

src/pages/Customer/Contact/index.jsx

@@ -21,7 +21,15 @@ import styles from './index.less'
 
 const Contact = props => {
   const { toggleDrawer, setDrawerProps } = useModal()
-  const { personTagColorMap, teamTagColorMap, personTags, teamTags, dispatch, shouldUpdate } = props
+  const {
+    personTagColorMap,
+    teamTagColorMap,
+    personTags,
+    teamTags,
+    dispatch,
+    shouldUpdate,
+    loading
+  } = props
 
   const tRef = useRef()
   const [tagState, setTagState] = useState({
@@ -65,7 +73,7 @@ const Contact = props => {
     })
 
     return { personTagMap, teamTagMap, personOptions, teamOptions }
-  }, [personTags, teamTags, personTagColorMap, teamTagColorMap])
+  }, [personTags, teamTags, personTagColorMap, teamTagColorMap, loading])
 
   const toolbarOptionsChange = (type, ids) => {
     setTagState({ ...tagState, [type]: ids })
@@ -613,10 +621,11 @@ const Contact = props => {
   )
 }
 
-export default connect(({ contact, refresh }) => ({
+export default connect(({ contact, refresh, loading }) => ({
   personTagColorMap: contact.personTagColorMap,
   personTags: contact.personTags,
   teamTagColorMap: contact.teamTagColorMap,
   teamTags: contact.teamTags,
+  loading: loading.models.contact,
   shouldUpdate: refresh.contact
 }))(Contact)