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

package.json

@@ -59,6 +59,7 @@
     "classnames": "^2.2.6",
     "crypto-js": "^4.0.0",
     "dayjs": "^1.10.4",
+    "dragm": "^0.0.5",
     "lodash": "^4.17.11",
     "moment": "^2.25.3",
     "omit.js": "^2.0.2",

src/components/DragmModal/index.tsx

@@ -0,0 +1,22 @@
+/* eslint-disable */
+import React, { PureComponent } from 'react'
+import DragM from 'dragm'
+
+export default class ModalDrag extends PureComponent<{ title?: string }> {
+  updateTransform = transformStr => {
+    this.modalDom.style.transform = transformStr
+  }
+
+  componentDidMount() {
+    this.modalDom = document.getElementsByClassName('ant-modal-content')[0]
+  }
+
+  render() {
+    const { title } = this.props
+    return (
+      <DragM updateTransform={this.updateTransform}>
+        <div>{title}</div>
+      </DragM>
+    )
+  }
+}

src/layouts/UserLayout.jsx

@@ -1,6 +1,6 @@
-import { DefaultFooter, getMenuData, getPageTitle } from '@ant-design/pro-layout'
+import { getMenuData, getPageTitle } from '@ant-design/pro-layout'
 import { Helmet, HelmetProvider } from 'react-helmet-async'
-import { Link, SelectLang, useIntl, connect, FormattedMessage } from 'umi'
+import { SelectLang, useIntl, connect, FormattedMessage } from 'umi'
 import React from 'react'
 import logo from '../assets/logo.svg'
 import styles from './UserLayout.less'

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

@@ -10,7 +10,7 @@ import ProTable from '@ant-design/pro-table'
 import { useModal } from '@/components/Modal'
 // import { queryContact } from '@/services/contact'
 
-const CompanyTabList = ({ initData, customerId, client, software, departmentsMap }) => {
+const CompanyTabList = ({ initData, customerId, client, software }) => {
   const { toggleDrawer, setDrawerProps } = useModal()
   const { TabPane } = Tabs
   const tRef = useRef(null)
@@ -32,8 +32,13 @@ const CompanyTabList = ({ initData, customerId, client, software, departmentsMap
     {
       title: '所有部门',
       dataIndex: 'department',
+      onFilter: true,
       filters: true,
-      valueEnum: departmentsMap
+      valueEnum: client.client
+        ?.map(item => item.department)
+        ?.reduce((prev, curr) => {
+          return { ...prev, [curr]: { text: curr } }
+        }, {})
     },
     {
       title: '姓名',
@@ -77,20 +82,6 @@ const CompanyTabList = ({ initData, customerId, client, software, departmentsMap
       dataIndex: 'client'
     }
   ]
-  // const [dataSource, setDataSource] = useState([])
-  // useEffect(() => {
-  //   const fetchClients = async () => {
-  //     const { code = -1, data: { client = [] } = { client: [], total: 0 } } = await queryContact({
-  //       customerId,
-  //       current: 1,
-  //       pageSize: consts.MAX_PAGE_SIZE
-  //     })
-  //     if (code === consts.RET_CODE.SUCCESS) {
-  //       setDataSource(client)
-  //     }
-  //   }
-  //   fetchClients()
-  // }, [])
 
   const handleAddClient = async values => {
     // 客户id
@@ -116,7 +107,6 @@ const CompanyTabList = ({ initData, customerId, client, software, departmentsMap
                 rowKey={record => record.id}
                 pagination={false}
               />
-              {/* <Table columns={columns} dataSource={state.dataSource} pagination={false} /> */}
             </div>
           </TabPane>
           <TabPane tab="软件锁" key="软件锁">

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

@@ -15,9 +15,9 @@ const CompanyDetail = props => {
     shouldUpdate,
     visible,
     dataId = '',
-    orderIds = [],
-    departments = [],
-    departmentsMap = {}
+    orderIds = []
+    // departments = [],
+    // departmentsMap = {}
   } = props
   const [state, setState] = useState({
     loading: false,
@@ -48,11 +48,11 @@ const CompanyDetail = props => {
   }, [shouldUpdate])
   useEffect(() => {
     visible && initData(dataId)
-    if (!departments.length) {
-      dispatch({
-        type: 'staff/fetchDepartments'
-      })
-    }
+    // if (!departments.length) {
+    //   dispatch({
+    //     type: 'staff/fetchDepartments'
+    //   })
+    // }
   }, [visible])
   return (
     <Spin spinning={state.loading}>
@@ -95,7 +95,7 @@ const CompanyDetail = props => {
               customerId={flipConsts.curId}
               software={state.software}
               client={state.client}
-              departmentsMap={departmentsMap}
+              // departmentsMap={departmentsMap}
             />
             <CompanyLowerList log={state.log} />
           </Col>
@@ -106,9 +106,9 @@ const CompanyDetail = props => {
 }
 
 // export default index
-export default connect(({ refresh, single, staff }) => ({
+export default connect(({ refresh, single }) => ({
   shouldUpdate: refresh.company,
-  visible: single.drawer.visible,
-  departments: staff.departments,
-  departmentsMap: staff.departmentsMap
+  visible: single.drawer.visible
+  // departments: staff.departments,
+  // departmentsMap: staff.departmentsMap
 }))(CompanyDetail)

src/pages/Customer/Contact/components/AddContact/index.jsx

@@ -3,6 +3,7 @@ import { Form, Row, Col, Button } from 'antd'
 import LazyCascader, { validCascaderRule } from '@/components/LazyCascader'
 import { ModalForm, ProFormSelect, ProFormText } from '@ant-design/pro-form'
 import { Plus } from '@icon-park/react'
+import ModalDrag from '@/components/DragmModal'
 
 const Addcontact = props => {
   const { onConfirm } = props
@@ -14,7 +15,7 @@ const Addcontact = props => {
   return (
     <ModalForm
       {...layout}
-      title="添加联系人"
+      title={<ModalDrag title={'添加联系人'} />}
       trigger={
         <Button key="button" type="primary" size="small" className="flex items-center">
           <Plus className="zh-mg-right-5" />

src/utils/auth/authority.js

@@ -10,7 +10,6 @@ export async function getAuthority() {
   return authority
 }
 export function setAuthority(authority) {
-  console.log('setAuthority', authority)
   const proAuthority = typeof authority === 'string' ? [authority] : authority
   setAuthCache(ROLES_KEY, proAuthority)
   reloadAuthorized()