From bb26dd08041630faea295b8535554341b9f26738 Mon Sep 17 00:00:00 2001
From: Starryi <starryi@foxmail.com>
Date: Fri, 7 Jan 2022 10:35:45 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-65576=20=E6=A1=86=E9=80=89=E5=8D=95?=
 =?UTF-8?q?=E5=85=83=E6=A0=BC=EF=BC=8C=E5=88=87=E6=8D=A2=E4=B8=BB=E9=A2=98?=
 =?UTF-8?q?=EF=BC=8C=E4=BC=9A=E5=BD=B1=E5=93=8D=E5=8D=95=E5=85=83=E6=A0=BC?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E7=9A=84=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

【问题原因】
格式面板从单元格样式面板中移除后，所以不能通过样式面板配置项修改格式。
这就要求修改样式面板中的设置项，产生新的样式对象，需要保留旧的样式对象中格式配置，
保证格式不变

【改动思路】
同上
---
 .../fr/design/mainframe/cell/settingpane/CellStylePane.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellStylePane.java b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellStylePane.java
index ec3c1bd05c..3bdd034c68 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellStylePane.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellStylePane.java
@@ -11,7 +11,6 @@ import com.fr.design.mainframe.theme.utils.DefaultThemedTemplateCellElementCase;
 import com.fr.design.style.BorderUtils;
 import com.fr.design.utils.gui.AdjustWorkBookDefaultStyleUtils;
 import com.fr.design.utils.gui.GUICoreUtils;
-import com.fr.report.cell.DefaultTemplateCellElement;
 import com.fr.report.cell.TemplateCellElement;
 import com.fr.report.elementcase.TemplateElementCase;
 
@@ -20,7 +19,7 @@ import javax.swing.JPanel;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import java.awt.BorderLayout;
-import java.awt.Rectangle;
+import java.text.Format;
 
 /**
  * @author zhou
@@ -118,7 +117,10 @@ public class CellStylePane extends AbstractCellAttrPane {
                     AdjustWorkBookDefaultStyleUtils.adjustCellElement(cellElement);
                     elementCase.addCellElement(cellElement);
                 }
+                Format format = cellElement.getStyle().getFormat();
                 Style style = stylePane.updateBean();
+                // 格式不能通过样式面板中的配置项修改，因此需要保留
+                style = style.deriveFormat(format);
                 cellElement.setStyle(style);
             }
         });