Entropy
/
design
forked from fanruan/design
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/release' into release

master
mengao 8 years ago
parent
cc43c53143 04f0fb00f2
commit
3a0894ea9e
12 changed files with 639 additions and 488 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      designer_base/src/com/fr/design/locale/designer.properties
  2. 5
      designer_base/src/com/fr/design/locale/designer_en_US.properties
  3. 68
      designer_base/src/com/fr/design/locale/designer_ja_JP.properties
  4. 38
      designer_base/src/com/fr/design/locale/designer_ko_KR.properties
  5. 2
      designer_base/src/com/fr/design/locale/designer_zh_CN.properties
  6. 13
      designer_base/src/com/fr/design/locale/designer_zh_TW.properties
  7. 5
      designer_base/src/com/fr/design/mainframe/JTemplate.java
  8. 6
      designer_form/src/com/fr/design/designer/beans/adapters/layout/FRAbsoluteLayoutAdapter.java
  9. 8
      designer_form/src/com/fr/design/designer/beans/adapters/layout/FRFitLayoutAdapter.java
  10. 53
      designer_form/src/com/fr/design/designer/beans/models/SelectionModel.java
  11. 19
      designer_form/src/com/fr/design/designer/creator/XWAbsoluteLayout.java
  12. 14
      designer_form/src/com/fr/design/mainframe/FormSelectionUtils.java

6
designer_base/src/com/fr/design/locale/designer.properties
Unescape View File

@ -591,3 +591,9 @@ FR-Designer_Chart_Log_Base=Log Base
FR-Designer_Chart_F_Radar_Axis=Chart_F_Radar_Axis
FR-Designer_Too_Large_To_Paste=too large to paste
FR-Designer_Too_Small_To_Paste=Too small to paste
FR-Designer_Validate=
FR-Designer_Get-CubeGetting cube=
FR-Designer_Get-CubeGetting=
FR-Designer_Fit=
FR-Designer_Properties_Mobile=
FR-Designer_Oracle=

5
designer_base/src/com/fr/design/locale/designer_en_US.properties
Unescape View File

@ -592,3 +592,8 @@ FR-Designer_Chart_Log_Base=Log Base
FR-Designer_Chart_F_Radar_Axis=Value Axis
FR-Designer_Too_Large_To_Paste=Too large to paste!
FR-Designer_Too_Small_To_Paste=Too small to paste!
FR-Designer_SimpleCross_Report=
FR-Designer_Get-Cube=
FR-Designer_DoubleLayer_Report=
FR-Designer_Get-CubeGetting=
FR-Designer_SimpleDetail_Report=

68
designer_base/src/com/fr/design/locale/designer_ja_JP.properties
Unescape View File

