Pull request #16932: REPORT-148067【模板主题】开启控件显示增强后模板主题打开显示不全

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

* commit '61e7155d140c0cbc0d3496463187aafa5a84ab43':
  REPORT-148067【模板主题】开启控件显示增强后模板主题打开显示不全

designer-base/src/main/java/com/fr/widgettheme/theme/panel/ControlPreviewCell.java

@@ -101,7 +101,12 @@ public class ControlPreviewCell extends JPanel {
         if (this.reportTheme != null) {
             if (icon instanceof ImageIcon) {
                 ImageIcon imageIcon = (ImageIcon) icon;
-                BufferedImage bufferedImage = ImageUtils.colorImage(ImageUtils.imageIconToBufferedImage(imageIcon), getIconColor());
+                BufferedImage bufferedImage = ImageUtils.imageIconToBufferedImage(imageIcon);
+                Color iconColor = getIconColor();
+                // 设置为透明色时color是null
+                if (iconColor != null) {
+                    ImageUtils.colorImage(bufferedImage, iconColor);
+                }
                 return new ImageIcon(bufferedImage);
             }
         }