Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~neil/design into release/10.0

designer-base/src/main/java/com/fr/design/gui/controlpane/UIControlPane.java

@@ -249,7 +249,8 @@ abstract class UIControlPane extends JControlPane {
                 checkValid();
             } catch (Exception exp) {
                 // 存在非法输入 拒绝隐藏
-                JOptionPane.showMessageDialog(UIControlPane.this.controlUpdatePane, exp.getMessage());
+                this.setAlwaysOnTop(true);
+                JOptionPane.showMessageDialog(this, exp.getMessage());
                 this.requestFocus();
                 return;
             }

designer-form/src/main/java/com/fr/design/designer/properties/EventPropertyTable.java

@@ -50,10 +50,12 @@ public class EventPropertyTable extends UIListControlPane {
                 protected String title4PopupWindow() {
                     return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Callback_Function");
                 }
+
                 @Override
                 protected EmailPane initEmaiPane() {
                     return new FormEmailPane();
                 }
+
                 @Override
                 public boolean isForm() {
                     return true;
@@ -95,6 +97,10 @@ public class EventPropertyTable extends UIListControlPane {
         Widget widget = creator.toData();
 
         refreshNameableCreator(EventCreator.createEventCreator(widget.supportedEvents(), WidgetEventListenerUpdatePane.class));
+    }
+
+    public void populateNameObjects() {
+        Widget widget = creator.toData();
 
         ArrayList<NameObject> nameObjectList = new ArrayList<>();
         for (int i = 0, size = widget.getListenerSize(); i < size; i++) {
@@ -110,6 +116,7 @@ public class EventPropertyTable extends UIListControlPane {
 
     /**
      * 更新控件事件
+     *
      * @param creator 控件
      */
     public void updateWidgetListener(XCreator creator) {

designer-form/src/main/java/com/fr/design/mainframe/WidgetPropertyPane.java

@@ -108,6 +108,7 @@ public class WidgetPropertyPane extends FormDockView implements BaseWidgetProper
      */
     private void initTables() {
         formWidgetCardPane.populate();
+        eventTable.refresh();
 
         if (mobileExtraPropertyPanes != null) {
             for (MobileWidgetDefinePane extraPane : mobileExtraPropertyPanes) {
@@ -233,7 +234,7 @@ public class WidgetPropertyPane extends FormDockView implements BaseWidgetProper
             public void tabChanged(int index) {
                 //切换的时候再populate
                 if (index == 1) {
-                    eventTable.refresh();
+                    eventTable.populateNameObjects();
                 } else if (index == 2) {
                     if (mobileExtraPropertyPanes != null) {
                         for (MobileWidgetDefinePane extraPane : mobileExtraPropertyPanes) {