Merge branch '9.0' of http://www.finedevelop.com:2015/scm/ba/design into 9.0

designer/src/com/fr/design/dscolumn/ResultSetGroupDockingPane.java

@@ -69,13 +69,13 @@ public class ResultSetGroupDockingPane extends ResultSetGroupPane {
                 int i = goBox.getSelectedIndex();
                 if (i == BIND_GROUP) {
                     cardLayout.show(cardPane, "groupPane");
-                    cardPane.setPreferredSize(new Dimension(155, 20));
+                    cardPane.setPreferredSize(new Dimension(156, 20));
                 } else if (i == BIND_SELECTED) {
                     cardLayout.show(cardPane, "listPane");
                     cardPane.setPreferredSize(new Dimension(0, 0));
                 } else if (i == BIND_SUMMARY) {
                     cardLayout.show(cardPane, "summaryPane");
-                    cardPane.setPreferredSize(new Dimension(155, 20));
+                    cardPane.setPreferredSize(new Dimension(156, 20));
                     CellExpandAttr cellExpandAttr = cellElement.getCellExpandAttr();
                     cellExpandAttr.setDirection(Constants.NONE);
                 }
@@ -84,7 +84,7 @@ public class ResultSetGroupDockingPane extends ResultSetGroupPane {
 
         double[] columnSize = {p, f};
         double[] rowSize = {p, p};
-        return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
+        return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 8, 10);
     }
 
     private void initCardPane() {

designer/src/com/fr/design/dscolumn/SelectedDataColumnPane.java

@@ -144,7 +144,7 @@ public class SelectedDataColumnPane extends BasicPane {
                 {dcLabel, columnNameComboBox}
         };
         this.setLayout(new BorderLayout());
-        this.add(TableLayoutHelper.createTableLayoutPane(components, new double[]{p, p, p}, new double[]{p, f}));
+        this.add(TableLayoutHelper.createGapTableLayoutPane(components, new double[]{p, p, p}, new double[]{p, f}, 8, 10));
 
     }
 

designer/src/com/fr/quickeditor/CellQuickEditor.java

@@ -55,6 +55,8 @@ public abstract class CellQuickEditor extends QuickEditor<ElementCasePane> {
         emptyLabel.setPreferredSize(new Dimension(60, 20));
     }
 
+    protected static final int VGAP = 10, HGAP = 8;
+
     public CellQuickEditor() {
 
         scrollBar = new UIScrollBar(UIScrollBar.VERTICAL) {
@@ -101,7 +103,7 @@ public abstract class CellQuickEditor extends QuickEditor<ElementCasePane> {
                 new Component[]{initTopContent(), null},
                 new Component[]{centerBody, null}
         };
-        leftContentPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
+        leftContentPane = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, HGAP, VGAP);
         this.setLayout(new BarLayout());
         this.add(scrollBar);
         this.add(leftContentPane);
@@ -122,8 +124,8 @@ public abstract class CellQuickEditor extends QuickEditor<ElementCasePane> {
                 new Component[]{cellLabel, columnRowTextField = initColumnRowTextField()},
                 new Component[]{insertContentLabel, cellElementEditButton},
         };
-        JPanel topContent = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
+        JPanel topContent = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, HGAP, VGAP);
-        topContent.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 0));
+        topContent.setBorder(BorderFactory.createEmptyBorder(10, 10, 0, 0));
         return topContent;
     }
 

designer/src/com/fr/quickeditor/cellquick/CellBiasTextPainterEditor.java

@@ -34,10 +34,10 @@ public class CellBiasTextPainterEditor extends CellQuickEditor {
             }
         });
         editButton.setOpaque(false);
-        content.add(TableLayoutHelper.createTableLayoutPane(new Component[][]{
+        content.add(TableLayoutHelper.createGapTableLayoutPane(new Component[][]{
                         new Component[]{emptyLabel, editButton}},
                 new double[]{TableLayout.PREFERRED},
-                new double[]{TableLayout.PREFERRED, TableLayout.FILL}), BorderLayout.CENTER);
+                new double[]{TableLayout.PREFERRED, TableLayout.FILL}, HGAP, VGAP), BorderLayout.CENTER);
         return content;
     }
 

