Browse Source

Pull request #4514: REPORT-53365 && REPORT-53310 交互修改

Merge in DESIGN/design from ~KERRY/design_10.0:feature/10.0 to feature/10.0

* commit 'a92a5c82d8c6781f13a4c3105ceb871c5b962dfe':
  REPORT-53365 && REPORT-53310 交互修改
feature/10.0
kerry 3 years ago
parent
commit
311d096961
  1. 9
      designer-base/src/main/java/com/fr/design/gui/controlpane/UIListGroupControlPane.java
  2. 6
      designer-realize/src/main/java/com/fr/design/mainframe/CellWidgetPropertyPane.java

9
designer-base/src/main/java/com/fr/design/gui/controlpane/UIListGroupControlPane.java

@ -107,6 +107,15 @@ public abstract class UIListGroupControlPane extends UIControlPane implements L
contentPane.add(wrapperPane);
nameEdListMap.put(event, wrapperPane);
}
contentPane.addMouseListener(new MouseAdapter() {
@Override
public void mousePressed(MouseEvent e) {
super.mousePressed(e);
if (selectNameEdList != null) {
selectNameEdList.stopEditing();
}
}
});
}
protected void populateNameObjects(Widget widget) {

6
designer-realize/src/main/java/com/fr/design/mainframe/CellWidgetPropertyPane.java

@ -106,6 +106,9 @@ public class CellWidgetPropertyPane extends BasicPane {
final CellSelection finalCS = (CellSelection) ePane.getSelection();
final TemplateElementCase tplEC = ePane.getEditingElementCase();
final Widget cellWidget = cellEditorDefPane.update();
if(cellWidget == null){
return;
}
if (finalCS.isSelectedOneCell(ePane)) {
if (tplEC.getTemplateCellElement(cellElement.getColumn(), cellElement.getRow()) == null) {//cellElement未加入到report中时要添加进去
tplEC.addCellElement(cellElement);
@ -141,6 +144,9 @@ public class CellWidgetPropertyPane extends BasicPane {
final CellSelection finalCS = (CellSelection) selection;
final TemplateElementCase tplEC = ePane.getEditingElementCase();
final Widget cellWidget = cellEditorDefPane.update();
if(cellWidget == null){
return;
}
if(finalCS.isSelectedOneCell(ePane)){
if(tplEC.getTemplateCellElement(cellElement.getColumn(), cellElement.getRow())== null){//cellElement未加入到report中时要添加进去
tplEC.addCellElement(cellElement);

Loading…
Cancel
Save