REPORT-64487 表头按钮颜色配置主题色以后，联动有问题

3 years ago · c38b2329dd
9 changed files with 70 additions and 799 deletions
--- a/designer-base/src/main/java/com/fr/base/svg/IconUtils.java
+++ b/designer-base/src/main/java/com/fr/base/svg/IconUtils.java
@ -1,148 +0,0 @@
 package com.fr.base.svg;
 import com.fr.general.IOUtils;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.bridge.StableFactory;
 import com.fr.stable.fun.ResourcePathTransformer;
 import com.fr.stable.plugin.ExtraClassManagerProvider;
 import javax.swing.Icon;
 import javax.swing.ImageIcon;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 /**
 * 主要是用来读取svgIcon的工具类
 * @author Yvan
 * @version 10.0
 * Created by Yvan on 2020/12/23
 */
 public class IconUtils {
    private static final String ICON_SUFFIX_SVG = ".svg";
    private static final String ICON_SUFFIX_PNG = ".png";
    private static final String ICON_SUFFIX_GIF = ".gif";
    private static final String SUFFIX_SEPARATOR = ".";
    public static final String ICON_TYPE_NORMAL= "_normal.svg";
    public static final String ICON_TYPE_DISABLED= "_disabled.svg";
    public static final String ICON_TYPE_PRESSED= "_pressed.svg";
    /**
     * 可以读取SVG图标或者普通图标，并且可以读取不带扩展名的文件
     * 不带扩展名时以svg优先、其次png，最后gif
     * @param resource 图片路径
     * @return 图标
     */
    public static Icon readIcon(String resource) {
        // 判断是否有.XXX文件后缀
        if (resource.contains(SUFFIX_SEPARATOR)) {
            // 判断是否以.svg结尾
            if (resource.endsWith(ICON_SUFFIX_SVG)) {
                if (IOUtils.readResource(resource) != null) {
                    return SVGIcon.readSVGIcon(transformPath(resource));
                }
                // 适配插件
                return adjustPluginsPng(resource);
            }
            return IOUtils.readIcon(resource);
        }
        // 文件无后缀时
        return readNoSuffixResource(resource, ICON_TYPE_NORMAL);
    }
    /**
     * 适配插件中使用_normal.png、_selected.png、_disabled.png的情况
     * @param resource 图片路径
     * @return Icon
     */
    private static Icon adjustPluginsPng(String resource) {
        String pngResource = resource.replace(ICON_SUFFIX_SVG, ICON_SUFFIX_PNG);
        // 考虑到某些插件可能只会使用三种图标中的一部分，这里做个判断，不然就会因为资源不存在而报错
        return IOUtils.readResource(pngResource) == null ? new ImageIcon() : IOUtils.readIcon(pngResource);
    }
    /**
     * 尝试读取不带扩展名的图标，svg优先，其次png，最后gif，都没读到就打印错误日志，返回空白Icon
     * @param resource 图片路径
     * @param svgIconType 针对svg来说的图标类型
     *                     取值为：ICON_TYPE_NORMAL、ICON_TYPE_DISABLED、ICON_TYPE_PRESSED
     * @return 图标
     */
    private static Icon readNoSuffixResource(String resource, String svgIconType) {
        String svgPath = resource + svgIconType;
        if (IOUtils.readResource(svgPath) != null) {
            return SVGIcon.readSVGIcon(transformPath(svgPath));
        }
        String pngPath = resource + ICON_SUFFIX_PNG;
        if (IOUtils.readResource(pngPath) != null) {
            return IOUtils.readIcon(transformPath(pngPath));
        }
        String gifPath = resource + ICON_SUFFIX_GIF;
        if (IOUtils.readResource(gifPath) != null) {
            return IOUtils.readIcon(transformPath(gifPath));
        }
        FineLoggerFactory.getLogger().error("File not exists:{}", resource);
        return new ImageIcon();
    }
    /**
     * 读取指定类型的svgIcon
     * @param resource
     * @param svgIconType
     * @return
     */
    public static Icon readSVGIcon(String resource, String svgIconType) {
        // 判断下是否有后缀
        if (!resource.contains(SUFFIX_SEPARATOR)) {
            return readNoSuffixResource(resource, svgIconType);
        }
        // 如果是".png"后缀，就替换为传入的svgIconType，然后读取图标
        if (resource.endsWith(ICON_SUFFIX_PNG)) {
            return readSpecifiedTypeIcon(resource, ICON_SUFFIX_PNG, svgIconType);
        }
        // 如果是"_XXXXXX.svg"后缀
        if (resource.endsWith(ICON_TYPE_NORMAL)) {
            return readSpecifiedTypeIcon(resource, ICON_TYPE_NORMAL, svgIconType);
        }
        if (resource.endsWith(ICON_TYPE_DISABLED)) {
            return readSpecifiedTypeIcon(resource, ICON_TYPE_DISABLED, svgIconType);
        }
        if (resource.endsWith(ICON_TYPE_PRESSED)) {
            return readSpecifiedTypeIcon(resource, ICON_TYPE_PRESSED, svgIconType);
        }
        return readIcon(resource);
    }
    private static Icon readSpecifiedTypeIcon(String resource, String oldSuffix, String newSuffix) {
        String iconPath = resource.replace(oldSuffix, newSuffix);
        if (IOUtils.readResource(iconPath) != null) {
            return SVGIcon.readSVGIcon(transformPath(iconPath));
        }
        return readIcon(resource);
    }
    private static String transformPath(String path) {
        Set<ResourcePathTransformer> set = getResourcePathTransformers();
        for (ResourcePathTransformer transformer : set) {
            if (transformer.accept(path)) {
                return transformer.transform(path);
            }
        }
        return path;
    }
    private static Set<ResourcePathTransformer> getResourcePathTransformers() {
        Set<ResourcePathTransformer> set = new HashSet<ResourcePathTransformer>();
        ExtraClassManagerProvider provider = StableFactory.getExtraClassManager();
        if (provider != null) {
            Set<ResourcePathTransformer> pluginProvided = provider.getArray(ResourcePathTransformer.MARK_STRING);
            set.addAll(pluginProvided);
        }
        ResourcePathTransformer[] oemSet = StableFactory.getMarkedObjectsFromCollection(ResourcePathTransformer.MARK_STRING, ResourcePathTransformer.class);
        set.addAll(Arrays.asList(oemSet));
        return set;
    }
 }
