|
|
@ -97,6 +97,7 @@ import java.awt.image.BufferedImage; |
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.HashMap; |
|
|
|
import java.util.HashMap; |
|
|
|
import java.util.List; |
|
|
|
import java.util.List; |
|
|
|
|
|
|
|
import javax.swing.tree.TreePath; |
|
|
|
|
|
|
|
|
|
|
|
public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm<Form> { |
|
|
|
public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm<Form> { |
|
|
|
private static final String FORM_CARD = "FORM"; |
|
|
|
private static final String FORM_CARD = "FORM"; |
|
|
@ -623,6 +624,11 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm<F |
|
|
|
this.formDesign.getSelectionModel().setSelectedCreators(FormSelectionUtils.rebuildSelection(formDesign.getRootComponent(), |
|
|
|
this.formDesign.getSelectionModel().setSelectedCreators(FormSelectionUtils.rebuildSelection(formDesign.getRootComponent(), |
|
|
|
formDesign.getRootComponent() == selectedBodyLayout() ? u.getSelectWidgets() : new Widget[]{selectedBodyLayout().toData()})); |
|
|
|
formDesign.getRootComponent() == selectedBodyLayout() ? u.getSelectWidgets() : new Widget[]{selectedBodyLayout().toData()})); |
|
|
|
refreshToolArea(); |
|
|
|
refreshToolArea(); |
|
|
|
|
|
|
|
// 停止编辑 恢复浮层展示
|
|
|
|
|
|
|
|
TreePath[] treePaths = FormHierarchyTreePane.getInstance(formDesign).getComponentTree().getSelectedTreePath(); |
|
|
|
|
|
|
|
for (TreePath path : treePaths) { |
|
|
|
|
|
|
|
formDesign.stopEditing(path); |
|
|
|
|
|
|
|
} |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
// 只在报表块里撤销是不需要修改外部form对象的, 因为编辑的是当前报表块.
|
|
|
|
// 只在报表块里撤销是不需要修改外部form对象的, 因为编辑的是当前报表块.
|
|
|
|
// 修改了JForm的Target需要同步修改formDesign的Target.
|
|
|
|
// 修改了JForm的Target需要同步修改formDesign的Target.
|
|
|
|