From 245d66c6cbad8e32bb9d908e7ce087f388ff9393 Mon Sep 17 00:00:00 2001 From: "Leo.Qin" Date: Wed, 21 Jun 2023 17:26:06 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-98450=20=E6=89=B9=E9=87=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=8D=95=E5=85=83=E6=A0=BC=E6=A0=BC=E5=BC=8F=E4=BC=9A?= =?UTF-8?q?=E5=BD=B1=E5=93=8D=E5=8D=95=E5=85=83=E6=A0=BC=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=20=E3=80=90=E9=97=AE=E9=A2=98=E5=8E=9F=E5=9B=A0=E3=80=91?= =?UTF-8?q?=E5=AE=9E=E9=99=85=E4=BF=AE=E6=94=B9=E6=97=B6=EF=BC=8C=E6=9C=AA?= =?UTF-8?q?=E8=80=83=E8=99=91=E5=88=B0style=E6=98=AF=E5=8C=85=E5=90=AB?= =?UTF-8?q?=E5=AD=97=E4=BD=93=E3=80=81=E8=83=8C=E6=99=AF=E7=AD=89=E5=85=B6?= =?UTF-8?q?=E4=BB=96=E6=A0=B7=E5=BC=8F=EF=BC=8C=E4=BB=A3=E7=A0=81=E4=B8=AD?= =?UTF-8?q?=E5=B0=86=E6=95=B4=E4=B8=AAstyle=E6=A0=B7=E5=BC=8F=E6=9B=BF?= =?UTF-8?q?=E6=8D=A2=E4=B8=BA=E4=BA=86=E5=B7=A6=E4=B8=8A=E8=A7=92=E5=8D=95?= =?UTF-8?q?=E5=85=83=E6=A0=BC=E7=9A=84=E6=A0=B7=E5=BC=8F=20=E3=80=90?= =?UTF-8?q?=E6=94=B9=E5=8A=A8=E6=80=9D=E8=B7=AF=E3=80=91=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=B6=EF=BC=8C=E4=BB=85=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/quickeditor/CellQuickEditor.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/quickeditor/CellQuickEditor.java b/designer-realize/src/main/java/com/fr/quickeditor/CellQuickEditor.java index 0b0650478b..7c3c158765 100644 --- a/designer-realize/src/main/java/com/fr/quickeditor/CellQuickEditor.java +++ b/designer-realize/src/main/java/com/fr/quickeditor/CellQuickEditor.java @@ -446,12 +446,14 @@ public abstract class CellQuickEditor extends QuickEditor { Style oldStyle = cellElement == null ? Style.DEFAULT_STYLE : cellElement.getStyle(); Style style = formatPane.update(oldStyle); for (TemplateCellElement cellElement : allCellElements) { - Format elementFormat = cellElement.getStyle().getFormat(); + Style cellElementStyle = cellElement.getStyle(); + Format elementFormat = cellElementStyle.getFormat(); Format paneFormat = style.getFormat(); if (!Objects.equals(paneFormat, elementFormat)) { // 点击单元格，但未设置格式时，不将单元格设置为编辑状态，防止将所选的每个单元格都设置为编辑状态 editingElementCase.addCellElement(cellElement); - cellElement.setStyle(style); + Style newStyle = cellElementStyle.deriveFormat(paneFormat); + cellElement.setStyle(newStyle); updateStyle = true; } }