Pull request #14984: REPORT-134932【设计器】参数面板的背景颜色会在“撤回"报表主体设计时消失

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

* commit 'daf94d29f4ca58bac106e1be0b967d539b592b6a':
  REPORT-134932【设计器】参数面板的背景颜色会在“撤回"报表主体设计时消失

designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java

@@ -725,7 +725,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
     public void undo() {
         this.getUndoManager().undo();
         // 撤销前模版使用主题可能已经被删除或修改，需要重置模版样式
-        checkAndResetTheme();
+        checkAndResetTheme(true);
         fireSuperTargetModified();
     }
 
@@ -735,7 +735,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
     public void redo() {
         this.getUndoManager().redo();
         // 重做前模版使用主题可能已经被删除或修改，需要重置模版样式
-        checkAndResetTheme();
+        checkAndResetTheme(true);
         fireSuperTargetModified();
     }
 

designer-form/src/main/java/com/fr/design/mainframe/JForm.java

@@ -686,7 +686,7 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm<F
     protected void applyUndoState(FormUndoState u) {
         try {
             Form undoForm = (Form) u.getForm().clone();
-            undoForm.checkAndResetTheme();
+            undoForm.checkAndResetTheme(true);
             undoForm = (Form) FineColorSynchronizer.flush(undoForm, undoForm.getTemplateTheme());
             if (this.index == FORM_TAB) {
                 //JForm的target重置

designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java

@@ -790,7 +790,7 @@ public class JWorkBook extends JTemplate<WorkBook, WorkBookUndoState> {
     protected void applyUndoState(WorkBookUndoState u) {
         try {
             WorkBook undoWorkBook = (WorkBook) u.getWorkBook().clone();
-            undoWorkBook.checkAndResetTheme();
+            undoWorkBook.checkAndResetTheme(true);
             undoWorkBook = (WorkBook) FineColorSynchronizer.flush(undoWorkBook, undoWorkBook.getTemplateTheme());
             this.setTarget(undoWorkBook);
             if (!DesignerMode.isAuthorityEditing()) {