From 45d8382b556cb0c83d2091ab33803db88cf3d0f9 Mon Sep 17 00:00:00 2001
From: kerry <kerry@finereport.com>
Date: Fri, 2 Feb 2018 16:05:44 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-6769=20=20tab=E9=80=89=E4=B8=AD=E5=90=8E?=
 =?UTF-8?q?=E8=83=8C=E6=99=AF=E5=8F=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../creator/cardlayout/XCardAddButton.java    | 25 +++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/designer_form/src/com/fr/design/designer/creator/cardlayout/XCardAddButton.java b/designer_form/src/com/fr/design/designer/creator/cardlayout/XCardAddButton.java
index a2b8b05ba1..6db9f953ae 100644
--- a/designer_form/src/com/fr/design/designer/creator/cardlayout/XCardAddButton.java
+++ b/designer_form/src/com/fr/design/designer/creator/cardlayout/XCardAddButton.java
@@ -16,9 +16,13 @@ import com.fr.form.ui.CardSwitchButton;
 import com.fr.form.ui.container.cardlayout.WCardTagLayout;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.Inter;
+import com.fr.general.cardtag.DefaultTemplateStyle;
 
-import javax.swing.*;
-import java.awt.*;
+
+import javax.swing.Icon;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
 import java.awt.event.MouseEvent;
 
 public class XCardAddButton extends XButton{
@@ -80,7 +84,8 @@ public class XCardAddButton extends XButton{
 	 * @param e 点击事件
 	 * 
 	 */
-    public void respondClick(EditingMouseListener editingMouseListener,MouseEvent e){
+    @Override
+	public void respondClick(EditingMouseListener editingMouseListener, MouseEvent e){
 		FormDesigner designer = editingMouseListener.getDesigner();
 		designer.fireTargetModified();
     	
@@ -120,7 +125,8 @@ public class XCardAddButton extends XButton{
 		this.cardLayout = borderLayout.getCardPart();
     }
     
-    public void paintComponent(Graphics g) {
+    @Override
+	public void paintComponent(Graphics g) {
         super.paintComponent(g);
         Graphics2D g2d = (Graphics2D) g;
         drawAddIcon(g2d);
@@ -148,8 +154,14 @@ public class XCardAddButton extends XButton{
     	
 		String cardLayoutName = cardLayout.toData().getWidgetName();
     	CardSwitchButton titleButton = new CardSwitchButton(index,cardLayoutName);
+		WCardTagLayout layout = (WCardTagLayout) this.tagLayout.toData();
+
+		if(!ComparatorUtils.equals(layout.getTemplateStyle().getStyle(), DefaultTemplateStyle.DEFAULT_TEMPLATE_STYLE)){
+			titleButton.setInitialBackground(layout.getTemplateStyle().getTabDefaultBackground());
+			titleButton.setCustomStyle(true);
+		}
     	//设置标题
-    	titleButton.setText(getTabTitleName());
+    	titleButton.setText(getTabTitleName(layout));
     	XCardSwitchButton showButton = new XCardSwitchButton(titleButton, dimension, cardLayout, tagLayout);
     	titleButton.setShowButton(true);
 		showButton.setBackupParent(tagLayout);
@@ -168,8 +180,7 @@ public class XCardAddButton extends XButton{
 	}
 	
     //新增时去tabFitLayout名字中最大的Index+1，防止重名
-    private String getTabTitleName(){
-    	WCardTagLayout layout = (WCardTagLayout) this.tagLayout.toData();
+    private String getTabTitleName(WCardTagLayout layout){
     	int size = layout.getWidgetCount();
     	String prefix = Inter.getLocText("FR-Designer_Title");
     	String newTextName = prefix + size;