sss

src/service/assetS.js

+import request from "../util/request"
+
+
+
+
+const deleteDirectory =( data, successdo, errordo )=>{
+    request(
+        { url: `/api/dataassetmanager/directoryApi/deleteDirectory`, method: "post", data: data },
+        successdo,
+        errordo
+    )
+}
+
+const deleteDataAssets =( dirId, data, successdo, errordo )=>{
+    request(
+        { url: `/api/dataassetmanager/dataAssetApi/deleteDataAssets?dirId=${dirId}`, method: "post", data: data },
+        successdo,
+        errordo
+    )
+}
+
+export const assetS ={
+    deleteDirectory,
+    deleteDataAssets
+}
\ No newline at end of file

src/util/request.js

+import axios from "axios"
+import pathToRegexp from "path-to-regexp"
+import { message } from "antd"
+
+axios.interceptors.request.use(
+  config => {
+      config.headers.common['WWW-Authenticate']=null;
+      return config;
+  },
+  err => {
+    return Promise.reject(err);
+});
+
+
+axios.interceptors.response.use(
+  response => {
+      return response;
+  },
+    error => {
+        if (error.response) {
+            switch (error.response.status) {
+            case 401:
+                window.location.reload();
+            }
+        }
+        return Promise.reject(error)   // 返回接口返回的错误信息
+    }
+);
+
+
+
+const fetch = options => {
+    let { method = "get", data, url, config, ...opts } = options
+    try {
+        url = pathToRegexp.compile(url)(data)
+
+    } catch (e) {
+    }
+
+    switch (method.toLowerCase()) {
+        case "get":
+            return axios.get(
+                url,
+                {
+                    params: data,
+                },
+                config
+            )
+        case "delete":
+            return axios.delete(
+                url,
+                {
+                    data: data,
+                },
+                config
+            )
+        case "post":
+            return axios.post(url, data, config)
+        case "put":
+            return axios.put(url, data, config)
+        case "patch":
+            return axios.patch(url, data, config)
+        default:
+            return axios(options)
+    }
+}
+
+export default function request(options, successdo, errordo) {
+    fetch(options)
+        .then(response => {
+            if(successdo)
+                successdo(response)
+            else
+                message.success('操作成功')
+        })
+        .catch(error => {
+            if(errordo)
+                errordo(error)
+            else
+                message.error('网络异常')
+        })
+}

src/view/Manage/AssetManage/components/AssetTable.jsx

@@ -4,12 +4,14 @@ import "./AssetTable.less"
 import {dispatch } from '../../../../model';
 import AssetModal from "./AssetModal"
 import AssetDetail from "./AssetDetail"
+import { assetS } from '../../../../service/assetS';
+import { showMessage } from '../../../../util';
 
 const { Text } = Typography;
 
 
 export default (props) =>{
-    const {nodeId,keyword,selectKey,treeType} = props
+    const {nodeId,} = props
 
     const [tableLoad,setTableLoad] = useState(false)
     const [attrBox,setAttrBox] = useState([])
@@ -101,13 +103,17 @@ export default (props) =>{
 
 
     const del = (data) =>{
-        let box = attrBox2
-        for (let item of data.basicAttrs){
-            box[item.key] = item.value
-        }
-        setAttrBox2(box)
-        setEditBox(data)
-        setVisible({addtype:false,visible:true})
+        modal.confirm({
+            title: '提示',
+            content: '该资产在所有目录上唯一存在，移除后，你可以前往“资产回收站”重新挂载。',
+            onOk: () => {
+                assetS.deleteDataAssets(nodeId,[`${data.id}`],response=>{
+                    setPageNumber({...pageNumber,rebuild:new Date().getTime})
+                    showMessage("success","删除成功")
+                },error=>{
+                })
+            }
+        })
     }
 
     const more=(data)=>{
@@ -171,7 +177,7 @@ export default (props) =>{
                         <List.Item
                             actions={[
                                 <Button type="link" key="edit" onClick={()=>edit(item)}>修改</Button>,
-                                <Button type="link"key="delete" >删除</Button>,
+                                <Button type="link"key="delete" onClick={()=>del(item)}>删除</Button>,
                                 <Button type="link"key="detail" onClick={()=>more(item)}>详情</Button>,
                             ]}
                         >

src/view/Manage/AssetManage/components/LeftTree.jsx

@@ -2,6 +2,8 @@ import React,{useState, useEffect} from "react"
 import {Card,Spin,Button,Tooltip,Modal,Tree,Input,Dropdown,Menu} from "antd"
 import { PlusOutlined, ImportOutlined,EditOutlined,DeleteOutlined,ExportOutlined  } from '@ant-design/icons';
 import { showMessage, generateList } from '../../../../util';
+import { assetS } from '../../../../service/assetS';
+
 import { dispatch } from '../../../../model';
 import TreeModal from "./TreeModal"
 import ThemeFile from "./ThemeFile"
@@ -26,7 +28,6 @@ export default (props)=>{
     const [visible2,setVisible2] = useState(false)
 
     useEffect(()=>{
-        getAllTpoic()
         getTree()
     },[treeRebuild.build])//获取树数据
 
@@ -79,18 +80,6 @@ export default (props)=>{
         })
     }
 
-    const getAllTpoic= async()=>{
-        dispatch({
-            type: 'assetmanage.listAllTopics',
-            payload: null,
-            callback: dataBox => {
-                setAllTopic(dataBox)
-            },
-            error: () => {
-
-            }
-        })
-    }
 
     const treeRebuildFun = (data,pid) => {
         for (let node of data){
@@ -201,17 +190,10 @@ export default (props)=>{
                             title: '提示',
                             content: '节点下包含资产信息，删除后将把资产从该目录上移除，确定继续吗?',
                             onOk: () => {
-                                console.log({data:[`${nodeBox.dataBox.nodeId}`]})
-                                dispatch({
-                                    type: 'assetmanage.deleteDirectory',
-                                    payload:{data:[`${nodeBox.dataBox.nodeId}`]},
-                                    callback:data=>{
-                                        setTreeRebuild({build:new Date().getTime(),type:'delete'})
-                                        showMessage("success","删除成功")
-                                    },
-                                    error:data=>{
-                                        showMessage("error","删除异常")
-                                    },
+                                assetS.deleteDirectory([`${nodeBox.dataBox.nodeId}`],response=>{
+                                    setTreeRebuild({build:new Date().getTime(),type:'delete'})
+                                    showMessage("success","删除成功")
+                                },error=>{
                                 })
                             }
                         })