Commit 0f2b50ba by zhaochengxiang

bug fix

parent bd949de1
...@@ -414,6 +414,10 @@ export function getAssetType(reference) { ...@@ -414,6 +414,10 @@ export function getAssetType(reference) {
return (reference===AssetManageReference || reference===AssetBrowseReference || reference===AssetRecycleReference) ? 'dataAsset' : 'resource' return (reference===AssetManageReference || reference===AssetBrowseReference || reference===AssetRecycleReference) ? 'dataAsset' : 'resource'
} }
export function getAssetTypeByRange(range) {
return (range==='dataAsset_dataAssetManage' || range==='dataAsset_dataAssetBrowse') ? 'dataAsset' : 'resource'
}
export function getAssetRange(menuName) { export function getAssetRange(menuName) {
if (menuName === ResourceManageReference ) { if (menuName === ResourceManageReference ) {
return 'dataAsset_resourceManage'; return 'dataAsset_resourceManage';
......
import React, { useEffect, useMemo, useState } from "react"; import React, { useEffect, useMemo, useState } from "react";
import { Spin, Descriptions, Divider } from "antd"; import { Spin, Descriptions, Divider } from "antd";
import { getAssetRange, getAssetType, highlightSearchContentByTerms } from '../../../../util'; import { getAssetRange, getAssetType, getAssetTypeByRange, highlightSearchContentByTerms } from '../../../../util';
import { dispatch } from '../../../../model'; import { dispatch } from '../../../../model';
import { ElementItem } from "./AssetAction"; import { ElementItem } from "./AssetAction";
import { AssetManageReference, ResourceManageReference } from "../../../../util/constant"; import { AssetManageReference, ResourceManageReference } from "../../../../util/constant";
...@@ -13,20 +13,14 @@ const AssetDetail = (props)=>{ ...@@ -13,20 +13,14 @@ const AssetDetail = (props)=>{
const [ types, setTypes ] = useState([]); const [ types, setTypes ] = useState([]);
const [ loading, setLoading ] = useState(false); const [ loading, setLoading ] = useState(false);
const [ userElements, setUserElements ] = useState(undefined); const [ userElements, setUserElements ] = useState(undefined);
const [range, setRange] = useState();
useEffect(() => { useEffect(() => {
if ((id||'') !== '') { if (dirId && id) {
getUserElements();
}
//eslint-disable-next-line react-hooks/exhaustive-deps
}, [ id ])
useEffect(() => {
if (dirId) {
getPreviewRangeByDirIdThenGetAsset(); getPreviewRangeByDirIdThenGetAsset();
} }
//eslint-disable-next-line react-hooks/exhaustive-deps //eslint-disable-next-line react-hooks/exhaustive-deps
}, [ dirId ]) }, [ dirId, id])
const _asset = useMemo(() => { const _asset = useMemo(() => {
let newAsset = {}; let newAsset = {};
...@@ -58,7 +52,9 @@ const AssetDetail = (props)=>{ ...@@ -58,7 +52,9 @@ const AssetDetail = (props)=>{
}, },
callback: data => { callback: data => {
setLoading(false); setLoading(false);
getAsset(data); setRange(data);
getUserElements();
getAsset();
}, },
error: () => { error: () => {
setLoading(false); setLoading(false);
...@@ -67,13 +63,14 @@ const AssetDetail = (props)=>{ ...@@ -67,13 +63,14 @@ const AssetDetail = (props)=>{
} }
const getUserElements = () => { const getUserElements = () => {
setRange(prevRange => {
setLoading(true); setLoading(true);
dispatch({ dispatch({
type: 'assetmanage.listUserElements', type: 'assetmanage.listUserElements',
payload: { payload: {
params: { params: {
range: getAssetRange(reference), range: prevRange,
dataAssetType: getAssetType(reference) dataAssetType: getAssetTypeByRange(prevRange)
} }
}, },
callback: data => { callback: data => {
...@@ -92,14 +89,17 @@ const AssetDetail = (props)=>{ ...@@ -92,14 +89,17 @@ const AssetDetail = (props)=>{
setLoading(false); setLoading(false);
} }
}) })
return prevRange
})
} }
const getAsset = (range) => { const getAsset = () => {
setRange(prevRange => {
setLoading(true); setLoading(true);
dispatch({ dispatch({
type: 'assetmanage.getDataAssetDetail', type: 'assetmanage.getDataAssetDetail',
payload: { payload: {
range, range: prevRange,
dataAssetId: id, dataAssetId: id,
dirId: dirId||'', dirId: dirId||'',
checkPermission: true checkPermission: true
...@@ -112,6 +112,8 @@ const AssetDetail = (props)=>{ ...@@ -112,6 +112,8 @@ const AssetDetail = (props)=>{
setLoading(false); setLoading(false);
} }
}) })
return prevRange
})
} }
return( return(
......
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