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"
+      className="w-12rem rounded-4px flex flex-col h-full"
       style={{
         height: `calc(100vh - 96px)`,
         overflowY: 'auto'
@@ -56,7 +56,7 @@ const Organization = props => {
       <div className="p-4 border-b-1 border-solid border-black border-opacity-10 bg-[#f7f9fa]">
         <span className="text-[0.9375rem]">组织架构</span>
       </div>
-      <div className="py-4 pt-4 bg-white" style={{ height: 'calc(100% - 1rem*2 - 21px)' }}>
+      <div className="py-4 bg-white flex-1">
         {departments.length ? (
           <DirectoryTree
             multiple

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

@@ -83,7 +83,7 @@ const RoleMenu = props => {
 
   return (
     <div
-      className="w-12rem rounded-4px"
+      className="w-12rem rounded-4px flex flex-col"
       style={{
         height: `calc(100vh - 96px)`
       }}>
@@ -118,7 +118,7 @@ const RoleMenu = props => {
           </ModalForm>
         )}
       </div>
-      <div className="py-4 bg-white" style={{ height: 'calc(100% - 44px)' }}>
+      <div className="py-4 bg-white flex-1">
         {departments.length ? (
           <DirectoryTree
             multiple