Commit f0254681 by zhaochengxiang

资产添加资源

parent ef505802
...@@ -172,6 +172,10 @@ export function* loadDataAssets(payload) { ...@@ -172,6 +172,10 @@ export function* loadDataAssets(payload) {
return yield call(service.loadDataAssets, payload); return yield call(service.loadDataAssets, payload);
} }
export function* dataAssetAddResources(payload) {
return yield call(service.dataAssetAddResources, payload);
}
export function* unloadDataAssets(payload) { export function* unloadDataAssets(payload) {
return yield call(service.unloadDataAssets, payload); return yield call(service.unloadDataAssets, payload);
} }
......
...@@ -88,6 +88,10 @@ export function loadDataAssets(payload) { ...@@ -88,6 +88,10 @@ export function loadDataAssets(payload) {
return PostJSON("/dataassetmanager/dataAssetApi/loadDataAssets", payload); return PostJSON("/dataassetmanager/dataAssetApi/loadDataAssets", payload);
} }
export function dataAssetAddResources(payload) {
return PostJSON("/dataassetmanager/dataAssetApi/addResources", payload);
}
export function unloadDataAssets(payload) { export function unloadDataAssets(payload) {
return PostJSON("/dataassetmanager/dataAssetApi/unloadDataAssetsByDataAssetIdAndDirId", payload); return PostJSON("/dataassetmanager/dataAssetApi/unloadDataAssetsByDataAssetIdAndDirId", payload);
} }
......
...@@ -39,7 +39,7 @@ const ResourceItem = ({ data, config, terms }) => { ...@@ -39,7 +39,7 @@ const ResourceItem = ({ data, config, terms }) => {
{ {
(typeof data === 'string') ? <span style={{ marginRight: 5 }}> (typeof data === 'string') ? <span style={{ marginRight: 5 }}>
{highlightSearchContentByTerms(data, terms)} {highlightSearchContentByTerms(data, terms)}
</span> : (IsArr(data) ? <span> </span> : ((IsArr(data)&&data.length>0) ? <span>
<Tooltip <Tooltip
overlayClassName='tooltip-common' overlayClassName='tooltip-common'
title={<MetadataColumnTooltipTitle data={data} />} title={<MetadataColumnTooltipTitle data={data} />}
......
.add-resources {
.tree {
height: calc(80vh - 30px);
overflow: auto;
}
}
\ No newline at end of file
...@@ -15,6 +15,7 @@ import PermissionButton from '../../../util/Component/PermissionButton' ...@@ -15,6 +15,7 @@ import PermissionButton from '../../../util/Component/PermissionButton'
import PermissionMenuItem from '../../../util/Component/PermissionMenuItem' import PermissionMenuItem from '../../../util/Component/PermissionMenuItem'
import { FullScreenSvg, CancelFullScreenSvg } from './Component/AssetSvg' import { FullScreenSvg, CancelFullScreenSvg } from './Component/AssetSvg'
import AddResources from './add-resources'
import ImportAsset from './Component/ImportAssetDrawer' import ImportAsset from './Component/ImportAssetDrawer'
import ChangeCatalog from './change-catalog' import ChangeCatalog from './change-catalog'
import AssetDelete from './Component/AssetDeleteModal' import AssetDelete from './Component/AssetDeleteModal'
...@@ -64,10 +65,9 @@ const FC = (props) => { ...@@ -64,10 +65,9 @@ const FC = (props) => {
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 [resoureTagMap, setResourceTagMap] = React.useState()
const [addAssetParams, setAddAssetParams] = React.useState({ const [addResourcesParams, setAddResourcesParams] = React.useState({
visible: false, visible: false,
reference: undefined, item: undefined
nodeId: undefined
}) })
const [importAssetParams, setImportAssetParams] = React.useState({ const [importAssetParams, setImportAssetParams] = React.useState({
visible: false, visible: false,
...@@ -555,10 +555,9 @@ const FC = (props) => { ...@@ -555,10 +555,9 @@ const FC = (props) => {
} }
const onAddClick = () => { const onAddClick = () => {
setAddAssetParams({ setAddResourcesParams({
visible: true, visible: true,
reference: AssetManageReference, item: undefined,
nodeId: node?.nodeId
}) })
} }
...@@ -896,6 +895,17 @@ const FC = (props) => { ...@@ -896,6 +895,17 @@ const FC = (props) => {
/> />
</ResizeObserver> </ResizeObserver>
</div> </div>
<AddResources
{...addResourcesParams}
onCancel={(refresh) => {
setAddResourcesParams({
visible: false,
item: undefined
})
refresh && getAssets()
}}
/>
<ImportAsset <ImportAsset
{...importAssetParams} {...importAssetParams}
onCancel={() => { onCancel={() => {
......
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