--- a/designer-base/src/main/java/com/fr/base/svg/SVGIcon.java
+++ b/designer-base/src/main/java/com/fr/base/svg/SVGIcon.java
@ -1,101 +0,0 @@
 package com.fr.base.svg;
 import com.fr.general.IOUtils;
 import javax.swing.Icon;
 import java.awt.Component;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.image.BufferedImage;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 /**
 * SVG转化而来的Icon
 * @author Yvan
 * @version 10.0
 * Created by Yvan on 2020/12/17
 */
 public class SVGIcon implements Icon {
    private BufferedImage image;
    private static final boolean HI_DPI_SURPORT = SystemScaleUtils.isJreHiDPIEnabled();
    public static final float SYSTEM_SCALE = SystemScaleUtils.sysScale();
    private static final String ICON_PREFIX = "/";
    public SVGIcon(BufferedImage image) {
        this.image = image;
    }
    private static Map<String, Icon> iconCache = new ConcurrentHashMap<>();
    @Override
    public void paintIcon(Component c, Graphics g, int x, int y) {
        if (HI_DPI_SURPORT) {
            Graphics2D graphics = (Graphics2D) g.create(x, y, image.getWidth(null), image.getHeight(null));
            float scale = SYSTEM_SCALE;
            graphics.scale(1 / scale, 1 / scale);
            graphics.drawImage(image, 0, 0, null);
            graphics.scale(1.0D, 1.0D);
            graphics.dispose();
        } else {
            g.drawImage(image, x, y, null);
        }
    }
    @Override
    public int getIconWidth() {
        return HI_DPI_SURPORT ? (int) (image.getWidth() / SYSTEM_SCALE) : image.getWidth();
    }
    @Override
    public int getIconHeight() {
        return HI_DPI_SURPORT ? (int) (image.getHeight() / SYSTEM_SCALE) : image.getHeight();
    }
    /**
     * 读取高清图标
     * @param url
     * @return
     */
    public static Icon readSVGIcon(String url) {
        return readSVGIconWithCache(url, true);
    }
    public static Icon readSVGIconWithCache(String url, boolean cacheRead) {
        Icon icon = null;
        if (cacheRead) {
            icon = iconCache.get(url);
        }
        if (icon == null) {
            if (!url.startsWith(ICON_PREFIX)) {
                url = ICON_PREFIX + url;
            }
            BufferedImage image = (BufferedImage) SVGLoader.load(url);
            icon = image == null ? IOUtils.readIcon(url) : new SVGIcon(image);
            //只缓存svg图标
            if (image != null){
                iconCache.put(url, icon);
            }
        }
        return icon;
    }
    /**
     * 读取指定尺寸的图标
     * @param url 资源路径
     * @param width 宽度
     * @param height 高度
     * @return
     */
    public static Icon readSVGIcon(String url, float width, float height) {
        if (!url.startsWith(ICON_PREFIX)) {
            url = ICON_PREFIX + url;
        }
        BufferedImage image = (BufferedImage) SVGLoader.load(url, width, height);
        return image == null ? IOUtils.readIcon(url) : new SVGIcon(image);
    }
 }
--- a/designer-base/src/main/java/com/fr/base/svg/SVGLoader.java
+++ b/designer-base/src/main/java/com/fr/base/svg/SVGLoader.java
@ -1,92 +0,0 @@
 package com.fr.base.svg;
 import com.fr.general.IOUtils;
 import org.apache.batik.transcoder.TranscoderException;
 import org.apache.batik.transcoder.TranscoderInput;
 import org.apache.xmlgraphics.java2d.Dimension2DDouble;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import java.awt.Image;
 import java.io.IOException;
 import java.net.URL;
 /**
 * SVG图标加载器
 * @author Yvan
 * @version 10.0
 * Created by Yvan on 2020/12/17
 */
 public class SVGLoader {
    public static final int ICON_DEFAULT_SIZE = 16;
    public SVGLoader() {
    }
    @Nullable
    public static Image load(@NotNull String url) {
        try {
            URL resource = IOUtils.getResource(url, SVGLoader.class);
            if (resource == null) {
                return null;
            }
            return load(resource, SVGIcon.SYSTEM_SCALE);
        } catch (IOException ignore) {
            return null;
        }
    }
    @Nullable
    public static Image load(@NotNull URL url) throws IOException {
        return load(url, SVGIcon.SYSTEM_SCALE);
    }
    @Nullable
    public static Image load(@NotNull URL url, double scale) throws IOException {
        try {
            String svgUri = url.toString();
            TranscoderInput input = new TranscoderInput(svgUri);
            return SVGTranscoder.createImage(scale, input).getImage();
        } catch (TranscoderException ignore) {
            return null;
        }
    }
    @Nullable
    public static Image load(@NotNull URL url, double scale, Dimension2DDouble dimension) throws IOException {
        try {
            String svgUri = url.toString();
            TranscoderInput input = new TranscoderInput(svgUri);
            return SVGTranscoder.createImage(scale, input,
                    (float) (dimension.getWidth() * scale), (float) (dimension.getHeight() * scale)).getImage();
        } catch (TranscoderException ignore) {
            return null;
        }
    }
    @Nullable
    public static Image load(@NotNull URL url, double scale, double overriddenWidth, double overriddenHeight) throws IOException {
        try {
            String svgUri = url.toString();
            TranscoderInput input = new TranscoderInput(svgUri);
            return SVGTranscoder.createImage(scale, input, (float) (overriddenWidth * scale), (float) (overriddenHeight * scale)).getImage();
        } catch (TranscoderException ignore) {
            return null;
        }
    }
    @Nullable
    public static Image load(@NotNull String url, float width, float height) {
        try {
            URL resource = IOUtils.getResource(url, SVGLoader.class);
            if (resource == null) {
                return null;
            }
            TranscoderInput input = new TranscoderInput(resource.toString());
            return SVGTranscoder.createImage(SVGIcon.SYSTEM_SCALE, input, -1, -1, width, height).getImage();
        } catch (TranscoderException ignore) {
            return null;
        }
    }
 }
