From 063c2cd52be32536c21903efa0eb549a13e1a01d Mon Sep 17 00:00:00 2001
From: Yvan <Yvan@fanruan.com>
Date: Fri, 24 Jul 2020 09:50:28 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-35906=20=E6=95=B0=E6=8D=AE=E9=9B=86?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=9A=84=E7=95=8C=E9=9D=A2=EF=BC=8C=E5=9C=A8?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=A1=8C=E6=95=B0=E6=88=96=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E8=A1=8C=E6=95=B0=E5=90=8E=EF=BC=8C=E4=BB=A3=E7=A0=81=E4=B8=AD?=
 =?UTF-8?q?=E4=BC=9A=E5=81=9A=E4=B8=80=E9=83=A8=E5=88=86=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=EF=BC=8C=E6=A0=B9=E6=8D=AE=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=9A=84=E9=A1=BA=E5=BA=8F=E7=89=B9=E7=82=B9=EF=BC=8C=E5=88=A0?=
 =?UTF-8?q?=E5=8E=BB=E5=A4=9A=E4=BD=99=E7=9A=84Component=EF=BC=8C=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle                                             | 2 +-
 .../tabledata/tabledatapane/MaxMemRowCountPanel.java     | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 3118ed8a99..84c06b0b5e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -58,7 +58,7 @@ allprojects {
 
     dependencies {
         implementation 'com.fr.third:jxbrowser:6.23'
-        implementation 'com.fr.third:jxbrowser-swing:6.23'
+        //implementation 'com.fr.third:jxbrowser-swing:6.23'
         implementation 'com.fr.third:jxbrowser-mac:6.23'
         implementation 'com.fr.third:jxbrowser-win64:6.23'
         implementation 'com.fr.third.server:servlet-api:3.0'
diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MaxMemRowCountPanel.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MaxMemRowCountPanel.java
index 00bbcc995b..fbab521b06 100644
--- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MaxMemRowCountPanel.java
+++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MaxMemRowCountPanel.java
@@ -1,6 +1,6 @@
 package com.fr.design.data.tabledata.tabledatapane;
 
-import java.awt.Dimension;
+import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
@@ -11,6 +11,7 @@ import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.ispinner.UISpinner;
 import com.fr.design.gui.itoolbar.UIToolbar;
+import com.fr.design.i18n.Toolkit;
 
 
 public class MaxMemRowCountPanel extends UIToolbar {
@@ -88,7 +89,11 @@ public class MaxMemRowCountPanel extends UIToolbar {
 		switchCache.setSelectedIndex(MAX_IN_MEMORY);
 		this.add(new UILabel(" "));
 		this.add(numberSpinner);
-		this.add(new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Row")));
+		this.add(new UILabel(" " + Toolkit.i18nText("Fine-Design_Basic_Row")));
+		if (this.getComponentCount() > 4) {
+			this.remove(1);
+			this.remove(1);
+		}
 		this.validate();
 		this.repaint();
 	}