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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
wangjiahao 2022-08-19 15:02:17 +08:00
commit da6bbe7ddc
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/src/main/java/io/dataease/commons/utils/DeLogUtils.java
View File

@ -69,6 +69,9 @@ public class DeLogUtils {
if(sourcetype == SOURCE_TYPE.DRIVER_FILE){ if(sourcetype == SOURCE_TYPE.DRIVER_FILE){
List<FolderItem> parentsAndSelf = logManager.parentsAndSelf(positionId.toString(), SOURCE_TYPE.DRIVER); List<FolderItem> parentsAndSelf = logManager.parentsAndSelf(positionId.toString(), SOURCE_TYPE.DRIVER);
sysLogDTO.setPositions(parentsAndSelf); sysLogDTO.setPositions(parentsAndSelf);
}else if(sourcetype == SOURCE_TYPE.VIEW){
List<FolderItem> parentsAndSelf = logManager.parentsAndSelf(positionId.toString(), SOURCE_TYPE.PANEL);
sysLogDTO.setPositions(parentsAndSelf);
}else { }else {
List<FolderItem> parentsAndSelf = logManager.parentsAndSelf(positionId.toString(), sourcetype); List<FolderItem> parentsAndSelf = logManager.parentsAndSelf(positionId.toString(), sourcetype);
sysLogDTO.setPositions(parentsAndSelf); sysLogDTO.setPositions(parentsAndSelf);

1
frontend/src/views/chart/components/shape-attr/ColorSelector.vue
View File

@ -330,6 +330,7 @@ export default {
if (!this.batchOptStatus && this.chart.render && this.chart.render === 'antv' && if (!this.batchOptStatus && this.chart.render && this.chart.render === 'antv' &&
(this.chart.type.includes('bar') || (this.chart.type.includes('bar') ||
this.chart.type.includes('line') || this.chart.type.includes('line') ||
this.chart.type.includes('area') ||
this.chart.type.includes('pie') || this.chart.type.includes('pie') ||
this.chart.type === 'funnel' || this.chart.type === 'funnel' ||
this.chart.type === 'radar' || this.chart.type === 'radar' ||