From fa12e77d5aadfd67358fe3be353804cf47691613 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 2 Mar 2022 18:02:11 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E6=97=A0=E6=B3=95=E5=A4=8D=E5=88=B6?=
 =?UTF-8?q?=E7=A9=BA=E4=BB=AA=E8=A1=A8=E6=9D=BF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/io/dataease/service/panel/PanelGroupService.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

From c29759ad8a5d63a21b6c08c2b9fffae27a8daa8f Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 2 Mar 2022 18:03:48 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E7=A7=BB=E5=8A=A8=E7=AB=AF=E4=BB=AA?=
 =?UTF-8?q?=E8=A1=A8=E6=9D=BF=E7=BA=B5=E5=90=91=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mobile/src/pages/tabBar/home/detail.nvue | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

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">
 			
+			<!-- <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