Browse Source

Merge pull request #359 in DESIGN/design from ~JINBOKAI/design:release/10.0 to release/10.0

* commit '87454555966b81d10414db17e568da60169ee683':
  删除拼接字符 Signed-off-by: Jinbokai <Jinbokai@fanruan.com>
  格式化 Signed-off-by: Jinbokai <Jinbokai@fanruan.com>
  格式化 Signed-off-by: Jinbokai <Jinbokai@fanruan.com>
  格式化 Signed-off-by: Jinbokai <Jinbokai@fanruan.com>
  格式化 Signed-off-by: Jinbokai <Jinbokai@fanruan.com>
  格式化 Signed-off-by: Jinbokai <Jinbokai@fanruan.com>
  格式化 Signed-off-by: Jinbokai <Jinbokai@fanruan.com>
  添加过滤器
  删除无用
  ForbidType.java edited online with Bitbucket
  designer-realize中i18nTextArray()替换为i18nText()方法
  添加过滤器,禁止访问指定资源
final/10.0
Jinbokai 6 years ago
parent
commit
e1c9dda03b
  1. 2
      designer-realize/src/main/java/com/fr/design/actions/cell/CleanAuthorityAction.java
  2. 2
      designer-realize/src/main/java/com/fr/design/actions/columnrow/ResetColumnHideAction.java
  3. 2
      designer-realize/src/main/java/com/fr/design/actions/columnrow/ResetRowHideAction.java
  4. 4
      designer-realize/src/main/java/com/fr/design/actions/edit/EditFloatElementNameAction.java
  5. 8
      designer-realize/src/main/java/com/fr/design/condition/HyperlinkPane.java
  6. 2
      designer-realize/src/main/java/com/fr/design/condition/PresentHighlightPane.java
  7. 2
      designer-realize/src/main/java/com/fr/design/condition/WidgetHighlightPane.java
  8. 4
      designer-realize/src/main/java/com/fr/design/dscolumn/SpecifiedGroupAttrPane.java
  9. 6
      designer-realize/src/main/java/com/fr/design/javascript/ListenerEditPane.java
  10. 9
      designer-realize/src/main/java/com/fr/design/mainframe/AuthorityEditToolBarPane.java
  11. 2
      designer-realize/src/main/java/com/fr/design/mainframe/AuthoritySheetEditedPane.java
  12. 13
      designer-realize/src/main/java/com/fr/design/mainframe/AuthorityToolBarPane.java
  13. 2
      designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePane.java
  14. 2
      designer-realize/src/main/java/com/fr/design/mainframe/ReportComponent.java
  15. 2
      designer-realize/src/main/java/com/fr/design/mainframe/cell/CellElementEditPane.java
  16. 2
      designer-realize/src/main/java/com/fr/design/mainframe/cell/QuickEditorRegion.java
  17. 2
      designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/CustomStylePane.java
  18. 2
      designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/PredefinedStylePane.java
  19. 2
      designer-realize/src/main/java/com/fr/design/mainframe/form/FormElementCaseDesigner.java
  20. 2
      designer-realize/src/main/java/com/fr/design/parameter/ParameterDefinitePane.java
  21. 2
      designer-realize/src/main/java/com/fr/design/present/BarCodePane.java
  22. 6
      designer-realize/src/main/java/com/fr/design/report/ExcelExportPane.java
  23. 4
      designer-realize/src/main/java/com/fr/design/report/LayerReportPane.java
  24. 2
      designer-realize/src/main/java/com/fr/design/report/PDFExportPane.java
  25. 10
      designer-realize/src/main/java/com/fr/design/report/SubReportPane.java
  26. 101
      designer-realize/src/main/java/com/fr/design/report/VerifierListPane.java
  27. 2
      designer-realize/src/main/java/com/fr/design/report/freeze/FreezePagePane.java
  28. 4
      designer-realize/src/main/java/com/fr/design/report/freeze/FreezeWriteColPane.java
  29. 4
      designer-realize/src/main/java/com/fr/design/report/freeze/FreezeWriteRowPane.java
  30. 10
      designer-realize/src/main/java/com/fr/design/report/freeze/RepeatAndFreezeSettingPane.java
  31. 2
      designer-realize/src/main/java/com/fr/design/webattr/DragToolBarPane.java
  32. 18
      designer-realize/src/main/java/com/fr/design/webattr/EditToolBar.java
  33. 2
      designer-realize/src/main/java/com/fr/design/webattr/ReportWebWidgetConstants.java
  34. 2
      designer-realize/src/main/java/com/fr/design/webattr/ToolBarDragPane.java
  35. 2
      designer-realize/src/main/java/com/fr/design/webattr/WriteToolBarPane.java
  36. 2
      designer-realize/src/main/java/com/fr/design/webattr/WriteWebSettingPane.java
  37. 2
      designer-realize/src/main/java/com/fr/design/widget/ValueWidgetPane.java
  38. 2
      designer-realize/src/main/java/com/fr/design/widget/WidgetPane.java
  39. 2
      designer-realize/src/main/java/com/fr/design/widget/ui/CheckBoxGroupDefinePane.java
  40. 2
      designer-realize/src/main/java/com/fr/design/widget/ui/ParameterTreeComboBox.java
  41. 2
      designer-realize/src/main/java/com/fr/design/widget/ui/btn/DefineAppendColumnRowPane.java
  42. 2
      designer-realize/src/main/java/com/fr/design/widget/ui/btn/DefineDeleteColumnRowPane.java
  43. 4
      designer-realize/src/main/java/com/fr/design/write/submit/SmartInsertDBManipulationPane.java
  44. 6
      designer-realize/src/main/java/com/fr/grid/selection/FloatSelection.java

2
designer-realize/src/main/java/com/fr/design/actions/cell/CleanAuthorityAction.java

@ -26,7 +26,7 @@ public class CleanAuthorityAction extends ElementCaseAction {
public CleanAuthorityAction(ElementCasePane t) { public CleanAuthorityAction(ElementCasePane t) {
super(t); super(t);
this.setName(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Clear", "DashBoard-Potence"})); this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Clear_DashBoard_Potence"));
} }

2
designer-realize/src/main/java/com/fr/design/actions/columnrow/ResetColumnHideAction.java

@ -11,7 +11,7 @@ public class ResetColumnHideAction extends AbstractColumnRowIndexAction {
public ResetColumnHideAction(ElementCasePane t, int indexOfColumnOrRow) { public ResetColumnHideAction(ElementCasePane t, int indexOfColumnOrRow) {
super(t, indexOfColumnOrRow); super(t, indexOfColumnOrRow);
this.setName(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"MConfig-CancelButton", "Hide"})); this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Cancel_Hide"));
} }
@Override @Override

2
designer-realize/src/main/java/com/fr/design/actions/columnrow/ResetRowHideAction.java

@ -11,7 +11,7 @@ public class ResetRowHideAction extends AbstractColumnRowIndexAction {
public ResetRowHideAction(ElementCasePane t, int indexOfColumnOrRow) { public ResetRowHideAction(ElementCasePane t, int indexOfColumnOrRow) {
super(t, indexOfColumnOrRow); super(t, indexOfColumnOrRow);
this.setName(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"MConfig-CancelButton", "Hide"})); this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Cancel_Hide"));
} }
@Override @Override

4
designer-realize/src/main/java/com/fr/design/actions/edit/EditFloatElementNameAction.java

