Browse Source

Merge pull request #1379 in BA/design from ~MOMEAK/design9.0:release/9.0 to release/9.0

* commit '48be05117fbe3159999ae91d9523f0bef448d345':
  REPORT-4888 设计器交互修改
  REPORT-4888 设计器交互修改 聚合报表单元报表缩放问题;数据字典-数据查询面板对齐;数据字典-公式 字体颜色灰化;悬浮元素item初始化修改
master
superman 7 years ago
parent
commit
d7de2d4370
  1. 4
      designer/src/com/fr/design/mainframe/ReportFloatPane.java
  2. 8
      designer/src/com/fr/poly/PolyDesignUI.java
  3. 2
      designer_base/src/com/fr/design/present/dict/FormulaDictPane.java
  4. 3
      designer_base/src/com/fr/design/present/dict/TableDataDictPane.java

4
designer/src/com/fr/design/mainframe/ReportFloatPane.java

@ -80,7 +80,9 @@ public class ReportFloatPane extends JPanel {
insertFloatMenu.setIconPath("com/fr/design/images/control/addPopup.png"); insertFloatMenu.setIconPath("com/fr/design/images/control/addPopup.png");
JTemplate editingTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate(); JTemplate editingTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
ElementCasePaneDelegate elementCasePaneDelegate = (ElementCasePaneDelegate) editingTemplate.getCurrentElementCasePane(); ElementCasePaneDelegate elementCasePaneDelegate = (ElementCasePaneDelegate) editingTemplate.getCurrentElementCasePane();
refreshInsertFloatMenu(elementCasePaneDelegate); if (elementCasePaneDelegate != null) {
refreshInsertFloatMenu(elementCasePaneDelegate);
}
} }
private UIButton createButtonUI() { private UIButton createButtonUI() {

8
designer/src/com/fr/poly/PolyDesignUI.java

@ -209,10 +209,10 @@ public class PolyDesignUI extends ComponentUI {
private void paintAddingData(Graphics g, AddingData addingData) { private void paintAddingData(Graphics g, AddingData addingData) {
BlockCreator comp = addingData.getCreator(); BlockCreator comp = addingData.getCreator();
int x = (int) (addingData.getCurrentX()*time); int x = (int) (addingData.getCurrentX() / time);
int y = (int) (addingData.getCurrentY()*time); int y = (int) (addingData.getCurrentY() / time);
int width = (int) (comp.getWidth()*time); int width = comp.getWidth();
int height = (int) (comp.getHeight()*time); int height = comp.getHeight();
paintCreator(g, comp, x, y, width, height); paintCreator(g, comp, x, y, width, height);
} }

2
designer_base/src/com/fr/design/present/dict/FormulaDictPane.java

@ -49,7 +49,7 @@ public class FormulaDictPane extends FurtherBasicBeanPane<FormulaDictionary> {
int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}}; int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}};
UILabel tag = new UILabel(Inter.getLocText("FR-Designer-Formula_Dictionary_Display_Examples_Html")); UILabel tag = new UILabel(Inter.getLocText("FR-Designer-Formula_Dictionary_Display_Examples_Html"));
tag.setForeground(new Color(51, 51, 52)); tag.setForeground(new Color(143, 143, 146));
tag.setPreferredSize(new Dimension(225, 80)); tag.setPreferredSize(new Dimension(225, 80));
JPanel t = new JPanel(new BorderLayout()); JPanel t = new JPanel(new BorderLayout());
t.add(tag, BorderLayout.CENTER); t.add(tag, BorderLayout.CENTER);

3
designer_base/src/com/fr/design/present/dict/TableDataDictPane.java

@ -51,6 +51,7 @@ import java.util.List;
public class TableDataDictPane extends FurtherBasicBeanPane<TableDataDictionary> implements Previewable, UIObserver { public class TableDataDictPane extends FurtherBasicBeanPane<TableDataDictionary> implements Previewable, UIObserver {
private static final int BEGIN = 1; private static final int BEGIN = 1;
private static final int END = 10; private static final int END = 10;
private static final int VGAP = 24;
private static final long serialVersionUID = -5469742115988153206L; private static final long serialVersionUID = -5469742115988153206L;
private static final int SELECTED_NO_TABLEDATA = -2; private static final int SELECTED_NO_TABLEDATA = -2;
public TableDataComboBox tableDataNameComboBox; public TableDataComboBox tableDataNameComboBox;
@ -111,7 +112,7 @@ public class TableDataDictPane extends FurtherBasicBeanPane<TableDataDictionary>
new Component[]{new UILabel(Inter.getLocText("FR-Designer_Display_Value") + " ", UILabel.LEFT), valueDictPane}, new Component[]{new UILabel(Inter.getLocText("FR-Designer_Display_Value") + " ", UILabel.LEFT), valueDictPane},
}; };
JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_MEDIUM, LayoutConstants.VGAP_MEDIUM); JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, VGAP, LayoutConstants.VGAP_MEDIUM);
this.setLayout(new BorderLayout()); this.setLayout(new BorderLayout());
this.add(panel, BorderLayout.CENTER); this.add(panel, BorderLayout.CENTER);
} }

Loading…
Cancel
Save