@ -366,24 +366,30 @@ FR-Designer_XMLA_Get_Catalog=\u30AB\u30BF\u30ED\u30B0\u3092\u691C\u7D22\u3059\u3
FR-Designer_XMLA_Not_NULL=\u3053\u3053\u306F\u7A7A\u6B04\u306B\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093
FR-Designer_Column-Axis=\u5217\u8EF8
FR-Designer_LiteCondition_Common=\u4E00\u822C
FR-Designer_LiteCondition_Formula=\u516C\u5F0F
FR-Designer_LiteCondition_Formula=\u6570\u5F0F
FR-Designer_LiteCondition_ConditionB-AND=\u30A2\u30F3\u30C9(AND)
FR-Designer_LiteCondition_ConditionB-OR=\u30AA\u30A2(OR)
FR-Designer_LiteCondition_Common_Condition=\u666E\u901A\u6761\u4EF6
FR-Designer_LiteCondition_Formula_Condition=\u516C\u5F0F\u6761\u4EF6
FR-Designer_LiteCondition_Formula_Condition=\u6570\u5F0F\u6761\u4EF6
FR-Designer_LiteCondition_Define=\u5B9A\u7FA9
FR-Designer_Normal=\u6B63\u5E38
FR-Designer_Alert=\u30A2\u30E9\u30FC\u30C8
FR-Designer_Select_All=\u5168\u9078\u629E
FR-Designer-Plugin_Expire_Dialog_Title=\u671F\u9650\u5207\u308C\u306E\u30D7\u30E9\u30B0\u30A4\u30F3
FR-Designer-Plugin_Expire_Dialog_Text=\u30D7\u30E9\u30B0\u30A4\u30F3\u306F\u3001\u8CFC\u5165\u3092\u3059\u308B\u305F\u3081\u306B\u5E06\u30BD\u30D5\u30C8\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30BB\u30F3\u30BF\u30FC\u3092\u884C\u304F\u3001\u6709\u52B9\u671F\u9650\u304C\u5207\u308C\u3066\u3044\u307E\u3059\u3002
FR-Designer-Plugin_Finerest_Addon=\u5E06\u8EDF\u5FDC\u7528\u30BB\u30F3\u30BF\u30FC
FR-Designer_Clear_All=\u5168\u3066\u3092\u30AF\u30EA\u30A2
FR-Designer_Copy=\u30B3\u30D4\u30FC
FR-Designer_Log=\u30ED\u30B0
FR-Designer-Plugin_Expire_Dialog_Title=\u30D7\u30E9\u30B0\u30A4\u30F3\u306F\u671F\u9650\u5207\u308C
FR-Designer-Plugin_Expire_Dialog_Text=\u30D7\u30E9\u30B0\u30A4\u30F3\u306F\u6709\u52B9\u671F\u9650\u304C\u5207\u308C\u3066\u3044\u307E\u3059\u3001\u30D5\u30A1\u30F3\u30E9\u30F3\u30A2\u30D7\u30EA\u30BB\u30F3\u30BF\u30FC\u3078\u8CFC\u5165\u3057\u3066\u304F\u3060\u3055\u3044\u3002
FR-Designer-Plugin_Finerest_Addon=\u30D5\u30A1\u30F3\u30E9\u30F3\u30A2\u30D7\u30EA\u30BB\u30F3\u30BF\u30FC
FR-Designer_Performance_First=\u6027\u80FD\u512A\u5148
FR-Designer_Total_N_Grade=\u5168\u90E8\u3067\:${N}\u5C64
FR-Designer_time(s)=\u56DE
FR-Designer_General=\u5E38\u7528
FR-Designer_Advanced=\u9AD8\u7D1A
FR-Designer_General=\u901A\u5E38
FR-Designer_Advanced=\u8A73\u7D30
FR-Designer_Validate=\u691C\u8A3C
FR-Designer_Oracle=\u3059\u3079\u3066\u306E\u30C6\u30FC\u30D6\u30EB
FR-Designer_Product_improve=\u88FD\u54C1\u6539\u5584
FR-Designer_Join_Product_improve=\u88FD\u54C1\u6539\u5584\u30D7\u30E9\u30F3\u306B\u52A0\u3048\u308B
FR-Designer_Join_Product_improve=\u88FD\u54C1\u6539\u5584\u30D7\u30E9\u30F3\u306B\u5165\u308B
FR-Designer_Preference-Function=\u30D5\u30A1\u30F3\u30AF\u30B7\u30E7\u30F3\u8A2D\u5B9A
FR-Designer_max_undo_limit=\u6700\u5927\u53D6\u308A\u6D88\u3057\u56DE\u6570
FR-Designer_Surport_String_To_Formula=\u30AD\u30E3\u30E9\u30AF\u30BF\u30FC\u6587\u5B57\u5217\u7DE8\u96C6\u3092\u516C\u5F0F\u3068\u3059\u308B\u3053\u3068\u306B\u30B5\u30DD\u30FC\u30C8
@ -539,24 +545,52 @@ FR-Designer_Show_As_Download=\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u30EA\u30F3\u3
FR-Designer_File_Name_For_Download=\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u30D5\u30A1\u30A4\u30EB\u540D
FR-Designer_No=\u3044\u3044\u3048
FR-Designer_Pagination=\u30DA\u30FC\u30B8\u30F3\u30B0
FR-Designer_DS_TableData=\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9
FR-Designer_DS_TableData=\u30C7\u30FC\u30BF\u30BB\u30C3\u30C8
FR-Designer_Parameter-Formula=\u6570\u5F0F
FR-Designer_Background_Null=\u80CC\u666F\u306A\u3057
FR-Designer_Background_Color=\u8272
FR-Designer_Background_Texture=\u67C4
FR-Designer_Background_Pattern=\u6A21\u69D8
FR-Designer_Background_Gradient_Color=\u30B0\u30E9\u30C7\u30FC\u30B7\u30E7\u30F3\u8272
FR-Designer_Background_Image=\u5199\u771F
FR-Designer_Background_Texture=\u30C6\u30AF\u30B9\u30C1\u30E3
FR-Designer_Background_Pattern=\u30D1\u30BF\u30FC\u30F3
FR-Designer_Background_Gradient_Color=\u30B0\u30E9\u30C7\u30FC\u30B7\u30E7\u30F3
FR-Designer_Background_Image=\u753B\u50CF
FR-Designer_Background_Clear=\u30AF\u30EA\u30A2
FR-Designer_Background_Image_Select=\u5199\u771F\u3092\u9078\u629E
FR-Designer_Background_Image_Select=\u753B\u50CF\u9078\u629E
FR-Designer_Initial_Background_Tips=\u30DC\u30BF\u30F3\u306E\u521D\u671F\u80CC\u666F
FR-Designer_Mouse_Move_Tips=\u30DE\u30A6\u30B9\u304C\u30DC\u30BF\u30F3\u306B\u79FB\u3059\u6642\u306E\u80CC\u666F
FR-Designer_Mouse_Click_Tips=\u30DE\u30A6\u30B9\u304C\u30DC\u30BF\u30F3\u306B\u79FB\u3059\u6642\u306E\u80CC\u666F
FR-Designer_Mouse_Move_Tips=\u30DE\u30A6\u30B9\u304C\u30DC\u30BF\u30F3\u306B\u79FB\u3059\u6642\u5909\u5316\u3059\u308B\u80CC\u666F
FR-Designer_Mouse_Click_Tips=\u30DC\u30BF\u30F3\u3092\u30AF\u30EA\u30C3\u30AF\u3059\u308B\u6642\u5909\u5316\u3059\u308B\u80CC\u666F
FR-Designer-Move_Tab_First=\u30C8\u30C3\u30D7\u306B\u79FB\u3059
FR-Designer-Move_Tab_End=\u6700\u5F8C\u306B\u79FB\u3059
FR-Designer-Move_Tab_Next=\u5F8C\u308D\u306B\u79FB\u3059
FR-Designer-Move_Tab_Prev=\u524D\u306B\u79FB\u3059
FR-Designer_AxisReversed=\u8EF8\u9006\u914D\u5217
FR-Designer_AxisReversed=\u8EF8\u9006\u9806
FR-Designer_Logarithmic=\u5BFE\u6570\u76EE\u76DB\u308A
FR-Designer_Chart_Log_Base=\u5E95\u6570
FR-Designer_Chart_F_Radar_Axis=\u5782\u76F4\u8EF8
FR-Designer_Too_Large_To_Paste=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u30B5\u30A4\u30BA\u306F\u30DC\u30FC\u30C0\u30FC\u306B\u8D85\u3048\u305F\u306E\u3067\u3001\u8CBC\u308A\u4ED8\u3051\u3067\u304D\u307E\u305B\u3093\uFF01
FR-Designer_Too_Small_To_Paste=\u8A72\u5F53\u51E6\u306B\u8CBC\u308A\u4ED8\u3051\u3067\u304D\u307E\u305B\u3093\u3001\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u30B5\u30A4\u30BA\u306F\u9AD8\u3059\u304E\uFF01
FR-Designer_DoubleLayer_Report=
FR-Designer_Printer_Native_Button=
FR-Designer_Mobile-Warning=
FR-Designer_Form-Fit-Tip=
FR-Designer_Form-Forzen-Speed=
FR-Designer_Mobile_Form_Analysis_Annotation=
FR-Designer_TableData-Default-Para=
FR-Designer-Selected_Widget=
FR-Designer_Plugin_Should_Update_Please_Contact_Developer=
FR-Designer_SimpleCross_Report=
FR-Designer_Button-Cancel=
FR-Designer_Delete_Template=
FR-Designer_Install_Template=
FR-Designer_SimpleDetail_Report=
FR-Designer_LocalWidget=
FR-Designer_WidgetOrder=
FR-Designer_Form-Frozen-Tip=
FR-Designer-Invalid_Page_Number=
FR-Designer_Reset=
FR-Designer-Plugin_Please_Update_Jar=
FR-Designer_Get-CubeGetting cube=
FR-Designer_Mobile_Report_Analysis_Annotation=
FR-Designer_Properties_Mobile=
FR-Designer_Button-OK=
FR-Designer_Allow-Blank=
FR-Designer_AllCategories=

