center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

fix(仪表板、数据大屏): 修复重命名重复导致license导入后同步失败问题

Browse Source
This commit is contained in:
wangjiahao 2024-07-02 14:31:18 +08:00
parent 55bdd799e7
commit 83c261968b
4 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/core-backend/src/main/java/io/dataease/commons/constants/DataVisualizationConstants.java
View File

@ -57,6 +57,8 @@ public class DataVisualizationConstants {
public static final String MOVE = "move";
//重命名
public static final String RENAME = "rename";
public static final String EDIT = "edit";
//复制
public static final String COPY = "copy";
}

1
core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java
View File

@ -396,6 +396,7 @@ public class DataVisualizationServer implements DataVisualizationApi {
QueryWrapper<DataVisualizationInfo> wrapper = new QueryWrapper<>();
if (DataVisualizationConstants.RESOURCE_OPT_TYPE.MOVE.equals(request.getOpt())
|| DataVisualizationConstants.RESOURCE_OPT_TYPE.RENAME.equals(request.getOpt())
|| DataVisualizationConstants.RESOURCE_OPT_TYPE.EDIT.equals(request.getOpt())
|| DataVisualizationConstants.RESOURCE_OPT_TYPE.COPY.equals(request.getOpt())) {
if (request.getPid() == null) {
DataVisualizationInfo result = visualizationInfoMapper.selectById(request.getId());

4
core/core-frontend/src/components/data-visualization/DvToolbar.vue
View File

@ -98,12 +98,12 @@ const saveCanvasWithCheck = () => {
}
const saveResource = () => {
wsCache.delete('DE-DV-CATCH-' + dvInfo.value.id)
if (styleChangeTimes.value > 0) {
eventBus.emit('hideArea-canvas-main')
nextTick(() => {
snapshotStore.resetStyleChangeTimes()
canvasSave(() => {
snapshotStore.resetStyleChangeTimes()
wsCache.delete('DE-DV-CATCH-' + dvInfo.value.id)
ElMessage.success('保存成功')
window.history.pushState({}, '', `#/dvCanvas?dvId=${dvInfo.value.id}`)
})

12
core/core-frontend/src/utils/canvasUtils.ts
View File

@ -8,6 +8,7 @@ import eventBus from '@/utils/eventBus'
import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain'
import {
decompression,
dvNameCheck,
findById,
findCopyResource,
saveCanvas,
@ -298,7 +299,7 @@ export function checkIsBatchOptView(viewId) {
return curBatchOptComponents.value.includes(viewId)
}
export function canvasSave(callBack) {
export async function canvasSave(callBack) {
const componentDataToSave = cloneDeep(componentData.value)
componentDataToSave.forEach(item => {
if (item.component === 'UserView') {
@ -324,6 +325,15 @@ export function canvasSave(callBack) {
}
const method = dvInfo.value.id && dvInfo.value.optType !== 'copy' ? updateCanvas : saveCanvas
if (method === updateCanvas) {
await dvNameCheck({
opt: 'edit',
nodeType: 'leaf',
name: dvInfo.value.name,
type: dvInfo.value.type,
id: dvInfo.value.id
})
}
method(canvasInfo).then(res => {
dvMainStore.updateDvInfoId(res.data)
snapshotStore.resetStyleChangeTimes()