--- a/designer-base/src/main/java/com/fr/base/svg/SVGTranscoder.java
+++ b/designer-base/src/main/java/com/fr/base/svg/SVGTranscoder.java
@ -1,181 +0,0 @@
 package com.fr.base.svg;
 import com.fr.stable.AssistUtils;
 import com.fr.value.AtomicNotNullLazyValue;
 import org.apache.batik.anim.dom.SAXSVGDocumentFactory;
 import org.apache.batik.anim.dom.SVGOMDocument;
 import org.apache.batik.bridge.BridgeContext;
 import org.apache.batik.bridge.UserAgent;
 import org.apache.batik.transcoder.SVGAbstractTranscoder;
 import org.apache.batik.transcoder.TranscoderException;
 import org.apache.batik.transcoder.TranscoderInput;
 import org.apache.batik.transcoder.TranscoderOutput;
 import org.apache.batik.transcoder.image.ImageTranscoder;
 import org.apache.batik.util.XMLResourceDescriptor;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.w3c.dom.Element;
 import org.w3c.dom.svg.SVGDocument;
 import java.awt.GraphicsDevice;
 import java.awt.GraphicsEnvironment;
 import java.awt.Rectangle;
 import java.awt.geom.AffineTransform;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.io.StringReader;
 /**
 * 可以根据某个缩放倍数scale，将SVG图片转化为Image对象
 * @author Yvan
 * @version 10.0
 * Created by Yvan on 2020/12/17
 */
 public class SVGTranscoder extends ImageTranscoder {
    private static final float DEFAULT_VALUE = -1.0F;
    public static final float ICON_DEFAULT_SIZE = 16F;
    private float origDocWidth;
    private float origDocHeight;
    @Nullable
    private BufferedImage image;
    private final double scale;
    @NotNull
    private static AtomicNotNullLazyValue<Double> iconMaxSize = new AtomicNotNullLazyValue<Double>() {
        @NotNull
        @Override
        protected Double compute() {
            double maxSize = Double.MAX_VALUE;
            if (!GraphicsEnvironment.isHeadless()) {
                GraphicsDevice defaultScreenDevice = GraphicsEnvironment
                        .getLocalGraphicsEnvironment()
                        .getDefaultScreenDevice();
                Rectangle bounds = defaultScreenDevice.getDefaultConfiguration().getBounds();
                AffineTransform tx = defaultScreenDevice
                        .getDefaultConfiguration()
                        .getDefaultTransform();
                maxSize = Math.max(bounds.width * tx.getScaleX(), bounds.height * tx.getScaleY());
            }
            return maxSize;
        }
    };
    public SVGTranscoder(double scale) {
        this.scale = scale;
        this.width = ICON_DEFAULT_SIZE;
        this.height = ICON_DEFAULT_SIZE;
    }
    public SVGTranscoder(double scale, float width, float height) {
        this.scale = scale;
        this.width = width;
        this.height = height;
    }
    public final float getOrigDocWidth() {
        return this.origDocWidth;
    }
    public final void setOrigDocWidth(float origDocWidth) {
        this.origDocWidth = origDocWidth;
    }
    public final float getOrigDocHeight() {
        return this.origDocHeight;
    }
    public final void setOrigDocHeight(float origDocHeight) {
        this.origDocHeight = origDocHeight;
    }
    public static double getIconMaxSize() {
        return iconMaxSize.getValue();
    }
    @Nullable
    public final BufferedImage getImage() {
        return this.image;
    }
    @NotNull
    public static SVGTranscoder createImage(double scale, @NotNull TranscoderInput input) throws TranscoderException {
        return createImage(scale, input, -1, -1);
    }
    @NotNull
    public static SVGTranscoder createImage(double scale, @NotNull TranscoderInput input, float overriddenWidth, float overriddenHeight) throws TranscoderException {
        return createImage(scale, input, overriddenWidth, overriddenHeight, ICON_DEFAULT_SIZE, ICON_DEFAULT_SIZE);
    }
    @NotNull
    public static SVGTranscoder createImage(double scale, @NotNull TranscoderInput input, float overriddenWidth, float overriddenHeight, float width, float height) throws TranscoderException {
        SVGTranscoder transcoder = new SVGTranscoder(scale, width, height);
        if (!AssistUtils.equals(overriddenWidth, DEFAULT_VALUE)) {
            transcoder.addTranscodingHint(SVGAbstractTranscoder.KEY_WIDTH, overriddenWidth);
        }
        if (!AssistUtils.equals(overriddenHeight, DEFAULT_VALUE)) {
            transcoder.addTranscodingHint(SVGAbstractTranscoder.KEY_HEIGHT, overriddenHeight);
        }
        double iconMaxSize = SVGTranscoder.iconMaxSize.getValue();
        transcoder.addTranscodingHint(SVGAbstractTranscoder.KEY_MAX_WIDTH, (float) iconMaxSize);
        transcoder.addTranscodingHint(SVGAbstractTranscoder.KEY_MAX_HEIGHT, (float) iconMaxSize);
        transcoder.transcode(input, null);
        return transcoder;
    }
    private static SVGDocument createFallbackPlaceholder() {
        try {
            String fallbackIcon = "<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"16\" height=\"16\" viewBox=\"0 0 16 16\">\n" +
                    "  <rect x=\"1\" y=\"1\" width=\"14\" height=\"14\" fill=\"none\" stroke=\"red\" stroke-width=\"2\"/>\n" +
                    "  <line x1=\"1\" y1=\"1\" x2=\"15\" y2=\"15\" stroke=\"red\" stroke-width=\"2\"/>\n" +
                    "  <line x1=\"1\" y1=\"15\" x2=\"15\" y2=\"1\" stroke=\"red\" stroke-width=\"2\"/>\n" +
                    "</svg>\n";
            SAXSVGDocumentFactory factory = new SAXSVGDocumentFactory(XMLResourceDescriptor.getXMLParserClassName());
            return (SVGDocument) factory.createDocument(null, new StringReader(fallbackIcon));
        } catch (IOException e) {
            throw new IllegalStateException(e);
        }
    }
    @Override
    protected void setImageSize(float docWidth, float docHeight) {
        super.setImageSize((float) (docWidth * this.scale), (float) (docHeight * this.scale));
        this.origDocWidth = docWidth;
        this.origDocHeight = docHeight;
    }
    @Override
    @NotNull
    public BufferedImage createImage(int width, int height) {
        return new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);
    }
    @Override
    public void writeImage(@NotNull BufferedImage image, @Nullable TranscoderOutput output) {
        this.image = image;
    }
    @Override
    @NotNull
    protected UserAgent createUserAgent() {
        return new SVGAbstractTranscoderUserAgent() {
            @Override
            @NotNull
            public SVGDocument getBrokenLinkDocument(@NotNull Element e, @NotNull String url, @NotNull String message) {
                return createFallbackPlaceholder();
            }
        };
    }
    /**
     * 开放访问权限
     */
    @Override
    public BridgeContext createBridgeContext(SVGOMDocument doc) {
        return super.createBridgeContext(doc);
    }
 }
