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

Merge pull request #805 from dataease/pr@dev@fix_panel-linkage

Browse Source 
fix:视图更换数据集可能导致联动失效的问题
This commit is contained in:
王嘉豪 2021-09-10 11:25:51 +08:00 committed by GitHub
commit 350ef60ddc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/src/main/java/io/dataease/service/chart/ChartViewService.java
View File

@ -460,6 +460,9 @@ public class ChartViewService {
map.putAll(mapChart); map.putAll(mapChart);
map.putAll(mapTableNormal); map.putAll(mapTableNormal);
List<DatasetTableField> sourceFields = dataSetTableFieldsService.getFieldsByTableId(view.getTableId());
map.put("sourceFields",sourceFields);
ChartViewDTO dto = new ChartViewDTO(); ChartViewDTO dto = new ChartViewDTO();
BeanUtils.copyBean(dto, view); BeanUtils.copyBean(dto, view);
dto.setData(map); dto.setData(map);

2
frontend/src/components/canvas/custom-component/UserView.vue
View File

@ -121,7 +121,7 @@ export default {
trackMenu() { trackMenu() {
const trackMenuInfo = [] const trackMenuInfo = []
let linkageCount = 0 let linkageCount = 0
this.chart.data && this.chart.data.fields && this.chart.data.fields.forEach(item => { this.chart.data && this.chart.data.sourceFields && this.chart.data.sourceFields.forEach(item => {
const sourceInfo = this.chart.id + '#' + item.id const sourceInfo = this.chart.id + '#' + item.id
if (this.nowPanelTrackInfo[sourceInfo]) { if (this.nowPanelTrackInfo[sourceInfo]) {
linkageCount++ linkageCount++