Bladeren bron

fix: 修改部门管理样式

xieyonghong 3 jaren geleden
bovenliggende
commit
17dbf1f0a7

+ 6 - 9
src/components/Ellipsis/index.tsx

@@ -23,7 +23,7 @@ export default (props: EllipsisProps) => {
   const parentSize = useSize(parentNode.current);
   const extraSize = useSize(extraNode.current);
   const [isEllipsis, setIsEllipsis] = useState(false);
-  const [show, setShow] = useState(false);
+  // const [show, setShow] = useState(false);
 
   useEffect(() => {
     if (extraSize.width && parentSize.width) {
@@ -37,7 +37,6 @@ export default (props: EllipsisProps) => {
         extraNode.current.innerHTML = '';
         extraNode.current.setAttribute('style', 'display: none');
       }
-      setShow(true);
     }
   }, [props.title, extraSize]);
 
@@ -61,13 +60,11 @@ export default (props: EllipsisProps) => {
 
   return (
     <div className={Style['ellipsis-warp']} ref={parentNode}>
-      {show ? (
-        isEllipsis && props.showToolTip !== false ? (
-          <Tooltip title={props.title}>{ellipsisNode}</Tooltip>
-        ) : (
-          ellipsisNode
-        )
-      ) : null}
+      {isEllipsis && props.showToolTip !== false ? (
+        <Tooltip title={props.title}>{ellipsisNode}</Tooltip>
+      ) : (
+        ellipsisNode
+      )}
       <div className={Style['ellipsis-max']} ref={extraNode}>
         {props.title}
       </div>

+ 1 - 0
src/pages/system/Department/Assets/deivce/index.tsx

@@ -318,6 +318,7 @@ export default observer((props: { parentId: string }) => {
         search={false}
         params={searchParam}
         gridColumn={2}
+        height={'none'}
         scroll={{ x: 1366 }}
         request={async (params) => {
           params.sorts = [{ name: 'createTime', order: 'desc' }];

+ 1 - 0
src/pages/system/Department/Assets/product/index.tsx

@@ -277,6 +277,7 @@ export default observer((props: { parentId: string }) => {
         search={false}
         gridColumn={2}
         params={searchParam}
+        height={'none'}
         request={async (params) => {
           params.sorts = [{ name: 'createTime', order: 'desc' }];
           if (!props.parentId) {

+ 3 - 5
src/pages/system/Department/Tree/tree.tsx

@@ -1,4 +1,4 @@
-import { Button, Input, Tooltip, Tree } from 'antd';
+import { Button, Input, Tree } from 'antd';
 import {
   DeleteOutlined,
   EditOutlined,
@@ -8,7 +8,7 @@ import {
 } from '@ant-design/icons';
 import { useEffect, useRef, useState } from 'react';
 import { service } from '@/pages/system/Department';
-import { Empty, PermissionButton } from '@/components';
+import { Ellipsis, Empty, PermissionButton } from '@/components';
 import { useIntl, useLocation } from 'umi';
 import { debounce } from 'lodash';
 import Save from '../save';
@@ -234,9 +234,7 @@ export default (props: TreeProps) => {
                   }}
                 >
                   <span className={'tree-node-name--title'}>
-                    <Tooltip title={nodeData.name}>
-                      <span className={'ellipsis'}>{nodeData.name}</span>
-                    </Tooltip>
+                    <Ellipsis title={nodeData.name} />
                   </span>
                   <span
                     className={classnames('tree-node-name--btn', {