diff --git a/designer-realize/src/main/java/com/fr/design/share/effect/EffectItemGroup.java b/designer-realize/src/main/java/com/fr/design/share/effect/EffectItemGroup.java index 923c200d1..a07478c9d 100644 --- a/designer-realize/src/main/java/com/fr/design/share/effect/EffectItemGroup.java +++ b/designer-realize/src/main/java/com/fr/design/share/effect/EffectItemGroup.java @@ -68,8 +68,7 @@ public class EffectItemGroup { for (int index = 0; index < listenerSize; index ++) { Listener listener = widget.getListener(index); SourceNode sourceNode = SourceNodeUtils.createSourceNode(widget, null); - String eventName = switchLang(listener.getEventName()) + (index + 1); - this.add(new ListenerEffectItem(listener, sourceNode, eventName)); + this.add(new ListenerEffectItem(listener, sourceNode)); } } diff --git a/designer-realize/src/main/java/com/fr/design/share/effect/ListenerEffectItem.java b/designer-realize/src/main/java/com/fr/design/share/effect/ListenerEffectItem.java index 38d635424..55b53ad72 100644 --- a/designer-realize/src/main/java/com/fr/design/share/effect/ListenerEffectItem.java +++ b/designer-realize/src/main/java/com/fr/design/share/effect/ListenerEffectItem.java @@ -9,10 +9,9 @@ import com.fr.form.ui.Widget; public class ListenerEffectItem extends BaseEffectItem { private Listener listener; - public ListenerEffectItem(Listener listener, SourceNode sourceNode, String name) { + public ListenerEffectItem(Listener listener, SourceNode sourceNode) { this.listener = listener; this.setSourceNode(sourceNode); - this.setName(name); init(); } @@ -24,6 +23,8 @@ public class ListenerEffectItem extends BaseEffectItem { object = new Listener(listener.getTargetWidget(), listener.getEventName(), listener.getAction(), listener.isInvokeOnce()); } setObject(object); + + setName(listener.getName()); this.setNameableCreator(new EventCreator(Widget.EVENT_STATECHANGE, EventPropertyTable.WidgetEventListenerUpdatePane.class)); } @@ -32,7 +33,13 @@ public class ListenerEffectItem extends BaseEffectItem { setObject((Listener) bean); } + public void setName(String name) { + super.setName(name); + getObject().setName(name); + } + public void save() { + listener.setName(getObject().getName()); listener.setEventName(getObject().getEventName()); listener.setAction(getObject().getAction()); listener.setInvokeOnce(getObject().isInvokeOnce()); diff --git a/designer-realize/src/main/java/com/fr/design/share/ui/config/table/ConfigTableModel.java b/designer-realize/src/main/java/com/fr/design/share/ui/config/table/ConfigTableModel.java index 29fe8e125..b9b3f15d2 100644 --- a/designer-realize/src/main/java/com/fr/design/share/ui/config/table/ConfigTableModel.java +++ b/designer-realize/src/main/java/com/fr/design/share/ui/config/table/ConfigTableModel.java @@ -39,8 +39,7 @@ public class ConfigTableModel extends AbstractTableModel { @Override public boolean isCellEditable(int rowIndex, int columnIndex) { - EffectItem effectItem = effectItems.get(rowIndex); - return columnIndex == 1 && !(effectItem instanceof ListenerEffectItem); + return columnIndex == 1; } @Override diff --git a/designer-realize/src/main/java/com/fr/design/share/ui/generate/table/EffectTableModel.java b/designer-realize/src/main/java/com/fr/design/share/ui/generate/table/EffectTableModel.java index 042159c69..f9d4ecb2b 100644 --- a/designer-realize/src/main/java/com/fr/design/share/ui/generate/table/EffectTableModel.java +++ b/designer-realize/src/main/java/com/fr/design/share/ui/generate/table/EffectTableModel.java @@ -44,8 +44,7 @@ public class EffectTableModel extends AbstractTableModel { @Override public boolean isCellEditable(int rowIndex, int columnIndex) { - EffectItem effectItem = effectItems.get(rowIndex); - return columnIndex == 1 && !(effectItem instanceof ListenerEffectItem); + return columnIndex == 1; } @Override