Browse Source

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

* commit 'ae00ea6d559be9e5998df3be93f107086d72c6f2':
  REPORT-5134 设计器单元格里插入控件后,复制粘贴,显示null
  REPORT-5097 9.0,切换到本地其他目录,点击帮助-产品演示,不需要切换目录的提示 暂时先不改
  pmd
  REPORT-5097 9.0,切换到本地其他目录,点击帮助-产品演示,不需要切换目录的提示
master
superman 7 years ago
parent
commit
a27d4ec0d5
  1. 7
      designer/src/com/fr/design/cell/clipboard/CellElementsClip.java

7
designer/src/com/fr/design/cell/clipboard/CellElementsClip.java

@ -12,6 +12,7 @@ import com.fr.report.cell.CellElement;
import com.fr.report.cell.CellElementComparator;
import com.fr.report.cell.TemplateCellElement;
import com.fr.report.elementcase.TemplateElementCase;
import com.fr.stable.StringUtils;
import com.fr.stable.unit.FU;
/**
@ -62,9 +63,13 @@ public class CellElementsClip implements Cloneable, java.io.Serializable {
if (sbuf.length() > 0 && sbuf.charAt(sbuf.length() - 1) != '\n') {
sbuf.append('\t');
}
//REPORT-5134:会复制出null
if (cellElement.getValue() == null) {
sbuf.append(StringUtils.EMPTY);
} else {
sbuf.append(cellElement.getValue());
}
}
return sbuf.toString();
}

Loading…
Cancel
Save