Commit 24fa574d by fanyongjun

9.23

parent c7795c53
...@@ -159,12 +159,12 @@ class Assets extends Component { ...@@ -159,12 +159,12 @@ class Assets extends Component {
} }
> >
<Row gutter={16} className="manage-asset"> <Row gutter={16} className="manage-asset">
<Col md={6} > <Col md={5} >
<Card bordered={false} className='asset-table'> <Card bordered={false} className='asset-table'>
<SyncTree bodyHeight={'100%'} gData={gData} dataList={dataList} onClick={this.selectTree} defaultKeys={defaultKeys} selectKey={selectKey} loading={treeload} build={bulidTree} /> <SyncTree bodyHeight={'100%'} gData={gData} dataList={dataList} onClick={this.selectTree} defaultKeys={defaultKeys} selectKey={selectKey} loading={treeload} build={bulidTree} />
</Card> </Card>
</Col> </Col>
<Col md={18}> <Col md={19}>
<Card bordered={false} className='asset-table'> <Card bordered={false} className='asset-table'>
<ListBox <ListBox
loading={tableload} loading={tableload}
......
...@@ -40,13 +40,13 @@ class AssetTreeCOM extends Component { ...@@ -40,13 +40,13 @@ class AssetTreeCOM extends Component {
return ( return (
<Card bordered={false} className="asset-tree"> <Card bordered={false} className="asset-tree">
{treeData ? ( {treeData ? (
<Tree <Tree.DirectoryTree
defaultExpandedKeys={['0-0']} defaultExpandedKeys={['0-0']}
defaultSelectedKeys={['0-0']} defaultSelectedKeys={['0-0']}
onSelect={this.onSelect} onSelect={this.onSelect}
> >
{getTreeNodes(treeData)} {getTreeNodes(treeData)}
</Tree> </Tree.DirectoryTree>
) : ( ) : (
<Spin /> <Spin />
)} )}
......
...@@ -77,10 +77,10 @@ class Assets extends Component { ...@@ -77,10 +77,10 @@ class Assets extends Component {
} }
> >
<Row gutter={10} className="manage-asset"> <Row gutter={10} className="manage-asset">
<Col md={6}> <Col md={5}>
<AssetTreeCOM treeData={treeData} onSelect={this.getList} /> <AssetTreeCOM treeData={treeData} onSelect={this.getList} />
</Col> </Col>
<Col md={18}> <Col md={19}>
<Card bordered={false} className='asset-table'> <Card bordered={false} className='asset-table'>
<AssetListCOM <AssetListCOM
loading={loading} loading={loading}
......
...@@ -151,13 +151,14 @@ class MetadataTreeCOM extends Component { ...@@ -151,13 +151,14 @@ class MetadataTreeCOM extends Component {
</Row> </Row>
<Row> <Row>
{treeData ? ( {treeData ? (
<Tree <Tree.DirectoryTree
showLine showLine
expandedKeys={expandedKeys} expandedKeys={expandedKeys}
selectedKeys={selectedKeys} selectedKeys={selectedKeys}
loadData={this.onLoadData} loadData={this.onLoadData}
treeData={treeData} treeData={treeData}
onSelect={this.onTreeSelect} onSelect={this.onTreeSelect}
showLine={false}
/> />
) : ( ) : (
<Spin /> <Spin />
......
...@@ -67,10 +67,10 @@ export default class Indicator extends Component { ...@@ -67,10 +67,10 @@ export default class Indicator extends Component {
} }
> >
<Row gutter={10} className="indicator-container" > <Row gutter={10} className="indicator-container" >
<Col md={6}> <Col md={5}>
<MetadataTreeCOM type="IndicatorCatalog" onSelect={this.onTreeSelect} /> <MetadataTreeCOM type="IndicatorCatalog" onSelect={this.onTreeSelect} />
</Col> </Col>
<Col md={18}> <Col md={19}>
<Card bordered={false}> <Card bordered={false}>
<MetadataListCOM <MetadataListCOM
loading={loading} loading={loading}
......
...@@ -66,10 +66,10 @@ export default class Standard extends Component { ...@@ -66,10 +66,10 @@ export default class Standard extends Component {
} }
> >
<Row gutter={16}> <Row gutter={16}>
<Col md={6}> <Col md={5}>
<MetadataTreeCOM type="StandardCatalog" onSelect={this.onTreeSelect} /> <MetadataTreeCOM type="StandardCatalog" onSelect={this.onTreeSelect} />
</Col> </Col>
<Col md={18}> <Col md={19}>
<Card bordered={false}> <Card bordered={false}>
<MetadataListCOM <MetadataListCOM
loading={loading} loading={loading}
......
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