调整资产浏览页面

src/view/Manage/AssetBrowse/Component/RelationContainer.jsx

@@ -177,8 +177,9 @@ const RelationContainer = (props) => {
   }
 
   return (
-    <div style={{ width: '100%', height: '100%' }}>
+    <div style={{ width: '100%', height: '100%', position: 'relative' }}>
       <Relation data={relationData} expandTree={expandTree} onCenterClick={onCenterClick} onExpandClick={onExpandClick} />
+      <div className='title-text' style={{ position: 'absolute', left: 15, top: 24, fontWeight: 'bold' }} >关系图</div>
     </div>
   );
 }

src/view/Manage/AssetBrowse/index.jsx

@@ -6,6 +6,7 @@ import AssetTree from '../AssetManage/Component/AssetTree';
 import AssetDirectory from '../AssetManage/Component/AssetDirectory';
 import RelationContainer from './Component/RelationContainer';
 import AssetTable from "../AssetManage/Component/AssetTable";
+import Separate from '../AssetManage/Component/Separate';
 
 import { AssetBrowseReference } from '../../../util/constant';
 
@@ -53,22 +54,25 @@ const AssetBrowse = (props) => {
       <div className='left'>
         <AssetTree centerId={centerId} onSelect={onTreeSelect} reference={reference} {...props} />
       </div>
-      <div className='tree-toggle-wrap'>
-        <div className='tree-toggle' onClick={treeToggleClick}>
-        { expandTree ? <CaretLeftOutlined /> : <CaretRightOutlined /> }
-        </div>
-      </div>
+      {
+        expandTree && <Separate width={15} />
+      }
       <div className='right'>
         <AssetDirectory id={nodeId} assetCount={assetCount} reference={reference} />
-        <div className='flex' style={{ height: '100%' }}>
-          <div style={{ width: '50%', height: '100%' }}>
+        <Separate height={15} />
+        <div className='flex' style={{ flex: 1, height: '100%', overflow: 'hidden' }}>
+          <div style={{ flex: 1, height: '100%', overflow: 'hidden' }}>
             <RelationContainer reference={reference}  nodeParams={nodeParams} onChange={onRelationChange} expandTree={expandTree} />
           </div>
-          <div style={{ width: '50%' }}>
+          <Separate width={15} />
+          <div style={{ flex: 1, overflow: 'hidden' }}>
             <AssetTable nodeId={nodeId} reference={reference} onCountChange={onAssetCountChange} {...props} />
           </div>          
         </div>
       </div>
+      <div className='tree-toggle' onClick={treeToggleClick}>
+        { expandTree ? <CaretLeftOutlined /> : <CaretRightOutlined /> }
+        </div>
     </div>
   )
 }

src/view/Manage/AssetBrowse/index.less

@@ -10,31 +10,27 @@
     overflow: hidden;
   }
 
-  .tree-toggle-wrap {
-    position: relative;
-    width: 20px;
-    height: calc(100vh - 94px);
-  
-    .tree-toggle {
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      left: 0;
-      right: 0;
-      background: #f2f5fc;
-      position: absolute;
-      top: calc(50% - 40px);
-      width: 12px;
-      height: 80px;
-      border-radius: 0 12px 12px 0;
-      -ms-transform: translateY(-50%);
-      transform: translateY(-50%);
-      cursor: pointer;
-    }
+  .tree-toggle {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    left: 245px;
+    right: 0;
+    background: #f2f5fc;
+    position: absolute;
+    top: calc(50% - 40px);
+    width: 12px;
+    height: 80px;
+    border-radius: 0 12px 12px 0;
+    -ms-transform: translateY(-50%);
+    transform: translateY(-50%);
+    cursor: pointer;
   }
 
   .right {
-    width: calc(100% - 250px);
+    display: flex;
+    width: calc(100% - 245px);
+    flex-direction: column;
   }
 }
 
@@ -43,7 +39,11 @@
     width: 0;
   }
 
+  .tree-toggle {
+    left: 0;
+  }
+
   .right {
-    width: calc(100% - 20px);
+    width: 100%;
   }
 }
\ No newline at end of file

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

@@ -80,6 +80,7 @@ const AddAssetModel = (props) => {
           <Button type="primary" onClick={ onOk } loading={ confirmLoading }>确定</Button>
         </Space>
       }
+      bodyStyle={{ padding: '10px' }}
     >
       <AssetAction 
         form={form}

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

@@ -422,7 +422,7 @@ const AssetAction = (props) => {
                   </div>
                   
                   {
-                    (index < (attributes.length-1)) && <Separate height={8} />
+                    currentAction!=='add' && (index < (attributes.length-1)) && <Separate height={8} />
                   }
                 </div>
               );

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

@@ -136,7 +136,7 @@ const AssetDirectory = (props) => {
                 </Tooltip>
               </Paragraph>
             </div>
-            <div className='mb-common'>
+            <div className={(reference===AssetManageReference)?'mb-common':''}>
               <Paragraph>
                 <Tooltip title={dir?.desc||''}>
                   <Text className='title-color' ellipsis={true}>

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

@@ -515,9 +515,9 @@ const AssetTable = (props) => {
     } else if (reference===AssetManageReference) {
       scrollY = 'calc(100vh - 182px - 139px - 15px - 80px)';
     } else if (reference===AssetBrowseReference||reference===ResourceBrowseReference) {
-      scrollY = 'calc(100vh - 182px - 84px - 52px - 12px)';
+      scrollY = 'calc(100vh - 182px - 102px - 15px - 80px)';
     } else if (reference===AssetRecycleReference) {
-      scrollY = 'calc(100vh - 182px - 52px - 12px)';
+      scrollY = 'calc(100vh - 182px - 80px)';
     }
   }