Pull request #7306: REPORT-64733 & REPORT-64655@

Merge in DESIGN/design from ~STARRYI/design:release/11.0 to release/11.0 * commit '7d78a0e66cadda5c89e9303a041c861128a1561d': REPORT-64655 【视觉验收】模板主题管理 REPORT-64733 【视觉验收】样式更新
3 years ago · 9d41bd3800
5 changed files with 107 additions and 58 deletions
--- a/designer-base/src/main/java/com/fr/design/cell/CellRectangleStylePreviewPane.java
+++ b/designer-base/src/main/java/com/fr/design/cell/CellRectangleStylePreviewPane.java
@ -4,11 +4,19 @@ import com.fr.base.CellBorderSourceFlag;
 import com.fr.base.CellBorderStyle;
 import com.fr.base.Style;
 import com.fr.design.mainframe.theme.utils.DefaultThemedTemplateCellElementCase;
+import com.fr.general.IOUtils;
 import com.fr.report.cell.TemplateCellElement;

 import javax.swing.JPanel;
+import java.awt.AlphaComposite;
+import java.awt.Color;
+import java.awt.Composite;
 import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
 import java.awt.GridLayout;
+import java.awt.RenderingHints;
+import java.awt.image.BufferedImage;

 /**
 * @author Starryi
@ -16,6 +24,11 @@ import java.awt.GridLayout;
 * Created by Starryi on 2021/9/3
 */
 public class CellRectangleStylePreviewPane extends JPanel {
+
+    private static final BufferedImage transparentBackgroundImage = IOUtils.readImage("/com/fr/design/images/transparent_background.png");
+    private final float transparentBackgroundWidth;
+    private final float transparentBackgroundHeight;
+
    private static final int ROW_COUNT = 2;
    private static final int COLUMN_COUNT = 2;

@ -24,7 +37,12 @@ public class CellRectangleStylePreviewPane extends JPanel {
    private final CellStylePreviewPane[][] cellStylePreviewPaneGrid = new CellStylePreviewPane[ROW_COUNT][COLUMN_COUNT];

    public CellRectangleStylePreviewPane(boolean supportInnerBorder) {
+        transparentBackgroundWidth = transparentBackgroundImage.getWidth(null);
+        transparentBackgroundHeight = transparentBackgroundImage.getHeight(null);
+
        setLayout(new GridLayout(2, 2));
+        setOpaque(false);
+        setBackground(null);

        for (int r = 0; r < ROW_COUNT; r++) {
            for (int c = 0; c < COLUMN_COUNT; c++) {
@ -101,4 +119,56 @@ public class CellRectangleStylePreviewPane extends JPanel {

        return new Dimension(width, height);
    }
+
+    @Override
+    public void paint(Graphics g) {
+        Graphics2D g2d = (Graphics2D) g;
+        g2d.clearRect(0, 0, getWidth(), getHeight());
+
+        g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+        g2d.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
+
+        paintTransparentBackground((Graphics2D) g, cellElementGrid[0][0].getStyle());
+
+        g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF);
+        g2d.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_OFF);
+
+        super.paint(g);
+    }
+
+    private void paintTransparentBackground(Graphics2D g2d, Style style) {
+        float alpha = computeTransparentBackgroundAlpha(style);
+
+        float scaleWidth = 1.0F * getWidth() / transparentBackgroundWidth;
+        float scaleHeight = 1.0F * getHeight() / transparentBackgroundHeight;
+        float maxScale = Math.max(scaleWidth, scaleHeight);
+
+        if (maxScale <= 1) {
+            scaleWidth = scaleHeight = 1;
+        } else {
+            scaleHeight = scaleWidth = maxScale;
+        }
+
+        Composite oldComposite = g2d.getComposite();
+        g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_ATOP, alpha));
+        g2d.drawImage(transparentBackgroundImage, 0, 0, (int) (transparentBackgroundWidth * scaleWidth), (int) (transparentBackgroundHeight * scaleHeight), null);
+        g2d.setComposite(oldComposite);
+    }
+
+    private float computeTextColorBrightness(Style style) {
+        Color fontColor = style.getFRFont().getForeground();
+        return fontColor.getRed() * 0.299F + fontColor.getGreen() * 0.587F + fontColor.getBlue() * 0.114F;
+    }
+
+    private float computeTransparentBackgroundAlpha(Style style) {
+        float textBrightness = computeTextColorBrightness(style);
+
+        float alpha = 1.0F;
+        if (textBrightness < 50) {
+            alpha = 0.2F;
+        } else if (textBrightness < 160){
+            alpha = 0.5F;
+        }
+        return alpha;
+    }
 }
