test: 暂时使用plugin-dva导出的connect

src/components/LazyCascader/LazyCascader.tsx

@@ -3,13 +3,14 @@ import { getAuthCache } from '@/utils/auth'
 import { CASCADER_HISTORY_KEY } from '@/utils/cache/cacheEnum'
 import { isUnDef } from '@/utils/is'
 import { Cascader, Divider, Tag } from 'antd'
-import { connect } from '@umijs/max'
+import { connect } from '@@/plugin-dva'
 import { authSaveRecord } from './shared'
 import styles from './index.less'
 
-import type { Dispatch } from '@umijs/max'
+// import type { Dispatch } from '@umijs/max'
 import type { CascaderProps } from 'antd'
 import type { CascaderRef } from 'antd/lib/cascader'
+import classNames from 'classnames'
 
 type LazyCascaderProps<T> = {
   refinstance: CascaderRef
@@ -96,7 +97,7 @@ function CLazyCascader<T>({
   }
 
   useLayoutEffect(() => {
-    document.querySelector('.Cascader-Body')?.addEventListener(
+    document.querySelector('.cascader-body')?.addEventListener(
       'DOMSubtreeModified',
       () => {
         let width = 0
@@ -116,7 +117,7 @@ function CLazyCascader<T>({
       false
     )
     return () => {
-      document.querySelector('.Cascader-Body')?.removeEventListener('DOMSubtreeModified', () => {})
+      document.querySelector('.cascader-body')?.removeEventListener('DOMSubtreeModified', () => {})
     }
   }, [])
   const dropdownRender = menu => (
@@ -163,11 +164,9 @@ function CLazyCascader<T>({
     // }
   }
   return (
-    <div className={[styles.cascader, 'Cascader-Body'].join(' ')}>
+    <div className={classNames(styles.cascader, 'cascader-body')}>
       <Cascader
         value={cValue}
-        // 使用这个会导致小屏下市、区的层级不显示
-        // getPopupContainer={triggerNode => triggerNode.parentNode}
         open={visible}
         placeholder="省/市/区"
         options={options}

src/pages/Customer/Business/components/AddBusiness.jsx

@@ -1,6 +1,6 @@
 import { ProFormDatePicker, ProFormSelect, ProFormText } from '@ant-design/pro-form'
 import { Button, Row, Col, Modal, Form } from 'antd'
-import { connect } from '@umijs/max'
+import { connect } from '@@/plugin-dva'
 import { addBusiness } from '@/services/customer'
 import { isNullOrUnDef } from '@/utils/is'
 import consts from '@/consts'
@@ -44,7 +44,12 @@ const AddBusiness = props => {
       }>
       <Form {...layout} form={formRef}>
         <ProFormText name="name" label="商机名称" required />
-        <ProFormSelect fieldProps={{ options: groupList }} name="businessGroupId" label="商机状态组" required />
+        <ProFormSelect
+          fieldProps={{ options: groupList }}
+          name="businessGroupId"
+          label="商机状态组"
+          required
+        />
         {/* <Col span={12}>
           <ProFormDependency name={['businessGroupId']}>
             {({ businessGroupId }) => (

src/pages/Customer/Business/components/BusinessDetail/index.jsx

@@ -5,12 +5,12 @@ import TabList from './TabList'
 import LowerList from './LowerList'
 import { getBusinessDetailById } from '@/services/customer'
 import consts from '@/consts'
-import { connect, useModel } from '@umijs/max'
+import { useModel } from '@umijs/max'
 import { Up, Down } from '@icon-park/react'
 import { FlipOverEnum, useFlipOver } from '@/hooks/web/useFlipOver'
 import './index.less'
 import { WaterMark } from '@ant-design/pro-layout'
-
+import { connect } from '@@/plugin-dva'
 const Detail = props => {
   const { initialState: { currentUser = {} } = {} } = useModel('@@initialState')
   const { visible, onClose, dispatch, updateKey = 'business', refresh, dataId, orderIds = [] } = props

src/pages/Customer/Client/components/AddClient/index.jsx

@@ -2,7 +2,8 @@ import React, { useState, useEffect } from 'react'
 import { Form, Row, Col, Button, Modal } from 'antd'
 import LazyCascader from '@/components/LazyCascader'
 import { ProFormSelect, ProFormText, ProFormTextArea } from '@ant-design/pro-form'
-import { useDispatch, connect } from '@umijs/max'
+import { connect } from '@@/plugin-dva'
+import { useDispatch } from '@umijs/max'
 import { ChangeCompMap } from '@/pages/Customer/Company/components/ChangeCompany'
 import { isNullOrUnDef } from '@/utils/is'
 import TelephoneFormItem from './TelephoneFormItem'

src/pages/Customer/Client/components/ClientDetail/Form.tsx

@@ -2,14 +2,10 @@ import { Row, Col, Tooltip } from 'antd'
 import React, { useEffect, useMemo } from 'react'
 import EditableForm from '@/components/EditableForm'
 import ChangeCompanyInput from '@/pages/Customer/Company/components/ChangeCompany'
-import { connect } from '@umijs/max'
+import { connect } from '@@/plugin-dva'
 import PersonLabel from '@/pages/Customer/Company/components/PersonLabel'
 import { Add } from '@icon-park/react'
-import {
-  TagType,
-  TagDataType,
-  LabelModeType
-} from '@/pages/Customer/Company/components/PersonLabel/const'
+import { TagType, TagDataType, LabelModeType } from '@/pages/Customer/Company/components/PersonLabel/const'
 
 const ClientForm = props => {
   const {

src/pages/Customer/Client/components/ClientDetail/index.jsx

@@ -5,7 +5,8 @@ import ClientTabList from './TabList'
 import ClientLowerList from './LowerList'
 import { apiClientDetail } from '@/services/customer'
 import consts from '@/consts'
-import { connect, useModel } from '@umijs/max'
+import { connect } from '@@/plugin-dva'
+import { useModel } from '@umijs/max'
 import { Up, Down } from '@icon-park/react'
 import { FlipOverEnum, useFlipOver } from '@/hooks/web/useFlipOver'
 import { WaterMark } from '@ant-design/pro-layout'

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

@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react'
 import { Form, Row, Col, Button, Modal } from 'antd'
 import LazyCascader from '@/components/LazyCascader'
 import { ProFormText, ProFormCheckbox, ProFormTextArea } from '@ant-design/pro-form'
-import { connect } from '@umijs/max'
+import { connect } from '@@/plugin-dva'
 import { ChangeCompMap } from '../ChangeCompany'
 import { isNullOrUnDef } from '@/utils/is'
 import CompanyFormItem from './CompanyFormItem'
@@ -107,22 +107,19 @@ const AddCompanyModal = ({
                 }
                 formRef?.setFieldsValue(values)
                 handleOnOk()
-              }}
-            >
+              }}>
               添加并关联
             </Button>
           ) : null}
         </div>
-      }
-    >
+      }>
       <Form {...layout} form={formRef}>
         <Form.Item
           name="companyName"
           label="单位名称"
           validateStatus={state.validStatusFcn}
           hasFeedback
-          rules={[{ required: true, message: '请输入单位全称' }]}
-        >
+          rules={[{ required: true, message: '请输入单位全称' }]}>
           <CompanyFormItem validateFn={status => setState({ ...state, validStatusFcn: status })} />
         </Form.Item>
         {dataId ? <ProFormText name={`${dataType}Id`} hidden /> : null}

src/pages/Customer/Company/components/CompanyDetail/Form.tsx

@@ -4,18 +4,11 @@ import EditableForm from '@/components/EditableForm'
 import PersonLabel from '../PersonLabel'
 import { TagType, TagDataType, LabelModeType } from '../PersonLabel/const'
 import { Add } from '@icon-park/react'
-import { connect } from '@umijs/max'
+import { connect } from '@@/plugin-dva'
 
 const CompanyForm = props => {
-  const {
-    updatePayload,
-    customer,
-    personTagColorMap,
-    personTags,
-    teamTagColorMap,
-    teamTags,
-    dispatch
-  } = props
+  const { updatePayload, customer, personTagColorMap, personTags, teamTagColorMap, teamTags, dispatch } =
+    props
 
   useEffect(() => {
     if (!personTags.length) {
@@ -127,8 +120,7 @@ const CompanyForm = props => {
             tagType={TagType.PERSONTAG}
             tagColumn={TagDataType.COMPANY}
             checkCallBack={refreshCompany}
-            modeType={LabelModeType.column}
-          >
+            modeType={LabelModeType.column}>
             <Add theme="filled" size="20" fill="#868e96" className="cursor-pointer" />
           </PersonLabel>
         </div>
@@ -155,8 +147,7 @@ const CompanyForm = props => {
             tagType={TagType.TEAMTAG}
             tagColumn={TagDataType.COMPANY}
             checkCallBack={refreshCompany}
-            modeType={LabelModeType.column}
-          >
+            modeType={LabelModeType.column}>
             <Add theme="filled" size="20" fill="#868e96" className="cursor-pointer" />
           </PersonLabel>
         </div>

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

@@ -5,7 +5,8 @@ import { apiCompanyDetail } from '@/services/customer'
 import CompanyForm from './Form'
 import CompanyLowerList from './LowerList'
 import CompanyTabList from './TabList'
-import { connect, useModel } from '@umijs/max'
+import { connect } from '@@/plugin-dva'
+import { useModel } from '@umijs/max'
 import { Up, Down } from '@icon-park/react'
 import { FlipOverEnum, useFlipOver } from '@/hooks/web/useFlipOver'
 import { WaterMark } from '@ant-design/pro-layout'

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

@@ -1,16 +1,11 @@
 import { Button, Checkbox, Popover, Input, message, Spin } from 'antd'
 import React, { useState, useRef, useEffect, useMemo } from 'react'
-import { connect, useAccess } from '@umijs/max'
+import { useAccess } from '@umijs/max'
+import { connect } from '@@/plugin-dva'
 import styles from './index.less'
 import { apiConnOrDelTag, apiUpdateTag } from '@/services/customer'
 import consts from '@/basic/consts'
-import {
-  DropdownType,
-  LabelModeType,
-  LabelStatusColorMap,
-  TagDataType,
-  TagType
-} from './const'
+import { DropdownType, LabelModeType, LabelStatusColorMap, TagDataType, TagType } from './const'
 
 const DropDownMenu = props => {
   // 保存选中的checkbox ids
@@ -49,8 +44,7 @@ const DropDownMenu = props => {
       }
       checkCallBack()
     } else {
-      checkCallBack &&
-        checkCallBack(tagType === TagType.PERSONTAG ? 'tagIds' : 'tagCooperationIds', ids)
+      checkCallBack && checkCallBack(tagType === TagType.PERSONTAG ? 'tagIds' : 'tagCooperationIds', ids)
     }
     if (canRender) {
       setCheckedIds(ids)
@@ -89,16 +83,12 @@ const DropDownMenu = props => {
             return (
               <li
                 key={item.id}
-                className={[styles.menuItem, checkedIds.includes(item.id) && styles.select].join(
-                  ' '
-                )}
-              >
+                className={[styles.menuItem, checkedIds.includes(item.id) && styles.select].join(' ')}>
                 <div className={styles.labelText}>
                   <div
-                    className={[
-                      styles.statusIcon,
-                      tagType === TagType.PERSONTAG ? styles.suqare : ''
-                    ].join(' ')}
+                    className={[styles.statusIcon, tagType === TagType.PERSONTAG ? styles.suqare : ''].join(
+                      ' '
+                    )}
                     style={{ backgroundColor: LabelStatusColorMap[tagType][idx] }}
                   />
                   <span>{item.name}</span>
@@ -123,15 +113,13 @@ const DropDownMenu = props => {
                 styles.editMenuItem,
                 styles.menuItemWithBorder,
                 item.id === activeState.activeId ? styles.active : ''
-              ].join(' ')}
-            >
+              ].join(' ')}>
               <li onClick={() => labelOnClick(item.id)} style={{ width: '100%' }}>
                 <div className={styles.editLabel}>
                   <div
-                    className={[
-                      styles.statusIcon,
-                      tagType === TagType.PERSONTAG ? styles.suqare : ''
-                    ].join(' ')}
+                    className={[styles.statusIcon, tagType === TagType.PERSONTAG ? styles.suqare : ''].join(
+                      ' '
+                    )}
                     style={{ backgroundColor: LabelStatusColorMap[tagType][idx] }}
                   />
 
@@ -241,8 +229,7 @@ const PersonLabel = props => {
             {tagType === TagType.PERSONTAG || hasPermEdit ? (
               <span
                 onClick={() => setDropdownType(DropdownType.edit)}
-                className="text-primary cursor-pointer ml-3"
-              >
+                className="text-primary cursor-pointer ml-3">
                 编辑标签
               </span>
             ) : null}
@@ -254,11 +241,7 @@ const PersonLabel = props => {
             ) : null}
           </div>
         ) : (
-          <Button
-            size="small"
-            className="ml-5px"
-            onClick={() => setDropdownType(DropdownType.check)}
-          >
+          <Button size="small" className="ml-5px" onClick={() => setDropdownType(DropdownType.check)}>
             返回
           </Button>
         )}

src/pages/Hr/Contacts/components/Organization/index.tsx

@@ -1,6 +1,6 @@
 import { Tree } from 'antd'
 import React, { useEffect } from 'react'
-import { connect } from '@umijs/max'
+import { connect } from '@@/plugin-dva'
 const { DirectoryTree } = Tree
 
 const Organization = props => {

src/pages/Hr/Contacts/index.tsx

@@ -3,7 +3,7 @@ import { PageContainer } from '@ant-design/pro-layout'
 import { Input, List, Popover, Space, Tag } from 'antd'
 import type { ColumnsType } from 'antd/lib/table'
 import React, { useEffect, useMemo, useState } from 'react'
-import { connect } from '@umijs/max'
+import { connect } from '@@/plugin-dva'
 import Organization from './components/Organization'
 
 export type ContactsProps = {

src/pages/Hr/Employee/components/EmployeeDetail/index.jsx

@@ -1,7 +1,8 @@
 import React, { useState, useEffect } from 'react'
 import { Col, Drawer, Row } from 'antd'
 import consts from '@/consts'
-import { connect, useModel } from '@umijs/max'
+import { connect } from '@@/plugin-dva'
+import { useModel } from '@umijs/max'
 import EmployeeForm from './Form.jsx'
 import EmployeeLowerList from './LowerList.jsx'
 import EmployeeTabList from './TabList.jsx'

src/pages/Product/Cloud/components/Detail/index.jsx

@@ -1,7 +1,8 @@
 import React, { useState, useEffect } from 'react'
 import { Row, Col, Button, Tooltip, Spin, Modal, Drawer } from 'antd'
 import { LinkOne, LinkInterrupt } from '@icon-park/react'
-import { connect, useModel } from '@umijs/max'
+import { connect } from '@@/plugin-dva'
+import { useModel } from '@umijs/max'
 import consts from '@/consts'
 import Form from './Form'
 import ClientDetail from '@/pages/Customer/Client/components/ClientDetail/Form'

src/pages/Product/Lock/LockStore/components/LockDetail/OpreateLock.tsx

@@ -6,7 +6,8 @@ import { apiUpdateLonglelog, queryLock } from '@/services/product'
 import consts from '@/basic/consts'
 import { useDebounceFn } from 'ahooks'
 import { apiSoftwareAddLonglelog, apiReceiveLock } from '@/services/product'
-import { useDispatch, connect } from '@umijs/max'
+import { connect } from '@@/plugin-dva'
+import { useDispatch } from '@umijs/max'
 import { ProFormText, ProFormTextArea } from '@ant-design/pro-form'
 import styles from '@/pages/Customer/Company/components/ConnectCompany/index.less'
 

src/pages/Product/Lock/LockStore/components/LockDetail/index.jsx

@@ -5,7 +5,8 @@ import { apiSoftwareDetail } from '@/services/product'
 import LockForm from './Form'
 import LockLowerList from './LowerList'
 import LockTabList from './TabList'
-import { connect, useModel } from '@umijs/max'
+import { connect } from '@@/plugin-dva'
+import { useModel } from '@umijs/max'
 import { Down, Up } from '@icon-park/react'
 import { FlipOverEnum, useFlipOver } from '@/hooks/web/useFlipOver'
 import { WaterMark } from '@ant-design/pro-layout'

src/pages/Product/Lock/LockStore/index.jsx

@@ -1,7 +1,8 @@
 import React, { useEffect, useState, useRef } from 'react'
 import { Tag, Tooltip, Input, Button } from 'antd'
 import consts from '@/consts'
-import { connect, useModel } from '@umijs/max'
+import { connect } from '@@/plugin-dva'
+import { useModel } from '@umijs/max'
 import { queryLock } from '@/services/product'
 import { generateSortField } from '@/utils/utils'
 import { PermDataTypeEunm } from '@/pages/Customer/Company/components/PermSelect'

src/pages/Product/Road/Enterprise/components/AddEnterprise/EnterpriseSelect.jsx

@@ -1,6 +1,7 @@
 import { Select, Space } from 'antd'
 import React, { useState, useEffect } from 'react'
-import { useDispatch, connect } from '@umijs/max'
+import { connect } from '@@/plugin-dva'
+import { useDispatch } from '@umijs/max'
 
 const EnterpriseSelect = ({ compilationv2, disabled, ...otherProps }) => {
   const dispatch = useDispatch()

src/pages/Product/Road/Enterprise/components/AddEnterprise/index.jsx

@@ -1,7 +1,8 @@
 import { ProFormText } from '@ant-design/pro-form'
 import { Button, Form, Input, InputNumber, Modal, Select, Space } from 'antd'
 import React, { useState, useEffect } from 'react'
-import { useDispatch, connect } from '@umijs/max'
+import { connect } from '@@/plugin-dva'
+import { useDispatch } from '@umijs/max'
 import EnterpriseSearchSelect from './EnterpriseSearchSelect'
 import { validateEnum } from '@/pages/Customer/Company/components/AddCompany/CompanyFormItem'
 import SearchCompanyInput from './SearchCompanyInput'

src/pages/Product/Road/Enterprise/components/Detail/index.jsx

@@ -1,7 +1,8 @@
 import { apiRoadcompanyDetail, apiRoadPricingUnLinkCustomer } from '@/services/product'
 import { Button, Col, Drawer, Row, Spin, Tooltip, Modal } from 'antd'
 import React, { useState, useEffect } from 'react'
-import { connect, useModel } from '@umijs/max'
+import { connect } from '@@/plugin-dva'
+import { useModel } from '@umijs/max'
 import consts from '@/consts'
 import EnterpriseForm from './Form'
 import EnterpriseLowerList from './LowerList'

src/pages/Product/Road/Personal/components/Detail/index.jsx

@@ -1,7 +1,8 @@
 import React, { useState, useEffect } from 'react'
 import { LinkOne, LinkInterrupt } from '@icon-park/react'
 import { Row, Col, Button, Tooltip, Spin, Modal, Drawer } from 'antd'
-import { connect, useModel } from '@umijs/max'
+import { connect } from '@@/plugin-dva'
+import { useModel } from '@umijs/max'
 import consts from '@/consts'
 import { apiRoadpricingDetailV2, apiRoadPricingUnLinkClientV2 } from '@/services/product'
 import Form from './Form'

src/pages/Workbench/Dashboard/components/BusinessChar.jsx

@@ -1,6 +1,6 @@
 import { DualAxes } from '@ant-design/charts'
 import { Card, Select } from 'antd'
-import { connect } from '@umijs/max'
+import { connect } from '@@/plugin-dva'
 import React, { useEffect } from 'react'
 
 const BusinessChar = props => {
@@ -77,8 +77,7 @@ const BusinessChar = props => {
             ) : null}
           </div>
         </div>
-      }
-    >
+      }>
       {char && thread && <DualAxes {...config} />}
     </Card>
   )

src/pages/Workbench/Dashboard/index.tsx

@@ -3,7 +3,8 @@ import ProTable from '@ant-design/pro-table'
 import { Row, Col, Select, Card, Skeleton, TreeSelect } from 'antd'
 import { AddressBook, City, Comment } from '@icon-park/react'
 import consts from '@/consts'
-import { connect, useModel } from '@umijs/max'
+import { connect } from '@@/plugin-dva'
+import { useModel } from '@umijs/max'
 import { queryDashboard } from '@/services/dashboard'
 import { queryStaff } from '@/services/staff'
 import LeaderBoard from './components/LeaderBoard'