@ -18,7 +18,7 @@ public class EditFloatElementNameAction extends FloatSelectionAction {
public EditFloatElementNameAction(ElementCasePane t) { public EditFloatElementNameAction(ElementCasePane t) {
super(t); super(t);
this.setName(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Set", "Float_Element_Name"})); this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Float_Element_Name"));
} }
@Override @Override
@ -56,7 +56,7 @@ public class EditFloatElementNameAction extends FloatSelectionAction {
@Override @Override
protected String title4PopupWindow() { protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Set", "Float_Element_Name"}); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Float_Element_Name");
} }
public void populate(String name) { public void populate(String name) {

8
designer-realize/src/main/java/com/fr/design/condition/HyperlinkPane.java

@ -51,14 +51,14 @@ public class HyperlinkPane extends ConditionAttrSingleConditionPane<HighlightAct
} }
}); });
hyperlinkButton.setEnabled(false); hyperlinkButton.setEnabled(false);
UILabel hyperlinkLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Hyperlink", "Type"}) + ":"); UILabel hyperlinkLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Hyperlink_Type") + ":");
typeField = new UITextField(12); typeField = new UITextField(12);
typeField.setEditable(false); typeField.setEditable(false);
this.add(hyperlinkLabel); this.add(hyperlinkLabel);
this.add(typeField); this.add(typeField);
this.add(hyperlinkButton); this.add(hyperlinkButton);
useHyperlink = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Use", "Links"})); useHyperlink = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Use_Links"));
useHyperlink.addActionListener(l); useHyperlink.addActionListener(l);
this.add(useHyperlink); this.add(useHyperlink);
} }
@ -98,11 +98,11 @@ public class HyperlinkPane extends ConditionAttrSingleConditionPane<HighlightAct
if (js instanceof JavaScriptImpl) { if (js instanceof JavaScriptImpl) {
this.typeField.setText("JavaScript"); this.typeField.setText("JavaScript");
} else if (js instanceof ReportletHyperlink) { } else if (js instanceof ReportletHyperlink) {
this.typeField.setText(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Report", "Links"})); this.typeField.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Report_Links"));
} else if (js instanceof WebHyperlink) { } else if (js instanceof WebHyperlink) {
this.typeField.setText(com.fr.design.i18n.Toolkit.i18nText("Hyperlink-Web_link")); this.typeField.setText(com.fr.design.i18n.Toolkit.i18nText("Hyperlink-Web_link"));
} else if (js instanceof EmailJavaScript) { } else if (js instanceof EmailJavaScript) {
this.typeField.setText(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Email", "Links"})); this.typeField.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Email_Links"));
} }
} }

2
designer-realize/src/main/java/com/fr/design/condition/PresentHighlightPane.java

@ -35,7 +35,7 @@ public class PresentHighlightPane extends ConditionAttrSingleConditionPane<Highl
super(conditionAttributesPane); super(conditionAttributesPane);
this.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Present") + ":")); this.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Present") + ":"));
String[] typeArray = {PresentConstants.NORMAL, com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Other", "Present"})}; String[] typeArray = {PresentConstants.NORMAL, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Other_Present")};
presentComboBox = new UIComboBox(typeArray); presentComboBox = new UIComboBox(typeArray);
this.add(presentComboBox); this.add(presentComboBox);

2
designer-realize/src/main/java/com/fr/design/condition/WidgetHighlightPane.java

@ -83,7 +83,7 @@ public class WidgetHighlightPane extends ConditionAttrSingleConditionPane<Highli
box.setEnabled(false); box.setEnabled(false);
this.add(widgetButton); this.add(widgetButton);
widgetButton.setEnabled(false); widgetButton.setEnabled(false);
useWidget = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Use", "Widget"})); useWidget = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Use_Widget"));
this.add(useWidget); this.add(useWidget);
useWidget.addActionListener(new ActionListener() { useWidget.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {

4
designer-realize/src/main/java/com/fr/design/dscolumn/SpecifiedGroupAttrPane.java

@ -88,7 +88,7 @@ public class SpecifiedGroupAttrPane extends BasicPane {
protected void initComponents() { protected void initComponents() {
this.setLayout(FRGUIPaneFactory.createBorderLayout()); this.setLayout(FRGUIPaneFactory.createBorderLayout());
specifiedComboBox = new UIComboBox(new String[] { specifiedComboBox = new UIComboBox(new String[] {
com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Condition", "Group"}), com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Formula", "Group"}) com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Condition_Group"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Formula_Group")
}); });
specifiedComboBox.addItemListener(new ItemListener() { specifiedComboBox.addItemListener(new ItemListener() {
@ -359,7 +359,7 @@ public class SpecifiedGroupAttrPane extends BasicPane {
}); });
southPane = GUICoreUtils.createFlowPane(new JComponent[] {new UILabel(InsertText), //new UILabel(com.fr.design.i18n.Toolkit.i18nText("I-Message_FunctionGrouper_2")), southPane = GUICoreUtils.createFlowPane(new JComponent[] {new UILabel(InsertText), //new UILabel(com.fr.design.i18n.Toolkit.i18nText("I-Message_FunctionGrouper_2")),
new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Custom", "Value"}) + ": "), label, valueField, formulaButton}, FlowLayout.LEFT); new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Custom_Value") + ": "), label, valueField, formulaButton}, FlowLayout.LEFT);
contentPane.add(southPane); contentPane.add(southPane);
} }

6
designer-realize/src/main/java/com/fr/design/javascript/ListenerEditPane.java

@ -43,9 +43,9 @@ public class ListenerEditPane extends BasicBeanPane<Listener> {
private EmailPane emailPane; private EmailPane emailPane;
private static final String JS = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_JavaScript"); private static final String JS = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_JavaScript");
private static final String FORMSUBMIT = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_JavaScript_Form_Submit"); private static final String FORMSUBMIT = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_JavaScript_Form_Submit");
private static final String DBCOMMIT = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_JavaScript_Commit_To_Database"); private static final String DBCOMMIT = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_JavaScript_Commit_To_Database");
private static final String CUSTOMACTION= com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"FR-Designer_JavaScript_Custom", "FR-Designer_RWA_Submit"}); private static final String CUSTOMACTION= com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_JavaScript_Custom_Submit");
private static final String EMAIL = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Email_sentEmail"); private static final String EMAIL = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Email_sentEmail");
private Listener listener; private Listener listener;

9
designer-realize/src/main/java/com/fr/design/mainframe/AuthorityEditToolBarPane.java