--- a/designer-base/src/main/java/com/fr/design/cell/CellStylePreviewPane.java
+++ b/designer-base/src/main/java/com/fr/design/cell/CellStylePreviewPane.java
@ -30,15 +30,10 @@ import java.util.List;
 public class CellStylePreviewPane extends JPanel {

    public static final int MINIMUM_HEIGHT = 40;
-    private static final BufferedImage transparentBackgroundImage = IOUtils.readImage("/com/fr/design/images/transparent_background.png");
-    private final float transparentBackgroundWidth;
-    private final float transparentBackgroundHeight;
    private String paintText = "Report";
    private Style style = Style.DEFAULT_STYLE;

    public CellStylePreviewPane() {
-        transparentBackgroundWidth = transparentBackgroundImage.getWidth(null);
-        transparentBackgroundHeight = transparentBackgroundImage.getHeight(null);
        setPreferredSize(new Dimension(0, 0));
    }

@ -60,53 +55,15 @@ public class CellStylePreviewPane extends JPanel {
    @Override
    public void paint(Graphics g) {
        Graphics2D g2d = (Graphics2D) g;
-        g.clearRect(0, 0, getWidth(), getHeight());
        g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
        g2d.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON);

-        paintTransparentBackground(g2d, style);
        paintCellStyle(g2d, style);

        g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF);
        g2d.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_OFF);
    }

