Browse Source

Merge pull request #763 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0

* commit '602a4be22b148cf041d9d826e00b567b95613c4b':
  REPORT-14103 单元格控件设置左父格自动消失 10.0 同步 & REPORT-14558 【回归测试】单元格属性--修改自动调整属性,控件会消失
bugfix/10.0
Hades 6 years ago
parent
commit
3ea18a275d
  1. 4
      designer-realize/src/main/java/com/fr/design/mainframe/CellWidgetPropertyPane.java
  2. 14
      designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/AbstractCellAttrPane.java

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

@ -111,6 +111,8 @@ public class CellWidgetPropertyPane extends BasicPane {
if (finalCS.isSelectedOneCell(ePane)) { if (finalCS.isSelectedOneCell(ePane)) {
if (tplEC.getTemplateCellElement(cellElement.getColumn(), cellElement.getRow()) == null) {//cellElement未加入到report中时要添加进去 if (tplEC.getTemplateCellElement(cellElement.getColumn(), cellElement.getRow()) == null) {//cellElement未加入到report中时要添加进去
tplEC.addCellElement(cellElement); tplEC.addCellElement(cellElement);
} else {
cellElement = tplEC.getTemplateCellElement(finalCS.getColumn(), finalCS.getRow());
} }
setCellWidget(cellWidget, cellElement); setCellWidget(cellWidget, cellElement);
} else { } else {
@ -141,6 +143,8 @@ public class CellWidgetPropertyPane extends BasicPane {
if(finalCS.isSelectedOneCell(ePane)){ if(finalCS.isSelectedOneCell(ePane)){
if(tplEC.getTemplateCellElement(cellElement.getColumn(), cellElement.getRow())== null){//cellElement未加入到report中时要添加进去 if(tplEC.getTemplateCellElement(cellElement.getColumn(), cellElement.getRow())== null){//cellElement未加入到report中时要添加进去
tplEC.addCellElement(cellElement); tplEC.addCellElement(cellElement);
} else {
cellElement = tplEC.getTemplateCellElement(finalCS.getColumn(), finalCS.getRow());
} }
setCellWidget(cellWidget, cellElement); setCellWidget(cellWidget, cellElement);
}else{ }else{

14
designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/AbstractCellAttrPane.java

@ -4,6 +4,7 @@ import com.fr.design.mainframe.AbstractAttrPane;
import com.fr.design.mainframe.ElementCasePane; import com.fr.design.mainframe.ElementCasePane;
import com.fr.grid.selection.CellSelection; import com.fr.grid.selection.CellSelection;
import com.fr.grid.selection.FloatSelection; import com.fr.grid.selection.FloatSelection;
import com.fr.report.cell.DefaultTemplateCellElement;
import com.fr.report.cell.TemplateCellElement; import com.fr.report.cell.TemplateCellElement;
import com.fr.report.elementcase.TemplateElementCase; import com.fr.report.elementcase.TemplateElementCase;
@ -44,8 +45,17 @@ public abstract class AbstractCellAttrPane extends AbstractAttrPane {
* 分成两个方法的意义在于这个面板如果是个对话框那么可以传cellElement进来update 方便重复使用面板 为了对话框做准备 * 分成两个方法的意义在于这个面板如果是个对话框那么可以传cellElement进来update 方便重复使用面板 为了对话框做准备
*/ */
public void updateBean() { public void updateBean() {
updateBean(this.cellElement); if (elementCasePane == null) {
return;
}
cs = (CellSelection) elementCasePane.getSelection();
TemplateElementCase elementCase = elementCasePane.getEditingElementCase(); TemplateElementCase elementCase = elementCasePane.getEditingElementCase();
elementCase.addCellElement(cellElement); TemplateCellElement cellElement = elementCase.getTemplateCellElement(cs.getColumn(), cs.getRow());
if (cellElement == null) {
cellElement = new DefaultTemplateCellElement(cs.getColumn(), cs.getRow());
}
this.cellElement = cellElement;
elementCase.addCellElement(this.cellElement);
updateBean(this.cellElement);
} }
} }
Loading…
Cancel
Save