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

Merge branch 'v1.8' of github.com:dataease/dataease into v1.8

Browse Source
This commit is contained in:
taojinlong 2022-03-01 12:02:39 +08:00
commit 665cd7eefb
3 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
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());
}
panelId = this.panelGroupCopy(request, null, true);
} else if ("move".equals(request.getOptType())) {
PanelGroupWithBLOBs panelInfo = panelGroupMapper.selectByPrimaryKey(request.getId());
if (panelInfo.getPid().equalsIgnoreCase(request.getPid())) {
@ -206,9 +201,9 @@ public class PanelGroupService {
public PanelGroupWithBLOBs findOne(String panelId) {
PanelGroupWithBLOBs panelGroupWithBLOBs = extPanelGroupMapper.findOneWithPrivileges(panelId,String.valueOf(AuthUtils.getUser().getUserId()));
PanelGroupWithBLOBs panelGroupWithBLOBs = extPanelGroupMapper.findOneWithPrivileges(panelId, String.valueOf(AuthUtils.getUser().getUserId()));
if (panelGroupWithBLOBs != null && StringUtils.isNotEmpty(panelGroupWithBLOBs.getSource())) {
return extPanelGroupMapper.findOneWithPrivileges(panelGroupWithBLOBs.getSource(),String.valueOf(AuthUtils.getUser().getUserId()));
return extPanelGroupMapper.findOneWithPrivileges(panelGroupWithBLOBs.getSource(), String.valueOf(AuthUtils.getUser().getUserId()));
}
return panelGroupWithBLOBs;
}
@ -247,7 +242,7 @@ public class PanelGroupService {
if (AuthUtils.getUser().getIsAdmin()) {
// 原有视图的目录结构
List<VAuthModelDTO> viewOriginal = extVAuthModelMapper.queryAuthViewsOriginal(viewRequest);
if (CollectionUtils.isNotEmpty(viewOriginal) && viewOriginal.size() > 1 ) {
if (CollectionUtils.isNotEmpty(viewOriginal) && viewOriginal.size() > 1) {
result.addAll(TreeUtils.mergeTree(viewOriginal, "public_chart"));
}
}
@ -328,9 +323,9 @@ public class PanelGroupService {
//TODO 复制联动信息 copy panel_view_linkage_field panel_view_linkage
extPanelViewLinkageMapper.copyViewLinkage(copyId);
extPanelViewLinkageMapper.copyViewLinkageField(copyId);
}catch (Exception e){
} catch (Exception e) {
e.printStackTrace();
System.out.println("错误===》panel:"+panelGroupDTO.getId()+";panelView:"+ JSON.toJSONString(panelViewtemp));
System.out.println("错误===》panel:" + panelGroupDTO.getId() + ";panelView:" + JSON.toJSONString(panelViewtemp));
}
}
}

22
frontend/src/views/chart/view/ChartEdit.vue
View File

@ -1952,13 +1952,17 @@ export default {
}
}
},
dragMoveDuplicate(list, e) {
const that = this
const dup = list.filter(function(m) {
return m.id === that.moveId
})
if (dup && dup.length > 1) {
dragMoveDuplicate(list, e, mode) {
if (mode === 'ds') {
list.splice(e.newDraggableIndex, 1)
} else {
const that = this
const dup = list.filter(function(m) {
return m.id === that.moveId
})
if (dup && dup.length > 1) {
list.splice(e.newDraggableIndex, 1)
}
}
},
addXaxis(e) {
@ -1998,13 +2002,11 @@ export default {
this.calcData(true)
},
moveToDimension(e) {
this.dragCheckType(this.dimensionData, 'd')
this.dragMoveDuplicate(this.dimensionData, e)
this.dragMoveDuplicate(this.dimensionData, e, 'ds')
this.calcData(true)
},
moveToQuota(e) {
this.dragCheckType(this.quotaData, 'q')
this.dragMoveDuplicate(this.quotaData, e)
this.dragMoveDuplicate(this.quotaData, e, 'ds')
this.calcData(true)
},
addCustomFilter(e) {

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 {