Commit 9be4d113 by zhaochengxiang

元数据新增资产增加类型

parent d0e7d733
......@@ -113,6 +113,9 @@ export function* queryAllDirectoryAsTree(payload) {
export function* queryDirectoryTreeByMetadataId(payload) {
return yield call(service.queryDirectoryTreeByMetadataId, payload);
}
export function* queryDirectoryTreeAndElementTemplateByMetadataId(payload) {
return yield call(service.queryDirectoryTreeAndElementTemplateByMetadataId, payload);
}
export function* queryResourceDirectoryAsTree() {
return yield call(service.queryResourceDirectoryAsTree);
}
......
......@@ -148,6 +148,10 @@ export function queryDirectoryTreeByMetadataId(payload) {
return GetJSON("/dataassetmanager/directoryApi/queryDirectoryTreeByMetadataIdPath", payload)
}
export function queryDirectoryTreeAndElementTemplateByMetadataId(payload) {
return GetJSON("/dataassetmanager/directoryApi/queryDirectoryTreeAndElementTemplateByMetadataIdPath", payload)
}
export function queryResourceDirectoryAsTree() {
return PostJSON("/dataassetmanager/directoryApi/querySourceTypeAsTree");
}
......
import React, { useEffect, useState, useRef } from 'react';
import {Card, Spin, Tooltip, Tree, Dropdown, Menu, Modal, AutoComplete, Select} from 'antd';
import {Card, Spin, Tooltip, Tree, Dropdown, Menu, Modal, AutoComplete, Select, Descriptions} from 'antd';
import { PlusOutlined, ImportOutlined,ExportOutlined,ReloadOutlined, SettingOutlined } from '@ant-design/icons';
import classNames from 'classnames';
import { useContextMenu, Menu as RcMenu, Item as RcItem } from "react-contexify";
......@@ -69,6 +69,7 @@ const AssetManageTree = (props) => {
const [loadingTemplates, setLoadingTemplates] = useState(false)
const [templates, setTemplates] = useState()
const [currentTemplateType, setTemplateType] = useState()
const [metadataRelatedTemplate, setMetadataRelatedTemplate] = useState()
const [modal, contextHolder] = Modal.useModal();
......@@ -272,12 +273,13 @@ const AssetManageTree = (props) => {
if ((metadataIds??[]).length > 0) {
dispatch({
type: 'assetmanage.queryDirectoryTreeByMetadataId',
type: 'assetmanage.queryDirectoryTreeAndElementTemplateByMetadataId',
payload: {
metadataIdPath: metadataIds[0]
},
callback: data => {
disposeData(data)
disposeData(data?.jsonNodes)
setMetadataRelatedTemplate(data?.elementTemplate)
},
error: () => {
setLoading(false);
......@@ -825,6 +827,11 @@ const AssetManageTree = (props) => {
style={{ width: '100%' }}
>
<Spin spinning={loading}>
{
(metadataIds??[]).length > 0 && <Descriptions>
<Descriptions.Item label='资产类型'>{metadataRelatedTemplate?.name}</Descriptions.Item>
</Descriptions>
}
<AutoComplete
allowClear
value={keyword}
......
......@@ -52,8 +52,14 @@
}
.asset-manage-tree-asset-mount-reference {
.yy-card-body {
padding: 0 !important;
}
.yy-descriptions-item {
padding-bottom: 10 !important;
}
.yy-tree {
height: 400px !important;
height: 360px !important;
overflow: auto !important;
}
}
\ No newline at end of file
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