@ -40,8 +40,7 @@ public class AuthorityEditToolBarPane extends AuthorityPropertyPane {
super(HistoryTemplateListPane.getInstance().getCurrentEditingTemplate()); super(HistoryTemplateListPane.getInstance().getCurrentEditingTemplate());
this.setLayout(new BorderLayout()); this.setLayout(new BorderLayout());
this.setBorder(null); this.setBorder(null);
UILabel authorityTitle = new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"FR-Designer_Permissions", UILabel authorityTitle = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Permissions_Edit")) {
"FR-Designer_Edit"})) {
@Override @Override
public Dimension getPreferredSize() { public Dimension getPreferredSize() {
return new Dimension(super.getPreferredSize().width, TITLE_HEIGHT); return new Dimension(super.getPreferredSize().width, TITLE_HEIGHT);
@ -148,12 +147,12 @@ public class AuthorityEditToolBarPane extends AuthorityPropertyPane {
type = new UILabel(); type = new UILabel();
typePane = new JPanel(new BorderLayout()); typePane = new JPanel(new BorderLayout());
typePane.add(type, BorderLayout.CENTER); typePane.add(type, BorderLayout.CENTER);
type.setBorder(BorderFactory.createEmptyBorder(0,LEFT_GAP,0,0)); type.setBorder(BorderFactory.createEmptyBorder(0, LEFT_GAP, 0, 0));
typePane.setBorder(BorderFactory.createLineBorder(Color.lightGray)); typePane.setBorder(BorderFactory.createLineBorder(Color.lightGray));
name = new UILabel(); name = new UILabel();
namePane = new JPanel(new BorderLayout()); namePane = new JPanel(new BorderLayout());
namePane.add(name, BorderLayout.CENTER); namePane.add(name, BorderLayout.CENTER);
name.setBorder(BorderFactory.createEmptyBorder(0,LEFT_GAP,0,0)); name.setBorder(BorderFactory.createEmptyBorder(0, LEFT_GAP, 0, 0));
namePane.setBorder(BorderFactory.createLineBorder(Color.lightGray)); namePane.setBorder(BorderFactory.createLineBorder(Color.lightGray));
checkPane = new JPanel(); checkPane = new JPanel();
checkPane.setLayout(new BorderLayout()); checkPane.setLayout(new BorderLayout());
@ -208,7 +207,7 @@ public class AuthorityEditToolBarPane extends AuthorityPropertyPane {
if (name.getText() == "") { if (name.getText() == "") {
type.setText(""); type.setText("");
} else { } else {
type.setText(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"ReportServerP-Toolbar", "FR-Designer_Form_Button"})); type.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Toolbar_Button"));
} }
} }

2
designer-realize/src/main/java/com/fr/design/mainframe/AuthoritySheetEditedPane.java

@ -30,7 +30,7 @@ public class AuthoritySheetEditedPane extends AuthorityPropertyPane {
super(HistoryTemplateListPane.getInstance().getCurrentEditingTemplate()); super(HistoryTemplateListPane.getInstance().getCurrentEditingTemplate());
this.setLayout(new BorderLayout()); this.setLayout(new BorderLayout());
this.setBorder(null); this.setBorder(null);
UILabel authorityTitle = new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"DashBoard-Potence", "Edit"})) { UILabel authorityTitle = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit_DashBoard_Potence")) {
@Override @Override
public Dimension getPreferredSize() { public Dimension getPreferredSize() {
return new Dimension(super.getPreferredSize().width, TITLE_HEIGHT); return new Dimension(super.getPreferredSize().width, TITLE_HEIGHT);

13
designer-realize/src/main/java/com/fr/design/mainframe/AuthorityToolBarPane.java

@ -45,7 +45,9 @@ public class AuthorityToolBarPane<T extends WebContent> extends BasicBeanPane<Re
private static final int PRE_GAP = 9; private static final int PRE_GAP = 9;
private static final int COMBOX_WIDTH = 144; private static final int COMBOX_WIDTH = 144;
private static final String[] CHOOSEITEM = new String[]{com.fr.design.i18n.Toolkit.i18nText("M-Page_Preview"), com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Face_Write", "PageSetup-Page"}), com.fr.design.i18n.Toolkit.i18nText("M-Data_Analysis")}; private static final String[] CHOOSEITEM = new String[]{com.fr.design.i18n.Toolkit.i18nText("M-Page_Preview"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Face_Write_Page"),
com.fr.design.i18n.Toolkit.i18nText("M-Data_Analysis")};
private UIComboBox choseComboBox; private UIComboBox choseComboBox;
private ToolBarPane toolBarPane; private ToolBarPane toolBarPane;
private AuthorityEditToolBarPane authorityEditToolBarPane = null; private AuthorityEditToolBarPane authorityEditToolBarPane = null;
@ -128,7 +130,7 @@ public class AuthorityToolBarPane<T extends WebContent> extends BasicBeanPane<Re
public AuthorityToolBarPane() { public AuthorityToolBarPane() {
this.setLayout(new FlowLayout(FlowLayout.LEFT, 0, 3)); this.setLayout(new FlowLayout(FlowLayout.LEFT, 0, 3));
this.setBorder(BorderFactory.createEmptyBorder(0, PRE_GAP, 0, 0)); this.setBorder(BorderFactory.createEmptyBorder(0, PRE_GAP, 0, 0));
title = new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"ReportServerP-Toolbar", "Choose_Role"})); title = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Toolbar_Choose_Role"));
title.setHorizontalAlignment(SwingConstants.CENTER); title.setHorizontalAlignment(SwingConstants.CENTER);
this.add(title, 0); this.add(title, 0);
choseComboBox = new UIComboBox(CHOOSEITEM) { choseComboBox = new UIComboBox(CHOOSEITEM) {
@ -182,8 +184,7 @@ public class AuthorityToolBarPane<T extends WebContent> extends BasicBeanPane<Re
*/ */
private void checkToolBarPaneEnable() { private void checkToolBarPaneEnable() {
List<ToolBarButton> toolBarButtons = toolBarPane.getToolBarButtons(); List<ToolBarButton> toolBarButtons = toolBarPane.getToolBarButtons();
boolean isnotEnable = ComparatorUtils.equals(title.getText(), com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Server", "ReportServerP-Toolbar", "Choose_Role"})) boolean isnotEnable = ComparatorUtils.equals(title.getText(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Server_Toolbar_Choose_Role"))&& !WorkContext.getCurrent().isRoot();
&& !WorkContext.getCurrent().isRoot();
for (ToolBarButton button : toolBarButtons) { for (ToolBarButton button : toolBarButtons) {
button.setEnabled(!isnotEnable); button.setEnabled(!isnotEnable);
} }
@ -271,14 +272,14 @@ public class AuthorityToolBarPane<T extends WebContent> extends BasicBeanPane<Re
this.remove(title); this.remove(title);
// 如果是空值就说明采用服务器配置了 // 如果是空值就说明采用服务器配置了
if (reportWebAttr == null || this.getWebContent(reportWebAttr) == null) { if (reportWebAttr == null || this.getWebContent(reportWebAttr) == null) {
title = new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Server", "ReportServerP-Toolbar", "Choose_Role"})); title = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ServerToolbar_Choose_Role"));
populateServerSettings(); populateServerSettings();
this.add(title, 0); this.add(title, 0);
return; return;
} }
// 模板设置 // 模板设置
T webContent = this.getWebContent(reportWebAttr); T webContent = this.getWebContent(reportWebAttr);
title = new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"the_template", "ReportServerP-Toolbar", "Choose_Role"})); title = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Template_Toolbar_Choose_Role"));
this.add(title, 0); this.add(title, 0);
populate(webContent.getToolBarManagers()); populate(webContent.getToolBarManagers());
} }

2
designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePane.java

@ -1237,7 +1237,7 @@ public abstract class ElementCasePane<T extends TemplateElementCase> extends Tar
*/ */
public ShortCut[] shortCuts4Authority() { public ShortCut[] shortCuts4Authority() {
return new ShortCut[]{ return new ShortCut[]{
new NameSeparator(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"DashBoard-Potence", "Edit"})), new NameSeparator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit_DashBoard_Potence")),
DesignerMode.isAuthorityEditing() ? new ExitAuthorityEditAction(this) : new AllowAuthorityEditAction(this), DesignerMode.isAuthorityEditing() ? new ExitAuthorityEditAction(this) : new AllowAuthorityEditAction(this),
}; };

2
designer-realize/src/main/java/com/fr/design/mainframe/ReportComponent.java

@ -68,7 +68,7 @@ public abstract class ReportComponent<T extends TemplateReport, E extends Elemen
public ShortCut[] shortCuts4Authority() { public ShortCut[] shortCuts4Authority() {
return new ShortCut[]{ return new ShortCut[]{
new NameSeparator(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"DashBoard-Potence", "Edit"})), new NameSeparator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit_DashBoard_Potence")),
DesignerMode.isAuthorityEditing() ? new ExitAuthorityEditAction(this) : new AllowAuthorityEditAction(this), DesignerMode.isAuthorityEditing() ? new ExitAuthorityEditAction(this) : new AllowAuthorityEditAction(this),
}; };

2
designer-realize/src/main/java/com/fr/design/mainframe/cell/CellElementEditPane.java

@ -147,7 +147,7 @@ public class CellElementEditPane extends BasicPane {
ePane.fireTargetModified(); ePane.fireTargetModified();
} }
} else { } else {
DesignUtils.errorMessage(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"FR-Designer_Not_use_a_cell_attribute_table_editing", "FR-Designer_Float_Element"}) + "!"); DesignUtils.errorMessage(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Float_Element_Edit_Tips") + "!");
} }
ePane.setSupportDefaultParentCalculate(false); ePane.setSupportDefaultParentCalculate(false);
} }

