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

Merge branch 'dev' of github.com:dataease/dataease into dev

Browse Source
This commit is contained in:
taojinlong 2021-08-13 12:04:31 +08:00
commit af79e725a3
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java
View File

@ -44,9 +44,9 @@ public class ShiroServiceImpl implements ShiroService {
//验证链接 //验证链接
filterChainDefinitionMap.put("/api/link/validate**", ANON); filterChainDefinitionMap.put("/api/link/validate**", ANON);
filterChainDefinitionMap.put("/api/map/areaEntitys/**", ANON);
filterChainDefinitionMap.put("/**/*.json", ANON);
filterChainDefinitionMap.put("/system/ui/**", ANON); filterChainDefinitionMap.put("/system/ui/**", ANON);
filterChainDefinitionMap.put("/**/*.js", ANON); filterChainDefinitionMap.put("/**/*.js", ANON);
filterChainDefinitionMap.put("/**/*.css", ANON); filterChainDefinitionMap.put("/**/*.css", ANON);

4
frontend/src/views/chart/chart/map/map.js
View File

@ -39,6 +39,10 @@ export function baseMapOption(chart_option, chart) {
}) })
chart_option.visualMap.min = Math.min(...values) chart_option.visualMap.min = Math.min(...values)
chart_option.visualMap.max = Math.max(...values) chart_option.visualMap.max = Math.max(...values)
if (chart_option.visualMap.min === chart_option.visualMap.max) {
chart_option.visualMap.min = 0
}
if (customAttr.color && customAttr.color.colors) { if (customAttr.color && customAttr.color.colors) {
chart_option.visualMap.inRange.color = customAttr.color.colors chart_option.visualMap.inRange.color = customAttr.color.colors
} }

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

@ -1023,7 +1023,7 @@ export default {
if (!response.data.drill) { if (!response.data.drill) {
this.drillClickDimensionList.splice(this.drillClickDimensionList.length - 1, 1) this.drillClickDimensionList.splice(this.drillClickDimensionList.length - 1, 1)
} }
this.drillFilters = JSON.parse(JSON.stringify(response.data.drillFilters)) this.drillFilters = JSON.parse(JSON.stringify(response.data.drillFilters ? response.data.drillFilters : []))
}).catch(err => { }).catch(err => {
this.resetView() this.resetView()
this.resetDrill() this.resetDrill()