Merge pull request #1617 in BA/design from ~KERRY/design:master to master

* commit 'fc31fa83e5e07cef6168908cc7448568178a4f28':
  代码修改
  REPORT-6709 报表块、图表块的样式选了自定义，面板下方没有联动出内容

designer_form/src/com/fr/design/gui/xpane/CardTagLayoutBorderPreviewPane.java

@@ -11,4 +11,9 @@ public class CardTagLayoutBorderPreviewPane extends LayoutBorderPreviewPane{
 	public CardTagLayoutBorderPreviewPane(LayoutBorderStyle borderStyle) {
 		super(borderStyle,true);
 	}
+
+	@Override
+	protected void showTitlePreviewPane(){
+
+	}
 }

designer_form/src/com/fr/design/gui/xpane/LayoutBorderPreviewPane.java

@@ -91,10 +91,14 @@ public class LayoutBorderPreviewPane extends JPanel{
             jp.setPreferredSize(new Dimension(getWidth() - GAP, height));
             jp.setBounds(smallGAP,smallGAP, getWidth() - GAP, height);
             borderStyle.paint(g, new Rectangle2D.Double(smallGAP, smallGAP, getWidth() - GAP, getHeight() - GAP));
-            jp.setFontObject(borderStyle.getTitle().getFrFont());
+            showTitlePreviewPane();
         }
     }
 
+    protected void showTitlePreviewPane(){
+        jp.setVisible(borderStyle.getType() == LayoutBorderStyle.TITLE);
+    }
+
     private class titlePreviewPane extends UITextArea {
         private FRFont frFont = null;