2
designer-realize/src/main/java/com/fr/design/mainframe/cell/QuickEditorRegion.java

@ -32,7 +32,7 @@ public class QuickEditorRegion extends JPanel {
public static JPanel getEmptyEditor() { public static JPanel getEmptyEditor() {
if (EMPTY == null) { if (EMPTY == null) {
EMPTY = new JPanel(new BorderLayout()); EMPTY = new JPanel(new BorderLayout());
UILabel content = new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"DataFunction-None", "HJS-Message", "Form-Widget_Property_Table"}) + "!"); UILabel content = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None_Message_Property_Table") + "!");
content.setBorder(BorderFactory.createEmptyBorder(0, 70, 0, 0)); content.setBorder(BorderFactory.createEmptyBorder(0, 70, 0, 0));
EMPTY.add(content, BorderLayout.CENTER); EMPTY.add(content, BorderLayout.CENTER);
} }

2
designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/CustomStylePane.java

@ -59,7 +59,7 @@ public class CustomStylePane extends MultiTabPane<Style> {
* @return * @return
*/ */
public String title4PopupWindow() { public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Custom", "Style"}); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Custom_Style");
} }
/** /**

2
designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/PredefinedStylePane.java

@ -124,7 +124,7 @@ public class PredefinedStylePane extends FurtherBasicBeanPane<NameStyle> impleme
* @return 标题 * @return 标题
*/ */
public String title4PopupWindow() { public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"PageSetup-Predefined", "Style"}); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Predefined_Style");
} }
/** /**

2
designer-realize/src/main/java/com/fr/design/mainframe/form/FormElementCaseDesigner.java

@ -94,7 +94,7 @@ public class FormElementCaseDesigner<T extends FormElementCaseProvider, E extend
@Override @Override
public ShortCut[] shortCuts4Authority() { public ShortCut[] shortCuts4Authority() {
return new ShortCut[]{ return new ShortCut[]{
new NameSeparator(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"DashBoard-Potence", "Edit"})), new NameSeparator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit_DashBoard_Potence")),
DesignerMode.isAuthorityEditing() ? new ExitAuthorityEditAction(this) : new AllowAuthorityEditAction(this), DesignerMode.isAuthorityEditing() ? new ExitAuthorityEditAction(this) : new AllowAuthorityEditAction(this),
}; };

2
designer-realize/src/main/java/com/fr/design/parameter/ParameterDefinitePane.java

@ -481,7 +481,7 @@ public class ParameterDefinitePane extends JPanel implements ToolBarMenuDockPlus
if (!DesignerMode.isAuthorityEditing()) { if (!DesignerMode.isAuthorityEditing()) {
tplMenu.addShortCut(new NameSeparator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_WorkBook"))); tplMenu.addShortCut(new NameSeparator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_WorkBook")));
tplMenu.addShortCut(new ReportParameterAction(workBook)); tplMenu.addShortCut(new ReportParameterAction(workBook));
tplMenu.addShortCut(new NameSeparator(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"DashBoard-Potence", "Edit"}))); tplMenu.addShortCut(new NameSeparator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit_DashBoard_Potence")));
tplMenu.addShortCut(new AllowAuthorityEditAction(workBook)); tplMenu.addShortCut(new AllowAuthorityEditAction(workBook));
} else { } else {
tplMenu.addShortCut(new ExitAuthorityEditAction(workBook)); tplMenu.addShortCut(new ExitAuthorityEditAction(workBook));

2
designer-realize/src/main/java/com/fr/design/present/BarCodePane.java

@ -225,7 +225,7 @@ public class BarCodePane extends FurtherBasicBeanPane<BarcodePresent> {
} }
private void initVersionComboBox() { private void initVersionComboBox() {
String[] array = {com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Auto", "Choose"}), "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16"}; String[] array = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Auto_Choose"), "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16"};
initcombobox(this.RCodeVersionComboBox, array, 0); initcombobox(this.RCodeVersionComboBox, array, 0);
} }

6
designer-realize/src/main/java/com/fr/design/report/ExcelExportPane.java

@ -51,7 +51,7 @@ public class ExcelExportPane extends BasicPane {
northPane.add(passwordPane); northPane.add(passwordPane);
passwordWritePane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); passwordWritePane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
passwordPane.add(passwordWritePane); passwordPane.add(passwordWritePane);
UILabel passwordLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"File", "Password"}) + ":"); UILabel passwordLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_File_Password") + ":");
passwordWritePane.add(passwordLabel); passwordWritePane.add(passwordLabel);
passwordField = new UITextField(11); passwordField = new UITextField(11);
passwordWritePane.add(passwordField); passwordWritePane.add(passwordField);
@ -69,9 +69,9 @@ public class ExcelExportPane extends BasicPane {
JPanel protectedWordPane =FRGUIPaneFactory.createNormalFlowInnerContainer_M_Pane(); JPanel protectedWordPane =FRGUIPaneFactory.createNormalFlowInnerContainer_M_Pane();
protectedWord = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Protected", "Password"})); protectedWord = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Protected_Password"));
wordPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); wordPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
wordPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Sheet", "Password"}) + ":")); wordPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Sheet_Password") + ":"));
protectedField = new UITextField(11); protectedField = new UITextField(11);
wordPane.add(protectedField); wordPane.add(protectedField);
protectedWordPane.add(protectedWord); protectedWordPane.add(protectedWord);

4
designer-realize/src/main/java/com/fr/design/report/LayerReportPane.java

@ -49,7 +49,7 @@ public class LayerReportPane extends BasicBeanPane<LayerReportAttr> {
protected void initComponents() { protected void initComponents() {
this.setLayout(FRGUIPaneFactory.createBorderLayout()); this.setLayout(FRGUIPaneFactory.createBorderLayout());
JPanel outlayerReportPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Report_Engine", "Attribute"})); JPanel outlayerReportPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Report_Engine_Attribute"));
JPanel layerReportPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_M_Pane(); JPanel layerReportPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_M_Pane();
this.add(outlayerReportPane); this.add(outlayerReportPane);
outlayerReportPane.add(layerReportPane); outlayerReportPane.add(layerReportPane);
@ -113,7 +113,7 @@ public class LayerReportPane extends BasicBeanPane<LayerReportAttr> {
@Override @Override
protected String title4PopupWindow() { protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Report_Engine", "Attribute"}); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Report_Engine_Attribute");
} }
@Override @Override

2
designer-realize/src/main/java/com/fr/design/report/PDFExportPane.java

@ -40,7 +40,7 @@ public class PDFExportPane extends BasicPane {
northPane.add(passwordPane); northPane.add(passwordPane);
passwordWritePane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); passwordWritePane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
passwordPane.add(passwordWritePane); passwordPane.add(passwordWritePane);
UILabel passwordLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"File", "Password"}) + ":"); UILabel passwordLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_File_Password") + ":");
passwordWritePane.add(passwordLabel); passwordWritePane.add(passwordLabel);
passwordField = new UITextField(11); passwordField = new UITextField(11);
passwordWritePane.add(passwordField); passwordWritePane.add(passwordField);

10
designer-realize/src/main/java/com/fr/design/report/SubReportPane.java

@ -45,7 +45,7 @@ public class SubReportPane extends BasicPane {
this.setLayout(FRGUIPaneFactory.createM_BorderLayout()); this.setLayout(FRGUIPaneFactory.createM_BorderLayout());
JPanel northPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); JPanel northPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
// northPane.setLayout(FRGUIPaneFactory.createM_BorderLayout()); // northPane.setLayout(FRGUIPaneFactory.createM_BorderLayout());
northPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Sub_Report", "Path"}),null)); northPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Sub_Report_Path"),null));
northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Location") + ":"), BorderLayout.WEST); northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Location") + ":"), BorderLayout.WEST);
northPane.add(pathTextField = new UITextField(), BorderLayout.CENTER); northPane.add(pathTextField = new UITextField(), BorderLayout.CENTER);
pathTextField.setEditable(false); pathTextField.setEditable(false);
@ -79,8 +79,8 @@ public class SubReportPane extends BasicPane {
centerPane.setLayout(FRGUIPaneFactory.createM_BorderLayout()); centerPane.setLayout(FRGUIPaneFactory.createM_BorderLayout());
centerPane.setBorder(BorderFactory.createEmptyBorder(0, 5, 10, 5)); centerPane.setBorder(BorderFactory.createEmptyBorder(0, 5, 10, 5));
kvPane = new ReportletParameterViewPane(); kvPane = new ReportletParameterViewPane();
centerPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Set", "Delivery", "Parameter"}),null)); centerPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Delivery_Parameter"),null));
JPanel kcPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); JPanel kcPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
kcPane.add(kvPane); kcPane.add(kvPane);
extend = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Hyperlink-Extends_Report_Parameters")); extend = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Hyperlink-Extends_Report_Parameters"));
kcPane.add(extend, BorderLayout.SOUTH); kcPane.add(extend, BorderLayout.SOUTH);
@ -94,8 +94,8 @@ public class SubReportPane extends BasicPane {
@Override @Override
protected String title4PopupWindow() { protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Insert", "Sub_Report"}); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Insert_Sub_Report");
} }
public void populate(ElementCase report, CellElement cellElment) { public void populate(ElementCase report, CellElement cellElment) {
Object cellValue = cellElment.getValue(); Object cellValue = cellElment.getValue();

101
designer-realize/src/main/java/com/fr/design/report/VerifierListPane.java

@ -1 +1,100 @@
package com.fr.design.report; import com.fr.data.Verifier; import com.fr.design.ExtraDesignClassManager; import com.fr.design.fun.VerifyDefineProvider; import com.fr.design.gui.controlpane.NameObjectCreator; import com.fr.design.gui.controlpane.NameableCreator; import com.fr.design.gui.controlpane.ObjectJControlPane; import com.fr.design.mainframe.ElementCasePane; import com.fr.general.NameObject; import com.fr.report.write.ReportWriteAttr; import com.fr.report.write.ValueVerifier; import com.fr.report.write.WClassVerifier; import com.fr.stable.ArrayUtils; import com.fr.stable.Nameable; import java.util.ArrayList; import java.util.Set; /** * 校验列表 */ public class VerifierListPane extends ObjectJControlPane { public VerifierListPane(ElementCasePane ePane) { super(ePane); } /** * 创建选项 * * @return 选项 */ public NameableCreator[] createNameableCreators() { NameableCreator[] creators = new NameableCreator[]{ new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"BuildIn", "Verify"}), "/com/fr/web/images/reportlet.png", ValueVerifier.class, BuildInVerifierPane.class) }; Set<VerifyDefineProvider> set = ExtraDesignClassManager.getInstance().getArray(VerifyDefineProvider.MARK_STRING); for (VerifyDefineProvider provider : set) { creators = ArrayUtils.add(creators, new NameObjectCreator( provider.nameForVerifier(), provider.iconPath(), provider.classForVerifier(), provider.appearanceForVerifier() ) { }); } creators = ArrayUtils.add(creators, new NameObjectCreator( com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Custom", "Verify"}), "/com/fr/web/images/reportlet.png", WClassVerifier.class, CustomVerifierPane.class)); return creators; } @Override protected String title4PopupWindow() { return "Verify Collections"; } public void populate(ReportWriteAttr reportWriteAttr) { if (reportWriteAttr == null) { return; } java.util.List<NameObject> nameObjectList = new ArrayList<>(); int verifierCount = reportWriteAttr.getVerifierCount(); for (int i = 0; i < verifierCount; i++) { Verifier verifier = reportWriteAttr.getVerifier(i); nameObjectList.add(new NameObject(verifier.getName(), verifier)); } this.populate(nameObjectList.toArray(new NameObject[nameObjectList.size()])); } public void updateReportWriteAttr(ReportWriteAttr reportWriteAttr) { // Nameable[]居然不能强转成NameObject[],一定要这么写... Nameable[] res = this.update(); NameObject[] res_array = new NameObject[res.length]; java.util.Arrays.asList(res).toArray(res_array); reportWriteAttr.clearVerifiers(); for (int i = 0; i < res_array.length; i++) { NameObject nameObject = res_array[i]; if (nameObject.getObject() instanceof Verifier) { Verifier verifier = (Verifier) nameObject.getObject(); verifier.setName(nameObject.getName()); reportWriteAttr.addVerifier(verifier); } } } } package com.fr.design.report;
import com.fr.data.Verifier;
import com.fr.design.ExtraDesignClassManager;
import com.fr.design.fun.VerifyDefineProvider;
import com.fr.design.gui.controlpane.NameObjectCreator;
import com.fr.design.gui.controlpane.NameableCreator;
import com.fr.design.gui.controlpane.ObjectJControlPane;
import com.fr.design.mainframe.ElementCasePane;
import com.fr.general.NameObject;
import com.fr.report.write.ReportWriteAttr;
import com.fr.report.write.ValueVerifier;
import com.fr.report.write.WClassVerifier;
import com.fr.stable.ArrayUtils;
import com.fr.stable.Nameable;
import java.util.ArrayList;
import java.util.Set;
/**
* 校验列表
*/
public class VerifierListPane extends ObjectJControlPane {
public VerifierListPane(ElementCasePane ePane) {
super(ePane);
}
/**
* 创建选项
*
* @return 选项
*/
public NameableCreator[] createNameableCreators() {
NameableCreator[] creators = new NameableCreator[]{
new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_BuildIn_Verify"),
"/com/fr/web/images/reportlet.png",
ValueVerifier.class,
BuildInVerifierPane.class)
};
Set<VerifyDefineProvider> set = ExtraDesignClassManager.getInstance().getArray(VerifyDefineProvider.MARK_STRING);
for (VerifyDefineProvider provider : set) {
creators = ArrayUtils.add(creators, new NameObjectCreator(
provider.nameForVerifier(),
provider.iconPath(),
provider.classForVerifier(),
provider.appearanceForVerifier()
) {
});
}
creators = ArrayUtils.add(creators, new NameObjectCreator(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Custom_Verify"),
"/com/fr/web/images/reportlet.png",
WClassVerifier.class,
CustomVerifierPane.class));
return creators;
}
@Override
protected String title4PopupWindow() {
return "Verify Collections";
}
public void populate(ReportWriteAttr reportWriteAttr) {
if (reportWriteAttr == null) {
return;
}
java.util.List<NameObject> nameObjectList = new ArrayList<>();
int verifierCount = reportWriteAttr.getVerifierCount();
for (int i = 0; i < verifierCount; i++) {
Verifier verifier = reportWriteAttr.getVerifier(i);
nameObjectList.add(new NameObject(verifier.getName(), verifier));
}
this.populate(nameObjectList.toArray(new NameObject[nameObjectList.size()]));
}
public void updateReportWriteAttr(ReportWriteAttr reportWriteAttr) {
// Nameable[]居然不能强转成NameObject[],一定要这么写...
Nameable[] res = this.update();
NameObject[] res_array = new NameObject[res.length];
java.util.Arrays.asList(res).toArray(res_array);
reportWriteAttr.clearVerifiers();
for (int i = 0; i < res_array.length; i++) {
NameObject nameObject = res_array[i];
if (nameObject.getObject() instanceof Verifier) {
Verifier verifier = (Verifier) nameObject.getObject();
verifier.setName(nameObject.getName());
reportWriteAttr.addVerifier(verifier);
}
}
}
}

2
designer-realize/src/main/java/com/fr/design/report/freeze/FreezePagePane.java

@ -12,7 +12,7 @@ public class FreezePagePane extends FreezeAndRepeatPane {
public FreezePagePane(boolean isNumber) { public FreezePagePane(boolean isNumber) {
this.isNumber = isNumber; this.isNumber = isNumber;
start = new UILabel(isNumber ? com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Frozen", "N.O."})+" 1" : com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Frozen", "N.O."})+" A", SwingConstants.CENTER); start = new UILabel(isNumber ? com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Frozen_N.O.")+" 1" : com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Frozen_N.O.")+" A", SwingConstants.CENTER);
end = new UILabel(isNumber ? " 1"+com.fr.design.i18n.Toolkit.i18nText("Row") : " A"+com.fr.design.i18n.Toolkit.i18nText("Column"), SwingConstants.CENTER); end = new UILabel(isNumber ? " 1"+com.fr.design.i18n.Toolkit.i18nText("Row") : " A"+com.fr.design.i18n.Toolkit.i18nText("Column"), SwingConstants.CENTER);
super.initComponent(); super.initComponent();
} }

