调整资产样式

src/index.less

@@ -219,7 +219,7 @@ tr.drop-over-upward td {
 }
 
 .m-common {
-  margin: 24px 15px;
+  margin: 20px 15px;
 }
 
 .mx-common {
@@ -236,20 +236,20 @@ tr.drop-over-upward td {
 }
 
 .my-common {
-  margin-top: 24px;
-  margin-bottom: 24px;
+  margin-top: 20px;
+  margin-bottom: 20px;
 }
 
 .mt-common {
-  margin-top: 24px;
+  margin-top: 20px;
 }
 
 .mb-common {
-  margin-bottom: 24px;
+  margin-bottom: 20px;
 }
 
 .p-common {
-  padding: 24px 15px;
+  padding: 20px 15px;
 }
 
 .px-common {
@@ -266,16 +266,16 @@ tr.drop-over-upward td {
 }
 
 .py-common {
-  padding-top: 24px;
-  padding-bottom: 24px;
+  padding-top: 20px;
+  padding-bottom: 20px;
 }
 
 .pt-common {
-  padding-top: 24px;
+  padding-top: 20px;
 }
 
 .pb-common {
-  padding-bottom: 24px;
+  padding-bottom: 20px;
 }
 
 .py-compact-common {
@@ -352,4 +352,8 @@ tr.drop-over-upward td {
       }
     }
   }
+}
+
+.yy-card-head {
+  min-height: 40px !important;
 }
\ No newline at end of file

src/view/Manage/AssetManage/Component/AssetDirectory.jsx

@@ -8,6 +8,7 @@ import AttributeRelationModal from "./AttributeRelationModal";
 import FilterElementModal from './FilterElementModal';
 import { showNotifaction } from '../../../../util';
 import { MoreSvg } from './AssetSvg';
+import Separate from './Separate';
 import record from '../Assets/record.png'; 
 
 import './AssetDirectory.less';
@@ -120,18 +121,20 @@ const AssetDirectory = (props) => {
       >
         <div style={{ flex: 1, overflow: 'hidden'}}>
           <div>
-            <div className='mb-common'>
-              <Paragraph>
+            <div className='mb-common flex'>
+              <Paragraph style={{ flex: 1, overflow: 'hidden' }}>
                 <Tooltip title={dir?.name||''}>
-                  <Text className='title-color'>
-                    名称:&nbsp;
+                  <Text className='title-color'  ellipsis={true}>
+                    名称：
                     <Text className='text-color'>{dir?.name||''}</Text>
                   </Text>
                 </Tooltip>
-                &nbsp;&nbsp;
+              </Paragraph>
+              <Separate width={10} background='#fff' />
+              <Paragraph style={{ flex: 1, overflow: 'hidden' }}> 
                 <Tooltip title={dir?.code||''}>
-                  <Text className='title-color'>
-                    编号:&nbsp;
+                  <Text className='title-color'  ellipsis={true}>
+                    编号：
                     <Text className='text-color'>{dir?.code||''}</Text>
                   </Text>
                 </Tooltip>
@@ -141,7 +144,7 @@ const AssetDirectory = (props) => {
               <Paragraph>
                 <Tooltip title={dir?.desc||''}>
                   <Text className='title-color' ellipsis={true}>
-                    描述:&nbsp;
+                    描述：
                     <Text className='text-color'>{dir?.desc||''}</Text>
                   </Text>
                 </Tooltip>
@@ -152,7 +155,7 @@ const AssetDirectory = (props) => {
                 <Paragraph>
                   <Tooltip title={dir?.remarks||''}>
                     <Text className='title-color' ellipsis={true}>
-                      备注:&nbsp;
+                      备注：
                       <Text className='text-color'>{dir?.remarks||''}</Text>
                     </Text>
                   </Tooltip>
@@ -190,7 +193,7 @@ const AssetDirectory = (props) => {
                 flexDirection: 'column',
                 alignItems: 'center',
                 justifyContent: 'center',
-                marginBottom: 58,
+                marginBottom: 42,
               }}
             >
               <MoreSvg style={{ width: 20, height: 20, marginBottom: 5 }} />

src/view/Manage/AssetManage/Component/AssetTable.jsx

@@ -514,7 +514,7 @@ const AssetTable = (props) => {
     if (fullScreen) {
       scrollY = 'calc(100vh - 182px - 80px)';
     } else if (reference===AssetManageReference) {
-      scrollY = 'calc(100vh - 182px - 139px - 15px - 80px)';
+      scrollY = 'calc(100vh - 182px - 123px - 15px - 80px)';
     } else if (reference===AssetBrowseReference||reference===ResourceBrowseReference) {
       scrollY = 'calc(100vh - 182px - 102px - 15px - 80px)';
     } else if (reference===AssetRecycleReference) {

src/view/Manage/AssetManage/Component/AssetTree.jsx

@@ -555,7 +555,6 @@ const AssetTree = (props) => {
         index > -1 ? (
           <span 
             className={isRootLeaf?'title-color': 'text-color'}
-            style={{ fontWeight: isRootLeaf?'bold': '' }}
           >
             {beforeStr}
             <span className="site-tree-search-value">{keyword}</span>
@@ -564,7 +563,6 @@ const AssetTree = (props) => {
         ) : (
           <span
             className={isRootLeaf?'title-color': 'text-color'}
-            style={{ fontWeight: isRootLeaf?'bold': '' }}
           >{item.text}</span>
         );
       if (item.children) {
@@ -586,7 +584,7 @@ const AssetTree = (props) => {
         <div
           className='flex px-2 btn-group'
           style={{
-            height: 60,
+            height: 40,
             alignItems: 'center',
             justifyContent: 'space-around',
           }}
@@ -611,14 +609,14 @@ const AssetTree = (props) => {
         </div>
       )}
       bordered={false} 
-      bodyStyle={{ padding: '24px 15px' }}
+      bodyStyle={{ padding: '10px 15px' }}
       headStyle={{ padding: 0 }}
       style={{ width: '100%' }} 
     >
       <Spin spinning={loading}>
         <Input  
           value={keyword}
-          style={{ marginBottom: 24 }} 
+          style={{ marginBottom: 10 }} 
           onChange={(e) => { onChange(e) }}
         />
         <Tree

src/view/Manage/AssetManage/Component/AssetTree.less

@@ -7,7 +7,7 @@
   }
 
   .yy-tree{
-    height: calc(100vh - @header-height  - 30px - 60px - 104px) !important;
+    height: calc(100vh - @header-height  - 30px - 40px - 62px) !important;
     overflow: auto !important;
   }
 
@@ -18,7 +18,7 @@
 
 .asset-tree-read-only {
   .yy-tree {
-    height: calc(100vh - @header-height - 30px - 104px) !important;;
+    height: calc(100vh - @header-height - 30px - 62px) !important;;
     overflow: auto !important;
   }
 }

src/view/Manage/AssetManage/Component/Separate.jsx

 const Separate = (props) => {
-  const { width = '100%', height = '100%' } = props;
+  const { width = '100%', height = '100%', background = '#f0f2f5' } = props;
 
   return (
-    <div style={{ width, height, background: '#f0f2f5' }} />
+    <div style={{ width, height, background }} />
   )
 }