无jira 解决冲突

designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MaxMemRowCountPanel.java

@@ -21,7 +21,7 @@ public class MaxMemRowCountPanel extends UIToolbar {
 	private static final int MAX_IN_MEMORY = 1;
 	private static final String[] CACHE_LIST = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Save_All_Records_In_Memory"),
 												com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Max_Mem_Row_Count") };
-	private static final int MAX_WIDTH = getMaxComBoBoxWidth() > 200 ? 400 : 300;
+	private static final int MAX_WIDTH = getMaxComBoBoxWidth() > 200 ? 350 : 280;
 	private static final int MAX_COMPONENT_COUNT_OF_MAX_MEMORY = 4;
 	private static int getMaxComBoBoxWidth() {
 		int maxWidth = GraphHelper.getWidth(CACHE_LIST[0]);
@@ -73,7 +73,7 @@ public class MaxMemRowCountPanel extends UIToolbar {
 		switchCache = new UIComboBox(CACHE_LIST);
 		switchCache.addActionListener(switchStateL);
 		numberSpinner = new UISpinner(0, Integer.MAX_VALUE, 1);
-		numberSpinner.setNumberFieldColumns(4);
+		numberSpinner.setNumberFieldColumns(3);
 	}
 
 	private void showAllPanel() {