Merge pull request #1874 from dataease/v1.8

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;
     }
 

mobile/src/pages/tabBar/home/detail.nvue

@@ -31,6 +31,8 @@
 		@scrolltolower="lower"
 		@scroll="scroll">
 			
+			<!-- <web-view v-if="url" :style="{height: 'calc(100vh - ' + ktxStatusHeight +'px)'}" /> -->
+			<!-- <web-view v-if="url" style="height: 100vh;" /> -->
 			<web-view v-if="url" :style="{height: viewHeight}" />
 
 		</scroll-view>
@@ -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