Merge branch 'release/10.0' of https://code.fineres.com/scm/~qinghui.liu/design into release/10.0

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

designer-base/src/main/java/com/fr/design/web/CustomIconPane.java

@@ -404,7 +404,6 @@ public class CustomIconPane extends BasicPane {
             double p = TableLayout.PREFERRED;
             double[] rowSize = {p, p};
             double[] columnSize = {p, p};
-            int[][] rowCount = {{1, 1}, {1, 1}};
             UIButton browseButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom_Icon_SelectIcon"));
             browseButton.setPreferredSize(new Dimension(80, 25));
             browseButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Click_this_button"));
@@ -443,7 +442,7 @@ public class CustomIconPane extends BasicPane {
             imagePane.add(browseButton);
             Component[][] components = {{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Name") + ":"), nameTextField}, {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Icon") + ":"), imagePane}};
 
-            JPanel centerPane = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W0, IntervalConstants.INTERVAL_L1);
+            JPanel centerPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
             this.add(centerPane, BorderLayout.CENTER);
         }