Merge pull request #1234 in BA/design from ~KERRY/design:release/9.0 to release/9.0

* commit 'e23afa15590bfc5d38fc4431539863c8ac820fe4':
  删除无用import
  REPORT-4581 报表块样式-标题样式不起作用

designer_form/src/com/fr/design/designer/creator/XBorderStyleWidgetCreator.java

@@ -149,4 +149,12 @@ public class XBorderStyleWidgetCreator extends XWidgetCreator{
 		return false;
 	}
 
+	/**
+	 * data属性改变触发其他操作
+	 *
+	 */
+	public void firePropertyChange(){
+		initStyle();
+	}
+    
 }

designer_form/src/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java

@@ -8,7 +8,6 @@ import com.fr.design.foldablepane.UIExpandablePane;
 import com.fr.design.gui.frpane.AbstractAttrNoScrollPane;
 import com.fr.design.gui.frpane.AttributeChangeListener;
 import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.FormDesigner;
 import com.fr.design.widget.DataModify;
 import com.fr.design.widget.Operator;
@@ -152,8 +151,7 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane {
 
     private void initDefinePane() {
         currentEditorDefinePane = null;
-        boolean dedicateLayout = xCreator.acceptType(XWScaleLayout.class) && xCreator.getComponentCount() > 0 && ((XCreator) xCreator.getComponent(0)).shouldScaleCreator() || xCreator.acceptType(XWTitleLayout.class);
+        XCreator creator = getXCreatorDedicated();
-        XCreator creator = dedicateLayout ? (XCreator) xCreator.getComponent(0) : xCreator;
         FormWidgetDefinePaneFactoryBase.RN rn = FormWidgetDefinePaneFactoryBase.createWidgetDefinePane(creator, creator.toData(), new Operator() {
             @Override
             public void did(DataCreatorUI ui, String cardName) {
@@ -168,6 +166,10 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane {
         currentEditorDefinePane = definePane;
     }
 
+    private XCreator getXCreatorDedicated(){
+        boolean dedicateLayout = xCreator.acceptType(XWScaleLayout.class) && xCreator.getComponentCount() > 0 && ((XCreator) xCreator.getComponent(0)).shouldScaleCreator() || xCreator.acceptType(XWTitleLayout.class);
+        return dedicateLayout ? (XCreator) xCreator.getComponent(0) : xCreator;
+    }
 
     @Override
     public String title4PopupWindow() {
@@ -217,7 +219,8 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane {
     }
 
     public void fireValueChanged() {
-        xCreator.firePropertyChange();
+        XCreator creator = getXCreatorDedicated();
+        creator.firePropertyChange();
         designer.fireTargetModified();
         designer.refreshDesignerUI();
     }