Commit 9c29f086 by zhaochengxiang

资产全屏

parent 6faff5f3
...@@ -22,6 +22,7 @@ const AssetBrowse = (props) => { ...@@ -22,6 +22,7 @@ const AssetBrowse = (props) => {
const [ expandRelation, setExpandRelation ] = useState(true); const [ expandRelation, setExpandRelation ] = useState(true);
const [ assetCount, setAssetCount ] = useState(0); const [ assetCount, setAssetCount ] = useState(0);
const [ resizeRelation, setResizeRelation ] = useState(false); const [ resizeRelation, setResizeRelation ] = useState(false);
const [ assetFullScreen, setAssetFullScreen ] = useState(false);
const { centerId, expandId } = nodeParams; const { centerId, expandId } = nodeParams;
...@@ -47,6 +48,10 @@ const AssetBrowse = (props) => { ...@@ -47,6 +48,10 @@ const AssetBrowse = (props) => {
setAssetCount(count); setAssetCount(count);
} }
const onFullScreenChange = (value) => {
setAssetFullScreen(value);
}
let nodeId = ''; let nodeId = '';
if ((expandId||'') !== '') { if ((expandId||'') !== '') {
nodeId = expandId; nodeId = expandId;
...@@ -57,7 +62,11 @@ const AssetBrowse = (props) => { ...@@ -57,7 +62,11 @@ const AssetBrowse = (props) => {
const classes = classNames('asset-browse', { const classes = classNames('asset-browse', {
'asset-browse-tree-collapse': !expandTree, 'asset-browse-tree-collapse': !expandTree,
'asset-browse-relation-collapse': !expandRelation, 'asset-browse-relation-collapse': !expandRelation,
}); });
const rightClasses = classNames('right', {
'right-fullscreen': assetFullScreen
});
return ( return (
<div className={classes}> <div className={classes}>
...@@ -73,7 +82,7 @@ const AssetBrowse = (props) => { ...@@ -73,7 +82,7 @@ const AssetBrowse = (props) => {
{ {
expandTree && <Separate width={15} /> expandTree && <Separate width={15} />
} }
<div className='right'> <div className={rightClasses}>
<AssetDirectory id={nodeId} assetCount={assetCount} reference={reference} nodeType={nodeParams.nodeType} /> <AssetDirectory id={nodeId} 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' }}>
...@@ -86,7 +95,7 @@ const AssetBrowse = (props) => { ...@@ -86,7 +95,7 @@ const AssetBrowse = (props) => {
</React.Fragment> </React.Fragment>
} }
<div style={{ flex: 1, overflow: 'hidden' }}> <div style={{ flex: 1, overflow: 'hidden' }}>
<AssetTable nodeId={nodeId} nodeType={nodeParams.nodeType} reference={reference} onCountChange={onAssetCountChange} {...props} /> <AssetTable nodeId={nodeId} nodeType={nodeParams.nodeType} reference={reference} onCountChange={onAssetCountChange} onFullScreenChange={onFullScreenChange} {...props} />
</div> </div>
</div> </div>
<div className='tree-toggle' onClick={treeToggleClick}> <div className='tree-toggle' onClick={treeToggleClick}>
......
...@@ -36,6 +36,10 @@ ...@@ -36,6 +36,10 @@
flex-direction: column; flex-direction: column;
} }
.right-fullscreen {
position: static;
}
.relation-toggle { .relation-toggle {
display: flex; display: flex;
justify-content: center; justify-content: center;
......
...@@ -116,7 +116,7 @@ const ResizeableHeaderCell = props => { ...@@ -116,7 +116,7 @@ const ResizeableHeaderCell = props => {
const AssetTable = (props) => { const AssetTable = (props) => {
const { className, nodeId, nodeType, nodeLevel, elementsChanged, assetActionChanged, onSelect, onCountChange, reference = AssetManageReference } = props; const { className, nodeId, nodeType, nodeLevel, elementsChanged, assetActionChanged, onSelect, onCountChange, reference = AssetManageReference, onFullScreenChange } = props;
const MENU_ID = 'asset-table'; const MENU_ID = 'asset-table';
...@@ -686,6 +686,7 @@ const AssetTable = (props) => { ...@@ -686,6 +686,7 @@ const AssetTable = (props) => {
const onFullScreenClick = () => { const onFullScreenClick = () => {
setFullScreen(!fullScreen); setFullScreen(!fullScreen);
onFullScreenChange && onFullScreenChange(!fullScreen);
} }
const handleResize = index => (e, { size }) => { const handleResize = index => (e, { size }) => {
......
...@@ -21,6 +21,7 @@ const AssetManage = (props) => { ...@@ -21,6 +21,7 @@ const AssetManage = (props) => {
const [ nodeLevel, setNodeLevel ] = useState(null); const [ nodeLevel, setNodeLevel ] = useState(null);
const [ assetParams, setAssetParams ] = useState({ assetId: '', assetDirId: '' }) const [ assetParams, setAssetParams ] = useState({ assetId: '', assetDirId: '' })
const [ expandTree, setExpandTree ] = useState(true); const [ expandTree, setExpandTree ] = useState(true);
const [ assetFullScreen, setAssetFullScreen ] = useState(false);
const [ assetCount, setAssetCount ] = useState(0); const [ assetCount, setAssetCount ] = useState(0);
const [ directoryChanged, setDirectoryChanged ] = useState(false); const [ directoryChanged, setDirectoryChanged ] = useState(false);
...@@ -61,10 +62,18 @@ const AssetManage = (props) => { ...@@ -61,10 +62,18 @@ const AssetManage = (props) => {
setAssetCount(count); setAssetCount(count);
} }
const onFullScreenChange = (value) => {
setAssetFullScreen(value);
}
const classes = classNames('asset-manage', { const classes = classNames('asset-manage', {
'asset-manage-collapse': !expandTree 'asset-manage-collapse': !expandTree
}); });
const middleClasses = classNames('middle', {
'middle-fullscreen': assetFullScreen
});
return ( return (
<div className={classes}> <div className={classes}>
<ResizableBox <ResizableBox
...@@ -79,10 +88,10 @@ const AssetManage = (props) => { ...@@ -79,10 +88,10 @@ const AssetManage = (props) => {
{ {
expandTree && <Separate width={15} /> expandTree && <Separate width={15} />
} }
<div className='middle'> <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} {...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 /> }
</div> </div>
......
...@@ -33,6 +33,10 @@ ...@@ -33,6 +33,10 @@
overflow: hidden; overflow: hidden;
} }
.middle-fullscreen {
position: static;
}
.right { .right {
width: 400px; width: 400px;
border-left: 1px solid #EFEFEF; border-left: 1px solid #EFEFEF;
......
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