REPORT-4393 && REPORT-4028 && REPORT-4192 参数面板日期控件控件值联动失效 控件名无法修改 标签控件不自动换行设置无效

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

@@ -642,4 +642,12 @@ public abstract class XCreator extends JPanel implements XComponent, XCreatorToo
 		this.data = data;
 	}
 
+	/**
+	 * 属性改变触发
+	 *
+	 */
+	public void firePropertyChange(){
+
+	}
+
 }

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

@@ -174,5 +174,12 @@ public class XDateEditor extends XDirectWriteEditor {
 	public boolean shouldScaleCreator() {
 		return true;
 	}
-	
+
+	/**
+	 * 触发其他操作
+	 *
+	 */
+	public void firePropertyChange(){
+		initFieldText();
+	}
 }

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

@@ -161,4 +161,12 @@ public class XWScaleLayout extends DedicateLayoutContainer {
 	public boolean supportSetVisibleOrEnable(){
 		return true;
 	}
+
+	/**
+	 * 更新组件及子组件的UI
+	 */
+	public void firePropertyChange(){
+		XCreator child = getXCreator(INDEX);
+		child.firePropertyChange();
+	}
 }

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

@@ -1,6 +1,7 @@
 package com.fr.design.mainframe.widget.ui;
 
 import com.fr.design.data.DataCreatorUI;
+import com.fr.design.designer.beans.events.DesignerEvent;
 import com.fr.design.designer.creator.*;
 import com.fr.design.dialog.BasicScrollPane;
 import com.fr.design.foldablepane.UIExpandablePane;
@@ -205,6 +206,8 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane {
         if (widgetBoundPane != null) {
             widgetBoundPane.update();
         }
+        xCreator.resetCreatorName(widget.getWidgetName());
+        designer.getEditListenerTable().fireCreatorModified(xCreator, DesignerEvent.CREATOR_RENAMED);
         fireValueChanged();
     }
 
@@ -218,8 +221,9 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane {
     }
 
     public void fireValueChanged() {
-        designer.repaint();
+        xCreator.firePropertyChange();
-        DesignerContext.getDesignerFrame().getSelectedJTemplate().fireTargetModified();
+        designer.fireTargetModified();
+        designer.refreshDesignerUI();
     }
 
     public String getIconPath() {

designer_form/src/com/fr/design/parameter/RootDesignDefinePane.java

@@ -115,7 +115,7 @@ public class RootDesignDefinePane extends AbstractDataModify<WParameterLayout> {
         displayReport.setSelected(ob.isDelayDisplayContent());
         useParamsTemplate.setSelected(ob.isUseParamsTemplate());
         designerWidth.setValue(ob.getDesignWidth());
-        hAlignmentPane.setSelectedIndex(ob.getPosition());
+        hAlignmentPane.setSelectedItem(ob.getPosition());
     }
 
 
@@ -129,7 +129,7 @@ public class RootDesignDefinePane extends AbstractDataModify<WParameterLayout> {
         JTemplate jTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
         jTemplate.needAddTemplateId(useParamsTemplate.isSelected());
         wParameterLayout.setBackground((Background) background.getValue());
-        wParameterLayout.setPosition(hAlignmentPane.getSelectedIndex());
+        wParameterLayout.setPosition((int)hAlignmentPane.getSelectedItem());
         return wParameterLayout;
     }
 

designer_form/src/com/fr/design/widget/ui/designer/LabelDefinePane.java

@@ -84,7 +84,7 @@ public class LabelDefinePane extends AbstractDataModify<Label> {
         formWidgetValuePane.populate(ob);
         isStyleAlignmentWrapText.setSelected(ob.isAutoLine());
         isPageSetupVertically.setSelected(ob.isVerticalCenter());
-        hAlignmentPane.setSelectedIndex(ob.getTextalign());
+        hAlignmentPane.setSelectedItem(ob.getTextalign());
         frFontPane.populateBean(ob.getFont());
     }
 
@@ -95,7 +95,7 @@ public class LabelDefinePane extends AbstractDataModify<Label> {
         formWidgetValuePane.update(layout);
         layout.setAutoLine(isStyleAlignmentWrapText.isSelected());
         layout.setVerticalCenter(isPageSetupVertically.isSelected());
-        layout.setTextalign(hAlignmentPane.getSelectedIndex());
+        layout.setTextalign((int)hAlignmentPane.getSelectedItem());
         layout.setFont(frFontPane.update(layout.getFont()));
         return layout;
     }