4
designer-realize/src/main/java/com/fr/design/report/freeze/FreezeWriteColPane.java

@ -10,7 +10,7 @@ public class FreezeWriteColPane extends FreezeAndRepeatPane {
public FreezeWriteColPane() { public FreezeWriteColPane() {
start = new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Frozen", "N.O."}) + " A", SwingConstants.CENTER); start = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Frozen_N.O.") + " A", SwingConstants.CENTER);
end = new ColSpinner(1,Integer.MAX_VALUE,1,1); end = new ColSpinner(1,Integer.MAX_VALUE,1,1);
super.initComponent(); super.initComponent();
this.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Column"))); this.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Column")));
@ -25,7 +25,7 @@ public class FreezeWriteColPane extends FreezeAndRepeatPane {
@Override @Override
public void populateBean(FT ob) { public void populateBean(FT ob) {
((UILabel)start).setText(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Frozen", "N.O."}) + StableUtils.convertIntToABC(ob.getFrom())); ((UILabel)start).setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Frozen_N.O.") + StableUtils.convertIntToABC(ob.getFrom()));
((ColSpinner)end).setValue((ob.getTo() + 1)); ((ColSpinner)end).setValue((ob.getTo() + 1));
} }

4
designer-realize/src/main/java/com/fr/design/report/freeze/FreezeWriteRowPane.java