38
designer_base/src/com/fr/design/locale/designer_ko_KR.properties
Unescape View File

@ -557,3 +557,41 @@ FR-Designer_AxisReversed=\uCD95\uC5ED\uC21C
FR-Designer_Logarithmic=\uB85C\uADF8\uB208\uAE08
FR-Designer_Chart_Log_Base=\uAE30\uC218
FR-Designer_Chart_F_Radar_Axis=\uAC12\uCD95
FR-Designer_COMMUNITY_VIDEO=
FR-Designer_DoubleLayer_Report=
FR-Designer_Too_Small_To_Paste=
FR-Designer_formDesignerModule=
FR-Designer_Mobile-Warning=
FR-Designer_Mobile-Open=
FR-Designer_Form-Fit-Tip=
FR-Designer_Form-Forzen-Speed=
FR-Designer_Mobile_Form_Analysis_Annotation=
FR-Designer_Too_Large_To_Paste=
FR-Designer_COMMUNITY_HELP=
FR-Designer_Validate=
FR-Designer_Button-Cancel=
FR-Designer_Plugin_Should_Update_Please_Contact_Developer=
FR-Designer_COMMUNITY_QUESTIONS=
FR-Designer_SimpleCross_Report=
FR-Designer_COMMUNITY_NEED=
FR-Designer_Delete_Template=
FR-Designer_TableData-Default-Para=
FR-Designer_Allow-Blank=
FR-Designer_LocalWidget=
FR-Designer_WidgetOrder=
FR-Designer_Form-Frozen-Tip=
FR-Designer_Mobile-Horizontal=
FR-Designer-Invalid_Page_Number=
FR-Designer_COMMUNITY_BBS=
FR-Designer_COMMUNITY_SIGN=
FR-Designer_COMMUNITY_UPDATE=
FR-Designer_Mobile-Vertical=
FR-Designer_Get-CubeGetting cube=
FR-Designer_COMMUNITY=
FR-Designer_Mobile_Report_Analysis_Annotation=
FR-Designer_Properties_Mobile=
FR-Designer_Button-OK=
FR-Designer_COMMUNITY_BUG=
FR-Designer_AllCategories=
FR-Designer_Mobile-Attr=
FR-Designer_Mobile-Zoom=

