Browse Source

MOBILE-6341 【9.2】FR9.0设计器支持修改决策报表图表块移动端自适应逻辑=>与body的“手机重布局”选项联动,去勾选时显示提示

plough 7 years ago
parent
commit
a9747b0fd7
  1. 1
      designer_base/src/com/fr/design/locale/designer.properties
  2. 1
      designer_base/src/com/fr/design/locale/designer_en_US.properties
  3. 1
      designer_base/src/com/fr/design/locale/designer_ja_JP.properties
  4. 1
      designer_base/src/com/fr/design/locale/designer_ko_KR.properties
  5. 1
      designer_base/src/com/fr/design/locale/designer_zh_CN.properties
  6. 1
      designer_base/src/com/fr/design/locale/designer_zh_TW.properties
  7. 2
      designer_chart/src/com/fr/design/chart/mobile/ChartMobileAttr.java
  8. 38
      designer_form/src/com/fr/design/widget/ui/designer/mobile/ChartEditorDefinePane.java

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

@ -2182,3 +2182,4 @@ FR-Designer_Joption_News=news
FR-Designer_Zoom_In_Logic=zoom in logic FR-Designer_Zoom_In_Logic=zoom in logic
FR-Designer_Zoom_Out_Logic=zoom out logic FR-Designer_Zoom_Out_Logic=zoom out logic
FR-Designer_Chart_Adaptivity=chart adaptivity FR-Designer_Chart_Adaptivity=chart adaptivity
FR-Designer_Tip_Chart_Adaptivity_Unavailable=Hint: since the mobile relayout option is not checked, chart adaptivity settings are not available

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

@ -2181,3 +2181,4 @@ FR-Designer_Joption_News=news
FR-Designer_Zoom_In_Logic=zoom in logic FR-Designer_Zoom_In_Logic=zoom in logic
FR-Designer_Zoom_Out_Logic=zoom out logic FR-Designer_Zoom_Out_Logic=zoom out logic
FR-Designer_Chart_Adaptivity=chart adaptivity FR-Designer_Chart_Adaptivity=chart adaptivity
FR-Designer_Tip_Chart_Adaptivity_Unavailable=Hint: since the mobile relayout option is not checked, chart adaptivity settings are not available

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

@ -2179,3 +2179,4 @@ FR-Designer_Joption_News=\u30CB\u30E5\u30FC\u30B9
FR-Designer_Zoom_In_Logic= FR-Designer_Zoom_In_Logic=
FR-Designer_Zoom_Out_Logic= FR-Designer_Zoom_Out_Logic=
FR-Designer_Chart_Adaptivity= FR-Designer_Chart_Adaptivity=
FR-Designer_Tip_Chart_Adaptivity_Unavailable=

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

@ -2180,3 +2180,4 @@ FR-Designer_Joption_News=\uC18C\uC2DD
FR-Designer_Zoom_In_Logic= FR-Designer_Zoom_In_Logic=
FR-Designer_Zoom_Out_Logic= FR-Designer_Zoom_Out_Logic=
FR-Designer_Chart_Adaptivity= FR-Designer_Chart_Adaptivity=
FR-Designer_Tip_Chart_Adaptivity_Unavailable=

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

@ -2182,3 +2182,4 @@ FR-Designer_Joption_News=\u6D88\u606F
FR-Designer_Zoom_In_Logic=\u653E\u5927\u903B\u8F91 FR-Designer_Zoom_In_Logic=\u653E\u5927\u903B\u8F91
FR-Designer_Zoom_Out_Logic=\u7F29\u5C0F\u903B\u8F91 FR-Designer_Zoom_Out_Logic=\u7F29\u5C0F\u903B\u8F91
FR-Designer_Chart_Adaptivity=\u56FE\u8868\u81EA\u9002\u5E94 FR-Designer_Chart_Adaptivity=\u56FE\u8868\u81EA\u9002\u5E94
FR-Designer_Tip_Chart_Adaptivity_Unavailable=\u63D0\u793A\uFF1Abody\u672A\u52FE\u9009\u624B\u673A\u91CD\u5E03\u5C40\u72B6\u6001\u4E0B\uFF0C\u4E0D\u652F\u6301\u56FE\u8868\u81EA\u9002\u5E94

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

@ -2181,3 +2181,4 @@ FR-Designer_Joption_News=\u6D88\u606F
FR-Designer_Zoom_In_Logic=\u653E\u5927\u908F\u8F2F FR-Designer_Zoom_In_Logic=\u653E\u5927\u908F\u8F2F
FR-Designer_Zoom_Out_Logic=\u7E2E\u5C0F\u908F\u8F2F FR-Designer_Zoom_Out_Logic=\u7E2E\u5C0F\u908F\u8F2F
FR-Designer_Chart_Adaptivity=\u5716\u8868\u81EA\u6211\u8ABF\u6574 FR-Designer_Chart_Adaptivity=\u5716\u8868\u81EA\u6211\u8ABF\u6574
FR-Designer_Tip_Chart_Adaptivity_Unavailable=\u63D0\u793A\uFF1Abody\u672A\u52FE\u9078\u624B\u6A5F\u91CD\u4F48\u5C40\u72C0\u614B\u4E0B\uFF0C\u4E0D\u652F\u6301\u5716\u8868\u81EA\u6211\u8ABF\u6574

2
designer_chart/src/com/fr/design/chart/mobile/ChartMobileAttr.java

