资产删除

src/model/assetmanage.js

@@ -79,6 +79,11 @@ export function* listRecycleBinDataAssetsByPage(payload) {
 export function* addOrUpdateDirectory(payload) {
   return yield call(service.addOrUpdateDirectory, payload);
 }
+
+export function* checkDirectoryDeleteAble(payload) {
+  return yield call(service.checkDirectoryDeleteAble, payload)
+}
+
 export function* deleteDirectory(payload) {
   return yield call(service.deleteDirectory, payload);
 }

src/service/dataassetmanager.js

@@ -112,6 +112,10 @@ export function addOrUpdateDirectory(payload) {
   return PostJSON("/dataassetmanager/directoryApi/addOrUpdateDirectory", payload);
 }
 
+export function checkDirectoryDeleteAble(payload) {
+  return Post("/dataassetmanager/directoryApi/checkDirDeleteAble", payload);
+}
+
 export function deleteDirectory(payload) {
   return PostJSON("/dataassetmanager/directoryApi/deleteDirectory", payload);
 }

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

@@ -435,10 +435,18 @@ const AssetManageTree = (props) => {
   const deleteDir = () => {    
     if (currentRightClickDir.nodeId) {
       modal.confirm({
-        title: '提示',
-        content: '节点下可能包含资产信息，删除后将把资产从该目录上移除，确定继续吗?',
+        title: '您确定要删除该目录吗?',
         onOk: () => {
           dispatch({
+            type: 'assetmanage.checkDirectoryDeleteAble',
+            payload: {
+              params: {
+                dirId: currentRightClickDir.nodeId
+              }
+            },
+            callback: able => {
+              if (able === 'true') {
+                dispatch({
                   type: 'assetmanage.deleteDirectory',
                   payload: {data: [ currentRightClickDir.nodeId ]},
                   callback: () => {
@@ -446,6 +454,11 @@ const AssetManageTree = (props) => {
                     getAllDirectoryAsTree(true, (currentRightClickDir.nodeId===currentDirId)?'':currentDirId);
                   }
                 })
+              } else {
+                showMessage("warn","目录下有资产信息,不允许删除!");
+              }
+            }
+          })
         }
       })
 

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

@@ -347,10 +347,18 @@ const AssetTree = (props) => {
   const deleteDir = () => {    
     if (currentRightClickDir.nodeId) {
       modal.confirm({
-        title: '提示',
-        content: '节点下可能包含资产信息，删除后将把资产从该目录上移除，确定继续吗?',
+        title: '您确定要删除该目录吗?',
         onOk: () => {
           dispatch({
+            type: 'assetmanage.checkDirectoryDeleteAble',
+            payload: {
+              params: {
+                dirId: currentRightClickDir.nodeId
+              }
+            },
+            callback: able => {
+              if (able === 'true') {
+                dispatch({
                   type: 'assetmanage.deletePersonalCustomDirectory',
                   payload: {data: [ currentRightClickDir.nodeId ]},
                   callback: () => {
@@ -358,6 +366,11 @@ const AssetTree = (props) => {
                     getAllDirectoryAsTree(true, currentDirId);
                   }
                 })
+              } else {
+                showMessage("warn","目录下有资产信息,不允许删除!");
+              }
+            }
+          })
         }
       })