Merge pull request #7537 in DESIGN/design from final/11.0 to persist/11.0

* commit '7b8ffb40ec054a3c01622efc7f7f168a447901b9':
  REPORT-65613 【主题边框】单元格样式修改文本和对齐样式，会导致边框配置丢失

designer-base/src/main/java/com/fr/design/mainframe/theme/edit/cell/CellStyleEditPane.java

@@ -88,13 +88,13 @@ public class CellStyleEditPane extends MultiTabPane<ThemedCellStyle> {
 
     @Override
     public ThemedCellStyle updateBean() {
-        AbstractBasicStylePane basicStylePane = (AbstractBasicStylePane) paneList.get(tabPane.getSelectedIndex());
+        Style style = this.cellStyle.getStyle();
-        Style style = basicStylePane.update(this.cellStyle.getStyle());
         CellBorderStyle borderStyle = createDefaultBorderStyleFromStyle(style);
-
+        for (BasicPane basicPane : paneList) {
-
+            style = ((AbstractBasicStylePane) basicPane).update(style);
-        if (ThemedFeatureController.isCellStyleSupportInnerBorder() && basicStylePane instanceof BorderPane) {
+            if (ThemedFeatureController.isCellStyleSupportInnerBorder() && basicPane instanceof BorderPane) {
-            borderStyle = ((BorderPane) basicStylePane).update();
+                borderStyle = ((BorderPane) basicPane).update();
+            }
         }
 
         this.cellStyle.setStyle(style);