Browse Source

Merge pull request #11262 in DESIGN/design from release/11.0 to bugfix/11.0

* commit 'a2bebe3780a02a7fc45fd0f2acd4eaeb27fbbab9':
  REPORT-88365 决策报表,单元格插入数据列,单元格元素页面有异常 【问题原因】单选时默认将cellDSColumnAdvancedPane的visible设为true,导致显示异常 【改动思路】结合cellDSColumnAdvancedPane的原始visible状态及单元格的单选多选状态再进行设置
bugfix/11.0
superman 2 years ago
parent
commit
f105d79a6d
  1. 6
      designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java

6
designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java

@ -162,6 +162,7 @@ public class CellDSColumnEditor extends CellQuickEditor {
// 由于多选的时候修改了 cellDSColumnBasicPane 中组件的visiable属性,切换时需要将其设置为false
cellDSColumnBasicPane.setVisible(false);
cellDSColumnAdvancedPane.setVisible(false);
card.show(cardContainer, paneList.get(index).title4PopupWindow());
paneList.get(index).populate();
@ -1064,7 +1065,10 @@ public class CellDSColumnEditor extends CellQuickEditor {
@Override
public void refreshMultipleDetails() {
tabsHeaderIconPane.setVisible(tc.isSelectedOneCell());
cellDSColumnAdvancedPane.setVisible(tc.isSelectedOneCell());
// 需要结合AdvancedPane的原始visible状态设置单选多选visible
boolean advancedPaneVisible = cellDSColumnAdvancedPane.isVisible();
cellDSColumnAdvancedPane.setVisible(advancedPaneVisible && tc.isSelectedOneCell());
cellDSColumnBasicPane.setMultipleVisible(tc.isSelectedOneCell());
}

Loading…
Cancel
Save