2
designer_base/src/com/fr/design/locale/designer_zh_CN.properties
Unescape View File

@ -596,3 +596,5 @@ FR-Designer_Chart_Log_Base=\u5E95\u6570
FR-Designer_Chart_F_Radar_Axis=\u503C\u8F74
FR-Designer_Too_Large_To_Paste=\u7EC4\u4EF6\u5927\u5C0F\u8D85\u51FA\u8FB9\u754C\uFF0C\u65E0\u6CD5\u7C98\u8D34\uFF01
FR-Designer_Too_Small_To_Paste=\u6B64\u5904\u65E0\u6CD5\u7C98\u8D34\uFF0C\u5C0F\u4E8E\u7EC4\u4EF6\u6700\u5C0F\u9AD8\u5EA6\uFF01
FR-Designer_Get-CubeGetting cube=

13
designer_base/src/com/fr/design/locale/designer_zh_TW.properties
Unescape View File

@ -585,3 +585,16 @@ FR-Designer_Chart_Log_Base=\u5E95\u6578
FR-Designer_Chart_F_Radar_Axis=\u503C\u8EF8
FR-Designer_Too_Large_To_Paste=\u7D44\u4EF6\u5927\u5C0F\u8D85\u51FA\u908A\u754C\uFF0C\u7121\u6CD5\u7C98\u8CBC\uFF01
FR-Designer_Too_Small_To_Paste=\u6B64\u8655\u7121\u6CD5\u7C98\u8CBC\uFF0C\u5C0F\u65BC\u7D44\u4EF6\u6700\u5C0F\u9AD8\u5EA6\uFF01
FR-Designer_Download_Template=
FR-Designer-Selected_Widget=
FR-Designer_LocalWidget=
FR-Designer_Get-CubeGetting cube=
FR-Designer_Install_Template=
FR-Designer_Reset=
FR-Designer_SimpleCross_Report=
FR-Designer_Allow-Blank=
FR-Designer_AllCategories=
FR-Designer_SimpleDetail_Report=
FR-Designer_DoubleLayer_Report=
FR-Designer_Delete_Template=
FR-Designer_Validate=