designer/src/com/fr/quickeditor/cellquick/CellDSColumnEditor.java

@@ -18,6 +18,7 @@ import com.fr.design.gui.ibutton.UIButtonGroup;
 import com.fr.design.gui.ibutton.UIHeadGroup;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.icombobox.UIComboBox;
+import com.fr.design.gui.ilable.MultilineLabel;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ispinner.UISpinner;
 import com.fr.design.gui.itextfield.UITextField;
@@ -54,6 +55,7 @@ import java.util.ArrayList;
 public class CellDSColumnEditor extends CellQuickEditor {
 
     private static final double P = TableLayout.PREFERRED, F = TableLayout.FILL;
+    private static final Color TIP_FONT_COLOR = new Color(0x7F333334, true);
 
     private enum FilterType {
         //前N个 后N个 奇数 偶数 自定义 未定义
@@ -71,8 +73,6 @@ public class CellDSColumnEditor extends CellQuickEditor {
     private JPanel cardContainer;
     // 卡片布局TAB切换按钮
     private UIHeadGroup tabsHeaderIconPane;
-    // 数据列基本设置
-    private DSColumnBasicEditorPane cellDSColumnBasicPane;
     // 数据列高级设置
     private DSColumnAdvancedEditorPane cellDSColumnAdvancedPane;
 
@@ -156,7 +156,7 @@ public class CellDSColumnEditor extends CellQuickEditor {
     private void createPanes() {
         paneList = new ArrayList<>();
         /*基本设置面板*/
-        cellDSColumnBasicPane = new DSColumnBasicEditorPane();
+        DSColumnBasicEditorPane cellDSColumnBasicPane = new DSColumnBasicEditorPane();
         paneList.add(cellDSColumnBasicPane);
         /*高级设置面板*/
         cellDSColumnAdvancedPane = new DSColumnAdvancedEditorPane();
@@ -225,7 +225,7 @@ public class CellDSColumnEditor extends CellQuickEditor {
             Component[][] components = new Component[][]{
                     new Component[]{uiLabel, uiButton}
             };
-            conditionPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
+            conditionPane = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, HGAP, VGAP);
             this.add(this.createContentPane(), BorderLayout.CENTER);
             this.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
         }
@@ -272,7 +272,7 @@ public class CellDSColumnEditor extends CellQuickEditor {
                     //条件过滤
                     new Component[]{this.conditionPane}
             };
-            return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
+            return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, HGAP, VGAP);
         }
     }
 
@@ -483,11 +483,11 @@ public class CellDSColumnEditor extends CellQuickEditor {
             //数据倍数
             UILabel multipleLabel = new UILabel(Inter.getLocText("Column_Multiple"));
             multipleLabel.setPreferredSize(new Dimension(60, 20));
-            multiPane = TableLayoutHelper.createTableLayoutPane(new Component[][]{
+            multiPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{
                             new Component[]{
                                     multipleLabel, multiNumSpinner
                             }
-                    }, new double[]{P}, new double[]{P, F}
+                    }, new double[]{P}, new double[]{P, F}, HGAP, VGAP
             );
             multiNumPane.add(multiPane);
             useMultiplyNumCheckBox.addActionListener(new ActionListener() {
@@ -516,7 +516,7 @@ public class CellDSColumnEditor extends CellQuickEditor {
                     {extendableDirectionPane},
                     {multiNumPane}
             };
-            return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
+            return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, HGAP, VGAP);
         }
 
 
@@ -582,7 +582,9 @@ public class CellDSColumnEditor extends CellQuickEditor {
                 };
 
                 double[] rowSize = {P, P}, columnSize = {P, F};
-                this.add(TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize), BorderLayout.CENTER);
+                this.add(TableLayoutHelper.createGapTableLayoutPane(
+                        components, rowSize, columnSize, HGAP, VGAP
+                ), BorderLayout.CENTER);
             }
 
 
