From 0a80bfb61fbeb03598bb998fab667c630b57b546 Mon Sep 17 00:00:00 2001
From: Yvan <Yvan@fanruan.com>
Date: Fri, 24 Jul 2020 17:00:28 +0800
Subject: [PATCH] =?UTF-8?q?Merge=20branch=20'release/10.0'=20of=20https://?=
 =?UTF-8?q?code.fineres.com/scm/~yvan/design=20into=20release/10.0=20#=20?=
 =?UTF-8?q?=E8=AF=B7=E8=BE=93=E5=85=A5=E4=B8=80=E4=B8=AA=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=BB=A5=E8=A7=A3=E9=87=8A=E6=AD=A4=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6=E7=9A=84=E5=BF=85=E8=A6=81=E6=80=A7=EF=BC=8C=E5=B0=A4?=
 =?UTF-8?q?=E5=85=B6=E6=98=AF=E5=B0=86=E4=B8=80=E4=B8=AA=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E5=90=8E=E7=9A=84=E4=B8=8A=E6=B8=B8=E5=88=86=E6=94=AF=20#=20?=
 =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=88=B0=E4=B8=BB=E9=A2=98=E5=88=86=E6=94=AF?=
 =?UTF-8?q?=E3=80=82=20#=20#=20=E4=BB=A5=20'#'=20=E5=BC=80=E5=A7=8B?=
 =?UTF-8?q?=E7=9A=84=E8=A1=8C=E5=B0=86=E8=A2=AB=E5=BF=BD=E7=95=A5=EF=BC=8C?=
 =?UTF-8?q?=E8=80=8C=E7=A9=BA=E7=9A=84=E6=8F=90=E4=BA=A4=E8=AF=B4=E6=98=8E?=
 =?UTF-8?q?=E5=B0=86=E7=BB=88=E6=AD=A2=E6=8F=90=E4=BA=A4=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle                                           |  2 +-
 .../tabledata/tabledatapane/MaxMemRowCountPanel.java   | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index 84c06b0b5..3118ed8a9 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 fbab521b0..3f5902d8a 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,7 @@
 package com.fr.design.data.tabledata.tabledatapane;
 
-import java.awt.*;
+
+import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
@@ -87,13 +88,12 @@ public class MaxMemRowCountPanel extends UIToolbar {
 		this.removeAll();
 		this.add(switchCache);
 		switchCache.setSelectedIndex(MAX_IN_MEMORY);
+		if (this.getComponentCount() == 4) {
+			return;
+		}
 		this.add(new UILabel(" "));
 		this.add(numberSpinner);
 		this.add(new UILabel(" " + Toolkit.i18nText("Fine-Design_Basic_Row")));
-		if (this.getComponentCount() > 4) {
-			this.remove(1);
-			this.remove(1);
-		}
 		this.validate();
 		this.repaint();
 	}