--- a/designer-base/src/main/java/com/fr/base/svg/SystemScaleUtils.java
+++ b/designer-base/src/main/java/com/fr/base/svg/SystemScaleUtils.java
@ -1,101 +0,0 @@
 package com.fr.base.svg;
 import com.bulenkov.iconloader.util.UIUtil;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StableUtils;
 import com.fr.stable.os.OperatingSystem;
 import org.jetbrains.annotations.NotNull;
 import java.awt.GraphicsConfiguration;
 import java.awt.GraphicsDevice;
 import java.awt.GraphicsEnvironment;
 import java.lang.reflect.Method;
 import java.util.concurrent.atomic.AtomicReference;
 /**
 * 获取系统Scale相关的工具类
 * @author Yvan
 * @version 10.0
 * Created by Yvan on 2020/12/17
 */
 public class SystemScaleUtils {
    private static final AtomicReference<Boolean> JRE_HIDPI = new AtomicReference<>();
    private static final String HI_DPI = "hidpi";
    /**
     * 判断是否支持高清
     * @return
     */
    public static boolean isJreHiDPIEnabled() {
        if (JRE_HIDPI.get() != null) {
            return JRE_HIDPI.get();
        }
        if (OperatingSystem.isMacos()) {
            // 如果是mac os系统，直接返回true
            return true;
        }
        if (OperatingSystem.isWindows() && StableUtils.getMajorJavaVersion() <= 8) {
            // 如果是jdk8 + Windows系统，直接返回false
            return false;
        }
        synchronized (JRE_HIDPI) {
            if (JRE_HIDPI.get() != null) {
                return JRE_HIDPI.get();
            }
            boolean result = false;
            if (getBooleanProperty(HI_DPI, true)) {
                try {
                    GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
                    Class<?> sunGraphicsEnvironmentClass = Class.forName("sun.java2d.SunGraphicsEnvironment");
                    if (sunGraphicsEnvironmentClass.isInstance(ge)) {
                        try {
                            Method method = sunGraphicsEnvironmentClass.getDeclaredMethod("isUIScaleEnabled");
                            method.setAccessible(true);
                            result = (Boolean)method.invoke(ge);
                        }
                        catch (NoSuchMethodException e) {
                            FineLoggerFactory.getLogger().error(e.getMessage());
                        }
                    }
                }
                catch (Throwable ignore) {
                }
            }
            JRE_HIDPI.set(result);
            return result;
        }
    }
    public static boolean getBooleanProperty(@NotNull final String key, final boolean defaultValue) {
        final String value = System.getProperty(key);
        return value == null ? defaultValue : Boolean.parseBoolean(value);
    }
    /**
     * 获取系统Scale
     * @return
     */
    public static float sysScale() {
        // 如果检测到是retina，直接返回2
        if (UIUtil.isRetina()) {
            return 2.0f;
        }
        float scale = 1.0f;
        // 先判断是否支持高清，不支持代表此时是Windows + jdk8 的设计器，返回的scale值为1.0
        if (isJreHiDPIEnabled()) {
            // 获取屏幕图形设备对象
            GraphicsDevice graphicsDevice = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
            if (graphicsDevice != null) {
                // 获取图形配置对象
                GraphicsConfiguration configuration = graphicsDevice.getDefaultConfiguration();
                if (configuration != null && configuration.getDevice().getType() != GraphicsDevice.TYPE_PRINTER) {
                    // 获取屏幕缩放率，Windows+jdk11环境下会得到用户设置的dpi值
                    scale = (float) configuration.getDefaultTransform().getScaleX();
                }
            }
        }
        return scale;
    }
 }
