Browse Source

Pull request #15147: REPORT-138178 fix: 权限编辑阴影大小问题

Merge in DESIGN/design from ~ZONGYU.WANG/design:fbp/master to fbp/master

* commit '83312a432041aa2a2cb69a38d099f8e3074d6aa7':
  REPORT-138178 fix: 权限编辑阴影大小问题
fbp/master
Zongyu.Wang-王宗雨 1 month ago
parent
commit
190933b123
  1. 8
      designer-base/src/main/java/com/fr/design/gui/icontainer/UIModeControlContainer.java
  2. 1
      designer-realize/src/main/java/com/fr/design/mainframe/ReportComponentComposite.java

8
designer-base/src/main/java/com/fr/design/gui/icontainer/UIModeControlContainer.java

@ -44,6 +44,7 @@ public class UIModeControlContainer extends JLayeredPane {
private static final int NUM5 = 5; private static final int NUM5 = 5;
private JComponent upPane; private JComponent upPane;
private JComponent downPane; private JComponent downPane;
private JComponent sheetNameTabPane;
private JPanel horizontToolPane; private JPanel horizontToolPane;
private CoverPane coverPane; private CoverPane coverPane;
@ -115,6 +116,10 @@ public class UIModeControlContainer extends JLayeredPane {
this.downPane = downPane; this.downPane = downPane;
} }
public void setSheetNameTabPane(JComponent sheetNameTabPane) {
this.sheetNameTabPane = sheetNameTabPane;
}
protected void onResize(int distance) { protected void onResize(int distance) {
} }
@ -215,7 +220,8 @@ public class UIModeControlContainer extends JLayeredPane {
} }
if (DesignerMode.isAuthorityEditing() && isSheeetCovered) { if (DesignerMode.isAuthorityEditing() && isSheeetCovered) {
sheetInvisibleCoverPane.setBounds(0, toolPaneY + toolPaneHeight + UIConstants.SIZE, getWidth(), getHeight() - toolPaneY - toolPaneHeight - sheetCorverGap); sheetInvisibleCoverPane.setBounds(0, toolPaneY + toolPaneHeight + UIConstants.SIZE,
getWidth(), downPane.getHeight() - sheetNameTabPane.getHeight());
UIModeControlContainer.this.add(sheetInvisibleCoverPane); UIModeControlContainer.this.add(sheetInvisibleCoverPane);
UIModeControlContainer.this.setLayer(sheetInvisibleCoverPane, 2); UIModeControlContainer.this.setLayer(sheetInvisibleCoverPane, 2);
sheetInvisibleCoverPane.setVisible(true); sheetInvisibleCoverPane.setVisible(true);

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

@ -123,6 +123,7 @@ public class ReportComponentComposite extends JPanel implements RemoveListener {
centerCardPane.populate(workbook.getTemplateReport(newIndex)); centerCardPane.populate(workbook.getTemplateReport(newIndex));
if (parentContainer != null) { if (parentContainer != null) {
parentContainer.setDownPane(ReportComponentComposite.this); parentContainer.setDownPane(ReportComponentComposite.this);
parentContainer.setSheetNameTabPane(sheetNameTab);
} }
if (templateStateList.size() > newIndex) { if (templateStateList.size() > newIndex) {

Loading…
Cancel
Save