Commit 925fa799 by zhaochengxiang

去掉资产目录详情

parent 3e50b28c
...@@ -76,8 +76,8 @@ const AssetBrowse = (props) => { ...@@ -76,8 +76,8 @@ const AssetBrowse = (props) => {
expandTree && <Separate width={15} /> expandTree && <Separate width={15} />
} }
<div className={rightClasses}> <div className={rightClasses}>
<AssetDirectory id={centerId} assetCount={assetCount} reference={reference} nodeType={nodeParams.nodeType} /> {/* <AssetDirectory id={centerId} assetCount={assetCount} reference={reference} nodeType={nodeParams.nodeType} />
<Separate height={15} /> <Separate height={15} /> */}
<div className='flex' style={{ flex: 1, height: '100%', overflow: 'hidden' }}> <div className='flex' style={{ flex: 1, height: '100%', overflow: 'hidden' }}>
{ {
// expandRelation && <React.Fragment> // expandRelation && <React.Fragment>
......
...@@ -1123,7 +1123,7 @@ const AssetAction = (props) => { ...@@ -1123,7 +1123,7 @@ const AssetAction = (props) => {
影响关系 影响关系
</Button> </Button>
<Input size="middle" <Input size="middle"
placeholder="中英文名称/业务规则" placeholder="搜索中英文名称/业务规则"
value={keyword} value={keyword}
bordered={true} allowClear bordered={true} allowClear
onChange={(e) => { onChange={(e) => {
......
...@@ -769,7 +769,7 @@ const AssetManageTree = (props) => { ...@@ -769,7 +769,7 @@ const AssetManageTree = (props) => {
<div <div
className='flex' className='flex'
style={{ style={{
height: 40, height: 57,
alignItems: 'center', alignItems: 'center',
justifyContent: 'space-between', justifyContent: 'space-between',
padding: '0 15px' padding: '0 15px'
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
} }
.yy-tree{ .yy-tree{
height: calc(100vh - @header-height - @breadcrumb-height - 25px - 40px - 62px) !important; height: calc(100vh - @header-height - @breadcrumb-height - 25px - 57px - 62px) !important;
overflow: auto !important; overflow: auto !important;
} }
......
...@@ -992,9 +992,9 @@ const AssetTable = (props) => { ...@@ -992,9 +992,9 @@ const AssetTable = (props) => {
if (fullScreen) { if (fullScreen) {
scrollY = 'calc(100vh - 209px - 72px)'; scrollY = 'calc(100vh - 209px - 72px)';
} else if (reference===AssetManageReference) { } else if (reference===AssetManageReference) {
scrollY = 'calc(100vh - 209px - 123px - 15px - 72px)'; scrollY = 'calc(100vh - 209px - 72px)';
} else if (reference===AssetBrowseReference ||reference===ResourceBrowseReference) { } else if (reference===AssetBrowseReference ||reference===ResourceBrowseReference) {
scrollY = 'calc(100vh - 209px - 94px - 15px - 72px)'; scrollY = 'calc(100vh - 209px - 72px)';
} else if (reference===AssetRecycleReference) { } else if (reference===AssetRecycleReference) {
scrollY = 'calc(100vh - 209px - 72px)'; scrollY = 'calc(100vh - 209px - 72px)';
} }
...@@ -1003,10 +1003,11 @@ const AssetTable = (props) => { ...@@ -1003,10 +1003,11 @@ const AssetTable = (props) => {
return( return(
<div className={classes}> <div className={classes}>
<div <div
className='flex p-common' className='flex p-3'
style={{ style={{
alignItems: 'center', alignItems: 'center',
justifyContent: 'space-between', justifyContent: 'space-between',
borderBottom: '1px solid rgb(239, 239, 239)',
}} }}
> >
<Space size={15}> <Space size={15}>
...@@ -1111,7 +1112,7 @@ const AssetTable = (props) => { ...@@ -1111,7 +1112,7 @@ const AssetTable = (props) => {
</Space> </Space>
</div> </div>
<div <div
className='px-common' className='p-3'
> >
<ResizeObserver <ResizeObserver
onResize={({ width }) => { onResize={({ width }) => {
......
...@@ -567,7 +567,7 @@ const AssetTree = (props) => { ...@@ -567,7 +567,7 @@ const AssetTree = (props) => {
<div <div
className='flex' className='flex'
style={{ style={{
height: 40, height: 57,
alignItems: 'center', alignItems: 'center',
justifyContent: 'space-between', justifyContent: 'space-between',
padding: '0 15px' padding: '0 15px'
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
} }
.yy-tree{ .yy-tree{
height: calc(100vh - @header-height - @breadcrumb-height - 25px - 40px - 62px) !important; height: calc(100vh - @header-height - @breadcrumb-height - 25px - 57px - 62px) !important;
overflow: auto !important; overflow: auto !important;
} }
......
...@@ -89,8 +89,8 @@ const AssetManage = (props) => { ...@@ -89,8 +89,8 @@ const AssetManage = (props) => {
expandTree && <Separate width={15} /> expandTree && <Separate width={15} />
} }
<div className={middleClasses}> <div className={middleClasses}>
<AssetDirectory id={nodeId} assetCount={assetCount} directoryChanged={directoryChanged} onElementsChange={onElementsChange} /> {/* <AssetDirectory id={nodeId} assetCount={assetCount} directoryChanged={directoryChanged} onElementsChange={onElementsChange} />
<Separate height={15} /> <Separate height={15} /> */}
<AssetTable nodeId={nodeId} nodeType={nodeType} nodeLevel={nodeLevel} reference={AssetManageReference} elementsChanged={elementsChanged} assetActionChanged={assetActionChanged} onSelect={onTableSelect} onCountChange={onAssetCountChange} onFullScreenChange={onFullScreenChange} {...props} /> <AssetTable nodeId={nodeId} nodeType={nodeType} nodeLevel={nodeLevel} reference={AssetManageReference} elementsChanged={elementsChanged} assetActionChanged={assetActionChanged} onSelect={onTableSelect} onCountChange={onAssetCountChange} onFullScreenChange={onFullScreenChange} {...props} />
<div className='tree-toggle' onClick={treeToggleClick}> <div className='tree-toggle' onClick={treeToggleClick}>
{ expandTree ? <CaretLeftOutlined /> : <CaretRightOutlined /> } { expandTree ? <CaretLeftOutlined /> : <CaretRightOutlined /> }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment