Browse Source

REPORT-6979 手机显示限制高度的最大高度可以输入超过0.8以上的值=>小于0时给出提示

plough 7 years ago
parent
commit
cf76103cbe
  1. 2
      designer_base/src/com/fr/design/gui/ispinner/UISpinner.java
  2. 1
      designer_base/src/com/fr/design/locale/designer.properties
  3. 1
      designer_base/src/com/fr/design/locale/designer_en_US.properties
  4. 1
      designer_base/src/com/fr/design/locale/designer_ja_JP.properties
  5. 1
      designer_base/src/com/fr/design/locale/designer_ko_KR.properties
  6. 1
      designer_base/src/com/fr/design/locale/designer_zh_CN.properties
  7. 1
      designer_base/src/com/fr/design/locale/designer_zh_TW.properties
  8. 12
      designer_form/src/com/fr/design/widget/ui/designer/mobile/ElementCaseDefinePane.java

2
designer_base/src/com/fr/design/gui/ispinner/UISpinner.java

@ -23,7 +23,7 @@ import java.awt.event.*;
public class UISpinner extends JPanel implements UIObserver, GlobalNameObserver { public class UISpinner extends JPanel implements UIObserver, GlobalNameObserver {
protected double value = -1; protected double value;
private static final int SIZE = 20; private static final int SIZE = 20;
private static final int LEN = 13; private static final int LEN = 13;
private static final int WIDTH = 13; private static final int WIDTH = 13;

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

@ -2186,3 +2186,4 @@ FR-Designer_Tip_Chart_Adaptivity_Unavailable=Under the reserved layout state, th
FR-Designer_Official_Website=Official Website: FR-Designer_Official_Website=Official Website:
FR-Designer_Support_Email=Email: FR-Designer_Support_Email=Email:
FR-Designer_Tip_Chart_Adaptivity_Unavailable_In_Absolute_Layout=Under the absolute canvas block, the chart does not support the setting of self-adaptive FR-Designer_Tip_Chart_Adaptivity_Unavailable_In_Absolute_Layout=Under the absolute canvas block, the chart does not support the setting of self-adaptive
FR-Designer_Max_Height_Cannot_Be_Negative=The maximum height cannot be negative

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

@ -2185,3 +2185,4 @@ FR-Designer_Tip_Chart_Adaptivity_Unavailable=Under the reserved layout state, th
FR-Designer_Official_Website=Official Website: FR-Designer_Official_Website=Official Website:
FR-Designer_Support_Email=Email: FR-Designer_Support_Email=Email:
FR-Designer_Tip_Chart_Adaptivity_Unavailable_In_Absolute_Layout=Under the absolute canvas block, the chart does not support the setting of self-adaptive FR-Designer_Tip_Chart_Adaptivity_Unavailable_In_Absolute_Layout=Under the absolute canvas block, the chart does not support the setting of self-adaptive
FR-Designer_Max_Height_Cannot_Be_Negative=The maximum height cannot be negative

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

@ -2183,3 +2183,4 @@ FR-Designer_Tip_Chart_Adaptivity_Unavailable=
FR-Designer_Official_Website= FR-Designer_Official_Website=
FR-Designer_Support_Email= FR-Designer_Support_Email=
FR-Designer_Tip_Chart_Adaptivity_Unavailable_In_Absolute_Layout= FR-Designer_Tip_Chart_Adaptivity_Unavailable_In_Absolute_Layout=
FR-Designer_Max_Height_Cannot_Be_Negative=

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

@ -2184,3 +2184,4 @@ FR-Designer_Tip_Chart_Adaptivity_Unavailable=
FR-Designer_Official_Website= FR-Designer_Official_Website=
FR-Designer_Support_Email= FR-Designer_Support_Email=
FR-Designer_Tip_Chart_Adaptivity_Unavailable_In_Absolute_Layout= FR-Designer_Tip_Chart_Adaptivity_Unavailable_In_Absolute_Layout=
FR-Designer_Max_Height_Cannot_Be_Negative=

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

@ -2186,3 +2186,4 @@ FR-Designer_Tip_Chart_Adaptivity_Unavailable=\u4FDD\u7559\u5E03\u5C40\u72B6\u600
FR-Designer_Official_Website=\u5B98\u65B9\u7F51\u7AD9\uFF1A FR-Designer_Official_Website=\u5B98\u65B9\u7F51\u7AD9\uFF1A
FR-Designer_Support_Email=\u652F\u6301\u90AE\u7BB1\uFF1A FR-Designer_Support_Email=\u652F\u6301\u90AE\u7BB1\uFF1A
FR-Designer_Tip_Chart_Adaptivity_Unavailable_In_Absolute_Layout=\u7EDD\u5BF9\u753B\u5E03\u5757\u72B6\u6001\u4E0B\uFF0C\u56FE\u8868\u4E0D\u652F\u6301\u8BBE\u7F6E\u81EA\u9002\u5E94 FR-Designer_Tip_Chart_Adaptivity_Unavailable_In_Absolute_Layout=\u7EDD\u5BF9\u753B\u5E03\u5757\u72B6\u6001\u4E0B\uFF0C\u56FE\u8868\u4E0D\u652F\u6301\u8BBE\u7F6E\u81EA\u9002\u5E94
FR-Designer_Max_Height_Cannot_Be_Negative=\u6700\u5927\u9AD8\u5EA6\u4E0D\u53EF\u4E3A\u8D1F\u503C

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

@ -2185,3 +2185,4 @@ FR-Designer_Tip_Chart_Adaptivity_Unavailable=\u4FDD\u7559\u4F48\u5C40\u72C0\u614
FR-Designer_Official_Website=\u5B98\u65B9\u7DB2\u7AD9\uFF1A FR-Designer_Official_Website=\u5B98\u65B9\u7DB2\u7AD9\uFF1A
FR-Designer_Support_Email=\u652F\u6301\u90F5\u7BB1\uFF1A FR-Designer_Support_Email=\u652F\u6301\u90F5\u7BB1\uFF1A
FR-Designer_Tip_Chart_Adaptivity_Unavailable_In_Absolute_Layout=\u7D55\u5C0D\u756B\u5E03\u584A\u72C0\u614B\u4E0B\uFF0C\u5716\u8868\u4E0D\u652F\u6301\u8A2D\u5B9A\u81EA\u6211\u8ABF\u6574 FR-Designer_Tip_Chart_Adaptivity_Unavailable_In_Absolute_Layout=\u7D55\u5C0D\u756B\u5E03\u584A\u72C0\u614B\u4E0B\uFF0C\u5716\u8868\u4E0D\u652F\u6301\u8A2D\u5B9A\u81EA\u6211\u8ABF\u6574
FR-Designer_Max_Height_Cannot_Be_Negative=\u6700\u5927\u9AD8\u5EA6\u4E0D\u53EF\u70BA\u8CA0\u503C

12
designer_form/src/com/fr/design/widget/ui/designer/mobile/ElementCaseDefinePane.java

@ -18,6 +18,9 @@ import com.fr.design.mainframe.FormDesigner;
import com.fr.design.mainframe.WidgetPropertyPane; import com.fr.design.mainframe.WidgetPropertyPane;
import com.fr.form.ui.ElementCaseEditor; import com.fr.form.ui.ElementCaseEditor;
import com.fr.general.Inter; import com.fr.general.Inter;
import com.fr.stable.StringUtils;
import com.sun.codemodel.internal.JOp;
import jdk.nashorn.internal.scripts.JO;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;
@ -59,10 +62,17 @@ public class ElementCaseDefinePane extends MobileWidgetDefinePane{
this.maxHeightLabel = new UILabel(Inter.getLocText("FR-Designer_Mobile-Height-Percent"), SwingConstants.LEFT); this.maxHeightLabel = new UILabel(Inter.getLocText("FR-Designer_Mobile-Height-Percent"), SwingConstants.LEFT);
this.maxHeightSpinner = new UISpinner(0, MAX_HEIGHT_LIMIT, 0.01, 0.75) { this.maxHeightSpinner = new UISpinner(0, MAX_HEIGHT_LIMIT, 0.01, 0.75) {
public void setValue(double value) { public void setValue(double value) {
String warningText = StringUtils.EMPTY;
if (value > MAX_HEIGHT_LIMIT) { if (value > MAX_HEIGHT_LIMIT) {
warningText = Inter.getLocText("FR-Designer_Mobile-Warning");
} else if (value < 0) {
// 弹窗提示
warningText = Inter.getLocText("FR-Designer_Max_Height_Cannot_Be_Negative");
}
if (StringUtils.isNotEmpty(warningText)) {
// 弹窗提示 // 弹窗提示
JOptionPane.showMessageDialog(null, JOptionPane.showMessageDialog(null,
Inter.getLocText("FR-Designer_Mobile-Warning"), warningText,
Inter.getLocText("FR-Designer_Tooltips"), Inter.getLocText("FR-Designer_Tooltips"),
JOptionPane.PLAIN_MESSAGE); JOptionPane.PLAIN_MESSAGE);
} }

Loading…
Cancel
Save