fanruan
/
design
6
1
Fork 1
Code Issues 2 Pull Requests Releases Wiki Activity
Browse Source

模板填报属性

persist/11.0-arabic
obo 6 months ago
parent
6c35381353
commit
5b0adb5199
6 changed files with 29 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      designer-base/src/main/java/com/fr/design/gui/frpane/ObjectProperiesPane.java
  2. 8
      designer-base/src/main/java/com/fr/design/write/submit/CustomJobPane.java
  3. 24
      designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java
  4. 3
      designer-realize/src/main/java/com/fr/design/report/ValueVerifierEditPane.java
  5. 2
      designer-realize/src/main/java/com/fr/design/webattr/ReportWriteAttrPane.java
  6. 7
      designer-realize/src/main/java/com/fr/design/write/submit/SubmitVisitorListPane.java

3
designer-base/src/main/java/com/fr/design/gui/frpane/ObjectProperiesPane.java
Unescape View File

@ -1,6 +1,7 @@
package com.fr.design.gui.frpane; package com.fr.design.gui.frpane;
import com.fr.base.BaseUtils; import com.fr.base.BaseUtils;
import com.fr.base.i18n.BidiUtils;
import com.fr.design.beans.BasicBeanPane; import com.fr.design.beans.BasicBeanPane;
import com.fr.design.editor.ValueEditorPane; import com.fr.design.editor.ValueEditorPane;
import com.fr.design.editor.ValueEditorPaneFactory; import com.fr.design.editor.ValueEditorPaneFactory;
@ -30,7 +31,7 @@ public class ObjectProperiesPane extends BasicBeanPane<ListMap> {
JPanel buttonPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); JPanel buttonPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
this.addButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Add") + " " +com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Property")); this.addButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Add") + " " +com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Property"));
buttonPane.add(this.addButton, BorderLayout.WEST); buttonPane.add(this.addButton, BidiUtils.rtl() ? BorderLayout.EAST : BorderLayout.WEST);
this.add(buttonPane, BorderLayout.NORTH); this.add(buttonPane, BorderLayout.NORTH);
this.addButton.addActionListener(new ActionListener() { this.addButton.addActionListener(new ActionListener() {

8
designer-base/src/main/java/com/fr/design/write/submit/CustomJobPane.java
Unescape View File

@ -1,6 +1,7 @@
package com.fr.design.write.submit; package com.fr.design.write.submit;
import com.fr.base.GraphHelper; import com.fr.base.GraphHelper;
import com.fr.base.i18n.BidiUtils;
import com.fr.data.AbstractClassJob; import com.fr.data.AbstractClassJob;
import com.fr.design.data.tabledata.tabledatapane.ClassNameSelectPane; import com.fr.design.data.tabledata.tabledatapane.ClassNameSelectPane;
import com.fr.design.beans.BasicBeanPane; import com.fr.design.beans.BasicBeanPane;
@ -86,18 +87,19 @@ public abstract class CustomJobPane extends BasicBeanPane {
} }
}); });
reportletNamePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Class_Name"), null)); reportletNamePane.setBorder(BidiUtils.applyTitledBorderJustification(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Class_Name"), null)));
this.add(reportletNamePane, BorderLayout.NORTH); this.add(reportletNamePane, BorderLayout.NORTH);
objectProperiesPane = new ObjectProperiesPane(); objectProperiesPane = new ObjectProperiesPane();
objectProperiesPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Property"), null)); objectProperiesPane.setBorder(BidiUtils.applyTitledBorderJustification(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Property"), null)));
this.add(objectProperiesPane, BorderLayout.CENTER); this.add(objectProperiesPane, BorderLayout.CENTER);
UITextArea area = new UITextArea(2, 1); UITextArea area = new UITextArea(2, 1);
area.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Extend_Class", "com.fr.data.AbstractSubmitTask")); area.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Extend_Class", "com.fr.data.AbstractSubmitTask"));
BidiUtils.setOrientationByLocale(area);
JPanel dsPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); JPanel dsPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
dsPane.add(area); dsPane.add(area);
dsPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom_Job_Description"), null)); dsPane.setBorder(BidiUtils.applyTitledBorderJustification(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom_Job_Description"), null)));
this.add(dsPane, BorderLayout.SOUTH); this.add(dsPane, BorderLayout.SOUTH);
checkAddButtonEnable(); checkAddButtonEnable();
} }

24
designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java
Unescape View File