--- a/designer-base/src/main/resources/com/fr/design/images/sort/asc.svg
+++ b/designer-base/src/main/resources/com/fr/design/images/sort/asc.svg
@ -1,19 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <title>升序备份</title>
    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
        <g id="画板" transform="translate(-641.000000, -632.000000)">
            <g id="升序备份" transform="translate(641.000000, 632.000000)">
                <rect id="矩形" x="0" y="0" width="16" height="16"></rect>
                <g id="编组-2" transform="translate(1.000000, 2.000000)" fill="#{fillColor}">
                    <rect id="矩形" x="10.5" y="1" width="1" height="11"></rect>
                    <path d="M11.16,0.213333333 L13.76,3.68 C13.8262742,3.76836556 13.8083656,3.89372583 13.72,3.96 C13.6853808,3.98596443 13.643274,4 13.6,4 L8.4,4 C8.28954305,4 8.2,3.91045695 8.2,3.8 C8.2,3.75672596 8.21403557,3.71461923 8.24,3.68 L10.84,0.213333333 C10.9062742,0.124967773 11.0316344,0.107059163 11.12,0.173333333 C11.1351611,0.184704183 11.1486292,0.1981722 11.16,0.213333333 Z" id="三角形"></path>
                    <rect id="矩形" x="0" y="4" width="7" height="1"></rect>
                    <rect id="矩形备份-3" x="0" y="0.5" width="6" height="1"></rect>
                    <rect id="矩形备份" x="0" y="7.5" width="8" height="1"></rect>
                    <rect id="矩形备份-2" x="0" y="11" width="9" height="1"></rect>
                </g>
            </g>
        </g>
    </g>
 </svg>
--- a/designer-base/src/main/resources/com/fr/design/images/sort/des.svg
+++ b/designer-base/src/main/resources/com/fr/design/images/sort/des.svg
@ -1,17 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <title>降序</title>
    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
        <g id="画板" transform="translate(-641.000000, -662.000000)">
            <g id="降序" transform="translate(641.000000, 662.000000)">
                <rect id="矩形" transform="translate(8.000000, 8.000000) scale(1, -1) translate(-8.000000, -8.000000) " x="0" y="0" width="16" height="16"></rect>
                <rect id="矩形" fill="#{fillColor}" transform="translate(12.000000, 7.500000) scale(1, -1) translate(-12.000000, -7.500000) " x="11.5" y="2" width="1" height="11"></rect>
                <path d="M12.16,10.2133333 L14.76,13.68 C14.8262742,13.7683656 14.8083656,13.8937258 14.72,13.96 C14.6853808,13.9859644 14.643274,14 14.6,14 L9.4,14 C9.28954305,14 9.2,13.9104569 9.2,13.8 C9.2,13.756726 9.21403557,13.7146192 9.24,13.68 L11.84,10.2133333 C11.9062742,10.1249678 12.0316344,10.1070592 12.12,10.1733333 C12.1351611,10.1847042 12.1486292,10.1981722 12.16,10.2133333 Z" id="三角形" fill="#{fillColor}" transform="translate(12.000000, 12.000000) scale(1, -1) translate(-12.000000, -12.000000) "></path>
                <rect id="矩形" fill="#{fillColor}" transform="translate(4.500000, 9.500000) scale(1, -1) translate(-4.500000, -9.500000) " x="1" y="9" width="7" height="1"></rect>
                <rect id="矩形备份-3" fill="#{fillColor}" transform="translate(4.000000, 13.000000) scale(1, -1) translate(-4.000000, -13.000000) " x="1" y="12.5" width="6" height="1"></rect>
                <rect id="矩形备份" fill="#{fillColor}" transform="translate(5.000000, 6.000000) scale(1, -1) translate(-5.000000, -6.000000) " x="1" y="5.5" width="8" height="1"></rect>
                <rect id="矩形备份-2" fill="#{fillColor}" transform="translate(5.500000, 2.500000) scale(1, -1) translate(-5.500000, -2.500000) " x="1" y="2" width="9" height="1"></rect>
            </g>
        </g>
    </g>
 </svg>
