diff --git a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java index 0c81afea35..81cfe76173 100644 --- a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java +++ b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java @@ -283,7 +283,6 @@ public class PanelGroupService { panelData = panelData.replaceAll(panelView.getCopyFromView(), panelView.getChartViewId()); } newPanel.setPanelData(panelData); - panelGroupMapper.insertSelective(newPanel); //TODO 复制跳转信息 copy panel_link_jump panel_link_jump_info panel_link_jump_target_view_info extPanelLinkJumpMapper.copyLinkJump(copyId); extPanelLinkJumpMapper.copyLinkJumpInfo(copyId); @@ -292,6 +291,7 @@ public class PanelGroupService { extPanelViewLinkageMapper.copyViewLinkage(copyId); extPanelViewLinkageMapper.copyViewLinkageField(copyId); } + panelGroupMapper.insertSelective(newPanel); return newPanelId; } diff --git a/mobile/src/pages/tabBar/home/detail.nvue b/mobile/src/pages/tabBar/home/detail.nvue index 63dcb2813e..bb212b927c 100644 --- a/mobile/src/pages/tabBar/home/detail.nvue +++ b/mobile/src/pages/tabBar/home/detail.nvue @@ -31,6 +31,8 @@ @scrolltolower="lower" @scroll="scroll"> + + @@ -89,7 +91,8 @@ old: { scrollTop: 0 }, - viewHeight: null + viewHeight: null, + ktxStatusHeight: null } }, onLoad(event) { @@ -181,14 +184,12 @@ }, caclViewHeight() { let systemInfo = uni.getSystemInfoSync() - let pxToRpxScale = 750 / systemInfo.windowWidth; - // 屏幕的高度 - let ktxScreentHeight = systemInfo.screenHeight * pxToRpxScale - // 状态栏的高度 - let ktxStatusHeight = systemInfo.statusBarHeight * pxToRpxScale - // 导航栏的高度 - let navigationHeight = 44 * pxToRpxScale - this.viewHeight = (ktxScreentHeight - ktxStatusHeight) + 'px' + const h5Height = systemInfo.windowHeight - systemInfo.statusBarHeight + if(systemInfo.navigationBarHeight) { + h5Height = h5Height - systemInfo.navigationBarHeight + } + this.viewHeight = h5Height + 'px' + }, back() { // #ifdef H5