Browse Source

feat: 优化通讯录、人资左侧Tree高度计算css

lanjianrong 4 years ago
parent
commit
5b284f8b7f

+ 3 - 3
src/pages/Hr/Contacts/components/Organization/index.tsx

@@ -48,15 +48,15 @@ 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'
       }}>
-      <div className="p-4 pb-3 border-b-1 border-solid border-black border-opacity-10 bg-[#f7f9fa]">
+      <div className="px-4 py-3 border-b-1 border-solid border-black border-opacity-10 bg-hex-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

+ 3 - 3
src/pages/Hr/Employee/components/RoleMenu/index.jsx

@@ -83,11 +83,11 @@ const RoleMenu = props => {
 
   return (
     <div
-      className="w-12rem rounded-4px"
+      className="w-12rem rounded-4px flex flex-col"
       style={{
         height: `calc(100vh - 96px)`
       }}>
-      <div className="p-4 pb-3 border-b-1 border-solid border-black border-opacity-10 bg-[#f7f9fa] flex justify-around items-center">
+      <div className="px-4 py-3 border-b-1 border-solid border-black border-opacity-10 bg-[#f7f9fa] flex justify-around items-center">
         <span className="text-[0.9375rem]">组织架构</span>
         {hasPerm && (
           <ModalForm
@@ -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