Merge branch 'master' of http://192.168.1.41:3000/outaozhen/cldV2react

src/layouts/BasicLayout.jsx

@@ -13,8 +13,6 @@ import RightContent from '@/components/GlobalHeader/RightContent'
 import { getMatchMenu } from '@umijs/route-utils'
 import logo from '../assets/logo.svg'
 import styles from './BasicLayout.less'
-import { CSSTransition, TransitionGroup } from 'react-transition-group'
-import './amimate.scss'
 import '@icon-park/react/styles/index.less'
 import { IconPark } from '@/components/SvgIcon'
 import BasicModal from '@/components/Modal'

src/layouts/amimate.scss

@@ -1,32 +0,0 @@
-.router-wrapper {
-  position: absolute;
-  top: 0;
-  left: 0;
-  overflow: hidden;
-  background: white;
-}
-
-
-.fade-enter {
-  transform: translateX(-30px);
-  opacity: 0;
-}
-
-.fade-enter-active {
-  transform: translateX(0);
-  opacity: 1;
-  transition: all 0.28s;
-}
-
-
-.fade-exit {
-  transform: translateX(0);
-  opacity: 1;
-}
-
-.fade-exit-active {
-  display: none;
-  transform: translateX(30px);
-  transition: all 0.28s;
-}
-

src/pages/Customer/Company/components/PersonLabel/index.jsx

@@ -149,10 +149,6 @@ const DropDownMenu = props => {
     initCallBack
   } = props
 
-  if (tagColumn === 0) {
-    console.log('checkedIds', checkedIds)
-  }
-
   const [activeState, setActiveState] = useState({
     id: '',
     activeId: '',

src/pages/Customer/Company/index.jsx

@@ -189,7 +189,7 @@ const Company = props => {
           <PersonLabel
             dataId={record.id}
             tagIds={record.tagCooperationIds}
-            tagType={TagTypeEnum.TEAM}
+            tagType={TagTypeEnum.TEAMTAG}
             tagColumn={TagDataTypeEnum.COMPANY}
             checkCallBack={refreshData}
             modeType={LabelModeType.column}>

src/pages/Customer/Contact/index.jsx

@@ -1,8 +1,8 @@
 import ContactDetail from '@/pages/customer/Contact/components/ContactDetail'
 import Addcontact from '@/pages/customer/Contact/components/AddContact'
 import ProTable from '@ant-design/pro-table'
-import { Button, Input, message, Tag } from 'antd'
-import { connect, useParams } from 'dva'
+import { Button, message } from 'antd'
+import { connect } from 'dva'
 import React, { useEffect, useState, useRef, useMemo } from 'react'
 import consts from '@/consts'
 import LazyCascader from '@/components/LazyCascader'
@@ -226,7 +226,7 @@ const Contact = props => {
           <PersonLabel
             dataId={record.id}
             tagIds={record.tagCooperationIds}
-            tagType={TagTypeEnum.TEAM}
+            tagType={TagTypeEnum.TEAMTAG}
             tagColumn={TagDataTypeEnum.CONTACT}
             checkCallBack={refreshData}
             modeType={LabelModeType.column}>