Browse Source

Pull request #14755: REPORT-132109 fix: FVS插件 浅色主题-表格内合并单元格导致键入文字颜色为白色(非默认)

Merge in DESIGN/design from ~ZHANYING/design:release/11.0 to release/11.0

* commit 'f14b53bf60af72c90dd789393d2cec70d92c15ba':
  REPORT-132109 fix: FVS插件 浅色主题-表格内合并单元格导致键入文字颜色为白色(非默认)
release/11.0
Zhanying-占盈 4 months ago
parent
commit
27fa35221f
  1. 4
      designer-realize/src/main/java/com/fr/grid/selection/CellSelection.java

4
designer-realize/src/main/java/com/fr/grid/selection/CellSelection.java

@ -407,7 +407,9 @@ public class CellSelection extends Selection {
if (hasCellElement) { if (hasCellElement) {
ec.merge(row, row + rowSpan - 1, column, column + columnSpan - 1); ec.merge(row, row + rowSpan - 1, column, column + columnSpan - 1);
} else { } else {
ec.addCellElement(DefaultThemedTemplateCellElementCase.createInstance(column, row, columnSpan, rowSpan, null), true); TemplateCellElement cellElement = DefaultThemedTemplateCellElementCase.createInstance(column, row, columnSpan, rowSpan, null);
AdjustWorkBookDefaultStyleUtils.adjustCellElement(cellElement);
ec.addCellElement(cellElement, true);
} }
return true; return true;

Loading…
Cancel
Save