Browse Source

Merge pull request #627 in DESIGN/design from ~MATA.LI/designrel:release/10.0 to release/10.0

* commit 'de653417ab662b0d6863ccd2666b245e6c7e6c66':
  REPORT-12710
final/10.0
Mata.Li 6 years ago
parent
commit
a590928c22
  1. 9
      designer-form/src/main/java/com/fr/design/designer/properties/EventPropertyTable.java
  2. 3
      designer-form/src/main/java/com/fr/design/mainframe/WidgetPropertyPane.java

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

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

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

Loading…
Cancel
Save