@ -9,7 +9,7 @@ import com.fr.stable.StableUtils;
public class FreezeWriteRowPane extends FreezeAndRepeatPane { public class FreezeWriteRowPane extends FreezeAndRepeatPane {
public FreezeWriteRowPane() { public FreezeWriteRowPane() {
start = new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Frozen", "N.O."}) + " 1", SwingConstants.CENTER); start = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Frozen_N.O.") + " 1", SwingConstants.CENTER);
end = new RowSpinner(1, Integer.MAX_VALUE, 1,1); end = new RowSpinner(1, Integer.MAX_VALUE, 1,1);
super.initComponent(); super.initComponent();
this.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Row"))); this.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Row")));
@ -22,7 +22,7 @@ public class FreezeWriteRowPane extends FreezeAndRepeatPane {
@Override @Override
public void populateBean(FT ob) { public void populateBean(FT ob) {
((UILabel)start).setText(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Frozen", "N.O."}) + String.valueOf(ob.getFrom())); ((UILabel)start).setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Frozen_N.O.") + String.valueOf(ob.getFrom()));
((RowSpinner)end).setValue(ob.getTo() + 1); ((RowSpinner)end).setValue(ob.getTo() + 1);
} }

10
designer-realize/src/main/java/com/fr/design/report/freeze/RepeatAndFreezeSettingPane.java

@ -66,7 +66,7 @@ public class RepeatAndFreezeSettingPane extends BasicPane {
JPanel soverlapRowStartPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); JPanel soverlapRowStartPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
useRepeatTitleRCheckBox = new UICheckBox(); useRepeatTitleRCheckBox = new UICheckBox();
soverlapRowStartPane.add(useRepeatTitleRCheckBox); soverlapRowStartPane.add(useRepeatTitleRCheckBox);
soverlapRowStartPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"PageSetup-Title_Start_Row", "From"}))); soverlapRowStartPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Title_Start_Row_Form")));
repeatTitleRowPane = new RepeatRowPane(); repeatTitleRowPane = new RepeatRowPane();
soverlapRowStartPane.add(repeatTitleRowPane); soverlapRowStartPane.add(repeatTitleRowPane);
@ -81,7 +81,7 @@ public class RepeatAndFreezeSettingPane extends BasicPane {
JPanel soverlapColStartPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); JPanel soverlapColStartPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
useRepeatTitleCCheckBox = new UICheckBox(); useRepeatTitleCCheckBox = new UICheckBox();
soverlapColStartPane.add(useRepeatTitleCCheckBox); soverlapColStartPane.add(useRepeatTitleCCheckBox);
soverlapColStartPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"PageSetup-Title_Start_Column", "From"}))); soverlapColStartPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Title_Start_Column_Form")));
// 重复打印标题的结束列 // 重复打印标题的结束列
repeatTitleColPane = new RepeatColPane(); repeatTitleColPane = new RepeatColPane();
soverlapColStartPane.add(repeatTitleColPane); soverlapColStartPane.add(repeatTitleColPane);
@ -97,7 +97,7 @@ public class RepeatAndFreezeSettingPane extends BasicPane {
JPanel foverlapRowStartPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); JPanel foverlapRowStartPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
useRepeatFinisRCheckBox = new UICheckBox(); useRepeatFinisRCheckBox = new UICheckBox();
foverlapRowStartPane.add(useRepeatFinisRCheckBox); foverlapRowStartPane.add(useRepeatFinisRCheckBox);
foverlapRowStartPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"PageSetup-Finis_Start_Row", "From"}))); foverlapRowStartPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Finis_Start_Row_Form")));
repeatFinisRowPane = new RepeatRowPane(); repeatFinisRowPane = new RepeatRowPane();
foverlapRowStartPane.add(repeatFinisRowPane); foverlapRowStartPane.add(repeatFinisRowPane);
@ -112,7 +112,7 @@ public class RepeatAndFreezeSettingPane extends BasicPane {
JPanel foverlapColStartPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); JPanel foverlapColStartPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
useRepeatFinisCCheckBox = new UICheckBox(); useRepeatFinisCCheckBox = new UICheckBox();
foverlapColStartPane.add(useRepeatFinisCCheckBox); foverlapColStartPane.add(useRepeatFinisCCheckBox);
foverlapColStartPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"PageSetup-Finis_Start_Column", "From"}))); foverlapColStartPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Finis_Start_Column_Form")));
repeatFinisColPane = new RepeatColPane(); repeatFinisColPane = new RepeatColPane();
foverlapColStartPane.add(repeatFinisColPane); foverlapColStartPane.add(repeatFinisColPane);
@ -175,7 +175,7 @@ public class RepeatAndFreezeSettingPane extends BasicPane {
private JPanel initWriteFrozenPane() { private JPanel initWriteFrozenPane() {
JPanel writePanel = FRGUIPaneFactory.createBorderLayout_S_Pane(); JPanel writePanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
// 填报冻结 // 填报冻结
UILabel writeLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Face_Write", "Frozen"}) + ":"); UILabel writeLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Face_Write_Frozen") + ":");
JPanel writeLabelPanel = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); JPanel writeLabelPanel = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
writeLabelPanel.add(writeLabel); writeLabelPanel.add(writeLabel);
writePanel.add(writeLabelPanel, BorderLayout.NORTH); writePanel.add(writeLabelPanel, BorderLayout.NORTH);

