Browse Source

Pull request #5960: REPORT-59844 && REPORT-59908 && REPORT-59906 && REPORT-59907 布局推荐 bug 修复;视觉微调

Merge in DESIGN/design from ~KERRY/design_10.0:feature/x to feature/x

* commit '0757ed358e0c727f2d2f09f5f44ab2f304790737':
  REPORT-59908 && REPORT-59906 && REPORT-59907
  REPORT-59844 视觉微调
research/11.0
kerry 3 years ago
parent
commit
6899994bc9
  1. 6
      designer-base/src/main/java/com/fr/design/mainframe/theme/preview/ecpreview/ECReportPreviewPane.java
  2. 1
      designer-form/src/main/java/com/fr/design/designer/creator/XWFitLayout.java
  3. 7
      designer-form/src/main/java/com/fr/design/mainframe/ComponentTree.java
  4. 3
      designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java

6
designer-base/src/main/java/com/fr/design/mainframe/theme/preview/ecpreview/ECReportPreviewPane.java

@ -64,8 +64,8 @@ public class ECReportPreviewPane extends UINoOpaquePanel implements ThemePreview
northPane.add(bigTitleCell, BorderLayout.NORTH); northPane.add(bigTitleCell, BorderLayout.NORTH);
CornerPreviewCell cornerCell = new CornerPreviewCell(new String[]{Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Profile_Pane_EC_Product"), CornerPreviewCell cornerCell = new CornerPreviewCell(new String[]{Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Profile_Pane_EC_Product"),
Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Profile_Pane_EC_Data"), Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Profile_Pane_EC_Statistical_Dimension")}, Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Profile_Pane_EC_Data"), Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Profile_Pane_EC_Statistical_Dimension")},
new Point2D[]{new Point(159, 71), new Point(226, 49)}); new Point2D[]{new Point(159, 71), new Point(225, 49)});
cornerCell.setPreferredSize(new Dimension(226, 71)); cornerCell.setPreferredSize(new Dimension(225, 71));
headerCellList.add(cornerCell); headerCellList.add(cornerCell);
northPane.add(cornerCell, BorderLayout.WEST); northPane.add(cornerCell, BorderLayout.WEST);
JPanel centerPane = FRGUIPaneFactory.createBorderLayout_NO_Opaque_Pane(); JPanel centerPane = FRGUIPaneFactory.createBorderLayout_NO_Opaque_Pane();
@ -99,7 +99,7 @@ public class ECReportPreviewPane extends UINoOpaquePanel implements ThemePreview
JPanel gridPane = new UINoOpaquePanel(new GridLayout(5, 1)); JPanel gridPane = new UINoOpaquePanel(new GridLayout(5, 1));
for (int i = 0; i < 5; i++) { for (int i = 0; i < 5; i++) {
PreviewCell cell = new PreviewCell(Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Profile_Pane_EC_Apple_Juice")); PreviewCell cell = new PreviewCell(Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Profile_Pane_EC_Apple_Juice"));
cell.setPreferredSize(new Dimension(114, 31)); cell.setPreferredSize(new Dimension(113, 31));
headerCellList.add(cell); headerCellList.add(cell);
gridPane.add(cell); gridPane.add(cell);
} }

1
designer-form/src/main/java/com/fr/design/designer/creator/XWFitLayout.java

@ -887,6 +887,7 @@ public class XWFitLayout extends XLayoutContainer {
isRefreshing = true; isRefreshing = true;
this.remove(oldCreator); this.remove(oldCreator);
this.add(newCreator); this.add(newCreator);
this.updateBoundsWidget();
isRefreshing = false; isRefreshing = false;
LayoutUtils.layoutContainer(this); LayoutUtils.layoutContainer(this);
} }

7
designer-form/src/main/java/com/fr/design/mainframe/ComponentTree.java

@ -362,7 +362,6 @@ public class ComponentTree extends JTree {
@Override @Override
public void mouseMoved(MouseEvent e) { public void mouseMoved(MouseEvent e) {
Point p = e.getPoint(); Point p = e.getPoint();
int selRow = tree.getRowForLocation(p.x, p.y); int selRow = tree.getRowForLocation(p.x, p.y);
TreeCellRenderer r = tree.getCellRenderer(); TreeCellRenderer r = tree.getCellRenderer();
@ -371,12 +370,12 @@ public class ComponentTree extends JTree {
Point point = tree.getPathBounds(path).getLocation(); Point point = tree.getPathBounds(path).getLocation();
SwingUtilities.convertPointToScreen(point, tree); SwingUtilities.convertPointToScreen(point, tree);
XCreator comp = (XCreator) path.getLastPathComponent(); XCreator comp = (XCreator) path.getLastPathComponent();
if (comp.getXCreatorBaseOperate().supportSelected()){ if (comp.getXCreatorBaseOperate().supportSelected()) {
popupPreviewPane(point.y, comp); popupPreviewPane(point.y, comp);
return;
} }
} else {
hidePreviewPane();
} }
hidePreviewPane();
} }
@Override @Override

3
designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java

@ -1317,9 +1317,6 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
protected void setToolbarButtons() { protected void setToolbarButtons() {
//自适应布局和底层都不能删除
DesignerContext.getDesignerFrame().checkCombineUp(!isRootSelected(), NAME_ARRAY_LIST);
if (isParameterSelected()) { if (isParameterSelected()) {
DesignerContext.getDesignerFrame().checkCombineUp(false, PARAMETER_TOOLAR_BAN_LIST); DesignerContext.getDesignerFrame().checkCombineUp(false, PARAMETER_TOOLAR_BAN_LIST);
} }

Loading…
Cancel
Save