From 6088af74c9b0c939bcc1b712ed9fd5c40e789d2c Mon Sep 17 00:00:00 2001
From: kerry <kerry@finereport.com>
Date: Fri, 9 Feb 2018 14:47:30 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-6373=20=20tab=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../creator/cardlayout/XWTabFitLayout.java    | 29 ++++++++++++++++++-
 .../src/com/fr/design/mainframe/FormArea.java |  2 +-
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/designer_form/src/com/fr/design/designer/creator/cardlayout/XWTabFitLayout.java b/designer_form/src/com/fr/design/designer/creator/cardlayout/XWTabFitLayout.java
index 7f80f94870..ee3c9dd07d 100644
--- a/designer_form/src/com/fr/design/designer/creator/cardlayout/XWTabFitLayout.java
+++ b/designer_form/src/com/fr/design/designer/creator/cardlayout/XWTabFitLayout.java
@@ -28,7 +28,12 @@ import com.fr.stable.ArrayUtils;
 import com.fr.stable.core.PropertyChangeAdapter;
 
 import javax.swing.border.Border;
-import java.awt.*;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.FontMetrics;
+import java.awt.Rectangle;
 import java.beans.IntrospectionException;
 
 
@@ -623,4 +628,26 @@ public class XWTabFitLayout extends XWFitLayout {
 		xCardSwitchButton.setPreferredSize(new Dimension(width, xCardSwitchButton.getHeight()));
 	}
 
+	private void checkVisible(){
+		WTabFitLayout wTabFitLayout = (WTabFitLayout)this.data;
+		CardSwitchButton cardSwitchButton = wTabFitLayout.getCurrentCard();
+		cardSwitchButton.setVisible(wTabFitLayout.isVisible());
+	}
+
+
+	/**
+	 * 是否支持设置可见
+	 * return boolean
+	 */
+	@Override
+	public boolean supportSetVisible(){
+		return true;
+	}
+
+
+	@Override
+	public void resetVisible(boolean visible){
+		checkVisible();
+	}
+
 }
\ No newline at end of file
diff --git a/designer_form/src/com/fr/design/mainframe/FormArea.java b/designer_form/src/com/fr/design/mainframe/FormArea.java
index 05853b7307..bcb6dd4755 100644
--- a/designer_form/src/com/fr/design/mainframe/FormArea.java
+++ b/designer_form/src/com/fr/design/mainframe/FormArea.java
@@ -488,7 +488,7 @@ public class FormArea extends JComponent implements ScrollRulerComponent {
     public void scrollPathToVisible(XCreator creator) {
         creator.seleteRelatedComponent(creator);
 
-        if (!ComponentUtils.isComponentVisible(creator) && !designer.isRoot(creator) && (creator.toData()).isVisible()) {
+        if (!ComponentUtils.isComponentVisible(creator) && !designer.isRoot(creator)) {
             designer.makeVisible(creator);
         }