Browse Source

Merge pull request #601 in BA/design from ~FANGLEI/design:dev to dev

* commit '3139e70f361796ac96f0277d3f592bbb484c9392':
  改了一下移动端选项卡里面标题“自适应布局”和“绝对布局”统一为“手机属性”
  给设计器->属性面板->绝对布局->移动端->加上手机重布局
master
superman 8 years ago
parent
commit
5703aad7ec
  1. 1
      designer_base/src/com/fr/design/locale/designer_en_US.properties
  2. 3
      designer_base/src/com/fr/design/locale/designer_zh_CN.properties
  3. 1
      designer_base/src/com/fr/design/locale/designer_zh_TW.properties
  4. 1
      designer_form/src/com/fr/design/designer/creator/XCreator.java
  5. 8
      designer_form/src/com/fr/design/designer/creator/XWAbsoluteBodyLayout.java
  6. 1
      designer_form/src/com/fr/design/designer/creator/XWFitLayout.java
  7. 4
      designer_form/src/com/fr/design/designer/properties/BodyAppRelayoutTable.java
  8. 5
      designer_form/src/com/fr/design/designer/properties/mobile/BodyMobilePropertyUI.java

1
designer_base/src/com/fr/design/locale/designer_en_US.properties

@ -486,3 +486,4 @@ FR-Designer-DS-Database_Query=DB Query
FR-Designer_Is_Share_DBTableData=Shared data set FR-Designer_Is_Share_DBTableData=Shared data set
FR-Designer_Event=Event FR-Designer_Event=Event
FR-Designer_Properties=Properties FR-Designer_Properties=Properties
FR-Designer_Properties_Mobile=MobileProperties

3
designer_base/src/com/fr/design/locale/designer_zh_CN.properties

@ -422,7 +422,7 @@ FR-Designer-Website_Url=http\://www.finereport.com/
FR-Designer-BBSLogin_Download-Unlogin-Tip=\u767B\u5F55\u540E\u624D\u80FD\u4E0B\u8F7D FR-Designer-BBSLogin_Download-Unlogin-Tip=\u767B\u5F55\u540E\u624D\u80FD\u4E0B\u8F7D
FR-Designer-App_ReLayout=\u624B\u673A\u91CD\u5E03\u5C40 FR-Designer-App_ReLayout=\u624B\u673A\u91CD\u5E03\u5C40
FR-Designer_Mobile-Attr=\u79FB\u52A8\u7AEF\u5C5E\u6027 FR-Designer_Mobile-Attr=\u79FB\u52A8\u7AEF\u5C5E\u6027
FR-Designer_Mobile-Vertical=\u7AD6\u5C4F FR-Designer_Mobile-Vertical=\u7AD6\u5C4FF
FR-Designer_Mobile-Horizontal=\u6A2A\u5C4F FR-Designer_Mobile-Horizontal=\u6A2A\u5C4F
FR-Designer_COMMUNITY=\u793E\u533A FR-Designer_COMMUNITY=\u793E\u533A
FR-Designer_COMMUNITY_BBS=\u5E06\u8F6F\u8BBA\u575B FR-Designer_COMMUNITY_BBS=\u5E06\u8F6F\u8BBA\u575B
@ -490,3 +490,4 @@ FR-Designer-LayerPageReport_Define_PageQuerySQL=\u5B9A\u4E49\u5206\u9875\u67E5\u
FR-Designer_Is_Share_DBTableData=\u5171\u4EAB\u6570\u636E\u96C6 FR-Designer_Is_Share_DBTableData=\u5171\u4EAB\u6570\u636E\u96C6
FR-Designer_Event=\u4E8B\u4EF6 FR-Designer_Event=\u4E8B\u4EF6
FR-Designer_Properties=\u5C5E\u6027 FR-Designer_Properties=\u5C5E\u6027
FR-Designer_Properties_Mobile=\u624B\u673A\u5C5E\u6027

1
designer_base/src/com/fr/design/locale/designer_zh_TW.properties

@ -478,3 +478,4 @@ FR-Designer-LayerPageReport_Define_PageQuerySQL=\u5B9A\u7FA9\u5206\u9801\u67E5\u
FR-Designer_Is_Share_DBTableData=\u662F\u5426\u5171\u4EAB\u8CC7\u6599\u96C6 FR-Designer_Is_Share_DBTableData=\u662F\u5426\u5171\u4EAB\u8CC7\u6599\u96C6
FR-Designer_Properties=\u5C6C\u6027 FR-Designer_Properties=\u5C6C\u6027
FR-Designer_Event=\u4E8B\u4EF6 FR-Designer_Event=\u4E8B\u4EF6
FR-Designer_Properties_Mobile=\u624B\u6A5F\u5C6C\u6027

1
designer_form/src/com/fr/design/designer/creator/XCreator.java

@ -617,4 +617,5 @@ public abstract class XCreator extends JPanel implements XComponent, XCreatorToo
public void adjustCompHeight(double percent) { public void adjustCompHeight(double percent) {
return; return;
} }
} }

