资产详情问题

src/view/Manage/AssetManage/Component/AssetAction.jsx

@@ -35,7 +35,13 @@ const AssetAction = (props) => {
       setCurrentAction('detail');
       if ((id||'')!=='') {
         getResourceRelations();
-        getAsset();
+
+        if (readOnly) {
+          getUserElements();
+        } else {
+          getAsset();
+        }
+        
       } else {
         setMetadataId('');
         setAssetParams({...assetParams, ...{assets: {}, attributes: []}});
@@ -91,7 +97,21 @@ const AssetAction = (props) => {
     })
   }
 
-  const getAsset = () => {
+  const getUserElements = () => {
+    setLoading(true);
+    dispatch({
+      type: 'assetmanage.listUserElements',
+      callback: data => {
+        setLoading(false);
+        getAsset(data||[]);
+      },
+      error: () => {
+        setLoading(false);
+      }
+    })
+  }
+
+  const getAsset = (userElements=null) => {
     setLoading(true);
     dispatch({
       type: 'assetmanage.getDataAssetDetail',
@@ -101,6 +121,18 @@ const AssetAction = (props) => {
       },
       callback: data => {
         setLoading(false);
+
+        if (userElements) {
+          const userElementIds = [];
+          (userElements||[]).forEach(element => {
+            userElementIds.push(element?.id);
+          })
+
+          const filterElements = (data?.elements||[]).filter(element => userElementIds.indexOf(element?.id) !== -1);
+
+          data = { ...data, elements: filterElements }
+        }
+
         setElements(data?.elements||[]);
         onElementsChange && onElementsChange(data?.elements||[]);
 

src/view/Manage/AssetManage/Component/AssetDetail.jsx

@@ -15,14 +15,26 @@ const AssetDetail = (props)=>{
   useEffect(() => {
 
     if ((id||'') !== '') {
-      getAssetThenGetAssetName();
+      getUserElements();
     }
     //eslint-disable-next-line react-hooks/exhaustive-deps
   }, [ id ])
 
-  const getAssetThenGetAssetName = () => {
+  const getUserElements = () => {
     setLoading(true);
     dispatch({
+      type: 'assetmanage.listUserElements',
+      callback: data => {
+        getAsset(data||[]);
+      },
+      error: () => {
+        setLoading(false);
+      }
+    })
+  }
+
+  const getAsset = (userElements) => {
+    dispatch({
       type: 'assetmanage.getDataAssetDetail',
       payload: {
         dataAssetId: id,
@@ -30,6 +42,16 @@ const AssetDetail = (props)=>{
       },
       callback: data => {
         setLoading(false);
+
+        const userElementIds = [];
+        (userElements||[]).forEach(element => {
+          userElementIds.push(element?.id);
+        })
+
+        const filterElements = (data?.elements||[]).filter(element => userElementIds.indexOf(element?.id) !== -1);
+
+        data = { ...data, elements: filterElements }
+
         setAsset(data);
 
         const _types = [];