|
|
|
|
@ -63,13 +63,13 @@ public class FRAbsoluteBodyLayoutDefinePane extends FRAbsoluteLayoutDefinePane {
|
|
|
|
|
watermarkEditor = new AccessibleBodyWatermarkEditor(); |
|
|
|
|
JPanel jPanel = TableLayoutHelper.createGapTableLayoutPane( |
|
|
|
|
new Component[][]{ |
|
|
|
|
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style")), borderStyleEditor}, |
|
|
|
|
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_WaterMark")), watermarkEditor} |
|
|
|
|
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style")), borderStyleEditor}, |
|
|
|
|
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_WaterMark")), watermarkEditor} |
|
|
|
|
}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W3, IntervalConstants.INTERVAL_L1); |
|
|
|
|
JPanel borderPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); |
|
|
|
|
jPanel.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0)); |
|
|
|
|
borderPane.add(jPanel, BorderLayout.CENTER); |
|
|
|
|
UIExpandablePane advancedPane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Advanced"), 280, 20, borderPane ); |
|
|
|
|
UIExpandablePane advancedPane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Advanced"), 280, 20, borderPane); |
|
|
|
|
centerPane.add(advancedPane, BorderLayout.NORTH); |
|
|
|
|
this.add(centerPane, BorderLayout.NORTH); |
|
|
|
|
} |
|
|
|
|
@ -122,9 +122,9 @@ public class FRAbsoluteBodyLayoutDefinePane extends FRAbsoluteLayoutDefinePane {
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if (layoutType == WBodyLayoutType.ABSOLUTE) { |
|
|
|
|
((XWFitLayout)creator.getBackupParent()).toData().resetStyle(); |
|
|
|
|
((XWFitLayout) creator.getBackupParent()).toData().resetStyle(); |
|
|
|
|
if (state == WBodyLayoutType.FIT.getTypeValue()) { |
|
|
|
|
switch2FitBodyLayout(); |
|
|
|
|
((XWFitLayout)creator.getBackupParent()).switch2FitBodyLayout(creator); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
layout.setBorderStyle((LayoutBorderStyle) borderStyleEditor.getValue()); |
|
|
|
|
@ -149,123 +149,5 @@ public class FRAbsoluteBodyLayoutDefinePane extends FRAbsoluteLayoutDefinePane {
|
|
|
|
|
return null; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private boolean switch2FitBodyLayout() { |
|
|
|
|
try { |
|
|
|
|
XWFitLayout xfl = (XWFitLayout) creator.getBackupParent(); |
|
|
|
|
//备份一下组件间隔
|
|
|
|
|
int compInterval = xfl.toData().getCompInterval(); |
|
|
|
|
Component[] components = creator.getComponents(); |
|
|
|
|
|
|
|
|
|
Arrays.sort(components, new ComparatorComponentLocation()); |
|
|
|
|
|
|
|
|
|
xfl.getLayoutAdapter().removeBean(creator, creator.getWidth(), creator.getHeight()); |
|
|
|
|
xfl.remove(creator); |
|
|
|
|
|
|
|
|
|
for (Component comp : components) { |
|
|
|
|
XCreator xCreator = (XCreator) comp; |
|
|
|
|
if (xCreator.shouldScaleCreator()) { |
|
|
|
|
XLayoutContainer parentPanel = xCreator.initCreatorWrapper(xCreator.getHeight()); |
|
|
|
|
xfl.add(parentPanel, xCreator.toData().getWidgetName()); |
|
|
|
|
parentPanel.updateChildBound(xfl.getActualMinHeight()); |
|
|
|
|
continue; |
|
|
|
|
} |
|
|
|
|
xfl.add(xCreator); |
|
|
|
|
} |
|
|
|
|
//这边计算的时候会先把组件间隔去掉
|
|
|
|
|
moveComponents2FitLayout(xfl); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
for (int i = 0; i < components.length; i++) { |
|
|
|
|
Component comp = xfl.getComponent(i); |
|
|
|
|
XCreator creator = (XCreator) comp; |
|
|
|
|
creator.setBackupBound(components[i].getBounds()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
//把组件间隔加上
|
|
|
|
|
if (xfl.toData().getCompInterval() != compInterval) { |
|
|
|
|
xfl.moveContainerMargin(); |
|
|
|
|
xfl.moveCompInterval(xfl.getAcualInterval()); |
|
|
|
|
xfl.toData().setCompInterval(compInterval); |
|
|
|
|
xfl.addCompInterval(xfl.getAcualInterval()); |
|
|
|
|
} |
|
|
|
|
xfl.toData().setLayoutType(WBodyLayoutType.FIT); |
|
|
|
|
FormDesigner formDesigner = WidgetPropertyPane.getInstance().getEditingFormDesigner(); |
|
|
|
|
formDesigner.getSelectionModel().setSelectedCreator(xfl); |
|
|
|
|
return true; |
|
|
|
|
} catch (Exception e) { |
|
|
|
|
FineLoggerFactory.getLogger().error(e.getMessage(), e); |
|
|
|
|
return false; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// 把绝对布局中的元素按规则移动到自适应布局中
|
|
|
|
|
// 规则：各元素按顺序放置，其中每行最多4个元素，超出则换行，各元素均分body的高度和宽度
|
|
|
|
|
private void moveComponents2FitLayout(XWFitLayout xwFitLayout) { |
|
|
|
|
Component[] components = xwFitLayout.getComponents(); |
|
|
|
|
if (components.length == 0) { |
|
|
|
|
xwFitLayout.updateBoundsWidget(); |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
int layoutWidth = xwFitLayout.getWidth() - xwFitLayout.toData().getMargin().getLeft() - xwFitLayout.toData().getMargin().getRight(); |
|
|
|
|
int layoutHeight = xwFitLayout.getHeight() - xwFitLayout.toData().getMargin().getTop() - xwFitLayout.toData().getMargin().getBottom(); |
|
|
|
|
int leftMargin = xwFitLayout.toData().getMargin().getLeft(); |
|
|
|
|
int topMargin = xwFitLayout.toData().getMargin().getTop(); |
|
|
|
|
xwFitLayout.toData().setCompInterval(0); |
|
|
|
|
int row = (components.length / EACH_ROW_COUNT) + (components.length % EACH_ROW_COUNT == 0 ? 0 : 1); |
|
|
|
|
//最后一行的列数不定
|
|
|
|
|
int column = components.length % EACH_ROW_COUNT == 0 ? EACH_ROW_COUNT : components.length % EACH_ROW_COUNT; |
|
|
|
|
int componentWidth = layoutWidth / EACH_ROW_COUNT; |
|
|
|
|
int componentHeight = layoutHeight / row; |
|
|
|
|
for (int i = 0; i < row - 1; i++) { |
|
|
|
|
for (int j = 0; j < EACH_ROW_COUNT; j++) { |
|
|
|
|
components[EACH_ROW_COUNT * i + j].setBounds( |
|
|
|
|
leftMargin + componentWidth * j, |
|
|
|
|
topMargin + componentHeight * i, |
|
|
|
|
j == EACH_ROW_COUNT - 1 ? layoutWidth - componentWidth * (EACH_ROW_COUNT - 1) : componentWidth, |
|
|
|
|
componentHeight |
|
|
|
|
); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
//最后一行列数是特殊的，要单独处理
|
|
|
|
|
int lastRowWidth = layoutWidth / column; |
|
|
|
|
int lastRowHeight = layoutHeight - componentHeight * (row - 1); |
|
|
|
|
for (int i = 0; i < column; i++) { |
|
|
|
|
components[EACH_ROW_COUNT * (row - 1) + i].setBounds( |
|
|
|
|
leftMargin + lastRowWidth * i, |
|
|
|
|
topMargin + componentHeight * (row - 1), |
|
|
|
|
i == column - 1 ? layoutWidth - lastRowWidth * (column - 1) : lastRowWidth, |
|
|
|
|
lastRowHeight |
|
|
|
|
); |
|
|
|
|
} |
|
|
|
|
for (int i = 0; i < components.length; i++) { |
|
|
|
|
if (components[i] instanceof XWCardMainBorderLayout) { |
|
|
|
|
((XWCardMainBorderLayout) components[i]).recalculateChildWidth(components[i].getWidth(), false); |
|
|
|
|
((XWCardMainBorderLayout) components[i]).recalculateChildHeight(components[i].getHeight(), false); |
|
|
|
|
} |
|
|
|
|
xwFitLayout.dealDirections((XCreator) components[i], false); |
|
|
|
|
} |
|
|
|
|
xwFitLayout.updateBoundsWidget(); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
//以组件的位置来确定先后顺序，y小的在前，x小的在前
|
|
|
|
|
private class ComparatorComponentLocation implements Comparator { |
|
|
|
|
@Override |
|
|
|
|
public int compare(Object o1, Object o2) { |
|
|
|
|
if (((Component) o1).getY() < ((Component) o2).getY()) { |
|
|
|
|
return -1; |
|
|
|
|
} else if (((Component) o1).getY() > ((Component) o2).getY()) { |
|
|
|
|
return 1; |
|
|
|
|
} else { |
|
|
|
|
if (((Component) o1).getX() < ((Component) o2).getX()) { |
|
|
|
|
return -1; |
|
|
|
|
} else if (((Component) o1).getX() > ((Component) o2).getX()) { |
|
|
|
|
return 1; |
|
|
|
|
} else { |
|
|
|
|
return 0; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
