Commit 28b695b7 by zhaochengxiang

资产详情元数据高亮

parent 12494c06
...@@ -81,7 +81,7 @@ const AssetAction = (props) => { ...@@ -81,7 +81,7 @@ const AssetAction = (props) => {
<a onClick={() => { <a onClick={() => {
window.open(`/center-home/metadetail?mid=${record._id}&action=metadetail&type=detail&manager=false&activekey=1`); window.open(`/center-home/metadetail?mid=${record._id}&action=metadetail&type=detail&manager=false&activekey=1`);
}}> }}>
{text||''} {highlightSearchContentByTerms(text||'', terms)}
</a> </a>
</Tooltip> </Tooltip>
); );
...@@ -92,6 +92,7 @@ const AssetAction = (props) => { ...@@ -92,6 +92,7 @@ const AssetAction = (props) => {
dataIndex: 'cnName', dataIndex: 'cnName',
// width: 200, // width: 200,
ellipsis: true, ellipsis: true,
render: (text, _) => highlightSearchContentByTerms(text||'', terms)
}, },
{ {
title: '是否有权限', title: '是否有权限',
...@@ -933,7 +934,7 @@ const AssetAction = (props) => { ...@@ -933,7 +934,7 @@ const AssetAction = (props) => {
<div className='pl-common py-compact-common'> <div className='pl-common py-compact-common'>
<Descriptions column={1}> <Descriptions column={1}>
<Descriptions.Item <Descriptions.Item
label={<div className='title-text' style={{ textAlign: 'right', width: 60 }}>资产目录路径</div>} label={<div className='title-text' style={{ textAlign: 'right', width: 90 }}>资产目录路径</div>}
style={{ paddingBottom: 0 }} style={{ paddingBottom: 0 }}
> >
<div className='flex' style={{ flexDirection: 'column' }}> <div className='flex' style={{ flexDirection: 'column' }}>
...@@ -948,7 +949,7 @@ const AssetAction = (props) => { ...@@ -948,7 +949,7 @@ const AssetAction = (props) => {
} }
</div> </div>
</Descriptions.Item> </Descriptions.Item>
{/* <Descriptions.Item label={<div className='title-text' style={{ textAlign: 'right', width: 60 }}>资产目录标签</div>} style={{ paddingBottom: 15 }}> {/* <Descriptions.Item label={<div className='title-text' style={{ textAlign: 'right', width: 90 }}>资产目录标签</div>} style={{ paddingBottom: 15 }}>
<AppContext.Consumer> <AppContext.Consumer>
{ {
value => { value => {
...@@ -958,7 +959,7 @@ const AssetAction = (props) => { ...@@ -958,7 +959,7 @@ const AssetAction = (props) => {
</AppContext.Consumer> </AppContext.Consumer>
</Descriptions.Item> */} </Descriptions.Item> */}
{/* <Descriptions.Item {/* <Descriptions.Item
label={<div className='title-text' style={{ textAlign: 'right', width: 60 }}>关联关系</div>} label={<div className='title-text' style={{ textAlign: 'right', width: 80 }}>关联关系</div>}
style={{ paddingBottom: 0 }} style={{ paddingBottom: 0 }}
> >
<div className='flex' style={{ flexDirection: 'column' }}> <div className='flex' style={{ flexDirection: 'column' }}>
......
...@@ -51,23 +51,12 @@ const ImportDirectory = (props) => { ...@@ -51,23 +51,12 @@ const ImportDirectory = (props) => {
setUploading(true); setUploading(true);
let payload; const payload = {
if (row.type === 'root') {
payload = {
params: { params: {
ignoreRepeatPath ignoreRepeatPath
}, },
fileList: fileList, fileList: fileList,
}; };
} else {
payload = {
params: {
ignoreRepeatPath,
parentPath: dir.path
},
fileList: fileList
};
}
dispatch({ dispatch({
type: 'assetmanage.directoryImport', type: 'assetmanage.directoryImport',
...@@ -152,13 +141,10 @@ const ImportDirectory = (props) => { ...@@ -152,13 +141,10 @@ const ImportDirectory = (props) => {
<Form {...formItemLayout} form={form}> <Form {...formItemLayout} form={form}>
<Form.Item <Form.Item
label="挂载位置" label="挂载位置"
name="type" // name="type"
rules={[{ required: true, message: '必填项'}]} rules={[{ required: true, message: '必填项'}]}
> >
<Radio.Group > <span>根节点导入</span>
<Radio value='root' >根节点导入</Radio>
{/* <Radio value='self' disabled={ dirId===null }>选中节点导入</Radio> */}
</Radio.Group>
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="文件" label="文件"
......
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