Commit 62836c8b by zhaochengxiang

个人增加自定义目录

parent 1bfe76cb
...@@ -122,10 +122,18 @@ export function* getDirectoryById(payload) { ...@@ -122,10 +122,18 @@ export function* getDirectoryById(payload) {
return yield call(service.getDirectoryById, payload); return yield call(service.getDirectoryById, payload);
} }
export function* getPersonalCustomDirectoryById(payload) {
return yield call(service.getPersonalCustomDirectoryById, payload);
}
export function* upDownDirectory(payload) { export function* upDownDirectory(payload) {
return yield call(service.upDownDirectory, payload); return yield call(service.upDownDirectory, payload);
} }
export function* upDownPersonalCustomDirectory(payload) {
return yield call(service.upDownPersonalCustomDirectory, payload);
}
export function* listDirectoryByName(payload) { export function* listDirectoryByName(payload) {
return yield call(service.listDirectoryByName, payload); return yield call(service.listDirectoryByName, payload);
} }
......
...@@ -156,10 +156,18 @@ export function getDirectoryById(payload) { ...@@ -156,10 +156,18 @@ export function getDirectoryById(payload) {
return GetJSON("/dataassetmanager/directoryApi/getDirectoryById", payload); return GetJSON("/dataassetmanager/directoryApi/getDirectoryById", payload);
} }
export function getPersonalCustomDirectoryById(payload) {
return GetJSON("/dataassetmanager/directoryApi/getPersonalCustomDirectoryById", payload);
}
export function upDownDirectory(payload) { export function upDownDirectory(payload) {
return PostJSON("/dataassetmanager/directoryApi/upDownDirectory", payload); return PostJSON("/dataassetmanager/directoryApi/upDownDirectory", payload);
} }
export function upDownPersonalCustomDirectory(payload) {
return PostJSON("/dataassetmanager/directoryApi/upDownPersonalCustomDirectory", payload);
}
export function listDirectoryByName(payload) { export function listDirectoryByName(payload) {
return GetJSON("/dataassetmanager/directoryApi/listDirectoryByName", payload); return GetJSON("/dataassetmanager/directoryApi/listDirectoryByName", payload);
} }
......
...@@ -67,7 +67,7 @@ const AssetBrowse = (props) => { ...@@ -67,7 +67,7 @@ const AssetBrowse = (props) => {
expandTree && <Separate width={15} /> expandTree && <Separate width={15} />
} }
<div className='right'> <div className='right'>
<AssetDirectory id={nodeId} assetCount={assetCount} reference={reference} /> <AssetDirectory id={nodeId} assetCount={assetCount} reference={reference} nodeType={nodeParams.nodeType} />
<Separate height={15} /> <Separate height={15} />
<div className='flex' style={{ flex: 1, height: '100%', overflow: 'hidden' }}> <div className='flex' style={{ flex: 1, height: '100%', overflow: 'hidden' }}>
{ {
......
...@@ -2,7 +2,7 @@ import React, { useEffect, useState } from 'react'; ...@@ -2,7 +2,7 @@ import React, { useEffect, useState } from 'react';
import { Spin, Tooltip, Typography, Dropdown, Menu } from 'antd'; import { Spin, Tooltip, Typography, Dropdown, Menu } from 'antd';
import { dispatch } from '../../../../model'; import { dispatch } from '../../../../model';
import { AssetManageReference } from '../../../../util/constant'; import { AssetBrowseReference, AssetManageReference, ResourceBrowseReference } from '../../../../util/constant';
import ImportElement from './ImportElement'; import ImportElement from './ImportElement';
import AttributeRelationModal from "./AttributeRelationModal"; import AttributeRelationModal from "./AttributeRelationModal";
import FilterElementModal from './FilterElementModal'; import FilterElementModal from './FilterElementModal';
...@@ -16,7 +16,7 @@ import './AssetDirectory.less'; ...@@ -16,7 +16,7 @@ import './AssetDirectory.less';
const { Paragraph, Text } = Typography; const { Paragraph, Text } = Typography;
const AssetDirectory = (props) => { const AssetDirectory = (props) => {
const { id, directoryChanged, assetCount, reference = AssetManageReference, onElementsChange } = props; const { id, directoryChanged, assetCount, reference = AssetManageReference, onElementsChange, nodeType } = props;
const [ dir, setDir ] = useState(null); const [ dir, setDir ] = useState(null);
const [ loading, setLoading ] = useState(false); const [ loading, setLoading ] = useState(false);
const [ importElementVisible, setImportElementVisible ] = useState(false); const [ importElementVisible, setImportElementVisible ] = useState(false);
...@@ -49,9 +49,14 @@ const AssetDirectory = (props) => { ...@@ -49,9 +49,14 @@ const AssetDirectory = (props) => {
}, [ id, directoryChanged ]) }, [ id, directoryChanged ])
const getDirectory = () => { const getDirectory = () => {
let url = 'assetmanage.getDirectoryById';
if ((reference===AssetBrowseReference|| reference===ResourceBrowseReference) && nodeType==='custom') {
url = 'assetmanage.getPersonalCustomDirectoryById';
}
setLoading(true); setLoading(true);
dispatch({ dispatch({
type: 'assetmanage.getDirectoryById', type: url,
payload: { payload: {
dirId: id dirId: id
}, },
......
...@@ -374,7 +374,7 @@ const AssetTree = (props) => { ...@@ -374,7 +374,7 @@ const AssetTree = (props) => {
setLoading(true); setLoading(true);
dispatch({ dispatch({
type: 'assetmanage.upDownDirectory', type: 'assetmanage.upDownPersonalCustomDirectory',
payload: { payload: {
params: { params: {
dirId: currentRightClickDir.nodeId, dirId: currentRightClickDir.nodeId,
......
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