5
designer_base/src/com/fr/design/mainframe/JTemplate.java
Unescape View File

@ -529,12 +529,13 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
}
protected boolean saveNewFile(FILE editingFILE, String oldName){
this.editingFILE = editingFILE;
// 在保存之前，初始化 templateID
initForCollect(); // 如果保存新模板（新建模板直接保存，或者另存为），则添加 templateID
this.editingFILE = editingFILE;
boolean result = this.saveFile();
if (result) {
DesignerFrameFileDealerPane.getInstance().refresh();
initForCollect(); // 如果保存新模板（新建模板直接保存，或者另存为），则添加 templateID
collectInfo();
}
//更换最近打开

6
designer_form/src/com/fr/design/designer/beans/adapters/layout/FRAbsoluteLayoutAdapter.java
Unescape View File

@ -235,7 +235,7 @@ public class FRAbsoluteLayoutAdapter extends FRBodyLayoutAdapter {
if (creator.hasTitleStyle()) {
addParentCreator(creator);
} else {
container.add(creator, creator.toData().getWidgetName());
container.add(creator, creator.toData().getWidgetName(),0);
}
XWAbsoluteLayout layout = (XWAbsoluteLayout) container;
layout.updateBoundsWidget(creator);
@ -246,7 +246,7 @@ public class FRAbsoluteLayoutAdapter extends FRBodyLayoutAdapter {
if (creator.shouldScaleCreator() || creator.hasTitleStyle()) {
addParentCreator(creator);
} else {
container.add(creator, creator.toData().getWidgetName());
container.add(creator, creator.toData().getWidgetName(),0);
}
XWFitLayout layout = (XWFitLayout) container;
// 更新对应的BoundsWidget
@ -265,7 +265,7 @@ public class FRAbsoluteLayoutAdapter extends FRBodyLayoutAdapter {
private void addParentCreator(XCreator child) {
XLayoutContainer parentPanel = child.initCreatorWrapper(child.getHeight());
container.add(parentPanel, child.toData().getWidgetName());
container.add(parentPanel, child.toData().getWidgetName(),0);
}
/**

8
designer_form/src/com/fr/design/designer/beans/adapters/layout/FRFitLayoutAdapter.java
Unescape View File

@ -274,12 +274,8 @@ public class FRFitLayoutAdapter extends FRBodyLayoutAdapter {
}
private Rectangle adjustBackupBound(Rectangle backupBound, XWCardMainBorderLayout mainLayout) {
// 参数界面高度对纵坐标产生的影响
JForm jform = (JForm) (HistoryTemplateListPane.getInstance().getCurrentEditingTemplate());
if (jform.getFormDesign().getParaComponent() != null) {
backupBound.y -= jform.getFormDesign().getParaHeight();
}
// zhouping: REPORT-2334 表单tab布局中图表放大缩小会明显
// 这边不需要单独处理参数面板高度了，下面的方法中获取的是XWCardMainBorderLayout相对坐标
Rectangle rec = getLayoutBound(mainLayout);
// XWTabLayout里面的横纵坐标收到外层XWCardMainBorderLayout的横纵坐标影响
// 减掉之后可以按照它原来的逻辑执行

53
designer_form/src/com/fr/design/designer/beans/models/SelectionModel.java
Unescape View File

@ -136,19 +136,35 @@ public class SelectionModel {
if (designer.getClass().equals(FormDesigner.class)) {
if (selection.getSelectedCreator() instanceof XWFitLayout) {
if (selection.getSelectedCreator().getClass().equals(XWTabFitLayout.class)) {
Rectangle rec = selection.getRelativeBounds();
//Tab布局
FormSelectionUtils.paste2Container(designer, (XLayoutContainer) selection.getSelectedCreator(),
clipboard,
rec.x + rec.width / 2,
rec.y + DELTA_X_Y);
XLayoutContainer container = (XLayoutContainer) selection.getSelectedCreator();
//tab布局编辑器内部左上角第一个坐标点
int leftUpX = container.toData().getMargin().getLeft() + 1;
int leftUpY = container.toData().getMargin().getTop() + 1;
//选中第一个坐标点坐在的组件
selection.setSelectedCreator((XCreator) container.getComponentAt(leftUpX, leftUpY));
Rectangle rectangle = selection.getRelativeBounds();
if (hasSelectedPasteSource()) {
selectedPaste();
} else {
FormSelectionUtils.paste2Container(designer, container, clipboard,
rectangle.x + rectangle.width / 2,
rectangle.y + DELTA_X_Y);
}
} else {
//自适应布局编辑器内部左上角第一个坐标点
int leftUpX = designer.getRootComponent().toData().getMargin().getLeft() + 1;
int leftUpY = designer.getRootComponent().toData().getMargin().getTop() + 1;
//选中第一个坐标点坐在的组件
selection.setSelectedCreator((XCreator) designer.getRootComponent().getComponentAt(leftUpX, leftUpY));
Rectangle rectangle = selection.getRelativeBounds();
if (hasSelectedPasteSource()) {
selectedPaste();
} else {
Rectangle rec = selection.getRelativeBounds();
//自适应布局
FormSelectionUtils.paste2Container(designer, designer.getRootComponent(),
clipboard,
rec.x + rec.width / 2,
rec.y + DELTA_X_Y);
rectangle.x + rectangle.width / 2,
rectangle.y + DELTA_X_Y);
}
}
} else {
//绝对布局
@ -178,12 +194,23 @@ public class SelectionModel {
container = XCreatorUtils.getParentXLayoutContainer(selection.getSelectedCreator());
if (container != null && selection.getSelectedCreator().getParent() instanceof XWFitLayout) {
//自适应布局
Rectangle selectionRec = selection.getRelativeBounds();
//获取父容器位置，补充因参数面板高度导致的位置坐标计算偏移
Rectangle containerRec = ComponentUtils.getRelativeBounds(container);
int positionX, positionY;
if (container.getClass().equals(XWTabFitLayout.class)) {
//tab内部粘贴不补充高度偏移
//且不计算参数面板造成的影响，因为在
//@see com.fr.design.designer.beans.adapters.layout.FRTabFitLayoutAdapter#addBean中做了
positionX = selectionRec.x + selectionRec.width / 2;
positionY = (int) (selectionRec.y + selectionRec.height * OFFSET_RELATIVE);
} else {
//计算自适应布局位置
int positionX = selectionRec.x - containerRec.x + selectionRec.width / 2;
int positionY = (int) (selectionRec.y - containerRec.y + selectionRec.height * OFFSET_RELATIVE);
positionX = selectionRec.x - containerRec.x + selectionRec.width / 2;
positionY = (int) (selectionRec.y - containerRec.y + selectionRec.height * OFFSET_RELATIVE);
}
FormSelectionUtils.paste2Container(designer, container, clipboard, positionX, positionY);
} else if (container != null && selection.getSelectedCreator().getParent() instanceof XWAbsoluteLayout) {
//绝对布局

19
designer_form/src/com/fr/design/designer/creator/XWAbsoluteLayout.java
Unescape View File

@ -86,6 +86,7 @@ public class XWAbsoluteLayout extends XLayoutContainer {
/**
* 返回容器大小的百分比
*
* @return the containerPercent
*/
public double getContainerPercent() {
@ -94,6 +95,7 @@ public class XWAbsoluteLayout extends XLayoutContainer {
/**
* 设置容器大小的百分比
*
* @param containerPercent the containerPercent to set
*/
public void setContainerPercent(double containerPercent) {
@ -104,6 +106,7 @@ public class XWAbsoluteLayout extends XLayoutContainer {
/**
* 返回界面处根据百分比调整后的最小宽度
*
* @return 最小宽度
*/
public int getActualMinWidth() {
@ -112,6 +115,7 @@ public class XWAbsoluteLayout extends XLayoutContainer {
/**
* 返回界面处根据百分比调整后的最小高度
*
* @return 最小高度
*/
public int getActualMinHeight() {
@ -120,6 +124,7 @@ public class XWAbsoluteLayout extends XLayoutContainer {
/**
* 返回界面处根据百分比调整后的间隔大小（且为偶数）
*
* @return 间隔
*/
public int getAcualInterval() {
@ -198,6 +203,7 @@ public class XWAbsoluteLayout extends XLayoutContainer {
* 更新子组件的Bound
* 这边主要用于绝对布局子组件在适应区域选项时
* 涉及到的不同分辨率下缩放
*
* @param minHeight 最小高度
*/
@Override
@ -222,6 +228,7 @@ public class XWAbsoluteLayout extends XLayoutContainer {
/**
* 增加对齐线
*
* @param connector 对齐线
*/
public void addConnector(Connector connector) {
@ -235,6 +242,7 @@ public class XWAbsoluteLayout extends XLayoutContainer {
/**
* 去除对齐线
*
* @param connector 对齐线
*/
public void removeConnector(Connector connector) {
@ -244,6 +252,7 @@ public class XWAbsoluteLayout extends XLayoutContainer {
/**
* 返回对应的widget容器
*
* @return 返回WAbsoluteLayout
*/
@Override
@ -258,6 +267,7 @@ public class XWAbsoluteLayout extends XLayoutContainer {
/**
* 返回默认的容器name
*
* @return 返回绝对布局容器名
*/
@Override
@ -315,6 +325,7 @@ public class XWAbsoluteLayout extends XLayoutContainer {
/**
* 当前组件zorder位置替换新的控件
*
* @param widget 控件
* @param oldcreator 旧组件
* @return 组件
@ -333,6 +344,7 @@ public class XWAbsoluteLayout extends XLayoutContainer {
/**
* 组件增加
*
* @param e 容器事件
*/
@Override
@ -350,6 +362,7 @@ public class XWAbsoluteLayout extends XLayoutContainer {
/**
* 在设计界面中有组件移除的时候，需要通知WLayout容器重新paint
*
* @param e 容器事件
*/
@Override
@ -379,14 +392,14 @@ public class XWAbsoluteLayout extends XLayoutContainer {
XLayoutContainer xTopLayout = XCreatorUtils.getParentXLayoutContainer(this).getTopLayout();
if (xTopLayout != null && !xTopLayout.isEditable()) {
return xTopLayout;
}
else{
} else {
return this;
}
}
/**
* 得到属性名
*
* @return 属性名
* @throws java.beans.IntrospectionException
*/
@ -459,6 +472,7 @@ public class XWAbsoluteLayout extends XLayoutContainer {
/**
* body大小手动调整的时候
* 按照比例调整组件的宽度
*
* @param percent 比例
*/
@Override
@ -475,6 +489,7 @@ public class XWAbsoluteLayout extends XLayoutContainer {
/**
* body大小手动调整的时候
* 按照比例调整组件的高度
*
* @param percent 比例
*/
@Override

14
designer_form/src/com/fr/design/mainframe/FormSelectionUtils.java
Unescape View File

@ -3,8 +3,10 @@ package com.fr.design.mainframe;
import com.fr.base.FRContext;
import com.fr.design.designer.beans.LayoutAdapter;
import com.fr.design.designer.beans.adapters.layout.AbstractLayoutAdapter;
import com.fr.design.designer.beans.adapters.layout.FRTabFitLayoutAdapter;
import com.fr.design.designer.beans.events.DesignerEvent;
import com.fr.design.designer.creator.*;
import com.fr.design.utils.ComponentUtils;
import com.fr.form.ui.Widget;
import com.fr.form.ui.container.WTitleLayout;
import com.fr.general.ComparatorUtils;
@ -83,15 +85,27 @@ public class FormSelectionUtils {
* 相对布局粘贴
*/
private static void relativePaste(FormDesigner designer, FormSelection clipboard, LayoutAdapter adapter, int x, int y) {
//@see FRTabFitLayoutAdapter
Rectangle tabContainerRect = ComponentUtils.getRelativeBounds(designer.getSelectionModel().getSelection()
.getSelectedCreator().getParent());
designer.getSelectionModel().getSelection().reset();
for (XCreator creator : clipboard.getSelectedCreators()) {
try {
Widget copied = copyWidget(designer, creator);
XCreator copiedCreator = XCreatorUtils.createXCreator(copied, creator.getSize());
if (adapter.getClass().equals(FRTabFitLayoutAdapter.class)) {
if (!adapter.accept(copiedCreator, x - tabContainerRect.x, y - tabContainerRect.y)) {
designer.showMessageDialog(Inter.getLocText("FR-Designer_Too_Small_To_Paste"));
return;
}
} else {
if (!adapter.accept(copiedCreator, x, y)) {
designer.showMessageDialog(Inter.getLocText("FR-Designer_Too_Small_To_Paste"));
return;
}
}
boolean addSuccess = adapter.addBean(copiedCreator, x, y);
if (addSuccess) {
designer.getSelectionModel().getSelection().addSelectedCreator(copiedCreator);

Write Preview
Loading…
Cancel
Save