center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #1852 from dataease/v1.8

Browse Source 
V1.8
This commit is contained in:
王嘉豪 2022-03-01 11:16:07 +08:00 committed by GitHub
commit 5193d5f125
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
View File

@ -130,12 +130,7 @@ public class PanelGroupService {
checkPanelName(newDefaultPanel.getName(), newDefaultPanel.getPid(), PanelConstants.OPT_TYPE_INSERT, newDefaultPanel.getId(), newDefaultPanel.getNodeType());
panelGroupMapper.insertSelective(newDefaultPanel);
} else if ("copy".equals(request.getOptType())) {
try {
panelId = this.panelGroupCopy(request, null, true);
} catch (Exception e) {
e.printStackTrace();
LOGGER.error("更新panelView出错panelId：{}", request.getId());
}
} else if ("move".equals(request.getOptType())) {
PanelGroupWithBLOBs panelInfo = panelGroupMapper.selectByPrimaryKey(request.getId());
if (panelInfo.getPid().equalsIgnoreCase(request.getPid())) {

4
frontend/src/views/panel/list/PanelViewShow.vue
View File

@ -169,8 +169,8 @@ export default {
imageWrapperStyle() {
if (this.exporting) {
return {
width: '4096px',
height: '2160px'
width: '2560px',
height: '1440px'
}
} else {
return {