Browse Source

Pull request #4804: REPORT-54123 设计器报表块组件进入和退出编辑时单元格选中状态优化

Merge in DESIGN/design from ~STARRYI/design:feature/10.0 to feature/10.0

* commit '0ec9b2839174743d3a1f1e8cd526af4371707652':
  REPORT-54123 设计器报表块组件进入和退出编辑时单元格选中状态优化
feature/10.0
starryi 3 years ago
parent
commit
56e3720efd
  1. 2
      designer-base/src/main/java/com/fr/design/mainframe/form/FormECDesignerProvider.java
  2. 3
      designer-form/src/main/java/com/fr/design/mainframe/JForm.java
  3. 3
      designer-realize/src/main/java/com/fr/design/mainframe/form/FormElementCaseDesigner.java

2
designer-base/src/main/java/com/fr/design/mainframe/form/FormECDesignerProvider.java

@ -90,4 +90,6 @@ public interface FormECDesignerProvider {
BufferedImage getElementCaseImage(Dimension elementCaseContainerSize); BufferedImage getElementCaseImage(Dimension elementCaseContainerSize);
void refreshPropertyPane(); void refreshPropertyPane();
void removeSelection();
} }

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

@ -917,6 +917,9 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm<F
ecTabAction(); ecTabAction();
} else { } else {
formDesign.setReportBlockEditing(false); formDesign.setReportBlockEditing(false);
if (elementCaseDesign != null) {
elementCaseDesign.removeSelection();
}
formTabAction(); formTabAction();
} }
refreshToolArea(); refreshToolArea();

3
designer-realize/src/main/java/com/fr/design/mainframe/form/FormElementCaseDesigner.java

@ -293,10 +293,13 @@ public class FormElementCaseDesigner
/** /**
* 移除选择 * 移除选择
*/ */
@Override
public void removeSelection() { public void removeSelection() {
TemplateElementCase templateElementCase = this.elementCasePane.getEditingElementCase(); TemplateElementCase templateElementCase = this.elementCasePane.getEditingElementCase();
if (templateElementCase instanceof WorkSheet) { if (templateElementCase instanceof WorkSheet) {
((WorkSheet) templateElementCase).setPaintSelection(false); ((WorkSheet) templateElementCase).setPaintSelection(false);
} else if (templateElementCase instanceof FormElementCase) {
this.elementCasePane.setSelection(new CellSelection(0, 0, 0, 0));
} }
elementCasePane.repaint(); elementCasePane.repaint();
} }

Loading…
Cancel
Save