Commit 14847e85 by zhaochengxiang

调整

parent 8e5fcd93
...@@ -130,22 +130,19 @@ const AssetAction = (props) => { ...@@ -130,22 +130,19 @@ const AssetAction = (props) => {
{ {
title: '操作', title: '操作',
dataIndex: 'action', dataIndex: 'action',
width: 150, width: 170,
render: (_, record) => { render: (_, record) => {
return (reference===AssetManageReference||canEdit) ? <Space> return (reference===AssetManageReference||canEdit) ? <Space>
<Button <Button
type='link'
size='small' size='small'
onClick={() => { onClick={() => {
setSelectStandardParam({ visible: true, id: record._id }); setSelectStandardParam({ visible: true, id: record._id });
}} }}
style={{ padding: 0 }}
> >
关联标准 关联标准
</Button> </Button>
{ {
record.standard?.standardId && <Button record.standard?.standardId && <Button
type='link'
size='small' size='small'
onClick={() => { onClick={() => {
modal.confirm({ modal.confirm({
...@@ -166,7 +163,6 @@ const AssetAction = (props) => { ...@@ -166,7 +163,6 @@ const AssetAction = (props) => {
} }
}) })
}} }}
style={{ padding: 0 }}
> >
取消关联 取消关联
</Button> </Button>
......
...@@ -735,9 +735,9 @@ const AssetManageTree = (props) => { ...@@ -735,9 +735,9 @@ const AssetManageTree = (props) => {
<ExportOutlined className='default' style={{ fontSize:16,cursor:'pointer' }} /> <ExportOutlined className='default' style={{ fontSize:16,cursor:'pointer' }} />
</Tooltip> </Tooltip>
</Dropdown> </Dropdown>
<Tooltip title="自定义目录"> {/* <Tooltip title="自定义目录">
<SettingOutlined className='default' onClick={customDir} style={{ fontSize:16,cursor:'pointer' }} /> <SettingOutlined className='default' onClick={customDir} style={{ fontSize:16,cursor:'pointer' }} />
</Tooltip> </Tooltip> */}
</div> </div>
)} )}
bordered={false} bordered={false}
......
...@@ -503,6 +503,9 @@ const AssetTree = (props) => { ...@@ -503,6 +503,9 @@ const AssetTree = (props) => {
className={(item.level===1)?'title-color': 'text-color'} className={(item.level===1)?'title-color': 'text-color'}
> >
{item.text} {item.text}
{
(item.level!==1||(item.level===1&&item.resourceType!=='custom')) && <span>{` (${item.dataAssetAndSubDirCount})`}</span>
}
</span> </span>
); );
...@@ -532,9 +535,9 @@ const AssetTree = (props) => { ...@@ -532,9 +535,9 @@ const AssetTree = (props) => {
<Tooltip title="刷新目录"> <Tooltip title="刷新目录">
<ReloadOutlined className='default' onClick={refreshTree} style={{ fontSize:16,cursor:'pointer',flex:1}} /> <ReloadOutlined className='default' onClick={refreshTree} style={{ fontSize:16,cursor:'pointer',flex:1}} />
</Tooltip> </Tooltip>
<Tooltip title="自定义目录"> {/* <Tooltip title="自定义目录">
<SettingOutlined className='default' onClick={customDir} style={{ fontSize:16,cursor:'pointer',flex:1}} /> <SettingOutlined className='default' onClick={customDir} style={{ fontSize:16,cursor:'pointer',flex:1}} />
</Tooltip> </Tooltip> */}
<div style={{ flex: 3 }}></div> <div style={{ flex: 3 }}></div>
</div> </div>
} }
......
...@@ -188,6 +188,28 @@ const ModelTable = (props) => { ...@@ -188,6 +188,28 @@ const ModelTable = (props) => {
} }
}, },
{ {
title: 'URI',
dataIndex: 'odata',
ellipsis: true,
width: 170,
render: (text, _, __) => {
return (
<React.Fragment>
{
text ? <div className='flex'>
<Tooltip title={text||''} overlayClassName='tooltip-common'>
<Text ellipsis={true}>
{text||''}
</Text>
</Tooltip>
<Text copyable={{ text }}></Text>
</div> : ''
}
</React.Fragment>
);
}
},
{
title: '路径', title: '路径',
dataIndex: 'path', dataIndex: 'path',
width: 120, width: 120,
...@@ -285,28 +307,6 @@ const ModelTable = (props) => { ...@@ -285,28 +307,6 @@ const ModelTable = (props) => {
); );
} }
}, },
{
title: 'URI',
dataIndex: 'odata',
ellipsis: true,
width: 170,
render: (text, _, __) => {
return (
<React.Fragment>
{
text ? <div className='flex'>
<Tooltip title={text||''} overlayClassName='tooltip-common'>
<Text ellipsis={true}>
{text||''}
</Text>
</Tooltip>
<Text copyable={{ text }}></Text>
</div> : ''
}
</React.Fragment>
);
}
},
]; ];
const [ columns, setColumns ] = useState([]); const [ columns, setColumns ] = useState([]);
......
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