Merge branch 'dev' of http://192.168.1.41:3000/outaozhen/cldV2react into dev

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

@@ -48,7 +48,7 @@ const Organization = props => {
   }
   return (
     <div
-      className="w-12rem rounded-4px flex flex-col h-full"
+      className="w-12rem rounded-4px flex flex-col"
       style={{
         height: `calc(100vh - 96px)`,
         overflowY: 'auto'

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

@@ -8,7 +8,7 @@ import { ModalForm, ProFormText } from '@ant-design/pro-form'
 import './index.less'
 const { DirectoryTree } = Tree
 
-const RoleMenu = props => {
+const DepartmentMenu = props => {
   const { dispatch, departments = [], onSelect } = props
   const hasPerm = useAccess()?.validatePermByType('employee_del_department')
   const newList = [...departments]
@@ -136,4 +136,4 @@ const RoleMenu = props => {
 
 export default connect(({ staff }) => ({
   departments: staff.departments
-}))(RoleMenu)
+}))(DepartmentMenu)

src/pages/Hr/Employee/index.jsx

@@ -1,6 +1,6 @@
 import React, { useState } from 'react'
 import consts from '@/consts'
-import RoleMenu from '@/pages/Hr/Employee/components/RoleMenu'
+import DepartmentMenu from '@/pages/Hr/Employee/components/DepartmentMenu'
 import { queryStaff } from '@/services/staff'
 import BasicTable from '@/components/Table'
 import { useModal } from '@/components/ModalStore'
@@ -83,7 +83,7 @@ const Employee = props => {
   return (
     <PageContainer title={false} breadcrumb={false}>
       <div className="h-full w-full flex flex-row">
-        <RoleMenu onSelect={onSelect} />
+        <DepartmentMenu onSelect={onSelect} />
         <div style={{ width: 'calc(100% - 12rem)' }}>
           <div className="ml-6 shadow-hex-3e2c5a">
             {state.params.id && (