-    private void paintTransparentBackground(Graphics2D g2d, Style style) {
-        float alpha = computeTransparentBackgroundAlpha(style);
-
-        float scaleWidth = 1.0F * getWidth() / transparentBackgroundWidth;
-        float scaleHeight = 1.0F * getHeight() / transparentBackgroundHeight;
-        float maxScale = Math.max(scaleWidth, scaleHeight);
-
-        if (maxScale <= 1) {
-            scaleWidth = scaleHeight = 1;
-        } else {
-            scaleHeight = scaleWidth = maxScale;
-        }
-
-        Composite oldComposite = g2d.getComposite();
-        g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_ATOP, alpha));
-        g2d.drawImage(transparentBackgroundImage, 0, 0, (int) (transparentBackgroundWidth * scaleWidth), (int) (transparentBackgroundHeight * scaleHeight), null);
-        g2d.setComposite(oldComposite);
-    }
-
-    private float computeTextColorBrightness(Style style) {
-        Color fontColor = style.getFRFont().getForeground();
-        return fontColor.getRed() * 0.299F + fontColor.getGreen() * 0.587F + fontColor.getBlue() * 0.114F;
-    }
-
-    private float computeTransparentBackgroundAlpha(Style style) {
-        float textBrightness = computeTextColorBrightness(style);
-
-        float alpha = 1.0F;
-        if (textBrightness < 50) {
-            alpha = 0.2F;
-        } else if (textBrightness < 160){
-            alpha = 0.5F;
-        }
-        return alpha;
-    }
-
    private void paintCellStyle(Graphics2D g2d, Style style) {
        int resolution = ScreenResolution.getScreenResolution();

@ -156,7 +113,7 @@ public class CellStylePreviewPane extends JPanel {
        final int textLineHeight = metrics.getHeight();
        final double textLineSpacing = PT.pt2pix(style.getLineSpacing(), resolution);

-        List textLineList = BaseUtils.getLineTextList(paintText, style, rfont, height, width, resolution);
+        List<?> textLineList = BaseUtils.getLineTextList(paintText, style, rfont, height, width, resolution);

        double textLinesHeight = textLineList.size() * textLineHeight + Math.max(0, textLineList.size() - 1) * textLineSpacing;

--- a/designer-base/src/main/java/com/fr/design/mainframe/theme/ThemedCellStyleListPane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/theme/ThemedCellStyleListPane.java
@ -11,9 +11,11 @@ import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.DesignerBean;
 import com.fr.design.mainframe.JTemplate;
 import com.fr.general.ComparatorUtils;
+import com.fr.general.IOUtils;

 import javax.swing.BorderFactory;
 import javax.swing.DefaultListModel;
+import javax.swing.Icon;
 import javax.swing.JList;
 import javax.swing.JPanel;
 import javax.swing.ListCellRenderer;
@ -24,6 +26,7 @@ import javax.swing.event.ListSelectionListener;
 import java.awt.BorderLayout;
 import java.awt.Component;
 import java.awt.Dimension;
+import java.awt.Graphics;
 import java.io.Serializable;
 import java.util.List;

@ -112,32 +115,40 @@ public class ThemedCellStyleListPane extends FurtherBasicBeanPane<ThemedCellStyl

    private static class RadioButtonListCellRangeRenderer extends JPanel implements ListCellRenderer<ThemedCellStyle>, Serializable {

-        private final UIRadioButton button;
+        private static final Icon selectedMarkIcon = IOUtils.readIcon("/com/fr/design/form/images/marked.png");
+
        private final CellRectangleStylePreviewPane previewArea;
+        private boolean selected = false;

        public RadioButtonListCellRangeRenderer(boolean supportInnerBorder) {
            super();
            setLayout(new BorderLayout(5, 0));
            setBorder(BorderFactory.createEmptyBorder(5, 0, 5, 0));
-            button = new UIRadioButton();
-            button.setBorder(BorderFactory.createEmptyBorder());
            previewArea = new CellRectangleStylePreviewPane(supportInnerBorder);
-            add(button, BorderLayout.WEST);
            add(previewArea, BorderLayout.CENTER);
        }

        @Override
        public Component getListCellRendererComponent(JList<? extends ThemedCellStyle> list, ThemedCellStyle value, int index, boolean isSelected, boolean cellHasFocus) {
-            button.setSelected(isSelected);
+            this.selected = isSelected;
            previewArea.setPlainText(value.getName());
            previewArea.setStyle(value.getStyle(), value.getCellBorderStyle());

-            int preferredWidth = list.getWidth() - 15 - button.getPreferredSize().width;
+            int preferredWidth = list.getWidth() - 15;
            preferredWidth = Math.max(0, preferredWidth);
            int preferredHeight = 0;
            previewArea.setPreferredSize(new Dimension(preferredWidth, preferredHeight));

            return this;
        }
+
+        @Override
+        public void paint(Graphics g) {
+            super.paint(g);
+
+            if (selected) {
+                selectedMarkIcon.paintIcon(this, g, getWidth() - selectedMarkIcon.getIconWidth(), 5);
+            }
+        }
    }
 }
--- a/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/cell/CellStyleEditPane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/cell/CellStyleEditPane.java
@ -137,9 +137,6 @@ public class CellStyleEditPane extends MultiTabPane<ThemedCellStyle> {
    protected void initLayout() {
        this.setLayout(new BorderLayout(0, 10));

-        JPanel jPanel = new JPanel();
-        jPanel.setLayout(new BorderLayout(0, 4));
-
        JPanel previewPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
        previewArea = new CellRectangleStylePreviewPane(true);
        previewArea.setPreferredSize(new Dimension(215, 48));
@ -150,8 +147,13 @@ public class CellStyleEditPane extends MultiTabPane<ThemedCellStyle> {

        this.add(previewPane, BorderLayout.NORTH);

-        this.add(jPanel, BorderLayout.CENTER);
-        jPanel.add(tabPane, BorderLayout.NORTH);
+        JPanel settingsPane = new JPanel();
+        this.add(settingsPane, BorderLayout.CENTER);
+
+        settingsPane.setBorder(BorderFactory.createEmptyBorder(0, 4, 0, 4));
+        settingsPane.setLayout(new BorderLayout(0, 4));
+
+        settingsPane.add(tabPane, BorderLayout.NORTH);
        JPanel attrListenerPane = new AbstractAttrNoScrollPane() {

            @Override
@ -176,18 +178,27 @@ public class CellStyleEditPane extends MultiTabPane<ThemedCellStyle> {
                        fireAttrChangeListener();
                    }
                });
-                BasicScrollPane basicScrollPane = new AttrScrollPane() {
+                return new EmptyBorderAttrScrollPane() {
                    @Override
                    protected JPanel createContentPane() {
                        return centerPane;
                    }
                };
-                return basicScrollPane;
            }
        };
-        jPanel.add(attrListenerPane, BorderLayout.CENTER);
+        settingsPane.add(attrListenerPane, BorderLayout.CENTER);
    }

    @Override
    public void updateBean(ThemedCellStyle ob) {}
+
+
+    private static abstract class EmptyBorderAttrScrollPane extends AttrScrollPane {
+
+        @Override
+        protected void layoutContentPane() {
+            super.layoutContentPane();
+            leftcontentPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
+        }
+    }
 }
--- a/designer-base/src/main/resources/com/fr/design/images/transparent_background.png
+++ b/designer-base/src/main/resources/com/fr/design/images/transparent_background.png