Browse Source

Pull request #2173: REPORT-37950 普通报表-多sheet-报表块缩放失效

Merge in DESIGN/design from ~YVAN/design:release/10.0 to release/10.0

* commit '8ca8309480a82314b4f53feaa241209c8cc726d9':
  REPORT-37950 普通报表-多sheet-报表块缩放失效 1. bug原因:当新建一个Sheet后,代码会走到这一步,新建一个JFormSliderPane,然后在进行缩放时,修改的是旧的JFormSliderPane中的showValue,而ReportComponentComposite中getShowValue取到的都是新的JFormSliderPane中的值,所以会发现新的JFormSliderPane中showValue一直不变,滚动条失效 2. 修改思路为,新建sheet后,仍然使用原来的JFormSliderPane,而因为界面的缩放后的绘制是跟resolution分辨率有关,所以共用JFormSliderPane之后,不同sheet中的界面缩放还是可以分开控制
feature/big-screen
Yvan 4 years ago
parent
commit
4ca3f7f39c
  1. 3
      designer-realize/src/main/java/com/fr/design/mainframe/ReportComponentComposite.java

3
designer-realize/src/main/java/com/fr/design/mainframe/ReportComponentComposite.java

@ -119,7 +119,8 @@ public class ReportComponentComposite extends JComponent implements RemoveListen
templateStateList.add(null); templateStateList.add(null);
} }
centerCardPane.editingComponet.setSelection(centerCardPane.editingComponet.getDefaultSelectElement()); centerCardPane.editingComponet.setSelection(centerCardPane.editingComponet.getDefaultSelectElement());
jSliderContainer = JFormSliderPane.getInstance(); // Yvan: REPORT-37950 普通报表-多sheet-报表块缩放失效
//jSliderContainer = JFormSliderPane.getInstance();
} }
if (centerCardPane.editingComponet.elementCasePane == null) { if (centerCardPane.editingComponet.elementCasePane == null) {

Loading…
Cancel
Save