Browse Source

Merge pull request #1506 in BA/design from ~MOMEAK/design9.0:release/9.0 to release/9.0

* commit '261feb1394cb5fea5527f49a7c4f2f0286871422':
  REPORT-5955 [Report]删除悬浮元素后,设计器卡死 之前wu做了释放内存,删除悬浮元素会报nep;删除悬浮元素逻辑改为先setSelection 再 remove
superman 8 years ago
parent
commit
855acfe21c
  1. 2
      designer/src/com/fr/grid/selection/FloatSelection.java

2
designer/src/com/fr/grid/selection/FloatSelection.java

@ -148,8 +148,8 @@ public class FloatSelection extends Selection {
TemplateElementCase ec = ePane.getEditingElementCase(); TemplateElementCase ec = ePane.getEditingElementCase();
FloatElement fe = ec.getFloatElement(selectedFloatName); FloatElement fe = ec.getFloatElement(selectedFloatName);
if (fe != null) { if (fe != null) {
ec.removeFloatElement(fe);
ePane.setSelection(new CellSelection(0, 0, 1, 1)); ePane.setSelection(new CellSelection(0, 0, 1, 1));
ec.removeFloatElement(fe);
return true; return true;
} }

Loading…
Cancel
Save