@ -42,7 +42,7 @@ public class ChartMobileAttr implements ChartMobileAttrProvider {
@Override @Override
public boolean isAdaptive() { public boolean isAdaptive() {
// TODO: body 是否开启手机重布局 // TODO: body 是否开启手机重布局。需要解决模块间依赖问题。这个方法暂时没用,等功能做好之后,再考虑是否去掉
return true; return true;
} }

38
designer_form/src/com/fr/design/widget/ui/designer/mobile/ChartEditorDefinePane.java

@ -15,6 +15,7 @@ import com.fr.design.layout.TableLayoutHelper;
import com.fr.design.mainframe.FormDesigner; import com.fr.design.mainframe.FormDesigner;
import com.fr.design.mainframe.WidgetPropertyPane; import com.fr.design.mainframe.WidgetPropertyPane;
import com.fr.form.ui.ChartEditor; import com.fr.form.ui.ChartEditor;
import com.fr.form.ui.container.WFitLayout;
import com.fr.general.Inter; import com.fr.general.Inter;
import javax.swing.*; import javax.swing.*;
@ -35,8 +36,6 @@ public class ChartEditorDefinePane extends MobileWidgetDefinePane{
private XCreator xCreator; // 当前选中控件的xCreator private XCreator xCreator; // 当前选中控件的xCreator
private FormDesigner designer; // 当前设计器 private FormDesigner designer; // 当前设计器
private UIComboBox zoomOutComboBox;// 缩小逻辑下拉框 private UIComboBox zoomOutComboBox;// 缩小逻辑下拉框
private UILabel maxHeightLabel;
private UISpinner maxHeightSpinner; // 最大高度Spinner
private AttributeChangeListener changeListener; private AttributeChangeListener changeListener;
private UILabel tipLabel; private UILabel tipLabel;
@ -67,7 +66,28 @@ public class ChartEditorDefinePane extends MobileWidgetDefinePane{
public void initPropertyGroups(Object source) { public void initPropertyGroups(Object source) {
this.setLayout(FRGUIPaneFactory.createBorderLayout()); this.setLayout(FRGUIPaneFactory.createBorderLayout());
this.designer = WidgetPropertyPane.getInstance().getEditingFormDesigner(); this.designer = WidgetPropertyPane.getInstance().getEditingFormDesigner();
// this.hComboBox = new UIComboBox(ITEMS);
if (((WFitLayout)designer.getRootComponent().toData()).isAppRelayout()) { // 如果开启了手机重布局
this.add(getMobileSettingsPane(), BorderLayout.NORTH);
this.bingListeners2Widgets();
this.setGlobalNames();
} else {
this.add(getUnavailableTipPane(), BorderLayout.NORTH);
}
this.repaint();
}
private JPanel getUnavailableTipPane() {
JPanel panel = new JPanel(new BorderLayout());
UILabel unavailableTipLabel = new UILabel();
unavailableTipLabel.setText("<html>" + Inter.getLocText("FR-Designer_Tip_Chart_Adaptivity_Unavailable") + "<html>");
unavailableTipLabel.setForeground(Color.gray);
panel.add(unavailableTipLabel, BorderLayout.NORTH);
return panel;
}
private UIExpandablePane getMobileSettingsPane() {
this.zoomOutComboBox = new UIComboBox(ITEMS); this.zoomOutComboBox = new UIComboBox(ITEMS);
this.zoomOutComboBox.addItemListener(new ItemListener() { this.zoomOutComboBox.addItemListener(new ItemListener() {
@Override @Override
@ -95,11 +115,7 @@ public class ChartEditorDefinePane extends MobileWidgetDefinePane{
panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0)); panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
final JPanel panelWrapper = FRGUIPaneFactory.createBorderLayout_S_Pane(); final JPanel panelWrapper = FRGUIPaneFactory.createBorderLayout_S_Pane();
panelWrapper.add(panel, BorderLayout.NORTH); panelWrapper.add(panel, BorderLayout.NORTH);
UIExpandablePane folderPane = new UIExpandablePane(Inter.getLocText("FR-Designer_Chart_Adaptivity"), 280, 20, panelWrapper); return new UIExpandablePane(Inter.getLocText("FR-Designer_Chart_Adaptivity"), 280, 20, panelWrapper);
this.add(folderPane, BorderLayout.NORTH);
this.bingListeners2Widgets();
this.setGlobalNames();
this.repaint();
} }
private void updateTipLabel() { private void updateTipLabel() {
@ -127,9 +143,9 @@ public class ChartEditorDefinePane extends MobileWidgetDefinePane{
@Override @Override
public void populate(FormDesigner designer) { public void populate(FormDesigner designer) {
this.designer = designer; // this.designer = designer;
this.addAttributeChangeListener(changeListener); // this.addAttributeChangeListener(changeListener);
ChartEditor chartEditor = (ChartEditor)xCreator.toData(); // ChartEditor chartEditor = (ChartEditor)xCreator.toData();
// this.zoomOutComboBox.setSelectedIndex(0); // this.zoomOutComboBox.setSelectedIndex(0);
// this.hComboBox.setSelectedItem(new Item (elementCaseEditor.getHorziontalAttr().description(), elementCaseEditor.getHorziontalAttr())); // this.hComboBox.setSelectedItem(new Item (elementCaseEditor.getHorziontalAttr().description(), elementCaseEditor.getHorziontalAttr()));
// this.vComboBox.setSelectedItem(new Item (elementCaseEditor.getVerticalAttr().description(), elementCaseEditor.getVerticalAttr())); // this.vComboBox.setSelectedItem(new Item (elementCaseEditor.getVerticalAttr().description(), elementCaseEditor.getVerticalAttr()));

Loading…
Cancel
Save