Commit 4005b344 by zhaochengxiang

任务删除提示

parent bfb62e3f
import { PostFile, GetJSON, PostJSON, Post, Get, Delete, Delete1 } from "../util/axios" import { PostFile, GetJSON, PostJSON, Post, Get, Delete, Delete1, Delete2 } from "../util/axios"
export function loadDataModelCatalog() { export function loadDataModelCatalog() {
return GetJSON("/datamodeler/easyDataModelerCURD/loadDataModelCatalog"); return GetJSON("/datamodeler/easyDataModelerCURD/loadDataModelCatalog");
...@@ -454,7 +454,7 @@ export function updateCompareJob(payload) { ...@@ -454,7 +454,7 @@ export function updateCompareJob(payload) {
} }
export function deleteCompareJobs(payload) { export function deleteCompareJobs(payload) {
return Delete("/datamodeler/easyDataModelModelCompareJob/delModelCompareJobs", payload) return Delete2("/datamodeler/easyDataModelModelCompareJob/delModelCompareJobs", payload)
} }
export function runCompareJob(payload) { export function runCompareJob(payload) {
......
...@@ -137,6 +137,15 @@ export function Delete1(url, payload) { ...@@ -137,6 +137,15 @@ export function Delete1(url, payload) {
) )
} }
export function Delete2(url, params) {
const cancelToken = __source ? __source.token : null;
return textplain.delete(url, {
params, cancelToken,
}).then(
callback
)
}
export function PostJSON(url, payload) { export function PostJSON(url, payload) {
const { params = null, data = null } = payload||{}; const { params = null, data = null } = payload||{};
const cancelToken = __source ? __source.token : null; const cancelToken = __source ? __source.token : null;
......
...@@ -4,7 +4,7 @@ import { Space, Button, Select, Input, Tooltip, Modal, Row, Typography } from 'a ...@@ -4,7 +4,7 @@ import { Space, Button, Select, Input, Tooltip, Modal, Row, Typography } from 'a
import { defaultPage } from '../../../util/hooks/page' import { defaultPage } from '../../../util/hooks/page'
import Table from '../../../util/Component/Table' import Table from '../../../util/Component/Table'
import { dispatch } from '../../../model' import { dispatch } from '../../../model'
import { generateUUID, paginate, showMessage } from '../../../util' import { generateUUID, paginate, showMessage, showNotifaction } from '../../../util'
import UpdateTask from './update-task' import UpdateTask from './update-task'
import ColConfig from './col-config' import ColConfig from './col-config'
...@@ -244,7 +244,12 @@ const FC = (props) => { ...@@ -244,7 +244,12 @@ const FC = (props) => {
modelCompareJobIds: (selectedRows??[]).map(item => item.id).toString() modelCompareJobIds: (selectedRows??[]).map(item => item.id).toString()
}, },
callback: data => { callback: data => {
if (data) {
showNotifaction('提示', data, 5)
} else {
showMessage('success', '删除成功') showMessage('success', '删除成功')
}
setSelectedRows() setSelectedRows()
getTasks() getTasks()
} }
...@@ -297,9 +302,13 @@ const FC = (props) => { ...@@ -297,9 +302,13 @@ const FC = (props) => {
modelCompareJobIds: record?.id modelCompareJobIds: record?.id
}, },
callback: data => { callback: data => {
if (data) {
showNotifaction('提示', data, 5)
} else {
showMessage('success', '删除成功') showMessage('success', '删除成功')
getTasks() getTasks()
} }
}
}) })
} }
}) })
......
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