Commit 91d88a37 by zhaochengxiang

资产项增加检索高亮

parent 7151671c
...@@ -100,7 +100,7 @@ const AssetDetail = (props)=>{ ...@@ -100,7 +100,7 @@ const AssetDetail = (props)=>{
return ( return (
<Descriptions.Item label={item.name||''} key={index}> <Descriptions.Item label={item.name||''} key={index}>
{ {
item.name==='资产项' ? <MetadataInfo config={false} value={item.value||''} /> : <span>{highlightSearchContentByTerms(item.value||'', terms)}</span> item.name==='资产项' ? <MetadataInfo config={false} value={item.value||''} terms={terms} /> : <span>{highlightSearchContentByTerms(item.value||'', terms)}</span>
} }
</Descriptions.Item> </Descriptions.Item>
); );
......
...@@ -2,9 +2,10 @@ import React from 'react'; ...@@ -2,9 +2,10 @@ import React from 'react';
import { Button } from 'antd'; import { Button } from 'antd';
import { SettingFilled } from '@ant-design/icons'; import { SettingFilled } from '@ant-design/icons';
import { highlightSearchContentByTerms } from '../../../../util';
import { AppContext } from '../../../../App'; import { AppContext } from '../../../../App';
const MetadataInfo = ({ value = '', config = true }) => { const MetadataInfo = ({ value = '', config = true, terms = [] }) => {
let metadata = {}; let metadata = {};
try { try {
...@@ -18,13 +19,13 @@ const MetadataInfo = ({ value = '', config = true }) => { ...@@ -18,13 +19,13 @@ const MetadataInfo = ({ value = '', config = true }) => {
{ {
value => <div className='flex'> value => <div className='flex'>
{ {
(typeof metadata==='string') ? <span style={{ marginRight: 5 }}>{metadata||''}</span> : <div className='flex' style={{ flexDirection: 'column' }}> (typeof metadata==='string') ? <span style={{ marginRight: 5 }}>{highlightSearchContentByTerms(metadata||'', terms)}</span> : <div className='flex' style={{ flexDirection: 'column' }}>
<a onClick={() => { <a onClick={() => {
value?.setGlobalState && value?.setGlobalState({ value?.setGlobalState && value?.setGlobalState({
message: 'data-govern-show-metadata-message', message: 'data-govern-show-metadata-message',
data: metadata data: metadata
}) })
}} style={{ marginRight: 5, marginTop: config?5:0 }}>{metadata?.tableName||''} }} style={{ marginRight: 5, marginTop: config?5:0 }}>{highlightSearchContentByTerms(metadata?.tableName||'',terms)}
</a> </a>
{ {
(metadata?.columnItems||[]).map((item, index) => { (metadata?.columnItems||[]).map((item, index) => {
...@@ -36,7 +37,7 @@ const MetadataInfo = ({ value = '', config = true }) => { ...@@ -36,7 +37,7 @@ const MetadataInfo = ({ value = '', config = true }) => {
_content += item.metadataColumnName||''; _content += item.metadataColumnName||'';
return <span key={index}>{_content}</span> return <span key={index}>{highlightSearchContentByTerms(_content,terms)}</span>
}) })
} }
</div> </div>
......
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