2
designer-realize/src/main/java/com/fr/design/webattr/DragToolBarPane.java

@ -136,7 +136,7 @@ public class DragToolBarPane extends WidgetToolBarPane {
@Override @Override
protected String title4PopupWindow() { protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"ReportServerP-Toolbar", "Set"}); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Toolbar");
} }
ListCellRenderer optionRenderer = new DefaultListCellRenderer() { ListCellRenderer optionRenderer = new DefaultListCellRenderer() {

18
designer-realize/src/main/java/com/fr/design/webattr/EditToolBar.java

@ -152,12 +152,12 @@ public class EditToolBar extends BasicPane {
this.add(splitPane); this.add(splitPane);
list.addListSelectionListener(listSelectionListener); list.addListSelectionListener(listSelectionListener);
JPanel backgroundPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); JPanel backgroundPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
UIButton bgButton = new UIButton(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Background", "Set"})); UIButton bgButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Background"));
defaultCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Default", "Background"})); defaultCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Default_Background"));
bgButton.addActionListener(actioner); bgButton.addActionListener(actioner);
backgroundPane.add(defaultCheckBox); backgroundPane.add(defaultCheckBox);
backgroundPane.add(bgButton); backgroundPane.add(bgButton);
backgroundPane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Background", "Set"}))); backgroundPane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Background")));
this.add(backgroundPane, BorderLayout.SOUTH); this.add(backgroundPane, BorderLayout.SOUTH);
} }
@ -380,13 +380,13 @@ public class EditToolBar extends BasicPane {
double rowSize[] = {p, p}; double rowSize[] = {p, p};
double columnSize[] = {p, p}; double columnSize[] = {p, p};
Component[][] coms = new Component[][]{{new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Widget", "Printer-Alias"}) + ":"), nameField}, {new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Widget", "Icon"}) + ":"), iconPane}}; Component[][] coms = new Component[][]{{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Widget_Printer_Alias") + ":"), nameField}, {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Widget_Icon") + ":"), iconPane}};
JPanel nameIconPane = TableLayoutHelper.createTableLayoutPane(coms, rowSize, columnSize); JPanel nameIconPane = TableLayoutHelper.createTableLayoutPane(coms, rowSize, columnSize);
north.add(nameIconPane, BorderLayout.SOUTH); north.add(nameIconPane, BorderLayout.SOUTH);
north.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Form-Button", "Property", "Set"}))); north.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Form_Button_Property")));
this.add(north, BorderLayout.NORTH); this.add(north, BorderLayout.NORTH);
JPanel none = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); JPanel none = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
centerPane = FRGUIPaneFactory.createCardLayout_S_Pane(); centerPane = FRGUIPaneFactory.createCardLayout_S_Pane();
@ -442,14 +442,14 @@ public class EditToolBar extends BasicPane {
export = exportToolBarProviders[i].updateCenterPane(export); export = exportToolBarProviders[i].updateCenterPane(export);
} }
export.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Form-Button", "Property", "Set"}), null)); export.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Form_Button_Property"), null));
return export; return export;
} }
private JPanel getCpane() { private JPanel getCpane() {
JPanel appendCountPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane(); JPanel appendCountPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane();
count = new UIBasicSpinner(new SpinnerNumberModel(1, 0, Integer.MAX_VALUE, 1)); count = new UIBasicSpinner(new SpinnerNumberModel(1, 0, Integer.MAX_VALUE, 1));
UILabel countLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Add", "Row", "Column", "Numbers"}) + ":"); UILabel countLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Add_Row_Column_Numbers") + ":");
JPanel cpane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); JPanel cpane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
cpane.add(countLabel); cpane.add(countLabel);
cpane.add(count); cpane.add(count);
@ -460,10 +460,10 @@ public class EditToolBar extends BasicPane {
private JPanel getSubmitPane() { private JPanel getSubmitPane() {
isVerify = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Verify-Data_Verify")); isVerify = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Verify-Data_Verify"));
failSubmit = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Verify_Fail", "Still", "Submit"})); failSubmit = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Verify_Fail_Still_Submit"));
isCurSheet = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Only_Submit_Current_Sheet")); isCurSheet = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Only_Submit_Current_Sheet"));
JPanel submitPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane(); JPanel submitPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane();
submitPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Form-Button", "Property", "Set"}), null)); submitPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Form_Button_Property"), null));
submitPane.add(isVerify); submitPane.add(isVerify);
submitPane.add(failSubmit); submitPane.add(failSubmit);
submitPane.add(isCurSheet); submitPane.add(isCurSheet);

2
designer-realize/src/main/java/com/fr/design/webattr/ReportWebWidgetConstants.java

@ -149,7 +149,7 @@ public class ReportWebWidgetConstants {
public static final WidgetOption SETPRINTEROFFSET = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_SetPrinterOffset"), BaseUtils.readIcon("/com/fr/web/images/pianyi.png"), SetPrinterOffset.class); public static final WidgetOption SETPRINTEROFFSET = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_SetPrinterOffset"), BaseUtils.readIcon("/com/fr/web/images/pianyi.png"), SetPrinterOffset.class);
public static final WidgetOption CUSTOM_BUTTON = WidgetOptionFactory public static final WidgetOption CUSTOM_BUTTON = WidgetOptionFactory
.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Custom", "Form-Button"}), CustomToolBarButton.class); .createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Custom_Form_Button"), CustomToolBarButton.class);
// 输出离线html报表 // 输出离线html报表
public static final WidgetOption WRITEOFFLINEHTML = WidgetOptionFactory public static final WidgetOption WRITEOFFLINEHTML = WidgetOptionFactory

2
designer-realize/src/main/java/com/fr/design/webattr/ToolBarDragPane.java

@ -256,7 +256,7 @@ public class ToolBarDragPane extends WidgetToolBarPane {
@Override @Override
protected String title4PopupWindow() { protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"ReportServerP-Toolbar", "Set"}); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Toolbar");
} }
public void setCheckBoxSelected(boolean b) { public void setCheckBoxSelected(boolean b) {

2
designer-realize/src/main/java/com/fr/design/webattr/WriteToolBarPane.java

@ -73,7 +73,7 @@ public class WriteToolBarPane extends AbstractEditToolBarPane {
rptButtonGroup.add(centerRadioButton); rptButtonGroup.add(centerRadioButton);
northPane.add(GUICoreUtils.createFlowPane(new Component[]{rptShowLocationLabel, centerRadioButton, leftRadioButton}, FlowLayout.LEFT)); northPane.add(GUICoreUtils.createFlowPane(new Component[]{rptShowLocationLabel, centerRadioButton, leftRadioButton}, FlowLayout.LEFT));
colorBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Face_Write", "Current", "Edit", "Row", "Background", "Set"}) + ":"); colorBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Face_Write_Current_Edit_Row_Background") + ":");
colorBox.setSelected(true); colorBox.setSelected(true);
colorBox.addActionListener(colorListener); colorBox.addActionListener(colorListener);
colorButton = new UIColorButton(BaseUtils.readIcon("/com/fr/design/images/gui/color/background.png")); colorButton = new UIColorButton(BaseUtils.readIcon("/com/fr/design/images/gui/color/background.png"));

2
designer-realize/src/main/java/com/fr/design/webattr/WriteWebSettingPane.java

@ -76,7 +76,7 @@ public class WriteWebSettingPane extends WebSettingPane<WebWrite> {
unloadCheck = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Unload_Check")); unloadCheck = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Unload_Check"));
unloadCheck.setSelected(true); unloadCheck.setSelected(true);
showWidgets = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"FR-Engine_Event_showWidgets"})); showWidgets = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Event_Show_Widgets"));
showWidgets.setSelected(false); showWidgets.setSelected(false);
isAutoStash = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Write_Auto_Stash")); isAutoStash = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Write_Auto_Stash"));
isAutoStash.setSelected(false); isAutoStash.setSelected(false);

