Commit cee11d0e by zhaochengxiang

资源任务编号,标签

parent 6dfe77bb
...@@ -23,6 +23,7 @@ import FilterElementValue from './filter-element-value' ...@@ -23,6 +23,7 @@ import FilterElementValue from './filter-element-value'
import SelectBatchEditElements from './select-batch-edit-elements' import SelectBatchEditElements from './select-batch-edit-elements'
import { AssetDirectorySubject } from '../AssetManage/Component/AssetDirectory' import { AssetDirectorySubject } from '../AssetManage/Component/AssetDirectory'
import { AssetActionSubject } from '../AssetManage/Component/AssetAction' import { AssetActionSubject } from '../AssetManage/Component/AssetAction'
import TagCell from '../Model/Component/tag-help'
import '../AssetManage/Component/AssetTable.less' import '../AssetManage/Component/AssetTable.less'
...@@ -57,6 +58,7 @@ const FC = (props) => { ...@@ -57,6 +58,7 @@ const FC = (props) => {
const $keyword = React.useMemo(() => new Subject(), []) const $keyword = React.useMemo(() => new Subject(), [])
const [keyword, setKeyword] = React.useState() const [keyword, setKeyword] = React.useState()
const [searchType, setSearchType] = React.useState('keyword') const [searchType, setSearchType] = React.useState('keyword')
const [resoureTagMap, setResourceTagMap] = React.useState()
const [addAssetParams, setAddAssetParams] = React.useState({ const [addAssetParams, setAddAssetParams] = React.useState({
visible: false, visible: false,
nodeId: undefined nodeId: undefined
...@@ -169,6 +171,12 @@ const FC = (props) => { ...@@ -169,6 +171,12 @@ const FC = (props) => {
} }
}, [args]) }, [args])
React.useEffect(() => {
if (data) {
getResourceTag()
}
}, [data])
const [addAble, importAble, exportAble, changeDirectoryAble, deleteAble] = React.useMemo(() => { const [addAble, importAble, exportAble, changeDirectoryAble, deleteAble] = React.useMemo(() => {
let [_addAble, _importAble, _exportAble, _changeDiretoryAble, _deleteAble] = [false, false, false, false, false] let [_addAble, _importAble, _exportAble, _changeDiretoryAble, _deleteAble] = [false, false, false, false, false]
...@@ -232,7 +240,11 @@ const FC = (props) => { ...@@ -232,7 +240,11 @@ const FC = (props) => {
dataIndex: 'taskN0', dataIndex: 'taskN0',
ellipsis: true, ellipsis: true,
width: 120, width: 120,
render: (_, record) => record.resourceExtraAttribute?.taskN0 render: (_, record) => <a onClick={() => {
window.open(`/center-home/menu/task-manage?id=${record.resourceExtraAttribute?.taskN0}`)
}}>
{record.resourceExtraAttribute?.taskN0}
</a>
}, },
{ {
title: '资源状态', title: '资源状态',
...@@ -247,6 +259,18 @@ const FC = (props) => { ...@@ -247,6 +259,18 @@ const FC = (props) => {
ellipsis: true, ellipsis: true,
width: 120, width: 120,
render: (_, record) => record.resourceExtraAttribute?.transferDataAsset render: (_, record) => record.resourceExtraAttribute?.transferDataAsset
},
{
title: '标签',
dataIndex: 'tag',
width: 360,
className: 'table-tag-cell',
render: (_, record) => <TagCell
id={record.id}
did={record.dirId}
type='dataAsset'
tags={resoureTagMap?.[`${record.id}`]}
/>
} }
] ]
...@@ -430,6 +454,27 @@ const FC = (props) => { ...@@ -430,6 +454,27 @@ const FC = (props) => {
}) })
} }
const getResourceTag = () => {
const ids = (data??[]).map(item => item.id)
if (ids.length > 0) {
dispatch({
type: 'tag.getResourceTagIn',
payload: {
params: {
resourceIds: ids,
includeAll: true,
includePrivate: true
}
},
callback: data => {
setResourceTagMap(data?.data)
}
});
} else {
setResourceTagMap()
}
}
const onAddClick = () => { const onAddClick = () => {
setAddAssetParams({ setAddAssetParams({
visible: true, visible: true,
......
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