eason-skx 8 years ago
parent
commit
8cb8d7308d
  1. 200
      designer_base/src/com/fr/design/data/datapane/TreeTableDataDictPane.java
  2. 10
      designer_base/src/com/fr/design/locale/designer.properties
  3. 10
      designer_base/src/com/fr/design/locale/designer_en_US.properties
  4. 10
      designer_base/src/com/fr/design/locale/designer_ja_JP.properties
  5. 10
      designer_base/src/com/fr/design/locale/designer_ko_KR.properties
  6. 10
      designer_base/src/com/fr/design/locale/designer_zh_CN.properties
  7. 10
      designer_base/src/com/fr/design/locale/designer_zh_TW.properties
  8. 8
      designer_base/src/com/fr/design/style/color/UsedColorPane.java
  9. 38
      designer_form/src/com/fr/design/mainframe/FormArea.java

200
designer_base/src/com/fr/design/data/datapane/TreeTableDataDictPane.java

@ -1,21 +1,21 @@
package com.fr.design.data.datapane;
import com.fr.design.data.DesignTableDataManager;
import com.fr.data.impl.RecursionTableData;
import com.fr.design.data.DesignTableDataManager;
import com.fr.design.data.datapane.preview.PreviewLabel;
import com.fr.design.data.datapane.preview.PreviewLabel.Previewable;
import com.fr.design.data.datapane.preview.PreviewTablePane;
import com.fr.design.data.tabledata.wrapper.TableDataWrapper;
import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.ibutton.UIRadioButton;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.dialog.BasicPane;
import com.fr.design.editor.ValueEditorPane;
import com.fr.design.editor.ValueEditorPaneFactory;
import com.fr.design.editor.editor.ColumnIndexEditor;
import com.fr.design.editor.editor.ColumnNameEditor;
import com.fr.design.editor.editor.Editor;
import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.ibutton.UIRadioButton;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.general.Inter;
import com.fr.script.Calculator;
import com.fr.stable.StringUtils;
@ -36,29 +36,30 @@ public class TreeTableDataDictPane extends BasicPane implements Previewable {
private UIRadioButton lengthMarkRadio;
private ButtonGroup markButtonGroup;
UILabel originalMarkedFieldLabel1;
UILabel parentMarkedFieldLabel1;
UILabel treeDataFieldLabel1;
UILabel originalMarkedFieldLabel2;
UILabel treeDataFieldLabel2;
private UILabel originFieldDependsOnParentLabel;
private UILabel parentFieldLabel;
private UILabel treeDataFieldLabel1;
private UILabel originFieldDependsOnLengthLabel;
private UILabel treeDataFieldLabel2;
private ValueEditorPane originalMarkedFieldPane1;
private ValueEditorPane parentMarkedFieldPane1;
private ValueEditorPane originalMarkedFieldPane2;
private ValueEditorPane originFieldDependsOnParentPane;
private ValueEditorPane parentFieldPane;
private ValueEditorPane originFieldDependsOnLengthPane;
public TreeTableDataDictPane(){
public TreeTableDataDictPane() {
this(StringUtils.EMPTY);
}
public TreeTableDataDictPane(String treeName) {
this.setLayout(new BorderLayout(5,30));
this.setLayout(new BorderLayout(5, 30));
this.setBorder(BorderFactory.createEmptyBorder(20, 20, 0, 0));
selectTableDataLabel = new UILabel(Inter.getLocText(new String[]{"Please_Select","Single", "DS-TableData"}) + " :");
selectTableDataLabel = new UILabel(Inter.getLocText(new String[]{"Please_Select", "Single", "DS-TableData"}) + " :");
setTableDataNameComboBox(treeName);
tableDataNameComboBox.setPreferredSize(new Dimension(180, 20));
JPanel tableFlowPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane();
tableFlowPane.add(selectTableDataLabel);
tableFlowPane.add(tableDataNameComboBox);
tableDataNameComboBox.addItemListener(new ItemListener(){
tableDataNameComboBox.addItemListener(new ItemListener() {
public void itemStateChanged(ItemEvent e) {
tdChange();
}
@ -66,12 +67,12 @@ public class TreeTableDataDictPane extends BasicPane implements Previewable {
tableFlowPane.add(new PreviewLabel(this));
this.add(tableFlowPane, BorderLayout.NORTH);
JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
this.add(centerPane,BorderLayout.CENTER);
parentMarkRadio = new UIRadioButton(Inter.getLocText("Build_Tree_Accord_Parent_Marked_Filed"), true);
lengthMarkRadio = new UIRadioButton(Inter.getLocText("Build_Tree_Accord_Marked_Filed_Length"));
this.add(centerPane, BorderLayout.CENTER);
parentMarkRadio = new UIRadioButton(Inter.getLocText("FR-Designer_Build_Tree_Accord_Parent_Marked_Filed"), true);
lengthMarkRadio = new UIRadioButton(Inter.getLocText("FR-Designer_Build_Tree_Accord_Marked_Filed_Length"));
parentMarkRadio.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
if(isBuildByParentFiled()) {
if (isBuildByParentFiled()) {
makeParentEnable();
tdChange();
}
@ -79,7 +80,7 @@ public class TreeTableDataDictPane extends BasicPane implements Previewable {
});
lengthMarkRadio.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
if(!isBuildByParentFiled()) {
if (!isBuildByParentFiled()) {
makeLengthEnable();
tdChange();
}
@ -89,60 +90,69 @@ public class TreeTableDataDictPane extends BasicPane implements Previewable {
markButtonGroup.add(parentMarkRadio);
markButtonGroup.add(lengthMarkRadio);
originalMarkedFieldLabel1 = new UILabel(Inter.getLocText("Original_Marked_Filed") + " :", SwingConstants.RIGHT);
parentMarkedFieldLabel1 = new UILabel(" " + Inter.getLocText("Parent_Marked_Field") + " :", SwingConstants.RIGHT);
treeDataFieldLabel1 = new UILabel(" " + Inter.getLocText("Tree_Data_Field") + " :", SwingConstants.RIGHT);
originalMarkedFieldLabel2 = new UILabel(Inter.getLocText("Original_Marked_Filed") + " :", SwingConstants.RIGHT);
treeDataFieldLabel2 = new UILabel(" " + Inter.getLocText("Tree_Data_Field") + " :", SwingConstants.RIGHT);
originFieldDependsOnParentLabel = new UILabel(Inter.getLocText("FR-Designer_Original_Marked_Filed") + " :", SwingConstants.RIGHT);
parentFieldLabel = new UILabel(" " + Inter.getLocText("FR-Designer_Parent_Marked_Field") + " :", SwingConstants.RIGHT);
treeDataFieldLabel1 = new UILabel(" " + Inter.getLocText("FR-Designer_Tree_Data_Field") + " :", SwingConstants.RIGHT);
originFieldDependsOnLengthLabel = new UILabel(Inter.getLocText("FR-Designer_Original_Marked_Filed") + " :", SwingConstants.RIGHT);
treeDataFieldLabel2 = new UILabel(" " + Inter.getLocText("FR-Designer_Tree_Data_Field") + " :", SwingConstants.RIGHT);
// originalMarkedFieldPane1 = ValueEditorPaneFactory.createValueEditorPane(new Editor[] {new OldColumnIndexEditor(Inter.getLocText("Columns"))});
// parentMarkedFieldPane1 = ValueEditorPaneFactory.createValueEditorPane(new Editor[] {new OldColumnIndexEditor(Inter.getLocText("Columns"))});
// originalMarkedFieldPane2 = ValueEditorPaneFactory.createValueEditorPane(new Editor[] {new OldColumnIndexEditor(Inter.getLocText("Columns"))});
originalMarkedFieldPane1 = ValueEditorPaneFactory.createValueEditorPane(new Editor[] { new ColumnNameEditor(), new ColumnIndexEditor() });
parentMarkedFieldPane1 = ValueEditorPaneFactory.createValueEditorPane(new Editor[] { new ColumnNameEditor(), new ColumnIndexEditor() });
originalMarkedFieldPane2 = ValueEditorPaneFactory.createValueEditorPane(new Editor[] { new ColumnNameEditor(), new ColumnIndexEditor() });
// originFieldDependsOnParentPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[] {new OldColumnIndexEditor(Inter.getLocText("Columns"))});
// parentFieldPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[] {new OldColumnIndexEditor(Inter.getLocText("Columns"))});
// originFieldDependsOnLengthPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[] {new OldColumnIndexEditor(Inter.getLocText("Columns"))});
originFieldDependsOnParentPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor()});
parentFieldPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor()});
originFieldDependsOnLengthPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor()});
makeParentEnable();
JPanel p1 = createCenterFlowZeroGapBorderPane(originalMarkedFieldLabel1, originalMarkedFieldPane1);
JPanel p2 = createCenterFlowZeroGapBorderPane(parentMarkedFieldLabel1, parentMarkedFieldPane1);
JPanel p1 = createCenterFlowZeroGapBorderPane(originFieldDependsOnParentLabel, originFieldDependsOnParentPane);
JPanel p2 = createCenterFlowZeroGapBorderPane(parentFieldLabel, parentFieldPane);
JPanel border1 = new JPanel();
border1.setLayout(new BorderLayout(0, 10));
border1.add(p1, BorderLayout.NORTH);
border1.add(p2, BorderLayout.CENTER);
JPanel p4 = createCenterFlowZeroGapBorderPane(originalMarkedFieldLabel2, originalMarkedFieldPane2);
JPanel p4 = createCenterFlowZeroGapBorderPane(originFieldDependsOnLengthLabel, originFieldDependsOnLengthPane);
JPanel border2 = new JPanel();
border2.setLayout(new BorderLayout(0, 20));
border2.add(p4, BorderLayout.NORTH);
JPanel xx = FRGUIPaneFactory.createBorderLayout_S_Pane();
xx.add(parentMarkRadio,BorderLayout.NORTH);
xx.add(border1,BorderLayout.CENTER);
xx.add(parentMarkRadio, BorderLayout.NORTH);
xx.add(border1, BorderLayout.CENTER);
JPanel xxx = FRGUIPaneFactory.createBorderLayout_S_Pane();
xxx.add(lengthMarkRadio,BorderLayout.NORTH);
xxx.add(border2,BorderLayout.CENTER);
xxx.add(lengthMarkRadio, BorderLayout.NORTH);
xxx.add(border2, BorderLayout.CENTER);
JPanel buildTreePanel = new JPanel(new BorderLayout(5, 30));
buildTreePanel.add(xx,BorderLayout.NORTH);
buildTreePanel.add(xxx,BorderLayout.CENTER);
buildTreePanel.add(xx, BorderLayout.NORTH);
buildTreePanel.add(xxx, BorderLayout.CENTER);
centerPane.add(buildTreePanel, BorderLayout.NORTH);
JPanel previewPanel = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
UIButton treeDataPreviewButton = new UIButton(Inter.getLocText("Preview"));
UIButton treeDataPreviewButton = new UIButton(Inter.getLocText("FR-Designer_Preview"));
previewPanel.add(treeDataPreviewButton);
treeDataPreviewButton.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
TableDataWrapper tableDataWrappe = tableDataNameComboBox.getSelectedItem();
if(tableDataWrappe == null) {
if (tableDataWrappe == null) {
return;
}
RecursionTableData rtd = new RecursionTableData();
rtd.setOriginalTableDataName(tableDataWrappe.getTableDataName());
if(isBuildByParentFiled()) {
rtd.setMarkFields((Integer.parseInt(originalMarkedFieldPane1.update().toString()) - 1) + "");
rtd.setParentmarkFields(Integer.parseInt(parentMarkedFieldPane1.update().toString()) - 1 + "");
if (isBuildByParentFiled()) {
Object o = parentFieldPane.update();
rtd.setParentmarkFields((Integer) o - 1 + "");
rtd.setParentmarkFieldName("" + o);
Object o2 = originFieldDependsOnParentPane.update();
rtd.setMarkFields((Integer) o2 - 1 + "");
rtd.setMarkFieldName("" + o2);
} else {
rtd.setMarkFields(Integer.parseInt(originalMarkedFieldPane2.update().toString()) - 1 + "");
rtd.setParentmarkFields("-1");
Object o = originFieldDependsOnLengthPane.update();
if (o == null) {
rtd.setMarkFields("-1");
} else {
rtd.setMarkFields((Integer) o - 1 + "");
rtd.setMarkFieldName("" + o);
}
}
rtd.setTableDataSource(DesignTableDataManager.getEditingTableDataSource());
rtd.createDataModel(Calculator.createCalculator());
@ -153,32 +163,32 @@ public class TreeTableDataDictPane extends BasicPane implements Previewable {
}
protected void setTableDataNameComboBox(String treeName) {
tableDataNameComboBox = new TableDataComboBox(DesignTableDataManager.getEditingTableDataSource(),treeName);
tableDataNameComboBox = new TableDataComboBox(DesignTableDataManager.getEditingTableDataSource(), treeName);
}
private void tdChange(){
private void tdChange() {
TableDataWrapper tableDataWrappe = this.tableDataNameComboBox.getSelectedItem();
if (tableDataWrappe == null) {
return;
}
ValueEditorPane[] valueEditorPanes;
if(isBuildByParentFiled()) {
valueEditorPanes = new ValueEditorPane[]{originalMarkedFieldPane1, parentMarkedFieldPane1};
if (isBuildByParentFiled()) {
valueEditorPanes = new ValueEditorPane[]{originFieldDependsOnParentPane, parentFieldPane};
} else {
valueEditorPanes = new ValueEditorPane[]{originalMarkedFieldPane2};
valueEditorPanes = new ValueEditorPane[]{originFieldDependsOnLengthPane};
}
try {
List<String> namelist = tableDataWrappe.calculateColumnNameList();
int len = namelist.size();
String[] columnNames = new String[len];
namelist.toArray(columnNames);
for(int i = 0; i < valueEditorPanes.length; i ++) {
valueEditorPanes[i].setEditors(new Editor[] { new ColumnNameEditor(columnNames), new ColumnIndexEditor(len) }, columnNames[0]);
for (int i = 0; i < valueEditorPanes.length; i++) {
valueEditorPanes[i].setEditors(new Editor[]{new ColumnNameEditor(columnNames), new ColumnIndexEditor(len)}, columnNames[0]);
}
} catch (Exception e) {
for(int i = 0; i < valueEditorPanes.length; i ++) {
valueEditorPanes[i].setEditors(new Editor[] { new ColumnNameEditor(), new ColumnIndexEditor() }, 1);
for (int i = 0; i < valueEditorPanes.length; i++) {
valueEditorPanes[i].setEditors(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor()}, 1);
}
} finally {
valueEditorPanes = null;
@ -192,31 +202,31 @@ public class TreeTableDataDictPane extends BasicPane implements Previewable {
public RecursionTableData update() {
RecursionTableData td = new RecursionTableData();
if(tableDataNameComboBox.getSelectedItem()==null){
if (tableDataNameComboBox.getSelectedItem() == null) {
td.setOriginalTableDataName(null);
}else{
} else {
td.setOriginalTableDataName(tableDataNameComboBox.getSelectedItem().getTableDataName());
}
if(isBuildByParentFiled()) {
Object o = parentMarkedFieldPane1.update(StringUtils.EMPTY);
if(o instanceof Object[]){
if (isBuildByParentFiled()) {
Object o = parentFieldPane.update(StringUtils.EMPTY);
if (o instanceof Object[]) {
Object[] temp = (Object[]) o;
td.setParentmarkFields(((Integer)temp[0]).intValue() - 1 + "");
td.setParentmarkFields((Integer) temp[0] - 1 + "");
td.setParentmarkFieldName((String) temp[1]);
}
Object o2 = originalMarkedFieldPane1.update(StringUtils.EMPTY);
if(o2 instanceof Object[]){
Object o2 = originFieldDependsOnParentPane.update(StringUtils.EMPTY);
if (o2 instanceof Object[]) {
Object[] temp = (Object[]) o2;
td.setMarkFields(((Integer)temp[0]).intValue() - 1 + "");
td.setMarkFields((Integer) temp[0] - 1 + "");
td.setMarkFieldName((String) temp[1]);
}
} else {
Object o = originalMarkedFieldPane2.update(StringUtils.EMPTY);
if(o == null || !(o instanceof Object[])){
Object o = originFieldDependsOnLengthPane.update(StringUtils.EMPTY);
if (o == null || !(o instanceof Object[])) {
td.setMarkFields("-1");
} else {
Object[] temp = (Object[]) o;
td.setMarkFields(((Integer)temp[0]).intValue() - 1 + "");
td.setMarkFields((Integer) temp[0] - 1 + "");
td.setMarkFieldName((String) temp[1]);
}
}
@ -225,30 +235,30 @@ public class TreeTableDataDictPane extends BasicPane implements Previewable {
}
public void populate(RecursionTableData rtb) {
if(StringUtils.isNotEmpty(rtb.getParentmarkFields())) {
if (StringUtils.isNotEmpty(rtb.getParentmarkFields())) {
makeParentEnable();
parentMarkRadio.setSelected(true);
lengthMarkRadio.setSelected(false);
tableDataNameComboBox.setSelectedTableDataByName(rtb.getOriginalTableDataName());
if(StringUtils.isNotEmpty(rtb.getMarkFieldName())){
originalMarkedFieldPane1.populate(rtb.getMarkFieldName());
}else{
originalMarkedFieldPane1.populate(rtb.getMarkFieldIndex() + 1);
if (StringUtils.isNotEmpty(rtb.getMarkFieldName())) {
originFieldDependsOnParentPane.populate(rtb.getMarkFieldName());
} else {
originFieldDependsOnParentPane.populate(rtb.getMarkFieldIndex() + 1);
}
if(StringUtils.isNotEmpty(rtb.getParentmarkFieldName())){
parentMarkedFieldPane1.populate(rtb.getParentmarkFieldName());
}else{
parentMarkedFieldPane1.populate(rtb.getParentmarkFieldIndex() + 1);
if (StringUtils.isNotEmpty(rtb.getParentmarkFieldName())) {
parentFieldPane.populate(rtb.getParentmarkFieldName());
} else {
parentFieldPane.populate(rtb.getParentmarkFieldIndex() + 1);
}
} else {
makeLengthEnable();
lengthMarkRadio.setSelected(true);
parentMarkRadio.setSelected(false);
tableDataNameComboBox.setSelectedTableDataByName(rtb.getOriginalTableDataName());
if(StringUtils.isNotEmpty(rtb.getMarkFieldName())){
originalMarkedFieldPane2.populate(rtb.getMarkFieldName());
}else{
originalMarkedFieldPane2.populate(rtb.getMarkFieldIndex() + 1);
if (StringUtils.isNotEmpty(rtb.getMarkFieldName())) {
originFieldDependsOnLengthPane.populate(rtb.getMarkFieldName());
} else {
originFieldDependsOnLengthPane.populate(rtb.getMarkFieldIndex() + 1);
}
}
}
@ -276,24 +286,24 @@ public class TreeTableDataDictPane extends BasicPane implements Previewable {
}
private void makeParentEnable() {
originalMarkedFieldPane1.setEnabled(true);
parentMarkedFieldPane1.setEnabled(true);
originalMarkedFieldLabel1.setEnabled(true);
parentMarkedFieldLabel1.setEnabled(true);
originFieldDependsOnParentPane.setEnabled(true);
parentFieldPane.setEnabled(true);
originFieldDependsOnParentLabel.setEnabled(true);
parentFieldLabel.setEnabled(true);
treeDataFieldLabel1.setEnabled(true);
originalMarkedFieldLabel2.setEnabled(false);
originFieldDependsOnLengthLabel.setEnabled(false);
treeDataFieldLabel2.setEnabled(false);
originalMarkedFieldPane2.setEnabled(false);
originFieldDependsOnLengthPane.setEnabled(false);
}
private void makeLengthEnable() {
originalMarkedFieldPane1.setEnabled(false);
parentMarkedFieldPane1.setEnabled(false);
originalMarkedFieldLabel1.setEnabled(false);
parentMarkedFieldLabel1.setEnabled(false);
originFieldDependsOnParentPane.setEnabled(false);
parentFieldPane.setEnabled(false);
originFieldDependsOnParentLabel.setEnabled(false);
parentFieldLabel.setEnabled(false);
treeDataFieldLabel1.setEnabled(false);
originalMarkedFieldLabel2.setEnabled(true);
originFieldDependsOnLengthLabel.setEnabled(true);
treeDataFieldLabel2.setEnabled(true);
originalMarkedFieldPane2.setEnabled(true);
originFieldDependsOnLengthPane.setEnabled(true);
}
}

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

@ -830,7 +830,7 @@ Form-TextArea=TextArea
FR-Designer_Https_Enable=
Widget-Custom_Widget_Config=Custom Widget
already_exists=already exists
Original_Marked_Filed=Original Marked Filed
FR-Designer_Original_Marked_Filed=Original Marked Filed
BackgroundTexture-Sand=Beach
Values=Values
Not_use_a_cell_attribute_table_editing=You may not use a cell attribute table editing
@ -1158,7 +1158,7 @@ Multiline=Multiline
Datasource-Convert_Charset=Convert Char Set
DashBoard-ConnectionList=ConnectionList
Utils-Submit_Forcibly=Submit Forcibly
Parent_Marked_Field=Parent Marked Field
FR-Designer_Parent_Marked_Field=Parent Marked Field
Logout=Logout
FR-Designer_Show_Blank_Row=
FR-Base_Format=
@ -1197,7 +1197,7 @@ Privilege-Selected_None_Of_Any_Items=Selected None Of Any Items
FRFont-Size=Size
Function-J2EE_server=J2EE server
FR-Designer_Allow_Blank=All Blank
Build_Tree_Accord_Parent_Marked_Filed=Build Tree according parent's marked filed
FR-Designer_Build_Tree_Accord_Parent_Marked_Filed=Build Tree according parent's marked filed
Preference-Horizontal_Scroll_Bar_Visible=Horizontal Scroll Bar Visible
Scope=Scope
Save_All_Records_In_Memory=Save All Records in Memory
@ -1266,7 +1266,7 @@ DateFormat-Custom_Warning=Note\: Custom date format does not support the format
Unit_MM=MM
Server-Start=Start
CellPage-Can_Break_On_Paginate=Can Break On Paginate
Build_Tree_Accord_Marked_Filed_Length=Build Tree according marked filed's length
FR-Designer_Build_Tree_Accord_Marked_Filed_Length=Build Tree according marked filed's length
ComboCheckBox-Start_Symbol=Start Symbol
Real=Real
RWA-Batch_Modify_Cells=Batch Modify Cells
@ -1714,7 +1714,7 @@ Condition_Display=Condition Display
FR-Server-Design_template_unopened=
Function-Function_Class_Name=Function Class Name
Schedule-Template=Template
Tree_Data_Field=Tree Data Field
FR-Designer_Tree_Data_Field=Tree Data Field
Border-Style-Normal=Rectangular
Top_And_Double_Bottom_Border_Line=Top And Double Bottom Border Line
FR-Server_Embedded_Server_Start=Server in Design-Start

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

@ -831,7 +831,7 @@ Form-TextArea=Text Fields
FR-Designer_Https_Enable=Start https
Widget-Custom_Widget_Config=Custom control
already_exists=Already exists
Original_Marked_Filed=Original Tag Field
FR-Designer_Original_Marked_Filed=Original Tag Field
BackgroundTexture-Sand=Beach
Values=Values
Not_use_a_cell_attribute_table_editing=You may not use a cell attribute table editing
@ -1159,7 +1159,7 @@ Multiline=Multi-line edit
Datasource-Convert_Charset=Encoding Conversion
DashBoard-ConnectionList=Data Connection
Utils-Submit_Forcibly=Submit forcibly
Parent_Marked_Field=Parent Tag Field
FR-Designer_Parent_Marked_Field=Parent Tag Field
Logout=Logout
FR-Designer_Show_Blank_Row=Supplement blank line
FR-Base_Format=Format
@ -1198,7 +1198,7 @@ Privilege-Selected_None_Of_Any_Items=Selected None
FRFont-Size=Size
Function-J2EE_server=J2EE server
FR-Designer_Allow_Blank=Allow NULLs
Build_Tree_Accord_Parent_Marked_Filed=Build Tree according to the parent tag field of the selected data set
FR-Designer_Build_Tree_Accord_Parent_Marked_Filed=Build Tree according to the parent tag field of the selected data set
Preference-Horizontal_Scroll_Bar_Visible=Horizontal Scroll Bar Visible
Scope=Scope
Save_All_Records_In_Memory=Save All Records in Memory
@ -1267,7 +1267,7 @@ DateFormat-Custom_Warning=Note\: Custom date format does not support the format
Unit_MM=MM
Server-Start=Start
CellPage-Can_Break_On_Paginate=Can break when paging
Build_Tree_Accord_Marked_Filed_Length=Build tree according to tag field's length
FR-Designer_Build_Tree_Accord_Marked_Filed_Length=Build tree according to tag field's length
ComboCheckBox-Start_Symbol=Initializer
Real=Real
RWA-Batch_Modify_Cells=Batch Modify Cells
@ -1715,7 +1715,7 @@ Condition_Display=Condition Display
FR-Server-Design_template_unopened=Can't open the template
Function-Function_Class_Name=Function Class Name
Schedule-Template=Template name
Tree_Data_Field=Tree Data Field
FR-Designer_Tree_Data_Field=Tree Data Field
Border-Style-Normal=Rectangular Border
Top_And_Double_Bottom_Border_Line=Top and bottom double border
FR-Server_Embedded_Server_Start=Built-in server-Open

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

@ -826,7 +826,7 @@ Form-TextArea=\u6587\u66F8\u57DF
FR-Designer_Https_Enable=https\u4F7F\u7528\u958B\u59CB
Widget-Custom_Widget_Config=\u30AB\u30B9\u30BF\u30DE\u30A4\u30BA\u30B3\u30F3\u30C8\u30ED\u30FC\u30EB
already_exists=\u3053\u3053\u306F\u3059\u3067\u306B\u5B58\u5728\u3057\u3066\u3044\u307E\u3059
Original_Marked_Filed=\u521D\u671F\u30BF\u30B0\u30D5\u30A3\u30FC\u30EB\u30C9
FR-Designer_Original_Marked_Filed=\u521D\u671F\u30BF\u30B0\u30D5\u30A3\u30FC\u30EB\u30C9
BackgroundTexture-Sand=\u7802\u6D5C
Values=\u5024
Not_use_a_cell_attribute_table_editing=\u3042\u306A\u305F\u304C\u7DE8\u96C6\u3059\u308B\u30BB\u30EB\u306E\u5C5E\u6027\u30C6\u30FC\u30D6\u30EB\u3092\u4F7F\u7528\u3059\u308B\u3053\u3068
@ -1154,7 +1154,7 @@ Multiline=\u8907\u6570\u884C\u7DE8\u96C6
Datasource-Convert_Charset=\u6587\u5B57\u30B3\u30FC\u30C9\u5909\u63DB
DashBoard-ConnectionList=\u30C7\u30FC\u30BF\u63A5\u7D9A
Utils-Submit_Forcibly=\u5F37\u884C\u63D0\u51FA
Parent_Marked_Field=\u89AA\u30BF\u30B0\u30D5\u30A3\u30FC\u30EB\u30C9
FR-Designer_Parent_Marked_Field=\u89AA\u30BF\u30B0\u30D5\u30A3\u30FC\u30EB\u30C9
Logout=\u9000\u51FA
FR-Designer_Show_Blank_Row=\u7A7A\u767D\u884C\u3092\u88DC\u5145
FR-Base_Format=\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8
@ -1193,7 +1193,7 @@ Privilege-Selected_None_Of_Any_Items=\u9805\u76EE\u3092\u3072\u3068\u3064\u3082\
FRFont-Size=\u30B5\u30A4\u30BA
Function-J2EE_server=J2EE_server
FR-Designer_Allow_Blank=\u7A7A\u6B04\u3042\u308A
Build_Tree_Accord_Parent_Marked_Filed=\u89AA\u30BF\u30B0\u30D5\u30A3\u30FC\u30EB\u30C9\u306F\u3001\u69CB\u7BC9\u3055\u308C\u305F\u30C4\u30EA\u30FC\u3092\u8A2D\u5B9A\u3057\u3001\u9078\u629E\u3057\u305F\u30C7\u30FC\u30BF\u306B\u4F9D\u5B58
FR-Designer_Build_Tree_Accord_Parent_Marked_Filed=\u89AA\u30BF\u30B0\u30D5\u30A3\u30FC\u30EB\u30C9\u306F\u3001\u69CB\u7BC9\u3055\u308C\u305F\u30C4\u30EA\u30FC\u3092\u8A2D\u5B9A\u3057\u3001\u9078\u629E\u3057\u305F\u30C7\u30FC\u30BF\u306B\u4F9D\u5B58
Preference-Horizontal_Scroll_Bar_Visible=\u6C34\u5E73\u30B9\u30AF\u30ED\u30FC\u30EB\u30D0\u30FC\u306F\u53EF\u8996
Scope=\u30B9\u30B3\u30FC\u30D7
Save_All_Records_In_Memory=\u5168\u3066\u306E\u8A18\u9332\u306F\u30E1\u30E2\u30EA\u306B\u4FDD\u5B58\u3055\u308C\u3066\u3044\u307E\u3059
@ -1262,7 +1262,7 @@ DateFormat-Custom_Warning=\u6CE8\uFF1A\u30AB\u30B9\u30BF\u30E0\u65E5\u6642\u30D5
Unit_MM=\u30DF\u30EA\u30E1\u30FC\u30C8\u30EB
Server-Start=\u8D77\u52D5
CellPage-Can_Break_On_Paginate=\u30DA\u30FC\u30B8\u30F3\u30B0\u304C\u5207\u65AD\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u305F\u3068\u304D
Build_Tree_Accord_Marked_Filed_Length=\u69CB\u7BC9\u30C4\u30EA\u30FC\u3092\u8A2D\u5B9A\u3057\u3001\u9078\u629E\u3057\u305F\u30C7\u30FC\u30BF\u306B\u4F9D\u5B58\u3057\u305F\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u9577\u3055\u3092\u30DE\u30FC\u30AF
FR-Designer_Build_Tree_Accord_Marked_Filed_Length=\u69CB\u7BC9\u30C4\u30EA\u30FC\u3092\u8A2D\u5B9A\u3057\u3001\u9078\u629E\u3057\u305F\u30C7\u30FC\u30BF\u306B\u4F9D\u5B58\u3057\u305F\u30D5\u30A3\u30FC\u30EB\u30C9\u306E\u9577\u3055\u3092\u30DE\u30FC\u30AF
ComboCheckBox-Start_Symbol=\u958B\u59CB\u6587\u5B57
Real=\u5B9F\u969B
RWA-Batch_Modify_Cells=\u6279\u91CF\u4FEE\u6B63\u30BB\u30EB
@ -1710,7 +1710,7 @@ Condition_Display=\u6761\u4EF6\u8868\u793A
FR-Server-Design_template_unopened=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u3092\u958B\u304F\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093
Function-Function_Class_Name=\u95A2\u6570\u30AF\u30E9\u30B9\u540D
Schedule-Template=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u540D
Tree_Data_Field=\u30C4\u30EA\u30FC\u30C7\u30FC\u30BF\u30D5\u30A3\u30FC\u30EB\u30C9
FR-Designer_Tree_Data_Field=\u30C4\u30EA\u30FC\u30C7\u30FC\u30BF\u30D5\u30A3\u30FC\u30EB\u30C9
Border-Style-Normal=\u76F4\u89D2\u306E\u56FD\u5883\u306B
Top_And_Double_Bottom_Border_Line=\u4E0A\u30D5\u30EC\u30FC\u30E0\u30E9\u30A4\u30F3\u3068\u53CC\u4E0B\u30D5\u30EC\u30FC\u30E0\u30E9\u30A4\u30F3
FR-Server_Embedded_Server_Start=\u5185\u8535\u30B5\u30FC\u30D0\u30FC-\u958B\u304F

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

@ -827,7 +827,7 @@ Form-TextArea=\uD14D\uC2A4\uD2B8\uC601\uC5ED
FR-Designer_Https_Enable=\uC2E4\uD589https
Widget-Custom_Widget_Config=\uC0AC\uC6A9\uC790\uC815\uC758\uC18C\uD504\uD2B8\uC6E8\uC5B4\uC81C\uC5B4
already_exists=\uC774\uBBF8\uC874\uC7AC\uD569\uB2C8\uB2E4.
Original_Marked_Filed=\uCD08\uAE30\uD0DC\uADF8\uD544\uB4DC
FR-Designer_Original_Marked_Filed=\uCD08\uAE30\uD0DC\uADF8\uD544\uB4DC
BackgroundTexture-Sand=\uBAA8\uB798\uC0AC\uC7A5
Values=\uAC12
Not_use_a_cell_attribute_table_editing=\uC140\uC18D\uC131\uC73C\uB85C\uD45C\uB97C\uD3B8\uC9D1\uD560\uC218\uC5C6\uC2B5\uB2C8\uB2E4.
@ -1155,7 +1155,7 @@ Multiline=\uC5EC\uB7EC\uD589\uD3B8\uC9D1
Datasource-Convert_Charset=\uCF54\uB529\uC804\uD658
DashBoard-ConnectionList=\uB370\uC774\uD130\uB9C1\uD06C
Utils-Submit_Forcibly=\uC81C\uCD9C\uAC15\uD589
Parent_Marked_Field=\uBD80\uBAA8\uD0DC\uADF8\uD544\uB4DC
FR-Designer_Parent_Marked_Field=\uBD80\uBAA8\uD0DC\uADF8\uD544\uB4DC
Logout=\uB098\uAC00\uAE30
FR-Designer_Show_Blank_Row=\uACF5\uBC31\uD589\uBCF4\uCDA9
FR-Base_Format=\uC11C\uC2DD
@ -1194,7 +1194,7 @@ Privilege-Selected_None_Of_Any_Items=\uC120\uD0DD\uD55C\uD56D\uC774\uC5C6\uC2B5\
FRFont-Size=\uD06C\uAE30
Function-J2EE_server=J2EE\uC11C\uBC84
FR-Designer_Allow_Blank=\uBE48\uCE78\uD5C8\uC6A9
Build_Tree_Accord_Parent_Marked_Filed=\uC120\uD0DD\uD55C\uB370\uC774\uD130\uC138\uD2B8\uC758\uBD80\uBAA8\uD0DC\uADF8\uD544\uB4DC\uC5D0\uB530\uB77C\uD2B8\uB9AC\uC0DD\uC131
FR-Designer_Build_Tree_Accord_Parent_Marked_Filed=\uC120\uD0DD\uD55C\uB370\uC774\uD130\uC138\uD2B8\uC758\uBD80\uBAA8\uD0DC\uADF8\uD544\uB4DC\uC5D0\uB530\uB77C\uD2B8\uB9AC\uC0DD\uC131
Preference-Horizontal_Scroll_Bar_Visible=\uC218\uD3C9\uC2A4\uD06C\uB864\uBC14\uB97C\uBCFC\uC218\uC788\uC2B5\uB2C8\uB2E4.
Scope=\uBC94\uC704
Save_All_Records_In_Memory=\uBAA8\uB4E0\uB808\uCF54\uB4DC\uAC00\uBA54\uBAA8\uB9AC\uC5D0\uC800\uC7A5\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
@ -1263,7 +1263,7 @@ DateFormat-Custom_Warning=\uBE44\uACE0\uFF1A\uC0AC\uC6A9\uC790\uC815\uC758\uB0A0
Unit_MM=\uBC00\uB9AC\uBBF8\uD130
Server-Start=\uC2E4\uD589
CellPage-Can_Break_On_Paginate=\uD398\uC774\uC9C0\uB098\uB204\uAE30\uC2DC\uB098\uB20C\uC218\uC788\uC74C
Build_Tree_Accord_Marked_Filed_Length=\uC120\uD0DD\uD55C\uB370\uC774\uD130\uC138\uD2B8\uC758\uD0DC\uADF8\uD544\uB4DC\uAE38\uC774\uC5D0\uB530\uB77C\uD2B8\uB9AC\uC0DD\uC131
FR-Designer_Build_Tree_Accord_Marked_Filed_Length=\uC120\uD0DD\uD55C\uB370\uC774\uD130\uC138\uD2B8\uC758\uD0DC\uADF8\uD544\uB4DC\uAE38\uC774\uC5D0\uB530\uB77C\uD2B8\uB9AC\uC0DD\uC131
ComboCheckBox-Start_Symbol=\uC2DC\uC791\uBD80\uD638
Real=\uC2E4\uC81C
RWA-Batch_Modify_Cells=\uB300\uB7C9\uC218\uC815\uC140
@ -1711,7 +1711,7 @@ Condition_Display=\uC870\uAC74\uBCF4\uC774\uAE30
FR-Server-Design_template_unopened=\uD15C\uD50C\uB9BF\uC744\uC5F4\uC218\uC5C6\uC2B5\uB2C8\uB2E4.
Function-Function_Class_Name=\uD568\uC218\uD074\uB798\uC2A4\uB124\uC784
Schedule-Template=\uD15C\uD50C\uB9BF\uBA85\uCE6D
Tree_Data_Field=\uD2B8\uB9AC\uB370\uC774\uD130\uD544\uB4DC
FR-Designer_Tree_Data_Field=\uD2B8\uB9AC\uB370\uC774\uD130\uD544\uB4DC
Border-Style-Normal=\uC9C1\uAC01\uD14C\uB450\uB9AC
Top_And_Double_Bottom_Border_Line=\uC704\uD14C\uB450\uB9AC\uC120\uACFC\uB450\uC904\uBC11\uD14C\uB450\uB9AC\uC120
FR-Server_Embedded_Server_Start=\uB0B4\uC7A5\uB41C\uC11C\uBC84-\uC5F4\uAE30

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

@ -826,7 +826,7 @@ Form-TextArea=\u6587\u672C\u57DF
FR-Designer_Https_Enable=\u542F\u7528https
Widget-Custom_Widget_Config=\u81EA\u5B9A\u4E49\u63A7\u4EF6
already_exists=\u5DF2\u7ECF\u5B58\u5728
Original_Marked_Filed=\u539F\u59CB\u6807\u8BB0\u5B57\u6BB5
FR-Designer_Original_Marked_Filed=\u539F\u59CB\u6807\u8BB0\u5B57\u6BB5
BackgroundTexture-Sand=\u6C99\u6EE9
Values=\u503C
Not_use_a_cell_attribute_table_editing=\u60A8\u4E0D\u53EF\u4EE5\u7528\u5355\u5143\u683C\u5C5E\u6027\u8868\u7F16\u8F91
@ -1154,7 +1154,7 @@ Multiline=\u591A\u884C\u7F16\u8F91
Datasource-Convert_Charset=\u7F16\u7801\u8F6C\u6362
DashBoard-ConnectionList=\u6570\u636E\u8FDE\u63A5
Utils-Submit_Forcibly=\u5F3A\u884C\u63D0\u4EA4
Parent_Marked_Field=\u7236\u6807\u8BB0\u5B57\u6BB5
FR-Designer_Parent_Marked_Field=\u7236\u6807\u8BB0\u5B57\u6BB5
Logout=\u9000\u51FA
FR-Designer_Show_Blank_Row=\u8865\u5145\u7A7A\u767D\u884C
FR-Base_Format=\u683C\u5F0F
@ -1193,7 +1193,7 @@ Privilege-Selected_None_Of_Any_Items=\u6CA1\u6709\u9009\u4E2D\u4EFB\u4F55\u4E00\
FRFont-Size=\u5927\u5C0F
Function-J2EE_server=J2EE\u670D\u52A1\u5668
FR-Designer_Allow_Blank=\u5141\u8BB8\u4E3A\u7A7A
Build_Tree_Accord_Parent_Marked_Filed=\u4F9D\u8D56\u6240\u9009\u6570\u636E\u96C6\u7684\u7236\u6807\u8BB0\u5B57\u6BB5\u6784\u5EFA\u6811
FR-Designer_Build_Tree_Accord_Parent_Marked_Filed=\u4F9D\u8D56\u6240\u9009\u6570\u636E\u96C6\u7684\u7236\u6807\u8BB0\u5B57\u6BB5\u6784\u5EFA\u6811
Preference-Horizontal_Scroll_Bar_Visible=\u6C34\u5E73\u6EDA\u52A8\u6761\u53EF\u89C1
Scope=\u8303\u56F4
Save_All_Records_In_Memory=\u6240\u6709\u8BB0\u5F55\u90FD\u4FDD\u5B58\u5728\u5185\u5B58\u4E2D
@ -1262,7 +1262,7 @@ DateFormat-Custom_Warning=\u6CE8\uFF1A\u81EA\u5B9A\u4E49\u65E5\u671F\u683C\u5F0F
Unit_MM=\u6BEB\u7C73
Server-Start=\u542F\u52A8
CellPage-Can_Break_On_Paginate=\u5206\u9875\u65F6\u53EF\u4EE5\u65AD\u5F00
Build_Tree_Accord_Marked_Filed_Length=\u4F9D\u8D56\u6240\u9009\u6570\u636E\u96C6\u7684\u6807\u8BB0\u5B57\u6BB5\u7684\u957F\u5EA6\u6784\u5EFA\u6811
FR-Designer_Build_Tree_Accord_Marked_Filed_Length=\u4F9D\u8D56\u6240\u9009\u6570\u636E\u96C6\u7684\u6807\u8BB0\u5B57\u6BB5\u7684\u957F\u5EA6\u6784\u5EFA\u6811
ComboCheckBox-Start_Symbol=\u8D77\u59CB\u7B26
Real=\u5B9E\u9645
RWA-Batch_Modify_Cells=\u6279\u91CF\u4FEE\u6539\u5355\u5143\u683C
@ -1710,7 +1710,7 @@ Condition_Display=\u6761\u4EF6\u663E\u793A
FR-Server-Design_template_unopened=\u65E0\u6CD5\u6253\u5F00\u6A21\u7248
Function-Function_Class_Name=\u51FD\u6570\u7C7B\u540D
Schedule-Template=\u6A21\u677F\u540D\u79F0
Tree_Data_Field=\u6811\u6570\u636E\u5B57\u6BB5
FR-Designer_Tree_Data_Field=\u6811\u6570\u636E\u5B57\u6BB5
Border-Style-Normal=\u76F4\u89D2\u8FB9\u6846
Top_And_Double_Bottom_Border_Line=\u4E0A\u6846\u7EBF\u548C\u53CC\u4E0B\u6846\u7EBF
FR-Server_Embedded_Server_Start=\u5167\u7F6E\u7684\u670D\u52A1\u5668-\u6253\u5F00

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

@ -826,7 +826,7 @@ Form-TextArea=\u6587\u672C\u57DF
FR-Designer_Https_Enable=\u555F\u7528https
Widget-Custom_Widget_Config=\u81EA\u5B9A\u7FA9\u63A7\u5236\u9805
already_exists=\u5DF2\u7D93\u5B58\u5728
Original_Marked_Filed=\u539F\u59CB\u6A19\u8A18\u6B04\u4F4D
FR-Designer_Original_Marked_Filed=\u539F\u59CB\u6A19\u8A18\u6B04\u4F4D
BackgroundTexture-Sand=\u6C99\u7058
Values=\u503C
Not_use_a_cell_attribute_table_editing=\u60A8\u4E0D\u53EF\u4EE5\u7528\u5132\u5B58\u683C\u5C6C\u6027\u8868\u7DE8\u8F2F
@ -1154,7 +1154,7 @@ Multiline=\u591A\u5217\u7DE8\u8F2F
Datasource-Convert_Charset=\u7DE8\u78BC\u8F49\u63DB
DashBoard-ConnectionList=\u8CC7\u6599\u9023\u63A5
Utils-Submit_Forcibly=\u5F37\u884C\u63D0\u4EA4
Parent_Marked_Field=\u7236\u6A19\u8A18\u6B04\u4F4D
FR-Designer_Parent_Marked_Field=\u7236\u6A19\u8A18\u6B04\u4F4D
Logout=\u9000\u51FA
FR-Designer_Show_Blank_Row=\u88DC\u5145\u7A7A\u767D\u5217
FR-Base_Format=\u683C\u5F0F
@ -1193,7 +1193,7 @@ Privilege-Selected_None_Of_Any_Items=\u6C92\u6709\u9078\u4E2D\u4EFB\u4F55\u4E00\
FRFont-Size=\u5927\u5C0F
Function-J2EE_server=J2EE\u4F3A\u670D\u5668
FR-Designer_Allow_Blank=\u5141\u8A31\u70BA\u7A7A
Build_Tree_Accord_Parent_Marked_Filed=\u4F9D\u8CF4\u6240\u9078\u8CC7\u6599\u96C6\u7684\u7236\u6A19\u8A18\u6B04\u4F4D\u69CB\u5EFA\u6A39
FR-Designer_Build_Tree_Accord_Parent_Marked_Filed=\u4F9D\u8CF4\u6240\u9078\u8CC7\u6599\u96C6\u7684\u7236\u6A19\u8A18\u6B04\u4F4D\u69CB\u5EFA\u6A39
Preference-Horizontal_Scroll_Bar_Visible=\u6C34\u5E73\u6EFE\u52D5\u689D\u53EF\u898B
Scope=\u7BC4\u570D
Save_All_Records_In_Memory=\u6240\u6709\u8A18\u9304\u90FD\u5132\u5B58\u5728\u5167\u5B58\u4E2D
@ -1262,7 +1262,7 @@ DateFormat-Custom_Warning=\u8A3B\uFF1A\u81EA\u5B9A\u7FA9\u65E5\u671F\u683C\u5F0F
Unit_MM=\u516C\u5398
Server-Start=\u555F\u52D5
CellPage-Can_Break_On_Paginate=\u5206\u9801\u6642\u53EF\u4EE5\u65B7\u958B
Build_Tree_Accord_Marked_Filed_Length=\u4F9D\u8CF4\u6240\u9078\u8CC7\u6599\u96C6\u7684\u6A19\u8A18\u6B04\u4F4D\u7684\u9577\u5EA6\u69CB\u5EFA\u6A39\u72C0
FR-Designer_Build_Tree_Accord_Marked_Filed_Length=\u4F9D\u8CF4\u6240\u9078\u8CC7\u6599\u96C6\u7684\u6A19\u8A18\u6B04\u4F4D\u7684\u9577\u5EA6\u69CB\u5EFA\u6A39\u72C0
ComboCheckBox-Start_Symbol=\u8D77\u59CB\u7B26
Real=\u5BE6\u969B
RWA-Batch_Modify_Cells=\u6279\u91CF\u4FEE\u6539\u5132\u5B58\u683C
@ -1710,7 +1710,7 @@ Condition_Display=\u689D\u4EF6\u986F\u793A
FR-Server-Design_template_unopened=\u7121\u6CD5\u6253\u958B\u7BC4\u672C
Function-Function_Class_Name=\u51FD\u6578\u985E\u540D
Schedule-Template=\u7BC4\u672C\u540D\u7A31
Tree_Data_Field=\u6A39\u72C0\u8CC7\u6599\u6B04\u4F4D
FR-Designer_Tree_Data_Field=\u6A39\u72C0\u8CC7\u6599\u6B04\u4F4D
Border-Style-Normal=\u76F4\u89D2\u6846\u7DDA
Top_And_Double_Bottom_Border_Line=\u4E0A\u6846\u7DDA\u548C\u96D9\u4E0B\u6846\u7DDA
FR-Server_Embedded_Server_Start=\u5167\u7F6E\u7684\u4F3A\u670D\u5668-\u555F\u52D5

8
designer_base/src/com/fr/design/style/color/UsedColorPane.java

@ -42,7 +42,7 @@ public class UsedColorPane extends BasicPane {
* @param rows
* @param columns
* @param reserveCells 留白的单元格个数
* @param colors 最近使用的颜色
* @param selectable
* @param needPickColorButton 是否需要加上取色器按钮
* @param setColorRealTime 取色器是否实时设定颜色
*/
@ -68,7 +68,6 @@ public class UsedColorPane extends BasicPane {
//最近使用颜色
Color[] colors = ColorSelectConfigManager.getInstance().getColors();
int size = colors.length;
int i = 0;
if (needPickColorButton) {
// 取色按钮
@ -84,7 +83,8 @@ public class UsedColorPane extends BasicPane {
i++;
}
while (i < total) {
Color color = i < size ? colors[size - (i - this.reserveCells) - 1] : DEFAULT_COLOR;
Color color = i - this.reserveCells < size ? colors[size - (i - this.reserveCells) - 1] :
DEFAULT_COLOR;
panel.add(new ColorCell(color == null ? DEFAULT_COLOR : color, selectable));
i++;
}
@ -100,7 +100,7 @@ public class UsedColorPane extends BasicPane {
int size = colors.length;
for (int i = this.reserveCells; i < total; i++) {
ColorCell cell = (ColorCell) this.pane.getComponent(i);
Color color = i < size ? colors[size - (i - this.reserveCells) - 1] : DEFAULT_COLOR;
Color color = i - this.reserveCells < size ? colors[size - (i - this.reserveCells) - 1] : DEFAULT_COLOR;
cell.setColor(color == null ? DEFAULT_COLOR : color);
}
}

38
designer_form/src/com/fr/design/mainframe/FormArea.java

@ -184,8 +184,8 @@ public class FormArea extends JComponent implements ScrollRulerComponent {
reCalculateRoot(screenValue, true);
} else {
// 组件间隔啊
int val = layout.getAcualInterval();
layout.addCompInterval(val);
// REPORT-2585 原有的逻辑导致嵌套的tab中的间隔加不上去,会在后续拖动的过程中出问题
reCalculateDefaultRoot(screenValue, true);
}
}
LayoutUtils.layoutContainer(root);
@ -356,6 +356,40 @@ public class FormArea extends JComponent implements ScrollRulerComponent {
}
}
/**
* 按照界面大小的百分比值调整root大小
* @param needCalculateParaHeight 是否需要调整参数界面高度
* @param value
*/
private void reCalculateDefaultRoot(double value, boolean needCalculateParaHeight) {
XLayoutContainer root = FormArea.this.designer.getRootComponent();
if (root.acceptType(XWFitLayout.class)) {
XWFitLayout layout = (XWFitLayout) root;
layout.setContainerPercent(1.0);
traverAndAdjust(layout, 0.0);
layout.adjustCreatorsWhileSlide(0.0);
// 拖动滑块,先将内部组件百分比大小计算,再计算容器大小
Dimension d = new Dimension(layout.getWidth(), layout.getHeight());
// 自适应布局的父层是border
if (layout.getParent() != null) {
int paraHeight = designer.getParaHeight();
if (needCalculateParaHeight && paraHeight > 0) {
designer.setParaHeight(paraHeight);
XWBorderLayout parent = (XWBorderLayout) layout.getParent();
parent.toData().setNorthSize(paraHeight);
parent.removeAll();
parent.add(designer.getParaComponent(),WBorderLayout.NORTH);
parent.add(designer.getRootComponent(),WBorderLayout.CENTER);
}
layout.getParent().setSize(d.width, d.height+paraHeight);
// 调整自适应布局大小后,同步调整参数界面和border大小,此时刷新下formArea
FormArea.this.validate();
}
}
}
//循环遍历布局,按百分比调整子组件大小
private void traverAndAdjust(XCreator creator,double percent){
for(int i=0; i<creator.getComponentCount(); i++){

Loading…
Cancel
Save