From da959c9243e0f68cc9fc387360b5373f821f7682 Mon Sep 17 00:00:00 2001
From: shine <zheng@fanruan.com>
Date: Wed, 13 Apr 2022 10:51:14 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-68357=20fix:namestyle=E5=AF=BC=E8=87=B4f?=
 =?UTF-8?q?vs.cpt=E4=B8=AD=E5=8D=95=E5=85=83=E6=A0=BC=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E4=B8=AD=E6=9C=89=E4=B8=BB=E9=A2=98=E7=9B=B8=E5=85=B3=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../theme/utils/DefaultThemedTemplateCellElementCase.java      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/designer-base/src/main/java/com/fr/design/mainframe/theme/utils/DefaultThemedTemplateCellElementCase.java b/designer-base/src/main/java/com/fr/design/mainframe/theme/utils/DefaultThemedTemplateCellElementCase.java
index 67be5cc9aa..64aaeb9c07 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/theme/utils/DefaultThemedTemplateCellElementCase.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/theme/utils/DefaultThemedTemplateCellElementCase.java
@@ -3,6 +3,7 @@ package com.fr.design.mainframe.theme.utils;
 import com.fr.base.NameStyle;
 import com.fr.base.theme.TemplateTheme;
 import com.fr.base.theme.settings.ThemedCellStyle;
+import com.fr.design.base.mode.DesignModeContext;
 import com.fr.design.file.HistoryTemplateListCache;
 import com.fr.design.mainframe.JTemplate;
 import com.fr.report.cell.DefaultTemplateCellElement;
@@ -37,7 +38,7 @@ public class DefaultThemedTemplateCellElementCase {
             ThemedCellStyle themedCellStyle = theme.getCellStyleList().getUse4Default();
             if (themedCellStyle != null) {
                 NameStyle nameStyle = NameStyle.getPassiveInstance(themedCellStyle.getName(), themedCellStyle.getStyle());
-                cellElement.setStyle(nameStyle);
+                cellElement.setStyle(DesignModeContext.isDuchampMode() ? nameStyle.getRealStyle() : nameStyle);
             }
         }
         return cellElement;