diff --git a/core/core-frontend/src/api/datasource.ts b/core/core-frontend/src/api/datasource.ts index bc51454740..4567ef1599 100644 --- a/core/core-frontend/src/api/datasource.ts +++ b/core/core-frontend/src/api/datasource.ts @@ -91,6 +91,24 @@ export const save = async (data = {}): Promise => { }) } +export const move = async (data = {}): Promise => { + return request.post({ url: '/datasource/move', data }).then(res => { + return res?.data + }) +} + +export const reName = async (data = {}): Promise => { + return request.post({ url: '/datasource/reName', data }).then(res => { + return res?.data + }) +} + +export const createFolder = async (data = {}): Promise => { + return request.post({ url: '/datasource/createFolder', data }).then(res => { + return res?.data + }) +} + export const checkRepeat = async (data = {}): Promise => { return request.post({ url: '/datasource/checkRepeat', data }).then(res => { return res?.data diff --git a/core/core-frontend/src/views/visualized/data/datasource/index.vue b/core/core-frontend/src/views/visualized/data/datasource/index.vue index 5444f9eeff..5ffa819f6d 100644 --- a/core/core-frontend/src/views/visualized/data/datasource/index.vue +++ b/core/core-frontend/src/views/visualized/data/datasource/index.vue @@ -22,7 +22,9 @@ import { getTableField, listDatasourceTables, deleteById, - save, + move, + reName, + createFolder, validateById, syncApiDs, syncApiTable @@ -234,28 +236,24 @@ const handleLoadExcel = data => { } const validateDS = () => { - validateById(nodeInfo.id as number) - .then(res => { - if (res.data.type === 'API') { - let error = 0 - const status = JSON.parse(res.data.status) - for (let i = 0; i < status.length; i++) { - if (status[i].status === 'Error') { - error++ - } + validateById(nodeInfo.id as number).then(res => { + if (res.data.type === 'API') { + let error = 0 + const status = JSON.parse(res.data.status) + for (let i = 0; i < status.length; i++) { + if (status[i].status === 'Error') { + error++ } - if (error === 0) { - ElMessage.success('校验成功') - } else { - ElMessage.error('校验失败') - } - } else { - ElMessage.success('校验成功') } - }) - .catch(() => { - ElMessage.error('校验失败') - }) + if (error === 0) { + ElMessage.success('校验成功') + } else { + ElMessage.error('校验失败') + } + } else { + ElMessage.success('校验成功') + } + }) } const dialogErrorInfo = ref(false) @@ -351,21 +349,29 @@ const infoList = computed(() => { } }) const saveDsFolder = (params, successCb, finallyCb, cmd) => { - save(params) + let method = move + let message = '移动成功' + + switch (cmd) { + case 'move': + method = move + message = '移动成功' + + break + case 'rename': + method = reName + message = '重命名成功' + break + default: + method = createFolder + message = '新建成功' + break + } + method(params) .then(res => { if (res !== undefined) { successCb() - switch (cmd) { - case 'move': - ElMessage.success('移动成功') - break - case 'rename': - ElMessage.success('重命名成功') - break - default: - ElMessage.success('新建成功') - break - } + ElMessage.success(message) listDs() } }) diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/ds/DatasourceApi.java b/sdk/api/api-base/src/main/java/io/dataease/api/ds/DatasourceApi.java index 96b7eec744..d0812d6059 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/ds/DatasourceApi.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/ds/DatasourceApi.java @@ -35,6 +35,15 @@ public interface DatasourceApi { DatasourceDTO save(@RequestBody DatasourceDTO dataSourceDTO) throws DEException; + @PostMapping("/move") + DatasourceDTO move(@RequestBody DatasourceDTO dataSourceDTO) throws DEException; + + @PostMapping("/reName") + DatasourceDTO reName(@RequestBody DatasourceDTO dataSourceDTO) throws DEException; + + @PostMapping("/createFolder") + DatasourceDTO createFolder(@RequestBody DatasourceDTO dataSourceDTO) throws DEException; + @PostMapping("/checkRepeat") boolean checkRepeat(@RequestBody DatasourceDTO dataSourceDTO) throws DEException;