2
designer-realize/src/main/java/com/fr/design/widget/ValueWidgetPane.java

@ -27,7 +27,7 @@ public class ValueWidgetPane extends WidgetPane {
public JPanel initNorthPane(){ public JPanel initNorthPane(){
JPanel northPane = super.initNorthPane(); JPanel northPane = super.initNorthPane();
label = new UILabel(" " + com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Widget", "Value"})+ ":"); label = new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Widget_Value")+ ":");
label.setVisible(false); label.setVisible(false);
widgetValuePane = new JPanel(); widgetValuePane = new JPanel();
widgetValuePane.setLayout(FRGUIPaneFactory.createBorderLayout()); widgetValuePane.setLayout(FRGUIPaneFactory.createBorderLayout());

2
designer-realize/src/main/java/com/fr/design/widget/WidgetPane.java

@ -81,7 +81,7 @@ public class WidgetPane extends AbstractAttrNoScrollPane implements ItemListener
double[] columnSize = {p, p, f}; double[] columnSize = {p, p, f};
double[] rowSize = {p}; double[] rowSize = {p};
Component[][] components = new Component[][]{ Component[][] components = new Component[][]{
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"FR-Designer_Selection", "FR-Designer_Widget"})), emptyLabel, editorTypeComboBox}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Select_Widget")), emptyLabel, editorTypeComboBox},
}; };
JPanel jPanel = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); JPanel jPanel = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
return jPanel; return jPanel;

2
designer-realize/src/main/java/com/fr/design/widget/ui/CheckBoxGroupDefinePane.java

@ -37,7 +37,7 @@ public class CheckBoxGroupDefinePane extends FieldEditorDefinePane<CheckBoxGroup
@Override @Override
protected JPanel setFirstContentPane() { protected JPanel setFirstContentPane() {
JPanel advancePane = FRGUIPaneFactory.createBorderLayout_S_Pane(); JPanel advancePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
checkbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Provide", "Choose_All"})); checkbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Provide_Choose_All"));
checkbox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); checkbox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
buttonGroupDictPane = new ButtonGroupDictPane(); buttonGroupDictPane = new ButtonGroupDictPane();
checkBoxDictPane = new CheckBoxDictPane(); checkBoxDictPane = new CheckBoxDictPane();

2
designer-realize/src/main/java/com/fr/design/widget/ui/ParameterTreeComboBox.java

@ -171,7 +171,7 @@ public class ParameterTreeComboBox extends FRTreeComboBox {
} }
} }
if (!ArrayUtils.isEmpty(parameters)) { if (!ArrayUtils.isEmpty(parameters)) {
groupList.add(new ParameterGroup(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Server", "Datasource-Datasource", "Parameter"}), parameters)); groupList.add(new ParameterGroup(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Server_Datasource_Parameter"), parameters));
} }
return groupList.toArray(new ParameterGroup[0]); return groupList.toArray(new ParameterGroup[0]);

2
designer-realize/src/main/java/com/fr/design/widget/ui/btn/DefineAppendColumnRowPane.java

@ -47,7 +47,7 @@ public class DefineAppendColumnRowPane extends BasicPane {
UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Append_Delete_Row_Message")); UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Append_Delete_Row_Message"));
label.setForeground(new Color(0x8F8F92)); label.setForeground(new Color(0x8F8F92));
lpane.add(label); lpane.add(label);
Component[][] components = { { new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Specify", "Cell"})), crEditor }, { rowCountLable, jNumberEditor } ,{lpane,null}}; Component[][] components = { { new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Specify_Cell")), crEditor }, { rowCountLable, jNumberEditor } ,{lpane,null}};
JPanel contentPane = TableLayoutHelper.createGapTableLayoutPane(components, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L2, IntervalConstants.INTERVAL_L1); JPanel contentPane = TableLayoutHelper.createGapTableLayoutPane(components, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L2, IntervalConstants.INTERVAL_L1);
contentPane.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0)); contentPane.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));

2
designer-realize/src/main/java/com/fr/design/widget/ui/btn/DefineDeleteColumnRowPane.java

@ -38,7 +38,7 @@ public class DefineDeleteColumnRowPane extends BasicPane {
UILabel messageLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Append_Delete_Row_Message")); UILabel messageLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Append_Delete_Row_Message"));
messageLabel.setForeground(new Color(0x8F8F92)); messageLabel.setForeground(new Color(0x8F8F92));
Component[][] components = { Component[][] components = {
{ new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Specify", "Cell"})), crEditor }, { new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Specify_Cell")), crEditor },
{ messageLabel, null}}; { messageLabel, null}};
JPanel contentPane = TableLayoutHelper.createGapTableLayoutPane(components, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L2, IntervalConstants.INTERVAL_L1); JPanel contentPane = TableLayoutHelper.createGapTableLayoutPane(components, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L2, IntervalConstants.INTERVAL_L1);
contentPane.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0)); contentPane.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));

4
designer-realize/src/main/java/com/fr/design/write/submit/SmartInsertDBManipulationPane.java

@ -82,11 +82,11 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
@Override @Override
public NameableCreator[] createNameableCreators() { public NameableCreator[] createNameableCreators() {
return new NameableCreator[]{ return new NameableCreator[]{
new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Submit", "Event"}), new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Submit_Event"),
"/com/fr/web/images/reportlet.png", "/com/fr/web/images/reportlet.png",
DMLConfigJob.class, DMLConfigJob.class,
SmartInsertDMLJobPane.class), SmartInsertDMLJobPane.class),
new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Custom", "Event"}), new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Custom_Event"),
"/com/fr/web/images/reportlet.png", "/com/fr/web/images/reportlet.png",
ClassSubmitJob.class, ClassSubmitJob.class,
CustomSubmitJobPane.class)}; CustomSubmitJobPane.class)};

6
designer-realize/src/main/java/com/fr/grid/selection/FloatSelection.java

@ -78,7 +78,7 @@ public class FloatSelection extends Selection {
@Override @Override
public boolean pasteCellElementsClip(CellElementsClip ceClip, ElementCasePane ePane) { public boolean pasteCellElementsClip(CellElementsClip ceClip, ElementCasePane ePane) {
Toolkit.getDefaultToolkit().beep(); Toolkit.getDefaultToolkit().beep();
DesignUtils.errorMessage(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Only_selected_cell_can_paste_only", "M_Insert-Cell"})); DesignUtils.errorMessage(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Paste_Cell_Tips"));
return false; return false;
} }
@ -86,7 +86,7 @@ public class FloatSelection extends Selection {
@Override @Override
public boolean pasteString(String str, ElementCasePane ePane) { public boolean pasteString(String str, ElementCasePane ePane) {
Toolkit.getDefaultToolkit().beep(); Toolkit.getDefaultToolkit().beep();
DesignUtils.errorMessage(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Only_selected_cell_can_paste_only", "Character"})); DesignUtils.errorMessage(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Paste_Character_Tips"));
// return pasteOtherType(str, ePane); // return pasteOtherType(str, ePane);
return false; return false;
} }
@ -238,7 +238,7 @@ public class FloatSelection extends Selection {
FloatElement selectedFloat = ePane.getEditingElementCase().getFloatElement(selectedFloatName); FloatElement selectedFloat = ePane.getEditingElementCase().getFloatElement(selectedFloatName);
Object value = null; Object value = null;
//处理撤销时npe //处理撤销时npe
if(selectedFloat != null) { if (selectedFloat != null) {
value = selectedFloat.getValue(); value = selectedFloat.getValue();
} }
value = value == null ? "" : value; value = value == null ? "" : value;

Loading…
Cancel
Save