@@ -604,7 +606,7 @@ public class CellDSColumnEditor extends CellQuickEditor {
                         if (noContent) {
                             centerPane.setPreferredSize(new Dimension(0, 0));
                         } else {
-                            centerPane.setPreferredSize(new Dimension(155, 20));
+                            centerPane.setPreferredSize(new Dimension(156, 20));
                         }
                         String sortFormula = dSColumn.getSortFormula();
                         if (sortFormula != null && sortFormula.length() >= 1) {
@@ -678,14 +680,14 @@ public class CellDSColumnEditor extends CellQuickEditor {
                             setCardPaneLayout.show(setCardPane, FilterType.TOP.name());
                             tipCardPaneLayout.show(tipCardPane, FilterType.TOP.name());
                             //隐藏tip 显示set
-                            setCardPane.setPreferredSize(new Dimension(155, 20));
+                            setCardPane.setPreferredSize(new Dimension(156, 20));
                             tipCardPane.setPreferredSize(new Dimension(0, 0));
                         } else if (selectIndex == 2) {
                             //后N个
                             setCardPaneLayout.show(setCardPane, FilterType.BOTTOM.name());
                             tipCardPaneLayout.show(tipCardPane, FilterType.BOTTOM.name());
                             //隐藏tip 显示set
-                            setCardPane.setPreferredSize(new Dimension(155, 20));
+                            setCardPane.setPreferredSize(new Dimension(156, 20));
                             tipCardPane.setPreferredSize(new Dimension(0, 0));
                         } else if (selectIndex == 3) {
                             //奇数
@@ -693,19 +695,19 @@ public class CellDSColumnEditor extends CellQuickEditor {
                             tipCardPaneLayout.show(tipCardPane, FilterType.ODD.name());
                             //隐藏set 显示tip
                             setCardPane.setPreferredSize(new Dimension(0, 0));
-                            tipCardPane.setPreferredSize(new Dimension(221, 15));
+                            tipCardPane.setPreferredSize(new Dimension(224, 40));
                         } else if (selectIndex == 4) {
                             setCardPaneLayout.show(setCardPane, FilterType.EVEN.name());
                             tipCardPaneLayout.show(tipCardPane, FilterType.EVEN.name());
                             //隐藏set 显示tip
                             setCardPane.setPreferredSize(new Dimension(0, 0));
-                            tipCardPane.setPreferredSize(new Dimension(221, 15));
+                            tipCardPane.setPreferredSize(new Dimension(224, 40));
                         } else if (selectIndex == 5) {
                             setCardPaneLayout.show(setCardPane, FilterType.SPECIFY.name());
                             tipCardPaneLayout.show(tipCardPane, FilterType.SPECIFY.name());
                             //显示set和tip
-                            setCardPane.setPreferredSize(new Dimension(155, 20));
+                            setCardPane.setPreferredSize(new Dimension(156, 20));
-                            tipCardPane.setPreferredSize(new Dimension(221, 15));
+                            tipCardPane.setPreferredSize(new Dimension(224, 40));
                         } else {
                             setCardPaneLayout.show(setCardPane, FilterType.UNDEFINE.name());
                             tipCardPaneLayout.show(tipCardPane, FilterType.UNDEFINE.name());
@@ -713,7 +715,10 @@ public class CellDSColumnEditor extends CellQuickEditor {
                             setCardPane.setPreferredSize(new Dimension(0, 0));
                             tipCardPane.setPreferredSize(new Dimension(0, 0));
                         }
-
+                        setCardPane.revalidate();
+                        tipCardPane.revalidate();
+                        setCardPane.repaint();
+                        tipCardPane.repaint();
                     }
                 });
                 //配置展示CardLayout
@@ -737,28 +742,29 @@ public class CellDSColumnEditor extends CellQuickEditor {
 
                 //奇数 UILabel 占一行作为提示信息
                 setCardPane.add(new JPanel(), FilterType.ODD.name());
-                tipCardPane.add(new UILabel(Inter.getLocText("BindColumn-Result_Serial_Number_Start_From_1")
+                MultilineLabel oddTip = new MultilineLabel(Inter.getLocText("FS-Designer_DS_Filter_Odd_Tip"));
-                        + "," + Inter.getLocText("BindColumn-Odd_Selected_(1,3,5...)")), FilterType.ODD.name());
+                oddTip.setForeground(TIP_FONT_COLOR);
+                tipCardPane.add(oddTip, FilterType.ODD.name());
 
 
                 //偶数 UILabel 占一行作为提示信息
                 setCardPane.add(new JPanel(), FilterType.EVEN.name());
-                tipCardPane.add(new UILabel(Inter.getLocText("BindColumn-Result_Serial_Number_Start_From_1")
+                MultilineLabel evenTip = new MultilineLabel(Inter.getLocText("FS-Designer_DS_Filter_Even_Tip"));
-                        + "," + Inter.getLocText("BindColumn-Even_Selected_(2,4,6...)")), FilterType.EVEN.name());
+                evenTip.setForeground(TIP_FONT_COLOR);
+                tipCardPane.add(evenTip, FilterType.EVEN.name());
 
                 //输入框占用右半边，提示信息占一行
                 serialTextField = new UITextField(16);
                 setCardPane.add(serialTextField, FilterType.SPECIFY.name());
-                tipCardPane.add(new UILabel(
+                MultilineLabel specifyTip = new MultilineLabel(Inter.getLocText("FS-Designer_DS_Filter_Specify_Tip"));
-                        Inter.getLocText(new String[]{
+                specifyTip.setForeground(TIP_FONT_COLOR);
-                                        "Format", "BindColumn-Result_Serial_Number_Start_From_1", "Inner_Parameter", "Group_Count"},
+                tipCardPane.add(specifyTip, FilterType.SPECIFY.name());
-                                new String[]{": 1,2-3,5,8  ", ",", "$__count__"})), FilterType.SPECIFY.name());
 
-                this.add(TableLayoutHelper.createTableLayoutPane(new Component[][]{
+                this.add(TableLayoutHelper.createGapTableLayoutPane(new Component[][]{
                         {filterLabel, rsComboBox},
                         {null, setCardPane},
                         {tipCardPane, null}
-                }, new double[]{P, P, P}, new double[]{P, F}), BorderLayout.CENTER);
+                }, new double[]{P, P, P}, new double[]{P, F}, HGAP, VGAP), BorderLayout.CENTER);
             }
 
             public void populate(CellElement cellElement) {
@@ -776,30 +782,30 @@ public class CellDSColumnEditor extends CellQuickEditor {
                                 case SelectCount.TOP:
                                     this.topFormulaPane.populate(selectCount.getFormulaCount());
                                     //隐藏tip 显示set
-                                    setCardPane.setPreferredSize(new Dimension(155, 20));
+                                    setCardPane.setPreferredSize(new Dimension(156, 20));
                                     tipCardPane.setPreferredSize(new Dimension(0, 0));
                                     break;
                                 case SelectCount.BOTTOM:
                                     this.bottomFormulaPane.populate(selectCount.getFormulaCount());
                                     //隐藏tip 显示set
-                                    setCardPane.setPreferredSize(new Dimension(155, 20));
+                                    setCardPane.setPreferredSize(new Dimension(156, 20));
                                     tipCardPane.setPreferredSize(new Dimension(0, 0));
                                     break;
                                 case SelectCount.SPECIFY:
                                     this.serialTextField.setText(selectCount.getSerial());
                                     //显示set和tip
-                                    setCardPane.setPreferredSize(new Dimension(155, 20));
+                                    setCardPane.setPreferredSize(new Dimension(156, 20));
-                                    tipCardPane.setPreferredSize(new Dimension(221, 15));
+                                    tipCardPane.setPreferredSize(new Dimension(224, 40));
                                     break;
                                 case SelectCount.EVEN:
                                     //隐藏set 显示tip
                                     setCardPane.setPreferredSize(new Dimension(0, 0));
-                                    tipCardPane.setPreferredSize(new Dimension(221, 15));
+                                    tipCardPane.setPreferredSize(new Dimension(224, 40));
                                     break;
                                 case SelectCount.ODD:
                                     //隐藏set 显示tip
                                     setCardPane.setPreferredSize(new Dimension(0, 0));
-                                    tipCardPane.setPreferredSize(new Dimension(221, 15));
+                                    tipCardPane.setPreferredSize(new Dimension(224, 40));
                                     break;
                                 default:
                                     //隐藏set和tip
@@ -949,9 +955,9 @@ public class CellDSColumnEditor extends CellQuickEditor {
                 UILabel customValueLabel = new UILabel(Inter.getLocText("FR-Designer_Display_Value"));
                 customValueLabel.setPreferredSize(new Dimension(60, 20));
                 formulaField = new JFormulaField("$$$");
-                this.add(TableLayoutHelper.createTableLayoutPane(new Component[][]{
+                this.add(TableLayoutHelper.createGapTableLayoutPane(new Component[][]{
                         new Component[]{customValueLabel, formulaField},
-                }, new double[]{P}, new double[]{P, F}), BorderLayout.CENTER);
+                }, new double[]{P}, new double[]{P, F}, HGAP, VGAP), BorderLayout.CENTER);
             }
 
             public void populate(CellElement cellElement) {

designer/src/com/fr/quickeditor/cellquick/CellFormulaQuickEditor.java

@@ -120,10 +120,10 @@ public class CellFormulaQuickEditor extends CellQuickEditor {
         pane.add(formulaButton, BorderLayout.EAST);
 
         content.add(pane, BorderLayout.NORTH);
-        return TableLayoutHelper.createTableLayoutPane(new Component[][]{
+        return TableLayoutHelper.createGapTableLayoutPane(new Component[][]{
                         new Component[]{emptyLabel, content}},
                 new double[]{TableLayout.PREFERRED},
-                new double[]{TableLayout.PREFERRED, TableLayout.FILL});
+                new double[]{TableLayout.PREFERRED, TableLayout.FILL}, HGAP, VGAP);
     }
 
     @Override

designer/src/com/fr/quickeditor/cellquick/CellImageQuickEditor.java

@@ -42,10 +42,10 @@ public class CellImageQuickEditor extends CellQuickEditor {
             }
         });
         editButton.setOpaque(false);
-        content.add(TableLayoutHelper.createTableLayoutPane(new Component[][]{
+        content.add(TableLayoutHelper.createGapTableLayoutPane(new Component[][]{
                         new Component[]{emptyLabel, editButton}},
                 new double[]{TableLayout.PREFERRED},
-                new double[]{TableLayout.PREFERRED, TableLayout.FILL}), BorderLayout.CENTER);
+                new double[]{TableLayout.PREFERRED, TableLayout.FILL}, HGAP, VGAP), BorderLayout.CENTER);
         return content;
     }
 

designer/src/com/fr/quickeditor/cellquick/CellRichTextEditor.java

@@ -29,10 +29,10 @@ public class CellRichTextEditor extends CellQuickEditor {
         JPanel content = new JPanel(new BorderLayout());
         richTextButton = new UIButton();
         richTextButton.setOpaque(false);
-        content.add(TableLayoutHelper.createTableLayoutPane(new Component[][]{
+        content.add(TableLayoutHelper.createGapTableLayoutPane(new Component[][]{
                         new Component[]{emptyLabel, richTextButton}},
                 new double[]{TableLayout.PREFERRED},
-                new double[]{TableLayout.PREFERRED, TableLayout.FILL}), BorderLayout.CENTER);
+                new double[]{TableLayout.PREFERRED, TableLayout.FILL}, HGAP, VGAP), BorderLayout.CENTER);
         return content;
     }
 

designer/src/com/fr/quickeditor/cellquick/CellSubReportEditor.java

@@ -30,10 +30,10 @@ public class CellSubReportEditor extends CellQuickEditor {
         JPanel content = new JPanel(new BorderLayout());
         subReportButton = new UIButton();
         subReportButton.setOpaque(false);
-        content.add(TableLayoutHelper.createTableLayoutPane(new Component[][]{
+        content.add(TableLayoutHelper.createGapTableLayoutPane(new Component[][]{
                         new Component[]{emptyLabel, subReportButton}},
                 new double[]{TableLayout.PREFERRED},
-                new double[]{TableLayout.PREFERRED, TableLayout.FILL}), BorderLayout.CENTER);
+                new double[]{TableLayout.PREFERRED, TableLayout.FILL}, HGAP, VGAP), BorderLayout.CENTER);
         return content;
     }
 

designer_base/src/com/fr/design/gui/frpane/RegPane.java

@@ -73,13 +73,13 @@ public class RegPane extends BasicPane {
 
     private void initComponents(){
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
-        this.setBorder(BorderFactory.createEmptyBorder(0, 0, 10, 0));
+        this.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
         regComboBox = new UIComboBox(regType);
         regComboBox.setRenderer(listCellRender);
 
         JPanel contentPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{new UILabel(Inter.getLocText("FR-Designer_Input_Rule")), regComboBox}}, TableLayoutHelper.FILL_LASTCOLUMN, 18, 7);
         this.add(contentPane, BorderLayout.NORTH);
-
+        JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         regErrorMsgPane = new RegErrorMsgPane();
         final JPanel cardPane = FRGUIPaneFactory.createCardLayout_S_Pane();
         detailedCardLayout = new CardLayout();
@@ -88,8 +88,9 @@ public class RegPane extends BasicPane {
         cardPane.add((regLengthPane = new RegLengthPane()), "Length");
         cardPane.add((regPhonePane = new RegPhonePane()), "Phone");
         cardPane.add((customRegRexPane = new CustomRegRexPane()), "Custom");
-        this.add(cardPane, BorderLayout.CENTER);
+        centerPane.add(cardPane, BorderLayout.NORTH);
-        this.add(regErrorMsgPane, BorderLayout.SOUTH);
+        centerPane.add(regErrorMsgPane, BorderLayout.CENTER);
+        this.add(centerPane, BorderLayout.CENTER);
         regComboBox.addActionListener(new ActionListener(){
             public void actionPerformed(ActionEvent e) {
                 RegExp regExp = (RegExp)regComboBox.getSelectedItem();

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

@@ -2120,4 +2120,7 @@ FR-Designer_Widget_Display_Position=Display Position
 FR-Designer_Size_Limit=Size_Limit
 FR-Designer_Widget_Name=Widget Name
 FR-Designer_Coords_And_Size=Coords & Size
-FR-Designer_Barcode_Size=Barcode_Size
+FR-Designer_Barcode_Size=Barcode_Size
+FS-Designer_DS_Filter_Odd_Tip=Odd_Tip
+FS-Designer_DS_Filter_Even_Tip=Even_Tip
+FS-Designer_DS_Filter_Specify_Tip=Specify_Tip

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

@@ -2117,3 +2117,6 @@ FR-Designer_Size_Limit=Size_Limit
 FR-Designer_Widget_Name=Widget Name
 FR-Designer_Coords_And_Size=Coords & Size
 FR-Designer_Barcode_Size=Barcode_Size
+FS-Designer_DS_Filter_Odd_Tip=Odd_Tip
+FS-Designer_DS_Filter_Even_Tip=Even_Tip 
+FS-Designer_DS_Filter_Specify_Tip=Specify_Tip

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

@@ -2109,7 +2109,7 @@ FR-Designer_Use_Params_Template=
 FR-Designer_Label_Name=
 FR-Designer_Insert_Formula=
 FR-Designer_Not_Support_Authority_Edit=\u3053\u306E\u8981\u7D20\u306F\u6A29\u9650\u5236\u5FA1\u3092\u30B5\u30DD\u30FC\u30C8\u3057\u3066\u3044\u307E\u305B\u3093
-FR-Designer_Dynamic_Parameter=\ 
+FR-Designer_Dynamic_Parameter=
 FR-Designer_Remove_Item=
 FR-Designer_Widget_No_Repeat=
 FR-Designer_Widget_Error_Tip=
@@ -2119,4 +2119,7 @@ FR-Designer_Widget_Display_Position=
 FR-Designer_Size_Limit=
 FR-Designer_Widget_Name=
 FR-Designer_Coords_And_Size=
-FR-Designer_Barcode_Size=
+FR-Designer_Barcode_Size=
+FS-Designer_DS_Filter_Odd_Tip=
+FS-Designer_DS_Filter_Even_Tip=
+FS-Designer_DS_Filter_Specify_Tip=

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

@@ -2109,7 +2109,7 @@ FR-Designer_Use_Params_Template=
 FR-Designer_Label_Name=
 FR-Designer_Add_Event=
 FR-Designer_Not_Support_Authority_Edit=\uD574\uB2F9\uC694\uC18C\uB294\uAD8C\uD55C\uCEE8\uD2B8\uB864\uC744\uC9C0\uC6D0\uD558\uC9C0\uC54A\uC2B5\uB2C8\uB2E4.
-FR-Designer_Dynamic_Parameter=\ 
+FR-Designer_Dynamic_Parameter=
 FR-Designer_Remove_Item=
 FR-Designer_Widget_No_Repeat=
 FR-Designer_Widget_Error_Tip=
@@ -2119,4 +2119,7 @@ FR-Designer_Widget_Display_Position=
 FR-Designer_Size_Limit=
 FR-Designer_Widget_Name=
 FR-Designer_Coords_And_Size=
-FR-Designer_Barcode_Size=
+FR-Designer_Barcode_Size=
+FS-Designer_DS_Filter_Odd_Tip=
+FS-Designer_DS_Filter_Even_Tip=
+FS-Designer_DS_Filter_Specify_Tip=

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

@@ -2127,4 +2127,7 @@ FR-Designer_Widget_Display_Position=\u663E\u793A\u4F4D\u7F6E
 FR-Designer_Size_Limit=\u5927\u5C0F\u9650\u5236
 FR-Designer_Widget_Name=\u63A7\u4EF6\u540D\u79F0
 FR-Designer_Coords_And_Size=\u5750\u6807\u00B7\u5C3A\u5BF8
-FR-Designer_Barcode_Size=\u6761\u5F62\u7801\u5927\u5C0F
+FR-Designer_Barcode_Size=\u6761\u5F62\u7801\u5927\u5C0F
+FS-Designer_DS_Filter_Odd_Tip=\u63D0\u793A\uFF1A\u5E8F\u53F7\u4ECE1\u5F00\u59CB\uFF0C\u9009\u62E9\u4E86\u5947\u6570\u96C6(1,3,5...)
+FS-Designer_DS_Filter_Even_Tip=\u63D0\u793A\uFF1A\u5E8F\u53F7\u4ECE1\u5F00\u59CB\uFF0C\u9009\u62E9\u4E86\u5076\u6570\u96C6(2,4,6...)
+FS-Designer_DS_Filter_Specify_Tip=\u63D0\u793A\uFF1A\u683C\u5F0F\u4E3A1,2-3,5,8\uFF0C\u5E8F\u53F7\u4ECE1\u5F00\u59CB\uFF0C\u5185\u503C\u53C2\u6570$_count_\u8868\u793A\u603B\u4E2A\u6570

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

@@ -2120,3 +2120,6 @@ FR-Designer_Size_Limit=
 FR-Designer_Widget_Name=
 FR-Designer_Coords_And_Size=
 FR-Designer_Barcode_Size=
+FS-Designer_DS_Filter_Odd_Tip=\u63D0\u793A\uFF1A\u5E8F\u865F\u5F9E1\u958B\u59CB\uFF0C\u9078\u64C7\u4E86\u5947\u6578\u96C6(1,3,5...)
+FS-Designer_DS_Filter_Even_Tip=\u63D0\u793A\uFF1A\u5E8F\u865F\u5F9E1\u958B\u59CB\uFF0C\u9078\u64C7\u4E86\u5076\u6578\u96C6(2,4,6...)
+FS-Designer_DS_Filter_Specify_Tip=\u63D0\u793A\uFF1A\u683C\u5F0F\u70BA1,2-3,5,8\uFF0C\u5E8F\u865F\u5F9E1\u958B\u59CB\uFF0C\u5185\u7F6E\u53C3\u6578$_count_\u8868\u793A\u7E02\u500B\u6578

designer_form/src/com/fr/design/widget/ui/designer/FieldEditorDefinePane.java

@@ -84,7 +84,6 @@ public abstract class FieldEditorDefinePane<T extends FieldEditor> extends Abstr
 
     protected void addValidatePane() {
         validatePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        validatePane.setLayout(new BorderLayout(0, 5));
 
         final UILabel uiLabel = new UILabel(Inter.getLocText("FR-Designer_Widget_Error_Tip"));
         allowBlankCheckBox.addItemListener(new ItemListener() {