@ -3,6 +3,7 @@ package com.fr.design.write.submit;
import com.fr.base.BaseFormula; import com.fr.base.BaseFormula;
import com.fr.base.BaseUtils; import com.fr.base.BaseUtils;
import com.fr.base.Parameter; import com.fr.base.Parameter;
import com.fr.base.i18n.BidiUtils;
import com.fr.data.DataConstants; import com.fr.data.DataConstants;
import com.fr.data.condition.JoinCondition; import com.fr.data.condition.JoinCondition;
import com.fr.data.condition.ListCondition; import com.fr.data.condition.ListCondition;
@ -28,6 +29,7 @@ import com.fr.design.gui.icombobox.UIComboBoxRenderer;
import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.ilist.CheckBoxList; import com.fr.design.gui.ilist.CheckBoxList;
import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode; import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode;
import com.fr.design.i18n.Toolkit;
import com.fr.design.javascript.JavaScriptActionPane; import com.fr.design.javascript.JavaScriptActionPane;
import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.DesignerContext;
@ -61,6 +63,7 @@ import javax.swing.JTable;
import javax.swing.JTree; import javax.swing.JTree;
import javax.swing.ListSelectionModel; import javax.swing.ListSelectionModel;
import javax.swing.SwingUtilities; import javax.swing.SwingUtilities;
import javax.swing.border.TitledBorder;
import javax.swing.table.AbstractTableModel; import javax.swing.table.AbstractTableModel;
import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.DefaultTableCellRenderer;
import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellEditor;
@ -145,12 +148,12 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
dmlConfigComboBox = new UIComboBox(DML_CONFIG_TYPES); dmlConfigComboBox = new UIComboBox(DML_CONFIG_TYPES);
JPanel typePane = GUICoreUtils.createFlowPane(new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Write_Choose_Submit_Type") + ":"), dmlConfigComboBox}, JPanel typePane = GUICoreUtils.createFlowPane(new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Write_Choose_Submit_Type") + ":"), dmlConfigComboBox},
FlowLayout.LEFT, 10); BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT, 10);
typePane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Write_Submit_Type"))); typePane.setBorder(BidiUtils.applyTitledBorderJustification(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Write_Submit_Type"))));
northPane.add(typePane, BorderLayout.NORTH); northPane.add(typePane, BorderLayout.NORTH);
chooseTable = new ChoosePaneSupportFormula(); chooseTable = new ChoosePaneSupportFormula();
chooseTable.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_Table"))); chooseTable.setBorder(BidiUtils.applyTitledBorderJustification(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_Table"))));
chooseTable.setTableNameComboBoxPopSize(160, 320); chooseTable.setTableNameComboBoxPopSize(160, 320);
northPane.add(chooseTable, BorderLayout.CENTER); northPane.add(chooseTable, BorderLayout.CENTER);
@ -158,7 +161,7 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
// peter:编辑的TablePane // peter:编辑的TablePane
JPanel editTablePane = FRGUIPaneFactory.createBorderLayout_S_Pane(); JPanel editTablePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
this.add(editTablePane, BorderLayout.CENTER); this.add(editTablePane, BorderLayout.CENTER);
editTablePane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_Value"))); editTablePane.setBorder(BidiUtils.applyTitledBorderJustification(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_Value"))));
keyColumnValuesTable = new KeyColumnNameValueTable(); keyColumnValuesTable = new KeyColumnNameValueTable();
editTablePane.add(new JScrollPane(this.keyColumnValuesTable), BorderLayout.CENTER); editTablePane.add(new JScrollPane(this.keyColumnValuesTable), BorderLayout.CENTER);
@ -188,7 +191,7 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
UpdateAction[] actions = this.getActions(); UpdateAction[] actions = this.getActions();
if (actions != null && actions.length > 0) { if (actions != null && actions.length > 0) {
JPanel controlBtnPane = new JPanel(new GridLayout(actions.length + 1, 1, 4, 4)); JPanel controlBtnPane = new JPanel(new GridLayout(actions.length + 1, 1, 4, 4));
editTablePane.add(GUICoreUtils.createBorderPane(controlBtnPane, BorderLayout.NORTH), BorderLayout.EAST); editTablePane.add(GUICoreUtils.createBorderPane(controlBtnPane, BorderLayout.NORTH), BidiUtils.rtl() ? BorderLayout.WEST : BorderLayout.EAST);
for (UpdateAction action : actions) { for (UpdateAction action : actions) {
controlBtnPane.add(new UIButton(action)); controlBtnPane.add(new UIButton(action));
@ -211,8 +214,9 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
} }
}); });
helpButton.set4ToolbarButton(); helpButton.set4ToolbarButton();
checkBoxUpdatePane.add(UpdateCheckBox, BorderLayout.WEST); checkBoxUpdatePane.add(UpdateCheckBox, BidiUtils.rtl() ? BorderLayout.EAST : BorderLayout.WEST);
checkBoxUpdatePane.add(helpButton, BorderLayout.EAST); checkBoxUpdatePane.add(helpButton, BidiUtils.rtl() ? BorderLayout.WEST : BorderLayout.EAST);
BidiUtils.applyOrientationByLocale(checkBoxUpdatePane);
} }
} }
@ -330,8 +334,8 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
protected void setBorderAndLayout(JPanel jPanel) { protected void setBorderAndLayout(JPanel jPanel) {
jPanel.setLayout(FRGUIPaneFactory.createBorderLayout()); jPanel.setLayout(FRGUIPaneFactory.createBorderLayout());
jPanel.setBorder(BorderFactory.createTitledBorder( jPanel.setBorder(BidiUtils.applyTitledBorderJustification(BorderFactory.createTitledBorder(
new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Submit_Condition"))); new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Submit_Condition"))));
} }
protected void addComponent(JPanel mainPane, JScrollPane addPane) { protected void addComponent(JPanel mainPane, JScrollPane addPane) {
@ -348,7 +352,7 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
} }
protected String setControlBtnPanePosition() { protected String setControlBtnPanePosition() {
return BorderLayout.EAST; return BidiUtils.rtl() ? BorderLayout.WEST : BorderLayout.EAST;
} }
private void refreshConditionList() { private void refreshConditionList() {

3
designer-realize/src/main/java/com/fr/design/report/ValueVerifierEditPane.java
Unescape View File

@ -1,6 +1,7 @@
package com.fr.design.report; package com.fr.design.report;
import com.fr.base.BaseFormula; import com.fr.base.BaseFormula;
import com.fr.base.i18n.BidiUtils;
import com.fr.data.VerifyItem; import com.fr.data.VerifyItem;
import com.fr.design.gui.itableeditorpane.ActionStyle; import com.fr.design.gui.itableeditorpane.ActionStyle;
import com.fr.design.gui.itableeditorpane.UIArrayFormulaTableModel; import com.fr.design.gui.itableeditorpane.UIArrayFormulaTableModel;
@ -27,7 +28,7 @@ public class ValueVerifierEditPane extends JPanel {
tableEditorPane = new UITableEditorPane(new UIArrayFormulaTableModel(columnNames, new int[] { tableEditorPane = new UITableEditorPane(new UIArrayFormulaTableModel(columnNames, new int[] {
ActionStyle.ADDSTYLE, ActionStyle.DELETESTYLE, ActionStyle.ADDSTYLE, ActionStyle.DELETESTYLE,
ActionStyle.MOVEUPSTYLE, ActionStyle.MOVEDOWNSTYLE})); ActionStyle.MOVEUPSTYLE, ActionStyle.MOVEDOWNSTYLE}));
this.add(tableEditorPane, BorderLayout.CENTER); this.add(BidiUtils.applyOrientationByLocale(tableEditorPane), BorderLayout.CENTER);
} }
/** /**

2
designer-realize/src/main/java/com/fr/design/webattr/ReportWriteAttrPane.java
Unescape View File

@ -1,5 +1,6 @@
package com.fr.design.webattr; package com.fr.design.webattr;
import com.fr.base.i18n.BidiUtils;
import com.fr.design.gui.frpane.LoadingBasicPane; import com.fr.design.gui.frpane.LoadingBasicPane;
import com.fr.design.gui.frpane.UITabbedPane; import com.fr.design.gui.frpane.UITabbedPane;
import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.FRGUIPaneFactory;
@ -56,6 +57,7 @@ public class ReportWriteAttrPane extends LoadingBasicPane {
tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Submit"), submiterListPane); tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Submit"), submiterListPane);
tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Verify_Data_Verify"), verifierListPane); tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Verify_Data_Verify"), verifierListPane);
tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Writer_ShortCuts_Setting"), writeShortCutsPane); tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Writer_ShortCuts_Setting"), writeShortCutsPane);
BidiUtils.applyOrientationByLocale(this);
} }
@Override @Override

7
designer-realize/src/main/java/com/fr/design/write/submit/SubmitVisitorListPane.java
Unescape View File

@ -1,5 +1,6 @@
package com.fr.design.write.submit; package com.fr.design.write.submit;
import com.fr.base.i18n.BidiUtils;
import com.fr.data.SubmitJob; import com.fr.data.SubmitJob;
import com.fr.design.ExtraDesignClassManager; import com.fr.design.ExtraDesignClassManager;
import com.fr.design.beans.BasicBeanPane; import com.fr.design.beans.BasicBeanPane;
@ -186,9 +187,9 @@ public class SubmitVisitorListPane extends ObjectJControlPane {
} }
csjConfigComboBox = new UIComboBox(configTypes.toArray()); csjConfigComboBox = new UIComboBox(configTypes.toArray());
JPanel typePane = GUICoreUtils.createFlowPane(new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Write_Choose_Submit_Type") + ":"), csjConfigComboBox}, JPanel typePane = GUICoreUtils.createFlowPane(new Component[]{new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Write_Choose_Submit_Type"), ":")), csjConfigComboBox},
FlowLayout.LEFT, 10); BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT, 10);
typePane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Write_Submit_Type"))); typePane.setBorder(BidiUtils.applyTitledBorderJustification(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Write_Submit_Type"))));
this.add(typePane, BorderLayout.NORTH); this.add(typePane, BorderLayout.NORTH);
this.add(customCardPane, BorderLayout.CENTER); this.add(customCardPane, BorderLayout.CENTER);

Write Preview
Loading…
Cancel
Save