diff --git a/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java b/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java index f91f5422d4..950fe234cd 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java @@ -403,7 +403,8 @@ public class DataVisualizationServer implements DataVisualizationApi { request.setPid(result.getPid()); } if (DataVisualizationConstants.RESOURCE_OPT_TYPE.MOVE.equals(request.getOpt()) - || DataVisualizationConstants.RESOURCE_OPT_TYPE.RENAME.equals(request.getOpt())) { + || DataVisualizationConstants.RESOURCE_OPT_TYPE.RENAME.equals(request.getOpt()) + || DataVisualizationConstants.RESOURCE_OPT_TYPE.EDIT.equals(request.getOpt())) { wrapper.ne("id", request.getId()); } } diff --git a/core/core-frontend/src/custom-component/de-tabs/Component.vue b/core/core-frontend/src/custom-component/de-tabs/Component.vue index d284de3391..f4098c491c 100644 --- a/core/core-frontend/src/custom-component/de-tabs/Component.vue +++ b/core/core-frontend/src/custom-component/de-tabs/Component.vue @@ -3,6 +3,7 @@ v-if="state.tabShow" style="width: 100%; height: 100%" :class="headClass" + class="custom-tabs-head" ref="tabComponentRef" > { const titleStyle = itemName => { if (editableTabsValue.value === itemName) { return { - fontSize: (element.value.style.activeFontSize || 18) + 'px' + fontSize: (element.value.style.activeFontSize || 18) * scale.value + 'px' } } else { return { - fontSize: (element.value.style.fontSize || 16) + 'px' + fontSize: (element.value.style.fontSize || 16) * scale.value + 'px' } } } diff --git a/core/core-frontend/src/utils/canvasUtils.ts b/core/core-frontend/src/utils/canvasUtils.ts index 3fb905ba3a..bbfda5f9fa 100644 --- a/core/core-frontend/src/utils/canvasUtils.ts +++ b/core/core-frontend/src/utils/canvasUtils.ts @@ -95,10 +95,10 @@ function matrixAdaptor(componentItem) { componentItem.y = 1 + (componentItem.y - 1) * 2 componentItem.sizeX = componentItem.sizeX * 2 componentItem.sizeY = componentItem.sizeY * 2 - componentItem.mx = 1 + (componentItem.mx - 1) * 2 - componentItem.my = 1 + (componentItem.my - 1) * 2 - componentItem.mSizeX = componentItem.mSizeX * 2 - componentItem.mSizeY = componentItem.mSizeY * 2 + componentItem['mx'] = 1 + (componentItem.mx - 1) * 2 + componentItem['my'] = 1 + (componentItem.my - 1) * 2 + componentItem['mSizeX'] = componentItem.mSizeX * 2 + componentItem['mSizeY'] = componentItem.mSizeY * 2 if (componentItem.component === 'Group') { componentItem.propValue.forEach(groupItem => { matrixAdaptor(groupItem) @@ -498,10 +498,7 @@ export async function decompressionPre(params, callBack) { (!deTemplateDataTemp.version || deTemplateDataTemp.version === 2) && deTemplateDataTemp.type === 'dashboard' ) { - componentItem.x = 1 + (componentItem.x - 1) * 2 - componentItem.y = 1 + (componentItem.y - 1) * 2 - componentItem.sizeX = componentItem.sizeX * 2 - componentItem.sizeY = componentItem.sizeY * 2 + matrixAdaptor(componentItem) } }) const sourceCanvasStyle = JSON.parse(deTemplateDataTemp['canvasStyleData'])