8
designer_form/src/com/fr/design/designer/creator/XWAbsoluteBodyLayout.java

@ -2,7 +2,9 @@ package com.fr.design.designer.creator;
import com.fr.design.designer.beans.LayoutAdapter; import com.fr.design.designer.beans.LayoutAdapter;
import com.fr.design.designer.beans.adapters.layout.FRAbsoluteBodyLayoutAdapter; import com.fr.design.designer.beans.adapters.layout.FRAbsoluteBodyLayoutAdapter;
import com.fr.design.designer.properties.mobile.BodyMobilePropertyUI;
import com.fr.design.form.util.XCreatorConstants; import com.fr.design.form.util.XCreatorConstants;
import com.fr.design.fun.WidgetPropertyUIProvider;
import com.fr.design.mainframe.widget.editors.PaddingMarginEditor; import com.fr.design.mainframe.widget.editors.PaddingMarginEditor;
import com.fr.design.mainframe.widget.editors.WLayoutBorderStyleEditor; import com.fr.design.mainframe.widget.editors.WLayoutBorderStyleEditor;
import com.fr.design.mainframe.widget.renderer.LayoutBorderStyleRenderer; import com.fr.design.mainframe.widget.renderer.LayoutBorderStyleRenderer;
@ -87,8 +89,14 @@ public class XWAbsoluteBodyLayout extends XWAbsoluteLayout {
}; };
} }
@Override
public WidgetPropertyUIProvider[] getWidgetPropertyUIProviders() {
return new WidgetPropertyUIProvider[]{ new BodyMobilePropertyUI(this)};
}
@Override @Override
protected void initStyle() { protected void initStyle() {
initBorderStyle(); initBorderStyle();
} }
} }

1
designer_form/src/com/fr/design/designer/creator/XWFitLayout.java

@ -25,6 +25,7 @@ import com.fr.form.ui.container.WBodyLayoutType;
import com.fr.form.ui.container.WFitLayout; import com.fr.form.ui.container.WFitLayout;
import com.fr.form.ui.container.WLayout; import com.fr.form.ui.container.WLayout;
import com.fr.general.FRScreen; import com.fr.general.FRScreen;
import com.fr.general.Inter;
import com.fr.stable.ArrayUtils; import com.fr.stable.ArrayUtils;
/** /**

4
designer_form/src/com/fr/design/designer/properties/BodyAppRelayoutTable.java

@ -53,7 +53,7 @@ public class BodyAppRelayoutTable extends AbstractPropertyTable {
FRContext.getLogger().error(e.getMessage()); FRContext.getLogger().error(e.getMessage());
} }
groups.add(new PropertyGroup(new ReportAppPropertyGroupModel(Inter.getLocText("FR-Designer-Layout_Adaptive_Layout"), xCreator, propertyTableEditor, designer))); groups.add(new PropertyGroup(new ReportAppPropertyGroupModel(Inter.getLocText("FR-Designer_Properties_Mobile"), xCreator, propertyTableEditor, designer)));
TableModel model = new BeanTableModel(); TableModel model = new BeanTableModel();
setModel(model); setModel(model);
@ -65,7 +65,7 @@ public class BodyAppRelayoutTable extends AbstractPropertyTable {
* 单元格tooltip * 单元格tooltip
* 属性名悬浮提示 * 属性名悬浮提示
* *
* @param 鼠标点击事件 * @param event 鼠标点击事件
* @return 单元格tooltip * @return 单元格tooltip
*/ */
public String getToolTipText(MouseEvent event) { public String getToolTipText(MouseEvent event) {

5
designer_form/src/com/fr/design/designer/properties/mobile/BodyMobilePropertyUI.java

@ -1,6 +1,7 @@
package com.fr.design.designer.properties.mobile; package com.fr.design.designer.properties.mobile;
import com.fr.design.designer.creator.XCreator; import com.fr.design.designer.creator.XCreator;
import com.fr.design.designer.creator.XWAbsoluteBodyLayout;
import com.fr.design.designer.creator.XWFitLayout; import com.fr.design.designer.creator.XWFitLayout;
import com.fr.design.designer.properties.BodyAppRelayoutTable; import com.fr.design.designer.properties.BodyAppRelayoutTable;
import com.fr.design.fun.impl.AbstractWidgetPropertyUIProvider; import com.fr.design.fun.impl.AbstractWidgetPropertyUIProvider;
@ -18,6 +19,10 @@ public class BodyMobilePropertyUI extends AbstractWidgetPropertyUIProvider {
this.xCreator = xwFitLayout; this.xCreator = xwFitLayout;
} }
public BodyMobilePropertyUI(XWAbsoluteBodyLayout xwAbsoluteBodyLayout) {
this.xCreator = xwAbsoluteBodyLayout;
}
@Override @Override
public AbstractPropertyTable createWidgetAttrTable() { public AbstractPropertyTable createWidgetAttrTable() {
return new BodyAppRelayoutTable(xCreator); return new BodyAppRelayoutTable(xCreator);

Loading…
Cancel
Save