--- a/designer-base/src/main/resources/com/fr/design/images/sort/nosort.svg
+++ b/designer-base/src/main/resources/com/fr/design/images/sort/nosort.svg
@ -1,41 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg"
     xmlns:xlink="http://www.w3.org/1999/xlink">
    <title>不排序</title>
    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
        <g id="画板" transform="translate(-641.000000, -692.000000)">
            <g id="不排序" transform="translate(641.000000, 692.000000)">
                <rect id="矩形" transform="translate(8.000000, 8.000000) scale(1, -1) translate(-8.000000, -8.000000) "
                      x="0" y="0" width="16" height="16"></rect>
                <g id="编组-5" transform="translate(9.000000, 8.000000)" fill="#{fillColor}">
                    <rect id="矩形"
                          transform="translate(3.000000, 2.500000) scale(1, -1) translate(-3.000000, -2.500000) "
                          x="2.5" y="0" width="1" height="5"></rect>
                    <path d="M3.16,2.21333333 L5.76,5.68 C5.82627417,5.76836556 5.80836556,5.89372583 5.72,5.96 C5.68538077,5.98596443 5.64327404,6 5.6,6 L0.4,6 C0.28954305,6 0.2,5.91045695 0.2,5.8 C0.2,5.75672596 0.214035574,5.71461923 0.24,5.68 L2.84,2.21333333 C2.90627417,2.12496777 3.03163444,2.10705916 3.12,2.17333333 C3.13516113,2.18470418 3.14862915,2.1981722 3.16,2.21333333 Z"
                          id="三角形"
                          transform="translate(3.000000, 4.000000) scale(1, -1) translate(-3.000000, -4.000000) "></path>
                </g>
                <g id="编组-5"
                   transform="translate(12.000000, 4.000000) scale(1, -1) translate(-12.000000, -4.000000) translate(9.000000, 1.000000)"
                   fill="#{fillColor}">
                    <rect id="矩形"
                          transform="translate(3.000000, 2.500000) scale(1, -1) translate(-3.000000, -2.500000) "
                          x="2.5" y="0" width="1" height="5"></rect>
                    <path d="M3.16,2.21333333 L5.76,5.68 C5.82627417,5.76836556 5.80836556,5.89372583 5.72,5.96 C5.68538077,5.98596443 5.64327404,6 5.6,6 L0.4,6 C0.28954305,6 0.2,5.91045695 0.2,5.8 C0.2,5.75672596 0.214035574,5.71461923 0.24,5.68 L2.84,2.21333333 C2.90627417,2.12496777 3.03163444,2.10705916 3.12,2.17333333 C3.13516113,2.18470418 3.14862915,2.1981722 3.16,2.21333333 Z"
                          id="三角形"
                          transform="translate(3.000000, 4.000000) scale(1, -1) translate(-3.000000, -4.000000) "></path>
                </g>
                <rect id="矩形" fill="#{fillColor}"
                      transform="translate(4.500000, 9.500000) scale(1, -1) translate(-4.500000, -9.500000) " x="1"
                      y="9" width="7" height="1"></rect>
                <rect id="矩形备份-3" fill="#{fillColor}" x="1" y="12.5" width="6" height="1"></rect>
                <rect id="矩形备份" fill="#{fillColor}"
                      transform="translate(4.500000, 6.000000) scale(1, -1) translate(-4.500000, -6.000000) " x="1"
                      y="5.5" width="7" height="1"></rect>
                <rect id="矩形备份-2" fill="#{fillColor}"
                      transform="translate(4.000000, 2.500000) scale(1, -1) translate(-4.000000, -2.500000) " x="1"
                      y="2" width="6" height="1"></rect>
            </g>
        </g>
    </g>
 </svg>
--- a/designer-realize/src/main/java/com/fr/design/sort/header/HeaderSortRulePane.java
+++ b/designer-realize/src/main/java/com/fr/design/sort/header/HeaderSortRulePane.java
@ -1,45 +1,37 @@
 package com.fr.design.sort.header;
 import com.fr.base.FineColor;
 import com.fr.base.svg.SVGIcon;
 import com.fr.base.svg.SVGTranscoder;
 import com.fr.design.event.UIObserver;
 import com.fr.design.event.UIObserverListener;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ipoppane.PopupHider;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.TableLayoutHelper;
