Browse Source

Pull request #1766: REPORT-34127 筛选条件,改了后面单元格条件之后,前面单元格自动跟着修改了

Merge in DESIGN/design from ~HENRY.WANG/design:bugfix/10.0 to bugfix/10.0

* commit 'e811e5846f888d2081ec5d1bc38b337fa0d31c39':
  REPORT-34127 筛选条件,改了后面单元格条件之后,前面单元格自动跟着修改了
bugfix/10.0
Henry.Wang 4 years ago
parent
commit
d27cf46c96
  1. 6
      designer-realize/src/main/java/com/fr/grid/IntelliElements.java

6
designer-realize/src/main/java/com/fr/grid/IntelliElements.java

@ -194,8 +194,12 @@ public class IntelliElements {
TemplateCellElement newCellElement = new DefaultTemplateCellElement(colIndex, rowIndex); TemplateCellElement newCellElement = new DefaultTemplateCellElement(colIndex, rowIndex);
applyStyle(newCellElement, sourceCellElement);//style applyStyle(newCellElement, sourceCellElement);//style
if (sourceCellElement.getValue() instanceof DSColumn) { if (sourceCellElement.getValue() instanceof DSColumn) {
DSColumn dsColumn = (DSColumn) sourceCellElement.getValue(); try{
DSColumn dsColumn = (DSColumn)((DSColumn) sourceCellElement.getValue()).clone();
newCellElement.setValue(dsColumn); newCellElement.setValue(dsColumn);
}catch (CloneNotSupportedException e){
FineLoggerFactory.getLogger().error(e.getMessage(), e);
}
newCellElement.setCellExpandAttr(sourceCellElement.getCellExpandAttr()); newCellElement.setCellExpandAttr(sourceCellElement.getCellExpandAttr());
} else if (sourceCellElement.getValue() instanceof Number) { } else if (sourceCellElement.getValue() instanceof Number) {
newCellElement.setValue(processNumber((Number) sourceCellElement.getValue())); newCellElement.setValue(processNumber((Number) sourceCellElement.getValue()));

Loading…
Cancel
Save