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

.stylelintrc.js

@@ -1,5 +1,3 @@
-const fabric = require('@umijs/fabric')
-
 module.exports = {
   extends: [require.resolve('@umijs/fabric/dist/stylelint')],
   rules: {

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

@@ -85,8 +85,7 @@ const RoleMenu = props => {
     <div
       className="w-12rem rounded-4px"
       style={{
-        height: `calc(100vh - 96px)`,
-        overflowY: 'auto'
+        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">
         <span className="text-[0.9375rem]">组织架构</span>
@@ -119,7 +118,7 @@ const RoleMenu = props => {
           </ModalForm>
         )}
       </div>
-      <div className="py-4 pt-4 bg-white" style={{ height: 'calc(100% - 1rem*2 - 21px)' }}>
+      <div className="py-4 bg-white" style={{ height: 'calc(100% - 44px)' }}>
         {departments.length ? (
           <DirectoryTree
             multiple