Unverified 提交 fcf742f5 authored 作者: 王嘉豪's avatar 王嘉豪 提交者: GitHub

Merge pull request #1874 from dataease/v1.8

V1.8
...@@ -283,7 +283,6 @@ public class PanelGroupService { ...@@ -283,7 +283,6 @@ public class PanelGroupService {
panelData = panelData.replaceAll(panelView.getCopyFromView(), panelView.getChartViewId()); panelData = panelData.replaceAll(panelView.getCopyFromView(), panelView.getChartViewId());
} }
newPanel.setPanelData(panelData); newPanel.setPanelData(panelData);
panelGroupMapper.insertSelective(newPanel);
//TODO 复制跳转信息 copy panel_link_jump panel_link_jump_info panel_link_jump_target_view_info //TODO 复制跳转信息 copy panel_link_jump panel_link_jump_info panel_link_jump_target_view_info
extPanelLinkJumpMapper.copyLinkJump(copyId); extPanelLinkJumpMapper.copyLinkJump(copyId);
extPanelLinkJumpMapper.copyLinkJumpInfo(copyId); extPanelLinkJumpMapper.copyLinkJumpInfo(copyId);
...@@ -292,6 +291,7 @@ public class PanelGroupService { ...@@ -292,6 +291,7 @@ public class PanelGroupService {
extPanelViewLinkageMapper.copyViewLinkage(copyId); extPanelViewLinkageMapper.copyViewLinkage(copyId);
extPanelViewLinkageMapper.copyViewLinkageField(copyId); extPanelViewLinkageMapper.copyViewLinkageField(copyId);
} }
panelGroupMapper.insertSelective(newPanel);
return newPanelId; return newPanelId;
} }
......
...@@ -31,6 +31,8 @@ ...@@ -31,6 +31,8 @@
@scrolltolower="lower" @scrolltolower="lower"
@scroll="scroll"> @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}" /> <web-view v-if="url" :style="{height: viewHeight}" />
</scroll-view> </scroll-view>
...@@ -89,7 +91,8 @@ ...@@ -89,7 +91,8 @@
old: { old: {
scrollTop: 0 scrollTop: 0
}, },
viewHeight: null viewHeight: null,
ktxStatusHeight: null
} }
}, },
onLoad(event) { onLoad(event) {
...@@ -181,14 +184,12 @@ ...@@ -181,14 +184,12 @@
}, },
caclViewHeight() { caclViewHeight() {
let systemInfo = uni.getSystemInfoSync() let systemInfo = uni.getSystemInfoSync()
let pxToRpxScale = 750 / systemInfo.windowWidth; const h5Height = systemInfo.windowHeight - systemInfo.statusBarHeight
// 屏幕的高度 if(systemInfo.navigationBarHeight) {
let ktxScreentHeight = systemInfo.screenHeight * pxToRpxScale h5Height = h5Height - systemInfo.navigationBarHeight
// 状态栏的高度 }
let ktxStatusHeight = systemInfo.statusBarHeight * pxToRpxScale this.viewHeight = h5Height + 'px'
// 导航栏的高度
let navigationHeight = 44 * pxToRpxScale
this.viewHeight = (ktxScreentHeight - ktxStatusHeight) + 'px'
}, },
back() { back() {
// #ifdef H5 // #ifdef H5
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论