Skip to content

S
szse
Commit d8db9390 by fanyongjun
Options

4.9.3

parent dc0bd3c1
Showing with 44 additions and 147 deletions
src/service/assetS.js deleted 100644 → 0
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/service/assetmanage.js
import { PostJSON, GetJSON, filePost2} from "../util/axios"
import { PostJSON, GetJSON, filePost2, PostJSON2} from "../util/axios"
export function addOrUpdateDataAsset(payload) {
return PostJSON("/dataassetmanager/dataAssetApi/addOrUpdateDataAsset", payload)
}
export function deleteDataAssets(payload) {
return PostJSON("/dataassetmanager/dataAssetApi/deleteDataAssets", payload)
return PostJSON2("/dataassetmanager/dataAssetApi/deleteDataAssets", payload)
}
export function getDataAssetDetail(payload) {
......@@ -31,7 +31,7 @@ export function addOrUpdateDirectory(payload) {
}
export function deleteDirectory(payload) {
return PostJSON("/dataassetmanager/directoryApi/deleteDirectory", payload)
return PostJSON2("/dataassetmanager/directoryApi/deleteDirectory", payload)
}
export function existDataAsset(payload) {
......
src/util/axios.js
......@@ -131,6 +131,14 @@ export function Post(url, payload) {
)
}
export function PostJSON2(url, payload) {
const { params = null, data = null } = payload||{};
return instance.post(url, data,{params}).then(
callback
)
}
export function filePost(url, payload) {
const { fileList = null,} = payload||{};
let formData = new FormData();
......@@ -145,19 +153,9 @@ export function filePost(url, payload) {
export function filePost2(url, payload) {
const { fileList = null,params=null} = payload||{};
// let formData = new FormData();
// (fileList||[]).forEach(file=> {
// formData.append('file', file);
// });
let formData=new FormData();// 创建form对象
formData.append('file',fileList);
if(params){
for(let key in params){
url = url+ '?' + key + '=' + params[key]
}
}
return fileplain.post(url,formData, ).then(
return fileplain.post(url,formData, {params} ).then(
callback
)
}
\ No newline at end of file
src/util/request.js deleted 100644 → 0
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,7 +4,6 @@ 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;
......@@ -118,11 +117,17 @@ const AssetTable = (props) =>{
title: '提示',
content: '该资产在所有目录上唯一存在，移除后，你可以前往“资产回收站”重新挂载。',
onOk: () => {
assetS.deleteDataAssets(nodeId,[`${data.id}`],response=>{
dispatch({
type: 'assetmanage.deleteDataAssets',
payload: {params:{dirId:nodeId},data:[`${data.id}`]},
callback: dataBox => {
setPageNumber({...pageNumber,rebuild:new Date().getTime()})
showMessage("success","删除成功")
},error=>{
},
error: () => {
}
})
}
})
}
......@@ -171,11 +176,17 @@ const AssetTable = (props) =>{
title: '提示',
content: `你已选择了${selectBox.length}个资产,确定把它们都从挂载目录上移除吗?`,
onOk: () => {
assetS.deleteDataAssets(nodeId,selectBox,response=>{
dispatch({
type: 'assetmanage.deleteDataAssets',
payload: {params:{dirId:nodeId},data:selectBox},
callback: dataBox => {
setPageNumber({...pageNumber,page:1,rebuild:new Date().getTime()})
showMessage("success","删除成功")
},error=>{
},
error: () => {
}
})
}
})
}else{
......
src/view/Manage/AssetManage/components/LeftTree.jsx
......@@ -2,8 +2,6 @@ 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"
......@@ -180,10 +178,15 @@ const LeftTree = (props)=>{
title: '提示',
content: '节点下包含资产信息，删除后将把资产从该目录上移除，确定继续吗?',
onOk: () => {
assetS.deleteDirectory([`${nodeBox.dataBox.nodeId}`],response=>{
dispatch({
type: 'assetmanage.deleteDirectory',
payload: {data:[`${nodeBox.dataBox.nodeId}`]},
callback: data => {
setTreeRebuild({build:new Date().getTime(),type:'delete'})
showMessage("success","删除成功")
},error=>{
},
error: () => {
}
})
}
})
......
src/view/Manage/AssetManage/components/ThemeFile.jsx
import React,{useState, useEffect} from "react"
import {Modal,Form,Upload,Button,message,Radio} from "antd"
import {Modal,Form,Upload,Button,Radio} from "antd"
import { PlusOutlined } from '@ant-design/icons';
import { dispatch } from '../../../../model';
import { showMessage} from '../../../../util';
import { showMessage,showNotifaction} from '../../../../util';
const ThemeFile = (props)=>{
const {fileVisible,handleCancle,editBox,selectKey,setTreeRebuild} = props
const [upLoad,setUpLoad] = useState(false)
const [message,setMessage] = useState('')
const [form] = Form.useForm()
useEffect(()=>{
if(fileVisible){
setMessage('')
form.resetFields()
}
},[fileVisible])
......@@ -32,7 +28,7 @@ const ThemeFile = (props)=>{
beforeUpload: (file) => {
const isLt20M = file.size / 1024 / 1024 < 2000;
if (!isLt20M) {
return message.error('上传文件不能超过 20MB!')
return showMessage("warn","上传文件不能超过 20MB!")
}
return false;
......@@ -50,13 +46,13 @@ const ThemeFile = (props)=>{
payload: { fileList: value.file[0].originFileObj },
callback: data => {
setTreeRebuild({build:new Date().getTime(),type:'build'})
// showMessage("success","导入成功")
form.resetFields()
setUpLoad(false)
if(data){
let msg=data.replace(RegExp(";", "g"),"<br />")
setMessage(msg)
showNotifaction('导入提示', msg);
}
handleCancle()
},
error: () => {
......@@ -70,10 +66,10 @@ const ThemeFile = (props)=>{
setUpLoad(false)
if(data){
let msg=data.replace(RegExp(";", "g"),"<br />")
setMessage(msg)
showNotifaction('导入提示', msg);
}
form.resetFields()
setTreeRebuild({build:new Date().getTime(),type:'build'})
handleCancle()
},
error: () => {
......@@ -160,10 +156,6 @@ const ThemeFile = (props)=>{
</Upload>
</Form.Item>
</Form>
<div style={{maxHeight:400,overflow:'auto'}} dangerouslySetInnerHTML={{__html:message}}></div>
</Modal>
)
}
......
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