-import com.fr.design.mainframe.theme.edit.ui.ColorListPane;
+import com.fr.design.style.color.ColorControlWindow;
-import com.fr.general.IOUtils;
+import com.fr.design.utils.gui.GUICoreUtils;
-import com.fr.log.FineLoggerFactory;
+import com.fr.report.core.sort.header.HeaderIconBuilder;
 import com.fr.report.core.sort.header.SortHeader;
 import com.fr.report.core.sort.common.SortRule;
 import org.apache.batik.transcoder.TranscoderInput;
 import javax.swing.*;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import java.awt.*;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 public class HeaderSortRulePane extends JPanel {
    private static final String ASC_ICON_TEMPLATE_PATH = "/com/fr/design/images/sort/asc.svg";
    private static final String DES_ICON_TEMPLATE_PATH = "/com/fr/design/images/sort/des.svg";
    private static final String NOSORT_ICON_TEMPLATE_PATH = "/com/fr/design/images/sort/nosort.svg";
    private static final double ICON_SCALE = SVGIcon.SYSTEM_SCALE * 1.25;
    private static final int ICON_LENGTH = (int) Math.ceil(16 * ICON_SCALE);
    IconButton ascIconButton;
    IconButton desIconButton;
    IconButton nosortIconButton;
    UICheckBox ascUICheckBox;
    UICheckBox desUICheckBox;
    UICheckBox nosortUICheckBox;
-    static Map<String, String> originalSvgTextMap = new HashMap<>();
+    Color defaultColor = new Color(33, 33, 34);
    HeaderSortRulePane() {
        initComponents();
@ -61,12 +53,12 @@ public class HeaderSortRulePane extends JPanel {
    void initSortRuleItem() {
        Component[][] components = new Component[][]{
-                new Component[]{ascUICheckBox = new UICheckBox(SortRule.ASC.getDescription()), ascIconButton = new IconButton(ASC_ICON_TEMPLATE_PATH)},
+                new Component[]{ascUICheckBox = new UICheckBox(SortRule.ASC.getDescription()), ascIconButton = new IconButton(SortRule.ASC)},
-                new Component[]{desUICheckBox = new UICheckBox(SortRule.DES.getDescription()), desIconButton = new IconButton(DES_ICON_TEMPLATE_PATH)},
+                new Component[]{desUICheckBox = new UICheckBox(SortRule.DES.getDescription()), desIconButton = new IconButton(SortRule.DES)},
-                new Component[]{nosortUICheckBox = new UICheckBox(SortRule.NO_SORT.getDescription()), nosortIconButton = new IconButton(NOSORT_ICON_TEMPLATE_PATH)},
+                new Component[]{nosortUICheckBox = new UICheckBox(SortRule.NO_SORT.getDescription()), nosortIconButton = new IconButton(SortRule.NO_SORT)},
        };
-        double[] rowSize = {ICON_LENGTH + 10, ICON_LENGTH + 10, ICON_LENGTH + 10};
+        double[] rowSize = {HeaderIconBuilder.ICON_LENGTH + 10, HeaderIconBuilder.ICON_LENGTH + 10, HeaderIconBuilder.ICON_LENGTH + 10};
-        double[] columnSize = {80, ICON_LENGTH + 10};
+        double[] columnSize = {80, HeaderIconBuilder.ICON_LENGTH + 10};
        JPanel sortRuleItem = TableLayoutHelper.createCommonTableLayoutPane(components, rowSize, columnSize, 0);
        this.add(sortRuleItem, BorderLayout.CENTER);
        initUICheckBoxChange(ascUICheckBox, ascIconButton);
@ -87,24 +79,23 @@ public class HeaderSortRulePane extends JPanel {
        ascUICheckBox.setSelected(selected);
        desUICheckBox.setSelected(selected);
        nosortUICheckBox.setSelected(selected);
-        ascIconButton.refreshIconLabelColor(new Color(33, 33, 34));
+        ascIconButton.refreshIconLabelColor(new FineColor(defaultColor));
-        desIconButton.refreshIconLabelColor(new Color(33, 33, 34));
+        desIconButton.refreshIconLabelColor(new FineColor(defaultColor));
-        nosortIconButton.refreshIconLabelColor(new Color(33, 33, 34));
+        nosortIconButton.refreshIconLabelColor(new FineColor(defaultColor));
    }
-    class IconButton extends JPanel implements UIObserver {
+    class IconButton extends JPanel implements UIObserver, PopupHider {
        SortRule sortRule;
        JLayeredPane jLayeredPane;
        String iconTemplatePath;
        UILabel iconLabel;
-        ColorListPane.ColorButton colorButton;
+        FineColor fineColor = new FineColor(defaultColor);
        Color color;
        BufferedImage bufferedImage;
        UIObserverListener uiObserverListener;
        boolean activeState;
        UILabel borderUiLabel;
        private ColorControlWindow colorSelector;
-        IconButton(String iconTemplatePath) {
+        IconButton(SortRule sortRule) {
-            this.iconTemplatePath = iconTemplatePath;
+            this.sortRule = sortRule;
            initComponents();
        }
@ -115,48 +106,47 @@ public class HeaderSortRulePane extends JPanel {
        public void setActiveState(boolean activeState) {
            if (activeState) {
                borderUiLabel.setBorder(BorderFactory.createLineBorder(Color.gray, 1));
                colorButton.setVisible(true);
            } else {
                borderUiLabel.setBorder(null);
                colorButton.setVisible(false);
            }
            this.activeState = activeState;
        }
        void initComponents() {
            jLayeredPane = new JLayeredPane();
-            iconLabel = getIconLabel(iconTemplatePath);
+            iconLabel = getIconLabel();
            borderUiLabel = new UILabel();
-            borderUiLabel.setSize(ICON_LENGTH, ICON_LENGTH);
+            borderUiLabel.setSize(HeaderIconBuilder.ICON_LENGTH, HeaderIconBuilder.ICON_LENGTH);
            borderUiLabel.setOpaque(true);
            borderUiLabel.setBackground(Color.WHITE);
-            iconLabel.setSize(ICON_LENGTH, ICON_LENGTH);
+            iconLabel.setSize(HeaderIconBuilder.ICON_LENGTH, HeaderIconBuilder.ICON_LENGTH);
-            colorButton = new ColorListPane.ColorButton(Color.CYAN);
+            iconLabel.addMouseListener(new MouseAdapter() {
            colorButton.setSize(ICON_LENGTH, ICON_LENGTH);
            colorButton.addChangeListener(new ChangeListener() {
                @Override
-                public void stateChanged(ChangeEvent e) {
+                public void mouseClicked(MouseEvent e) {
-                    color = colorButton.getSelectObject();
+                    if (activeState) {
-                    refreshIconLabelColor(color);
+                        showPopupMenu();
-                    uiObserverListener.doChange();
+                    }
                }
            });
-            jLayeredPane.setPreferredSize(new Dimension(ICON_LENGTH, ICON_LENGTH));
+            jLayeredPane.setPreferredSize(new Dimension(HeaderIconBuilder.ICON_LENGTH, HeaderIconBuilder.ICON_LENGTH));
            jLayeredPane.add(iconLabel, JLayeredPane.POPUP_LAYER);
            jLayeredPane.add(borderUiLabel, JLayeredPane.MODAL_LAYER);
            jLayeredPane.add(colorButton, JLayeredPane.PALETTE_LAYER);
            this.add(jLayeredPane);
        }
-        void refreshIconLabelColor(Color color) {
+        void refreshIconLabelColor(FineColor fineColor) {
-            Icon icon = getIcon(iconTemplatePath, color);
+            Icon icon = getIcon(fineColor);
            refreshIconLabel(icon);
        }
        Icon getIcon(FineColor fineColor) {
            BufferedImage bufferedImage = HeaderIconBuilder.getIcon(sortRule, fineColor);
            Icon icon = new ImageIcon(bufferedImage);
            return icon;
        }
        void refreshIconLabel(BufferedImage bufferedImage) {
            if (bufferedImage != null) {
                this.bufferedImage = bufferedImage;
                Icon icon = new SVGIcon(bufferedImage);
                refreshIconLabel(icon);
            }
@ -170,64 +160,46 @@ public class HeaderSortRulePane extends JPanel {
            }
        }
-        UILabel getIconLabel(String iconPath) {
+        UILabel getIconLabel() {
-            return getIconLabel(iconPath, new Color(33, 33, 34));
+            return getIconLabel(new FineColor(defaultColor));
        }
-        UILabel getIconLabel(String iconPath, Color color) {
+        UILabel getIconLabel(FineColor fineColor) {
-            Icon svgIcon = getIcon(iconPath, color);
+            Icon svgIcon = getIcon(fineColor);
            return new UILabel(svgIcon);
        }
-        Icon getIcon(String iconPath, Color color) {
+        private void showPopupMenu() {
-            try {
+            hidePopupMenu();
-                String originalSvgText = getOriginalSvgText(iconPath);
+            colorSelector = this.getColorSelector();
-                String svgText = originalSvgText.replaceAll("\\{fillColor\\}", shiftColor(color));
+            GUICoreUtils.showPopupMenu(colorSelector, this, 0, this.getSize().height);
                InputStream svgInputStream = new ByteArrayInputStream(svgText.getBytes(StandardCharsets.UTF_8));
                TranscoderInput input = new TranscoderInput(svgInputStream);
                bufferedImage = SVGTranscoder.createImage(ICON_SCALE, input).getImage();
                SVGIcon svgIcon = new SVGIcon(bufferedImage);
                return svgIcon;
            } catch (Exception e) {
                FineLoggerFactory.getLogger().error(e, e.getMessage());
            }
            return null;
        }
-        String getOriginalSvgText(String iconPath) throws Exception {
+        @Override
-            String originalSvgText = originalSvgTextMap.get(iconPath);
+        public void hidePopupMenu() {
-            if (originalSvgText == null) {
+            if (colorSelector != null) {
-                InputStream inputStream = IOUtils.getResourceAsStream(iconPath, HeaderSortRulePane.class);
+                colorSelector.setVisible(false);
                originalSvgText = getSvgText(inputStream);
                originalSvgTextMap.put(iconPath, originalSvgText);
            }
-            return originalSvgText;
+            colorSelector = null;
        }
        String shiftColor(Color color) {
            StringBuilder stringBuilder = new StringBuilder();
            stringBuilder.append(shiftValue(color.getRed()));
            stringBuilder.append(shiftValue(color.getGreen()));
            stringBuilder.append(shiftValue(color.getBlue()));
            return stringBuilder.toString();
        }
-        String shiftValue(int value) {
+        private ColorControlWindow getColorSelector() {
-            String resultValue = Integer.toHexString(value);
+            return new ColorControlWindow(false, IconButton.this) {
-            if (resultValue.length() == 1) {
+                @Override
-                resultValue = "0" + resultValue;
+                protected void colorChanged() {
-            }
+                    Color color = this.getColor();
-            return resultValue;
+                    if (color instanceof FineColor) {
                        fineColor = (FineColor) color;
                    } else {
                        fineColor = new FineColor(color);
                    }
                    refreshIconLabelColor(fineColor);
                    hidePopupMenu();
                    uiObserverListener.doChange();
                }
            };
        }
        private String getSvgText(InputStream inputStream) throws Exception {
            StringBuffer stringBuffer = new StringBuffer();
            byte[] b = new byte[1024];
            for (int n; (n = inputStream.read(b)) != -1; ) {
                stringBuffer.append(new String(b, 0, n));
            }
            return stringBuffer.toString();
        }
        @Override
        public void registerChangeListener(UIObserverListener uiObserverListener) {
@ -256,7 +228,6 @@ public class HeaderSortRulePane extends JPanel {
                    nosortIconButton.refreshIconLabel(bufferedImage);
                    nosortUICheckBox.setSelected(true);
                }
            }
        }
    }
@ -264,13 +235,13 @@ public class HeaderSortRulePane extends JPanel {
    public SortHeader.SortItem[] updateBean() {
        java.util.List<SortHeader.SortItem> items = new ArrayList<>();
        if (ascUICheckBox.isSelected()) {
-            items.add(new SortHeader.SortItem(SortRule.ASC, ascIconButton.bufferedImage));
+            items.add(new SortHeader.SortItem(SortRule.ASC, ascIconButton.fineColor));
        }
        if (desUICheckBox.isSelected()) {
-            items.add(new SortHeader.SortItem(SortRule.DES, desIconButton.bufferedImage));
+            items.add(new SortHeader.SortItem(SortRule.DES, desIconButton.fineColor));
        }
        if (nosortUICheckBox.isSelected()) {
-            items.add(new SortHeader.SortItem(SortRule.NO_SORT, nosortIconButton.bufferedImage));
+            items.add(new SortHeader.SortItem(SortRule.NO_SORT, nosortIconButton.fineColor));
        }
        SortHeader.SortItem[] resultItems = new SortHeader.SortItem[items.size()];
        return items.toArray(resultItems);