Merge pull request #8614 in DESIGN/design from final/11.0 to release/11.0

* commit 'f27a22348ef02b09c5143566828bfffb8ed9ab1a':
  REPORT-69842 修改边框颜色单元格背景颜色会变统一

designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellStylePane.java

@@ -118,7 +118,7 @@ public class CellStylePane extends AbstractCellAttrPane {
                     elementCase.addCellElement(cellElement);
                 }
                 Format format = cellElement.getStyle().getFormat();
-                Style style = stylePane.updateBean();
+                Style style = stylePane.mergeBean(cellElement.getStyle());
                 // 格式不能通过样式面板中的配置项修改，因此需要保留
                 style = style.deriveFormat(format);
                 cellElement.setStyle(style);

designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/StylePane.java

@@ -251,6 +251,14 @@ public class StylePane extends BasicPane implements UIObserver {
 		followingThemePane.setVisible(AdjustWorkBookDefaultStyleUtils.supportTheme());
 	}
 
+	public Style mergeBean(Style style) {
+		if (isFollowingTheme()) {
+			return updateBean();
+		} else {
+			return customStylePane.updateStyle(style);
+		}
+	}
+
 	private void fireStateChanged() {
 		for (UIObserverListener listener: observerListeners) {
 			listener.doChange();