REPORT-42238 【10.0.13】JDK11设计器图标模糊问题优化

No.4: ①为SVGIcon增加可以读取指定宽高Icon的接口；②普通报表-工具栏 && 聚合报表-报表块-工具栏图标替换

0001-REPORT-42238-10.0.13-JDK11.patch

@@ -0,0 +1,110 @@
+From 1df5af6bc3c3b9f6223b569479b3ca520a746561 Mon Sep 17 00:00:00 2001
+From: Yvan <Yvan@fanruan.com>
+Date: Fri, 18 Dec 2020 09:49:13 +0800
+Subject: [PATCH] =?UTF-8?q?REPORT-42238=20=E3=80=9010.0.13=E3=80=91JDK11?=
+ =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E5=99=A8=E5=9B=BE=E6=A0=87=E6=A8=A1=E7=B3=8A?=
+ =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BC=98=E5=8C=96=20No.2:=E6=8F=90=E4=BA=A4U?=
+ =?UTF-8?q?pdateAction?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+---
+ .../com/fr/design/actions/UpdateAction.java   | 41 ++++++++++++++++++-
+ 1 file changed, 40 insertions(+), 1 deletion(-)
+
+diff --git a/designer-base/src/main/java/com/fr/design/actions/UpdateAction.java b/designer-base/src/main/java/com/fr/design/actions/UpdateAction.java
+index 4fd7e6c42..c284b9d56 100644
+--- a/designer-base/src/main/java/com/fr/design/actions/UpdateAction.java
++++ b/designer-base/src/main/java/com/fr/design/actions/UpdateAction.java
+@@ -78,6 +78,16 @@ public abstract class UpdateAction extends ShortCut implements Action {
+ 
+ 	private String searchText = StringUtils.EMPTY;
+ 
++	/**
++	 * 按钮在按压状态的图标key
++	 */
++	public static final String PRESSED_ICON = "pressedIcon";
++
++	/**
++	 * 按钮在灰化状态的图标key
++	 */
++	public static final String DISABLED_ICON = "disabledIcon";
++
+ 
+ 
+ 	/**
+@@ -251,6 +261,14 @@ public abstract class UpdateAction extends ShortCut implements Action {
+ 
+ 	}
+ 
++	public void setPressedIcon(Icon pressedIcon) {
++		this.putValue(UpdateAction.PRESSED_ICON, pressedIcon);
++	}
++
++	public void setDisabledIcon(Icon disabledIcon) {
++		this.putValue(UpdateAction.DISABLED_ICON, disabledIcon);
++	}
++
+ 	@Override
+ 	public synchronized void addPropertyChangeListener(PropertyChangeListener listener) {
+ 
+@@ -271,6 +289,8 @@ public abstract class UpdateAction extends ShortCut implements Action {
+ 			UIMenuItem menuItem = new UIMenuItem(this);
+ 			// 设置名字用作单元测
+ 			menuItem.setName(getName());
++			setPressedIcon4Button(menuItem);
++			setDisabledIcon4Button(menuItem);
+ 			object = menuItem;
+ 
+ 			this.putValue(UIMenuItem.class.getName(), object);
+@@ -282,6 +302,8 @@ public abstract class UpdateAction extends ShortCut implements Action {
+ 		UIMenuEastAttrItem menuItem = new UIMenuEastAttrItem(this);
+ 		// 设置名字用作单元测
+ 		menuItem.setName(getName());
++		setPressedIcon4Button(menuItem);
++		setDisabledIcon4Button(menuItem);
+ 		this.putValue(UIMenuItem.class.getName(), menuItem);
+ 		return menuItem;
+ 	}
+@@ -307,6 +329,8 @@ public abstract class UpdateAction extends ShortCut implements Action {
+ 			}
+ 
+ 			button.setIcon((Icon) this.getValue(Action.SMALL_ICON));
++			setPressedIcon4Button(button);
++			setDisabledIcon4Button(button);
+ 			button.addActionListener(this);
+ 
+ 			button.registerKeyboardAction(this, this.getAccelerator(), JComponent.WHEN_IN_FOCUSED_WINDOW);
+@@ -454,6 +478,8 @@ public abstract class UpdateAction extends ShortCut implements Action {
+ 			object = new UseMenuItem(this);
+ 			this.putValue(UseMenuItem.class.getName(), object);
+ 		}
++		setPressedIcon4Button((UseMenuItem) object);
++		setDisabledIcon4Button((UseMenuItem) object);
+ 		return (UseMenuItem) object;
+ 	}
+ 
+@@ -594,4 +620,17 @@ public abstract class UpdateAction extends ShortCut implements Action {
+ 		shortPinyin.append(PinyinHelper.getShortPinyin(title)).append(separator);
+ 	}
+ 
+-}
+\ No newline at end of file
++	private void setPressedIcon4Button(AbstractButton button) {
++		Icon pressedIcon = (Icon) this.getValue(UpdateAction.PRESSED_ICON);
++		if (pressedIcon != null) {
++			button.setPressedIcon(pressedIcon);
++		}
++	}
++
++	private void setDisabledIcon4Button(AbstractButton button) {
++		Icon disabledIcon = (Icon) this.getValue(UpdateAction.DISABLED_ICON);
++		if (disabledIcon != null) {
++			button.setDisabledIcon(disabledIcon);
++		}
++	}
++}
+-- 
+2.24.1
+

designer-base/src/main/java/com/fr/base/svg/SVGIcon.java

@@ -2,6 +2,7 @@ package com.fr.base.svg;
 
 import javax.swing.Icon;
 import java.awt.Component;
+import java.awt.Dimension;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.image.BufferedImage;
@@ -49,11 +50,22 @@ public class SVGIcon implements Icon {
     }
 
     /**
-     * 外界读取高清图标
+     * 外界读取高清图标，默认尺寸为16*16
      * @param url
      * @return
      */
     public static Icon readSVGIcon(String url) {
         return new SVGIcon((BufferedImage) SVGLoader.load(url));
     }
+
+    /**
+     * 读取指定尺寸的图标
+     * @param url 资源路径
+     * @param width 宽度
+     * @param height 高度
+     * @return
+     */
+    public static Icon readSVGIcon(String url, float width, float height) {
+        return new SVGIcon((BufferedImage) SVGLoader.load(url, width, height));
+    }
 }

designer-base/src/main/java/com/fr/base/svg/SVGLoader.java

@@ -62,13 +62,24 @@ public class SVGLoader {
 
 
     @Nullable
-    public static Image load(@NotNull URL url, double scale, double width, double height) throws IOException {
+    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) (width * scale), (float) (height * scale)).getImage();
+            return SVGTranscoder.createImage(scale, input, (float) (overriddenWidth * scale), (float) (overriddenHeight * scale)).getImage();
         } catch (TranscoderException e) {
             throw new IOException(e);
         }
     }
+
+    @Nullable
+    public static Image load(@NotNull String url, float width, float height) {
+        try {
+            String svgUri = url.toString();
+            TranscoderInput input = new TranscoderInput(svgUri);
+            return SVGTranscoder.createImage(SVGIcon.SYSTEM_SCALE, input, -1, -1, width, height).getImage();
+        } catch (TranscoderException ignore) {
+            return null;
+        }
+    }
 }

designer-base/src/main/java/com/fr/base/svg/SVGTranscoder.java

@@ -67,6 +67,12 @@ public class SVGTranscoder extends ImageTranscoder {
         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;
     }
@@ -99,7 +105,12 @@ public class SVGTranscoder extends ImageTranscoder {
 
     @NotNull
     public static SVGTranscoder createImage(double scale, @NotNull TranscoderInput input, float overriddenWidth, float overriddenHeight) throws TranscoderException {
-        SVGTranscoder transcoder = new SVGTranscoder(scale);
+        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);
         }

designer-base/src/main/java/com/fr/design/menu/MenuDef.java

@@ -1,6 +1,7 @@
 package com.fr.design.menu;
 
 import com.fr.base.BaseUtils;
+import com.fr.base.svg.SVGIcon;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.imenu.*;
 import com.fr.design.gui.iscrollbar.UIScrollBar;
@@ -40,6 +41,7 @@ public class MenuDef extends ShortCut {
     protected JPopupMenu popupMenu;
     protected boolean hasScrollSubMenu;
     protected boolean isHeadMenu;
+    private boolean isSVGIcon = false;
 
     private String anchor;
 
@@ -99,6 +101,11 @@ public class MenuDef extends ShortCut {
         this.iconPath = iconPath;
     }
 
+    public void setIconPath(String iconPath, boolean isSVGIcon) {
+        this.iconPath = iconPath;
+        this.isSVGIcon = isSVGIcon;
+    }
+
     public int getShortCutCount() {
         return this.shortcutList.size();
     }
@@ -141,7 +148,7 @@ public class MenuDef extends ShortCut {
             addShortCut(i);
         }
     }
-    
+
     public void addShortCut(ShortCut shortCut) {
         this.shortcutList.add(shortCut);
     }
@@ -166,7 +173,7 @@ public class MenuDef extends ShortCut {
     public UIButton createUIButton() {
         if (createdButton == null) {
             if (iconPath != null) {
-                createdButton = new UIButton(BaseUtils.readIcon(iconPath));
+                createdButton = new UIButton(isSVGIcon ? SVGIcon.readSVGIcon(iconPath) : BaseUtils.readIcon(iconPath));
                 createdButton.set4ToolbarButton();
             } else {
                 createdButton = new UIButton(name);
@@ -206,9 +213,9 @@ public class MenuDef extends ShortCut {
 
         return createdJMenu;
     }
-    
+
     protected UIMenu createJMenu0() {
-        
+
         UIMenu createdJMenu;
         if (hasScrollSubMenu) {
             createdJMenu = new UIScrollMenu(this.getName());
@@ -219,7 +226,7 @@ public class MenuDef extends ShortCut {
         }
         return createdJMenu;
     }
-    
+
     protected ContainerListener getContainerListener() {
         return null;
     }
@@ -389,9 +396,9 @@ public class MenuDef extends ShortCut {
     public void intoJToolBar(JToolBar toolBar) {
         toolBar.add(this.createUIButton());
     }
-    
+
     protected MenuListener createMenuListener() {
-        
+
         return menuDefListener;
     }
 
@@ -456,4 +463,4 @@ public class MenuDef extends ShortCut {
     }
 
 
-}
+}

designer-base/src/main/java/com/fr/design/style/color/UIToolbarColorButton.java

@@ -3,7 +3,7 @@
  */
 package com.fr.design.style.color;
 
-import com.fr.base.BaseUtils;
+import com.fr.base.svg.SVGIcon;
 import com.fr.design.event.UIObserver;
 import com.fr.design.event.UIObserverListener;
 import com.fr.design.gui.ibutton.UIButton;
@@ -34,7 +34,7 @@ public class UIToolbarColorButton extends UICombinationButton implements PopupHi
     private UIObserverListener uiObserverListener;
 
     public UIToolbarColorButton(Icon icon) {
-        super(new UIColorButton(icon), new UIButton(BaseUtils.readIcon("/com/fr/design/images/gui/popup.gif")));
+        super(new UIColorButton(icon), new UIButton(SVGIcon.readSVGIcon("/com/fr/design/images/gui/popup_normal.svg")));
         getLeftButton().setEventBanned(true);
         getRightButton().addFocusListener(new FocusListener() {
 
@@ -244,4 +244,4 @@ public class UIToolbarColorButton extends UICombinationButton implements PopupHi
     public boolean shouldResponseChangeListener() {
         return true;
     }
-}
+}

designer-base/src/main/resources/com/fr/design/images/gui/color/background_normal.svg

@@ -0,0 +1,8 @@
+<?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>icon_文本背景色_normal</title>
+    <g id="icon_文本背景色_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M9,0 L8.9993,1.656 L11.3546845,4.01296053 C12.496044,4.07957725 16,4.48860182 16,7 C16,10 13,12 13,12 C13,12 13.4489375,10.2042499 12.842809,7.81595247 L7.6363,13.021 L1.9793,7.364 L4.9993,4.344 L5,0 L9,0 Z M7.9993,2.756 L3.3933,7.364 L7.6363,11.606 L12.5054659,6.73651111 C12.4728171,6.64900228 12.4386503,6.56099677 12.4029036,6.47254402 L8.9993,3.07 L9,6 L8,6 L7.9993,2.756 Z M7.9993,1 L5.9993,1 L5.9993,3.344 L7.9993,1.344 L7.9993,1 Z" id="Combined-Shape" fill="#333334"></path>
+        <rect id="Rectangle" fill="#F87777" x="0" y="12" width="16" height="4"></rect>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/gui/color/foreground_normal.svg

@@ -0,0 +1,7 @@
+<?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>icon_文本前景色_normal</title>
+    <g id="icon_文本前景色_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M6.7599,0.0002 L2.9999,10.1782 L5.6459,10.1782 L6.3549,8.1212 L10.1209,8.1212 L10.8299,10.1782 L13.5409,10.1782 L9.7809,0.0002 L6.7599,0.0002 Z M8.2389,2.6082 L9.4909,6.2552 L6.9859,6.2552 L8.2389,2.6082 Z" id="Fill-1" fill="#333334"></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/gui/popup_normal.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="8px" height="8px" viewBox="0 0 8 8" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon_组件分隔_箭头下_normal</title>
+    <g id="icon_组件分隔_箭头下_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M2,0.997030139 C2,0.446385598 2.31387329,0.313873291 2.70591205,0.705912054 L6,4 L2.70591205,7.29408795 C2.31604759,7.68395241 2,7.54696369 2,7.00296986 L2,0.997030139 Z" id="Rectangle-6" fill="#333334" transform="translate(4.000000, 4.000000) rotate(90.000000) translate(-4.000000, -4.000000) "></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_edit/merge_disabled.svg

@@ -0,0 +1,11 @@
+<?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>icon_合并单元格_disabled</title>
+    <g id="icon_合并单元格_disabled" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.300000012">
+        <g id="编组" transform="translate(1.000000, 1.000000)">
+            <polygon id="Fill-1" fill="#333334" opacity="0.3" points="1 10 13 10 13 3 1 3"></polygon>
+            <path d="M6.84570312,9.15820312 C7.20898438,9.15820312 7.54150391,9.08056641 7.84326172,8.92529297 C8.14501953,8.77001953 8.37646484,8.58691406 8.53759766,8.37597656 C8.56396484,8.56347656 8.609375,8.70849609 8.67382812,8.81103516 C8.796875,9.00439453 8.99462891,9.10107422 9.26708984,9.10107422 C9.37841797,9.10107422 9.46630859,9.09667969 9.53076172,9.08789062 C9.59521484,9.07910156 9.68896484,9.05712891 9.81201172,9.02197266 L9.81201172,9.02197266 L9.81201172,8.4375 C9.76220703,8.44628906 9.71533203,8.45288086 9.67138672,8.45727539 C9.62744141,8.46166992 9.58789062,8.46386719 9.55273438,8.46386719 C9.44433594,8.46386719 9.37329102,8.43896484 9.33959961,8.38916016 C9.3059082,8.33935547 9.2890625,8.2734375 9.2890625,8.19140625 L9.2890625,8.19140625 L9.2890625,5.47998047 C9.2890625,5.03466797 9.11767578,4.70654297 8.77490234,4.49560547 C8.42919922,4.28466797 7.97949219,4.17919922 7.42578125,4.17919922 C6.94824219,4.17919922 6.52856445,4.29272461 6.16674805,4.51977539 C5.80493164,4.74682617 5.61669922,5.15039062 5.60205078,5.73046875 L5.60205078,5.73046875 L6.34033203,5.73046875 C6.36962891,5.48730469 6.43261719,5.30419922 6.52929688,5.18115234 C6.70214844,4.95849609 6.99511719,4.84716797 7.40820312,4.84716797 C7.765625,4.84716797 8.0402832,4.90795898 8.23217773,5.02954102 C8.42407227,5.15112305 8.52001953,5.34667969 8.52001953,5.61621094 C8.52001953,5.74804688 8.50244141,5.84912109 8.46728516,5.91943359 C8.40576172,6.04833984 8.28417969,6.12451172 8.10253906,6.14794922 L8.10253906,6.14794922 L6.84130859,6.30615234 C6.39892578,6.36181641 6.04150391,6.50976562 5.76904297,6.75 C5.49658203,6.99023438 5.36035156,7.32861328 5.36035156,7.76513672 C5.36035156,8.16357422 5.4987793,8.49536133 5.77563477,8.76049805 C6.05249023,9.02563477 6.40917969,9.15820312 6.84570312,9.15820312 Z M7.03027344,8.48583984 C6.80175781,8.48583984 6.60400391,8.41992188 6.43701172,8.28808594 C6.27001953,8.15625 6.18652344,7.97607422 6.18652344,7.74755859 C6.18652344,7.44580078 6.30810547,7.22607422 6.55126953,7.08837891 C6.69482422,7.00634766 6.91015625,6.94628906 7.19726562,6.90820312 L7.19726562,6.90820312 L7.67626953,6.84667969 C7.82275391,6.82910156 7.97216797,6.79980469 8.12451172,6.75878906 C8.27685547,6.71777344 8.40136719,6.66650391 8.49804688,6.60498047 L8.49804688,6.60498047 L8.49804688,7.2421875 C8.49804688,7.72851562 8.27832031,8.07861328 7.83886719,8.29248047 C7.578125,8.42138672 7.30859375,8.48583984 7.03027344,8.48583984 Z" id="a" fill="#FFFFFF" fill-rule="nonzero"></path>
+            <path d="M14,0 L14,13 L0,13 L0,0 L14,0 Z M1,3 L1,12 L7,12 L7,11 L8,11 L8,12 L13,12 L13,3 L1,3 Z M13,2 L13,1 L8,1 L8,2 L13,2 Z M1,2 L7,2 L7,1 L1,1 L1,2 Z" id="Combined-Shape" fill="#333334"></path>
+        </g>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_edit/merge_normal.svg

@@ -0,0 +1,11 @@
+<?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>icon_合并单元格_normal</title>
+    <g id="icon_合并单元格_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <polygon id="Fill-1" fill="#41C9FD" points="2 11 14 11 14 4 2 4"></polygon>
+        <text id="a" font-family="Helvetica" font-size="9" font-weight="normal" line-spacing="9" fill="#FFFFFF">
+            <tspan x="6" y="10">a</tspan>
+        </text>
+        <path d="M15,1 L15,14 L1,14 L1,1 L15,1 Z M2,4 L2,13 L8,13 L8,12 L9,12 L9,13 L14,13 L14,4 L2,4 Z M14,3 L14,2 L9,2 L9,3 L14,3 Z M2,3 L8,3 L8,2 L2,2 L2,3 Z" id="Combined-Shape" fill="#333334"></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_edit/unmerge_disabled.svg

@@ -0,0 +1,10 @@
+<?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>icon_拆分单元格_disabled</title>
+    <g id="icon_拆分单元格_disabled" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.300000012">
+        <g id="编组" transform="translate(1.000000, 1.000000)" fill="#333334">
+            <polygon id="Fill-1" opacity="0.3" points="1 9 13 9 13 4 1 4"></polygon>
+            <path d="M-1.0658141e-14,13 L-1.0658141e-14,0 L14.001,0 L14.001,13 L-1.0658141e-14,13 Z M4,10 L1,10 L1,12 L4,12 L4,10 Z M9,10 L5.001,10 L5.001,12 L9,12 L9,10 Z M13,10 L10,10 L10,12 L13,12 L13,10 Z M4,7 L1,7 L1,9 L4,9 L4,7 Z M9,7 L5.001,7 L5.001,9 L9,9 L9,7 Z M13,7 L10,7 L10,9 L13,9 L13,7 Z M4,4 L1,4 L1,6 L4,6 L4,4 Z M9,4 L5.001,4 L5.001,6 L9,6 L9,4 Z M13,4 L10,4 L10,6 L13,6 L13,4 Z M4,1 L1,1 L1,3 L4,3 L4,1 Z M9,1 L5.001,1 L5.001,3 L9,3 L9,1 Z M13,1 L10,1 L10,3 L13,3 L13,1 Z" id="Combined-Shape"></path>
+        </g>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_edit/unmerge_normal.svg

@@ -0,0 +1,8 @@
+<?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>icon_拆分单元格_normal</title>
+    <g id="icon_拆分单元格_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <polygon id="Fill-1" fill="#41C9FD" points="2 10 14 10 14 5 2 5"></polygon>
+        <path d="M1,14 L1,1 L15.001,1 L15.001,14 L1,14 Z M5,11 L2,11 L2,13 L5,13 L5,11 Z M10,11 L6.001,11 L6.001,13 L10,13 L10,11 Z M14,11 L11,11 L11,13 L14,13 L14,11 Z M5,8 L2,8 L2,10 L5,10 L5,8 Z M10,8 L6.001,8 L6.001,10 L10,10 L10,8 Z M14,8 L11,8 L11,10 L14,10 L14,8 Z M5,5 L2,5 L2,7 L5,7 L5,5 Z M10,5 L6.001,5 L6.001,7 L10,7 L10,5 Z M14,5 L11,5 L11,7 L14,7 L14,5 Z M5,2 L2,2 L2,4 L5,4 L5,2 Z M10,2 L6.001,2 L6.001,4 L10,4 L10,2 Z M14,2 L11,2 L11,4 L14,4 L14,2 Z" id="Combined-Shape" fill="#333334"></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/bold_normal.svg

@@ -0,0 +1,7 @@
+<?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>icon_文本工具_加粗_nomal</title>
+    <g id="icon_文本工具_加粗_nomal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M8.9795,8.9814 C8.9795,8.7254 8.9245,8.5294 8.8145,8.3904 C8.7035,8.2524 8.5155,8.1494 8.2505,8.0814 C8.0695,8.0344 7.8195,8.0084 7.5015,8.0054 C7.1845,8.0024 6.8525,8.0004 6.5065,8.0004 L6.0005,8.0004 L6.0005,10.0004 L6.1685,10.0004 C6.8205,10.0004 7.2875,9.9984 7.5685,9.9944 C7.8495,9.9914 8.1095,9.9444 8.3465,9.8544 C8.5875,9.7644 8.7535,9.6454 8.8445,9.4964 C8.9345,9.3464 8.9795,9.1744 8.9795,8.9814 M8.4175,5.9394 C8.4175,5.7834 8.3805,5.6274 8.3055,5.4694 C8.2315,5.3134 8.0995,5.1974 7.9105,5.1204 C7.7415,5.0524 7.5305,5.0154 7.2785,5.0094 C7.0265,5.0024 6.6725,5.0004 6.2175,5.0004 L6.0005,5.0004 L6.0005,7.0004 L6.3625,7.0004 C6.7295,7.0004 7.0425,6.9944 7.2995,6.9814 C7.5575,6.9684 7.7605,6.9254 7.9105,6.8534 C8.1195,6.7564 8.2565,6.6304 8.3215,6.4764 C8.3855,6.3214 8.4175,6.1424 8.4175,5.9394 M11.7005,9.2444 C11.7005,9.6784 11.6125,10.0674 11.4375,10.4104 C11.2625,10.7524 11.0215,11.0374 10.7145,11.2624 C10.3605,11.5284 9.9705,11.7174 9.5455,11.8314 C9.1205,11.9434 8.5825,12.0004 7.9285,12.0004 L4.0005,12.0004 L4.0005,3.0004 L7.4935,3.0004 C8.2185,3.0004 8.7505,3.0244 9.0855,3.0724 C9.4225,3.1214 9.7555,3.2274 10.0865,3.3924 C10.4285,3.5664 10.6835,3.7984 10.8515,4.0904 C11.0185,4.3824 11.1025,4.7164 11.1025,5.0904 C11.1025,5.5264 10.9875,5.9104 10.7575,6.2434 C10.5285,6.5754 10.2035,6.8344 9.7845,7.0194 L9.7845,7.0674 C10.3735,7.1844 10.8385,7.4264 11.1835,7.7934 C11.5285,8.1604 11.7005,8.6434 11.7005,9.2444" id="Fill-1" fill="#333334"></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/bold_selected.svg

@@ -0,0 +1,7 @@
+<?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>icon_文本工具_加粗_selected</title>
+    <g id="icon_文本工具_加粗_selected" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M8.9795,8.9814 C8.9795,8.7254 8.9245,8.5294 8.8145,8.3904 C8.7035,8.2524 8.5155,8.1494 8.2505,8.0814 C8.0695,8.0344 7.8195,8.0084 7.5015,8.0054 C7.1845,8.0024 6.8525,8.0004 6.5065,8.0004 L6.0005,8.0004 L6.0005,10.0004 L6.1685,10.0004 C6.8205,10.0004 7.2875,9.9984 7.5685,9.9944 C7.8495,9.9914 8.1095,9.9444 8.3465,9.8544 C8.5875,9.7644 8.7535,9.6454 8.8445,9.4964 C8.9345,9.3464 8.9795,9.1744 8.9795,8.9814 M8.4175,5.9394 C8.4175,5.7834 8.3805,5.6274 8.3055,5.4694 C8.2315,5.3134 8.0995,5.1974 7.9105,5.1204 C7.7415,5.0524 7.5305,5.0154 7.2785,5.0094 C7.0265,5.0024 6.6725,5.0004 6.2175,5.0004 L6.0005,5.0004 L6.0005,7.0004 L6.3625,7.0004 C6.7295,7.0004 7.0425,6.9944 7.2995,6.9814 C7.5575,6.9684 7.7605,6.9254 7.9105,6.8534 C8.1195,6.7564 8.2565,6.6304 8.3215,6.4764 C8.3855,6.3214 8.4175,6.1424 8.4175,5.9394 M11.7005,9.2444 C11.7005,9.6784 11.6125,10.0674 11.4375,10.4104 C11.2625,10.7524 11.0215,11.0374 10.7145,11.2624 C10.3605,11.5284 9.9705,11.7174 9.5455,11.8314 C9.1205,11.9434 8.5825,12.0004 7.9285,12.0004 L4.0005,12.0004 L4.0005,3.0004 L7.4935,3.0004 C8.2185,3.0004 8.7505,3.0244 9.0855,3.0724 C9.4225,3.1214 9.7555,3.2274 10.0865,3.3924 C10.4285,3.5664 10.6835,3.7984 10.8515,4.0904 C11.0185,4.3824 11.1025,4.7164 11.1025,5.0904 C11.1025,5.5264 10.9875,5.9104 10.7575,6.2434 C10.5285,6.5754 10.2035,6.8344 9.7845,7.0194 L9.7845,7.0674 C10.3735,7.1844 10.8385,7.4264 11.1835,7.7934 C11.5285,8.1604 11.7005,8.6434 11.7005,9.2444" id="Fill-1" fill="#FFFFFF"></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/h_center_normal.svg

@@ -0,0 +1,7 @@
+<?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>icon_对齐 居中对齐_normal</title>
+    <g id="icon_对齐-居中对齐_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M13,13 L13,14 L3,14 L3,13 L13,13 Z M15,11 L15,12 L1,12 L1,11 L15,11 Z M13,9 L13,10 L3,10 L3,9 L13,9 Z M15,7 L15,8 L1,8 L1,7 L15,7 Z M13,5 L13,6 L3,6 L3,5 L13,5 Z M15,3 L15,4 L1,4 L1,3 L15,3 Z" id="Combined-Shape" fill="#333334"></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/h_center_selected.svg

@@ -0,0 +1,7 @@
+<?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>icon_对齐 居中对齐_selected</title>
+    <g id="icon_对齐-居中对齐_selected" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M13,13 L13,14 L3,14 L3,13 L13,13 Z M15,11 L15,12 L1,12 L1,11 L15,11 Z M13,9 L13,10 L3,10 L3,9 L13,9 Z M15,7 L15,8 L1,8 L1,7 L15,7 Z M13,5 L13,6 L3,6 L3,5 L13,5 Z M15,3 L15,4 L1,4 L1,3 L15,3 Z" id="Combined-Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/h_left_normal.svg

@@ -0,0 +1,7 @@
+<?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>icon_对齐 左对齐_normal</title>
+    <g id="icon_对齐-左对齐_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M11,13 L11,14 L1,14 L1,13 L11,13 Z M15,11 L15,12 L1,12 L1,11 L15,11 Z M11,9 L11,10 L1,10 L1,9 L11,9 Z M15,7 L15,8 L1,8 L1,7 L15,7 Z M11,5 L11,6 L1,6 L1,5 L11,5 Z M15,3 L15,4 L1,4 L1,3 L15,3 Z" id="Combined-Shape" fill="#333334"></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/h_left_selected.svg

@@ -0,0 +1,7 @@
+<?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>icon_对齐 左对齐_selected</title>
+    <g id="icon_对齐-左对齐_selected" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M11,13 L11,14 L1,14 L1,13 L11,13 Z M15,11 L15,12 L1,12 L1,11 L15,11 Z M11,9 L11,10 L1,10 L1,9 L11,9 Z M15,7 L15,8 L1,8 L1,7 L15,7 Z M11,5 L11,6 L1,6 L1,5 L11,5 Z M15,3 L15,4 L1,4 L1,3 L15,3 Z" id="Combined-Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/h_right_normal.svg

@@ -0,0 +1,7 @@
+<?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>icon_对齐 右对齐_normal</title>
+    <g id="icon_对齐-右对齐_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M15,13 L15,14 L5,14 L5,13 L15,13 Z M15,11 L15,12 L1,12 L1,11 L15,11 Z M15,9 L15,10 L5,10 L5,9 L15,9 Z M15,7 L15,8 L1,8 L1,7 L15,7 Z M15,5 L15,6 L5,6 L5,5 L15,5 Z M15,3 L15,4 L1,4 L1,3 L15,3 Z" id="Combined-Shape" fill="#333334"></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/h_right_selected.svg

@@ -0,0 +1,7 @@
+<?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>icon_对齐 右对齐_selected</title>
+    <g id="icon_对齐-右对齐_selected" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M15,13 L15,14 L5,14 L5,13 L15,13 Z M15,11 L15,12 L1,12 L1,11 L15,11 Z M15,9 L15,10 L5,10 L5,9 L15,9 Z M15,7 L15,8 L1,8 L1,7 L15,7 Z M15,5 L15,6 L5,6 L5,5 L15,5 Z M15,3 L15,4 L1,4 L1,3 L15,3 Z" id="Combined-Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/italic_normal.svg

@@ -0,0 +1,9 @@
+<?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>icon_文本工具_斜体_normal</title>
+    <g id="icon_文本工具_斜体_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <polygon id="Page-1" fill="#333334" points="8 4 6 11 8 11 10 4"></polygon>
+        <rect id="Rectangle-130" fill="#333334" x="7" y="3" width="4" height="1"></rect>
+        <rect id="Rectangle-130-Copy" fill="#333334" x="5" y="11" width="4" height="1"></rect>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/italic_selected.svg

@@ -0,0 +1,9 @@
+<?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>icon_文本工具_斜体_selected</title>
+    <g id="icon_文本工具_斜体_selected" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <polygon id="Page-1" fill="#FFFFFF" points="8 4 6 11 8 11 10 4"></polygon>
+        <rect id="Rectangle-130" fill="#FFFFFF" x="7" y="3" width="4" height="1"></rect>
+        <rect id="Rectangle-130-Copy" fill="#FFFFFF" x="5" y="11" width="4" height="1"></rect>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/underline_normal.svg

@@ -0,0 +1,7 @@
+<?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>icon_文本工具_下划线_normal</title>
+    <g id="icon_文本工具_下划线_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M13,12 L13,13 L4,13 L4,12 L13,12 Z M7,2 L7,9 C7,9.552 7.671,10 8.5,10 C9.329,10 10,9.552 10,9 L10,9 L10,2 L12,2 L12,9 C12,10.289 10.433,11.333 8.5,11.333 C6.567,11.333 5,10.289 5,9 L5,9 L5,2 L7,2 Z" id="Combined-Shape" fill="#333334"></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/underline_selected.svg

@@ -0,0 +1,7 @@
+<?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>icon_文本工具_下划线_selected</title>
+    <g id="icon_文本工具_下划线_selected" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M13,12 L13,13 L4,13 L4,12 L13,12 Z M7,2 L7,9 C7,9.552 7.671,10 8.5,10 C9.329,10 10,9.552 10,9 L10,9 L10,2 L12,2 L12,9 C12,10.289 10.433,11.333 8.5,11.333 C6.567,11.333 5,10.289 5,9 L5,9 L5,2 L7,2 Z" id="Combined-Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_format/noborder_normal.svg

@@ -0,0 +1,7 @@
+<?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>icon_边框_normal</title>
+    <g id="icon_边框_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M3,14 L3,15 L1,15 L1,14 L3,14 Z M16,14 L16,15 L14,15 L14,14 L16,14 Z M5,14 L5,15 L4,15 L4,14 L5,14 Z M7,14 L7,15 L6,15 L6,14 L7,14 Z M11,14 L11,15 L10,15 L10,14 L11,14 Z M13,14 L13,15 L12,15 L12,14 L13,14 Z M9,13 L9,15 L8,15 L8,13 L9,13 Z M16,12 L16,13 L15,13 L15,12 L16,12 Z M2,12 L2,13 L1,13 L1,12 L2,12 Z M9,11 L9,12 L8,12 L8,11 L9,11 Z M16,10 L16,11 L15,11 L15,10 L16,10 Z M2,10 L2,11 L1,11 L1,10 L2,10 Z M9,9 L9,10 L8,10 L8,9 L9,9 Z M16,8 L16,9 L15,9 L15,8 L16,8 Z M2,8 L2,9 L1,9 L1,8 L2,8 Z M5,7 L5,8 L4,8 L4,7 L5,7 Z M7,7 L7,8 L6,8 L6,7 L7,7 Z M3,7 L3,8 L2,8 L2,7 L3,7 Z M9,7 L9,8 L8,8 L8,7 L9,7 Z M15,7 L15,8 L14,8 L14,7 L15,7 Z M11,7 L11,8 L10,8 L10,7 L11,7 Z M13,7 L13,8 L12,8 L12,7 L13,7 Z M2,6 L2,7 L1,7 L1,6 L2,6 Z M16,6 L16,7 L15,7 L15,6 L16,6 Z M9,5 L9,6 L8,6 L8,5 L9,5 Z M2,4 L2,5 L1,5 L1,4 L2,4 Z M16,4 L16,5 L15,5 L15,4 L16,4 Z M9,3 L9,4 L8,4 L8,3 L9,3 Z M2,2 L2,3 L1,3 L1,2 L2,2 Z M16,2 L16,3 L15,3 L15,2 L16,2 Z M9,0 L9,2 L8,2 L8,0 L9,0 Z M3,-6.123234e-17 L3,1 L1,1 L1,6.123234e-17 L3,-6.123234e-17 Z M16,-8.38388457e-16 L16,1 L14,1 L14,-7.15923777e-16 L16,-8.38388457e-16 Z M5,-2.52660775e-16 L5,1 L4,1 L4,-1.91428435e-16 L5,-2.52660775e-16 Z M7,-3.63683077e-16 L7,1 L6,1 L6,-3.02450737e-16 L7,-3.63683077e-16 Z M11,-5.85727682e-16 L11,1 L10,1 L10,-5.24495342e-16 L11,-5.85727682e-16 Z M13,-6.96749985e-16 L13,1 L12,1 L12,-6.35517645e-16 L13,-6.96749985e-16 Z" id="Combined-Shape" fill="#333334"></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_insert/bias_disabled.svg

@@ -0,0 +1,7 @@
+<?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>icon_斜线_disabled</title>
+    <g id="icon_斜线_disabled" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.3">
+        <polygon id="Page-1" fill="#333334" points="1 1.000525 8.99925 14.5744 9.75 14.12465 3.296 3.1259 14.608875 8.61915 15 7.836025"></polygon>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_insert/bias_normal.svg

@@ -0,0 +1,7 @@
+<?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>icon_斜线_normal</title>
+    <g id="icon_斜线_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <polygon id="Page-1" fill="#757575" points="1 1.000525 8.99925 14.5744 9.75 14.12465 3.296 3.1259 14.608875 8.61915 15 7.836025"></polygon>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_insert/bindColumn_disabled.svg

@@ -0,0 +1,7 @@
+<?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>icon_插入数据列_disabled</title>
+    <g id="icon_插入数据列_disabled" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.3">
+        <path d="M15,5 L15,10 L1,10 L1,5 L15,5 Z M5,6 L2,6 L2,9 L5,9 L5,6 Z M14,6 L6,6 L6,9 L14,9 L14,6 Z M4,7 L4,8 L3,8 L3,7 L4,7 Z M13,7 L13,8 L7,8 L7,7 L13,7 Z" id="形状结合" fill="#333334"></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_insert/bindColumn_normal.svg

@@ -0,0 +1,7 @@
+<?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>icon_插入数据列_nomal</title>
+    <g id="icon_插入数据列_nomal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M15,5 L15,10 L1,10 L1,5 L15,5 Z M5,6 L2,6 L2,9 L5,9 L5,6 Z M14,6 L6,6 L6,9 L14,9 L14,6 Z M4,7 L4,8 L3,8 L3,7 L4,7 Z M13,7 L13,8 L7,8 L7,7 L13,7 Z" id="形状结合" fill="#333334" fill-rule="nonzero"></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_insert/chart_disabled.svg

@@ -0,0 +1,7 @@
+<?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>icon_图表_disabled</title>
+    <g id="icon_图表_disabled" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.3">
+        <path d="M5,6 L5,15 L1,15 L1,6 L5,6 Z M10,1 L10,15 L6,15 L6,1 L10,1 Z M15,3 L15,15 L11,15 L11,3 L15,3 Z" id="Combined-Shape" fill="#333334"></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_insert/chart_normal.svg

@@ -0,0 +1,7 @@
+<?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>icon_图表_normal</title>
+    <g id="icon_图表_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M5,6 L5,15 L1,15 L1,6 L5,6 Z M10,1 L10,15 L6,15 L6,1 L10,1 Z M15,3 L15,15 L11,15 L11,3 L15,3 Z" id="Combined-Shape" fill="#333334"></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_insert/floatPop_normal.svg

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="22px" height="16px" viewBox="0 0 22 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon_悬浮元素&amp;三角_normal</title>
+    <g id="icon_悬浮元素&amp;三角_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M2,0 L2,1 L14,1 L14,0 L15,0 L15,1 L16,1 L16,2 L15,2 L15,14 L16,14 L16,15 L15,15 L15,16 L14,16 L14,15 L2,15 L2,16 L1,16 L1,15 L0,15 L0,14 L1,14 L1,2 L0,2 L0,1 L1,1 L1,0 L2,0 Z M14,14 L14,2 L2,2 L2,14 L14,14 Z" id="Combined-Shape" fill="#333334"></path>
+        <polygon id="Fill-5" fill="#EEEEEF" points="2 14 14 14 14 2 2 2"></polygon>
+        <path d="M21.5741668,7.5 C21.9938502,7.5 22.0986659,7.73540497 21.797731,8.03633988 L19.3340709,10.5 L16.8704108,8.03633988 C16.5741985,7.74012754 16.6738481,7.5 17.0939751,7.5 L21.5741668,7.5 Z" id="Rectangle-6" fill="#333334"></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_insert/formula_disabled.svg

@@ -0,0 +1,7 @@
+<?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>icon_公式_disabled</title>
+    <g id="icon_公式_disabled" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.3">
+        <path d="M10,13 L10,14 L9,14 L9,13 L10,13 Z M15,13 L15,14 L14,14 L14,13 L15,13 Z M8,2 L8,5 L7,5 L7,3 L3,3 L3,7 L5.001,7 L5,5 L6,5 L6,10 L5,10 L5.001,8 L3,8 L3,12 L5,12 L5,13 L0,13 L0,12 L1,12 L1,3 L0,3 L0,2 L8,2 Z M9,6 L9,13 L8,13 L8,6 L9,6 Z M16,6 L16,13 L15,13 L15,6 L16,6 Z M12,7 L12,8 L13,8 L13,11 L14.001,11 L14.001,12 L12,12 L12,11 L11,11 L11,12 L10,12 L10,11 L11,11 L11,8 L10,8 L10,7 L12,7 Z M14.001,7 L14.001,8 L13,8 L13,7 L14.001,7 Z M10,5 L10,6 L9,6 L9,5 L10,5 Z M15,5 L15,6 L14,6 L14,5 L15,5 Z" id="Combined-Shape" fill="#333334"></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_insert/formula_normal.svg

@@ -0,0 +1,7 @@
+<?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>icon_公式_normal</title>
+    <g id="icon_公式_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M10,13 L10,14 L9,14 L9,13 L10,13 Z M15,13 L15,14 L14,14 L14,13 L15,13 Z M8,2 L8,5 L7,5 L7,3 L3,3 L3,7 L5.001,7 L5,5 L6,5 L6,10 L5,10 L5.001,8 L3,8 L3,12 L5,12 L5,13 L0,13 L0,12 L1,12 L1,3 L0,3 L0,2 L8,2 Z M9,6 L9,13 L8,13 L8,6 L9,6 Z M16,6 L16,13 L15,13 L15,6 L16,6 Z M12,7 L12,8 L13,8 L13,11 L14.001,11 L14.001,12 L12,12 L12,11 L11,11 L11,12 L10,12 L10,11 L11,11 L11,8 L10,8 L10,7 L12,7 Z M14.001,7 L14.001,8 L13,8 L13,7 L14.001,7 Z M10,5 L10,6 L9,6 L9,5 L10,5 Z M15,5 L15,6 L14,6 L14,5 L15,5 Z" id="Combined-Shape" fill="#333334"></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_insert/image_disabled.svg

@@ -0,0 +1,12 @@
+<?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>icon_图片__disabled</title>
+    <g id="icon_图片__disabled" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.300000012">
+        <g id="编组" transform="translate(0.000000, 1.000000)" fill="#333334">
+            <path d="M16,0 L16,14 L0,14 L0,0 L16,0 Z M15,1 L1,1 L1,13 L15,13 L15,1 Z" id="Fill-1" fill-rule="nonzero"></path>
+            <path d="M5,3.5 C5,4.328 4.329,5 3.5,5 C2.671,5 2,4.328 2,3.5 C2,2.672 2.671,2 3.5,2 C4.329,2 5,2.672 5,3.5" id="Fill-3" opacity="0.3"></path>
+            <polygon id="Fill-5" opacity="0.3" points="1 11.125 6 7 8 9 11 5 15 8 15 12 1 12"></polygon>
+            <rect id="Rectangle-25" x="0" y="11" width="16" height="3"></rect>
+        </g>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_insert/image_normal.svg

@@ -0,0 +1,10 @@
+<?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>icon_图片_normal</title>
+    <g id="icon_图片_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M15.5,1.5 L15.5,14.5 L0.5,14.5 L0.5,1.5 L15.5,1.5 Z" id="Fill-1" stroke="#333334" fill="#FFFFFF"></path>
+        <path d="M5,4.5 C5,5.328 4.329,6 3.5,6 C2.671,6 2,5.328 2,4.5 C2,3.672 2.671,3 3.5,3 C4.329,3 5,3.672 5,4.5" id="Fill-3" fill="#FFC748"></path>
+        <polygon id="Fill-5" fill="#41C9FD" points="1 12.125 6 8 8 10 11 6 15 9 15 13 1 13"></polygon>
+        <rect id="Rectangle-25" fill="#333334" x="0" y="12" width="16" height="3"></rect>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_insert/richtext_disabled.svg

@@ -0,0 +1,7 @@
+<?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>icon_富文本_disabled</title>
+    <g id="icon_富文本_disabled" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.3">
+        <path d="M11,13.001 L11,15.001 L1,15.001 L1,13.001 L11,13.001 Z M15,9 L15,11.001 L1,11.001 L1,9 L15,9 Z M11,5.001 L11,7.001 L1,7.001 L1,5.001 L11,5.001 Z M15,1 L15,3.001 L1,3.001 L1,1 L15,1 Z" id="Combined-Shape" fill="#333334"></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_insert/richtext_normal.svg

@@ -0,0 +1,7 @@
+<?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>icon_富文本_normal</title>
+    <g id="icon_富文本_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M11,13.001 L11,15.001 L1,15.001 L1,13.001 L11,13.001 Z M15,9 L15,11.001 L1,11.001 L1,9 L15,9 Z M11,5.001 L11,7.001 L1,7.001 L1,5.001 L11,5.001 Z M15,1 L15,3.001 L1,3.001 L1,1 L15,1 Z" id="Combined-Shape" fill="#333334"></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_insert/subReport_disabled.svg

@@ -0,0 +1,12 @@
+<?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>icon_子报表_disabled</title>
+    <g id="icon_子报表_disabled" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.300000012">
+        <g id="编组" transform="translate(2.000000, 1.000000)">
+            <rect id="Rectangle-24" fill="#FFFFFF" x="0" y="0" width="12" height="14"></rect>
+            <path d="M12,0 L12,14 L0,14 L0,0 L12,0 Z M11.5,0.5 L0.5,0.5 L0.5,13.5 L11.5,13.5 L11.5,0.5 Z M10,11 L10,12 L2,12 L2,11 L10,11 Z M10,4 L10,5 L2,5 L2,4 L10,4 Z M10,2 L10,3 L2,3 L2,2 L10,2 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
+            <polygon id="Fill-11" fill="#333334" opacity="0.3" points="2 10 10 10 10 6 2 6"></polygon>
+            <polygon id="Fill-12" fill="#333334" opacity="0.3" points="2 10 3.33333333 8.4 4.66666667 8.9336 7.33333333 6.8 10 10"></polygon>
+        </g>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_insert/subReport_normal.svg

@@ -0,0 +1,10 @@
+<?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>icon_子报表_normal</title>
+    <g id="icon_子报表_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <rect id="Rectangle-24" fill="#FFFFFF" x="2" y="1" width="12" height="14"></rect>
+        <path d="M14,1 L14,15 L2,15 L2,1 L14,1 Z M13.5,1.5 L2.5,1.5 L2.5,14.5 L13.5,14.5 L13.5,1.5 Z M12,12 L12,13 L4,13 L4,12 L12,12 Z M12,5 L12,6 L4,6 L4,5 L12,5 Z M12,3 L12,4 L4,4 L4,3 L12,3 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
+        <polygon id="Fill-11" fill="#76BBFF" points="4 11 12 11 12 7 4 7"></polygon>
+        <polygon id="Fill-12" fill="#0071BC" points="4 11 5.33333333 9.4 6.66666667 9.9336 9.33333333 7.8 12 11"></polygon>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_insert/text_disabled.svg

@@ -0,0 +1,7 @@
+<?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>icon_普通文本_disabled</title>
+    <g id="icon_普通文本_disabled" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.3">
+        <path d="M3.75043937,12.5623902 C2.69595782,12.5623902 2,11.8137083 2,10.8119508 C2,9.54657293 3.0228471,8.88224956 5.39543058,8.62917399 C5.37434095,8.04920914 5.12126538,7.60632689 4.39367311,7.60632689 C3.84534271,7.60632689 3.31810193,7.84885764 2.76977153,8.16520211 L2.21089631,7.14235501 C2.90685413,6.71001757 3.75043937,6.36203866 4.67838313,6.36203866 C6.17574692,6.36203866 6.94551845,7.25834798 6.94551845,8.96660808 L6.94551845,12.4147627 L5.6801406,12.4147627 L5.56414763,11.7820738 L5.53251318,11.7820738 C5.01581722,12.2249561 4.42530756,12.5623902 3.75043937,12.5623902 Z M4.25659051,11.3497364 C4.69947276,11.3497364 5.02636204,11.1388401 5.39543058,10.7697715 L5.39543058,9.57820738 C3.96133568,9.76801406 3.47627417,10.1581722 3.47627417,10.685413 C3.47627417,11.1493849 3.80316344,11.3497364 4.25659051,11.3497364 Z M11.4903339,12.5623902 C10.9630931,12.5623902 10.3936731,12.288225 9.9086116,11.7926186 L9.87697715,11.7926186 L9.73989455,12.4147627 L8.52724077,12.4147627 L8.52724077,4 L10.0667838,4 L10.0667838,6.11950791 L10.0351494,7.0685413 C10.4991213,6.64674868 11.0896309,6.36203866 11.6695958,6.36203866 C13.1247803,6.36203866 14,7.55360281 14,9.35676626 C14,11.3919156 12.7873462,12.5623902 11.4903339,12.5623902 Z M11.142355,11.2864675 C11.8594025,11.2864675 12.4077329,10.6748682 12.4077329,9.3884007 C12.4077329,8.26010545 12.0492091,7.63796134 11.2372583,7.63796134 C10.8365554,7.63796134 10.4780316,7.83831283 10.0667838,8.24956063 L10.0667838,10.8435852 C10.4358524,11.1704745 10.8260105,11.2864675 11.142355,11.2864675 Z" id="ab" fill="#333334"></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_insert/text_normal.svg

@@ -0,0 +1,7 @@
+<?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>icon_普通文本_normal</title>
+    <g id="icon_普通文本_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M3.75043937,12.5623902 C2.69595782,12.5623902 2,11.8137083 2,10.8119508 C2,9.54657293 3.0228471,8.88224956 5.39543058,8.62917399 C5.37434095,8.04920914 5.12126538,7.60632689 4.39367311,7.60632689 C3.84534271,7.60632689 3.31810193,7.84885764 2.76977153,8.16520211 L2.21089631,7.14235501 C2.90685413,6.71001757 3.75043937,6.36203866 4.67838313,6.36203866 C6.17574692,6.36203866 6.94551845,7.25834798 6.94551845,8.96660808 L6.94551845,12.4147627 L5.6801406,12.4147627 L5.56414763,11.7820738 L5.53251318,11.7820738 C5.01581722,12.2249561 4.42530756,12.5623902 3.75043937,12.5623902 Z M4.25659051,11.3497364 C4.69947276,11.3497364 5.02636204,11.1388401 5.39543058,10.7697715 L5.39543058,9.57820738 C3.96133568,9.76801406 3.47627417,10.1581722 3.47627417,10.685413 C3.47627417,11.1493849 3.80316344,11.3497364 4.25659051,11.3497364 Z M11.4903339,12.5623902 C10.9630931,12.5623902 10.3936731,12.288225 9.9086116,11.7926186 L9.87697715,11.7926186 L9.73989455,12.4147627 L8.52724077,12.4147627 L8.52724077,4 L10.0667838,4 L10.0667838,6.11950791 L10.0351494,7.0685413 C10.4991213,6.64674868 11.0896309,6.36203866 11.6695958,6.36203866 C13.1247803,6.36203866 14,7.55360281 14,9.35676626 C14,11.3919156 12.7873462,12.5623902 11.4903339,12.5623902 Z M11.142355,11.2864675 C11.8594025,11.2864675 12.4077329,10.6748682 12.4077329,9.3884007 C12.4077329,8.26010545 12.0492091,7.63796134 11.2372583,7.63796134 C10.8365554,7.63796134 10.4780316,7.83831283 10.0667838,8.24956063 L10.0667838,10.8435852 C10.4358524,11.1704745 10.8260105,11.2864675 11.142355,11.2864675 Z" id="ab" fill="#333334"></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_report/delete_disabled.svg

@@ -1,7 +1,7 @@
 <?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>icon_关闭_normal</title>
+    <title>icon_关闭_disabled</title>
-    <g id="icon_关闭_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="icon_关闭_disabled" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.3">
         <path d="M7.89949494,0.899494937 C8.28609426,0.899494937 8.59949494,1.21820884 8.59949494,1.59375711 L8.59849494,7.19949494 L14.2052328,7.19949494 C14.5567106,7.19949494 14.8471855,7.46057376 14.8931571,7.80394288 L14.8994949,7.89949494 C14.8994949,8.28609426 14.580781,8.59949494 14.2052328,8.59949494 L8.59849494,8.59849494 L8.59949494,14.2052328 C8.59949494,14.5567106 8.33841611,14.8471855 7.99504699,14.8931571 L7.89949494,14.8994949 C7.51289561,14.8994949 7.19949494,14.580781 7.19949494,14.2052328 L7.19949494,8.59849494 L1.59375711,8.59949494 C1.24227924,8.59949494 0.951804388,8.33841611 0.905832732,7.99504699 L0.899494937,7.89949494 C0.899494937,7.51289561 1.21820884,7.19949494 1.59375711,7.19949494 L7.19949494,7.19949494 L7.19949494,1.59375711 C7.19949494,1.24227924 7.46057376,0.951804388 7.80394288,0.905832732 L7.89949494,0.899494937 Z" id="Combined-Shape" fill="#333334" transform="translate(7.899495, 7.899495) rotate(45.000000) translate(-7.899495, -7.899495) "></path>
     </g>
 </svg>

designer-realize/src/main/java/com/fr/design/actions/cell/UIToolbarBorderButton.java

@@ -1,7 +1,7 @@
 package com.fr.design.actions.cell;
 
-import com.fr.base.BaseUtils;
 import com.fr.base.CellBorderStyle;
+import com.fr.base.svg.SVGIcon;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.gui.ibutton.UIButton;
@@ -35,9 +35,9 @@ import java.awt.event.MouseEvent;
 
 /**
  * 这个Pane用来显示常用边框和设置自定义边框
- * 
+ *
  * @author richer
- * 
+ *
  */
 public class UIToolbarBorderButton extends UICombinationButton implements PopupHider {
 	private EventListenerList styleChangeListenerList = new EventListenerList();
@@ -46,7 +46,7 @@ public class UIToolbarBorderButton extends UICombinationButton implements PopupH
 	private JPopupMenu popupWin;
 
 	public UIToolbarBorderButton(Icon icon, ElementCasePane reportPane) {
-		super(new UIButton(icon), new UIButton(BaseUtils.readIcon("/com/fr/design/images/gui/popup.gif")));
+		super(new UIButton(icon), new UIButton(SVGIcon.readSVGIcon("/com/fr/design/images/gui/popup_normal.svg")));
 		this.reportPane = reportPane;
 	}
 
@@ -80,7 +80,7 @@ public class UIToolbarBorderButton extends UICombinationButton implements PopupH
 		rightButton.setToolTipText(tooltipText);
 	}
 
-	
+
 	private void showPopupMenu() {
         if (popupWin != null && popupWin.isVisible()) {
             hidePopupMenu();
@@ -102,12 +102,12 @@ public class UIToolbarBorderButton extends UICombinationButton implements PopupH
 
 		return popupWin;
 	}
-	
+
 	protected void leftButtonClickEvent() {
 		UIToolbarBorderButton.this.cellBorderStyle = ((BorderIcon)getLeftButton().getIcon()).cellBorderStyle;
 		UIToolbarBorderButton.this.fireStyleStateChanged();
 	}
-	
+
 	@Override
 	protected void rightButtonClickEvent() {
 		showPopupMenu();
@@ -223,7 +223,7 @@ public class UIToolbarBorderButton extends UICombinationButton implements PopupH
 			return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Border");
 		}
 	}
-	
+
 	/**
      * Adds a new StyleChangeListener
      */
@@ -237,9 +237,9 @@ public class UIToolbarBorderButton extends UICombinationButton implements PopupH
     public void removeColorChangeListener(ChangeListener changeListener) {
     	styleChangeListenerList.remove(ChangeListener.class, changeListener);
     }
-    
+
     /**
-     * 
+     *
      */
     public void fireStyleStateChanged() {
         Object[] listeners = styleChangeListenerList.getListenerList();
@@ -254,7 +254,7 @@ public class UIToolbarBorderButton extends UICombinationButton implements PopupH
             }
         }
     }
-    
+
     public boolean isCanBeNull() {
 		return this.isCanBeNull;
 	}

designer-realize/src/main/java/com/fr/design/actions/cell/style/AlignmentAction.java

@@ -3,6 +3,7 @@ package com.fr.design.actions.cell.style;
 import com.fr.base.BaseUtils;
 import com.fr.base.Style;
 import com.fr.base.chart.BaseChartCollection;
+import com.fr.base.svg.SVGIcon;
 import com.fr.design.actions.ButtonGroupAction;
 import com.fr.design.actions.utils.ReportActionUtils;
 import com.fr.design.constants.UIConstants;
@@ -21,9 +22,9 @@ import javax.swing.*;
 public class AlignmentAction extends ButtonGroupAction implements StyleActionInterface {
 
     private static final Icon[][] ICONS = new Icon[][]{
-            {BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_left_normal.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_left_normal_white.png")},
+            {SVGIcon.readSVGIcon("/com/fr/design/images/m_format/cellstyle/h_left_normal.svg"), SVGIcon.readSVGIcon("/com/fr/design/images/m_format/cellstyle/h_left_selected.svg")},
-            {BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_center_normal.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_center_normal_white.png")},
+            {SVGIcon.readSVGIcon("/com/fr/design/images/m_format/cellstyle/h_center_normal.svg"), SVGIcon.readSVGIcon("/com/fr/design/images/m_format/cellstyle/h_center_selected.svg")},
-            {BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_right_normal.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_right_normal_white.png")}};
+            {SVGIcon.readSVGIcon("/com/fr/design/images/m_format/cellstyle/h_right_normal.svg"), SVGIcon.readSVGIcon("/com/fr/design/images/m_format/cellstyle/h_right_selected.svg")}};
 
 
     private static final Integer[] valueArray = new Integer[]{Constants.LEFT, Constants.CENTER, Constants.RIGHT};

designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontBoldAction.java

@@ -3,9 +3,9 @@
  */
 package com.fr.design.actions.cell.style;
 
-import com.fr.base.BaseUtils;
 import com.fr.base.Style;
 import com.fr.base.core.StyleUtils;
+import com.fr.base.svg.SVGIcon;
 import com.fr.design.actions.ToggleButtonUpdateAction;
 import com.fr.design.gui.ibutton.UIToggleButton;
 import com.fr.design.mainframe.ElementCasePane;
@@ -21,7 +21,7 @@ import javax.swing.*;
 public class ReportFontBoldAction extends AbstractStyleAction implements ToggleButtonUpdateAction {
     private UIToggleButton button;
     protected Style style;
-    private final static Icon[] ICONS = {BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/bold.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/bold_white.png")};
+    private final static Icon[] ICONS = {SVGIcon.readSVGIcon("/com/fr/design/images/m_format/cellstyle/bold_normal.svg"), SVGIcon.readSVGIcon("/com/fr/design/images/m_format/cellstyle/bold_selected.svg")};
 
     public ReportFontBoldAction(ElementCasePane t) {
         super(t);
@@ -92,4 +92,4 @@ public class ReportFontBoldAction extends AbstractStyleAction implements ToggleB
         }
         return button;
     }
-}
+}

designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontForegroundAction.java

@@ -6,6 +6,7 @@ package com.fr.design.actions.cell.style;
 import com.fr.base.BaseUtils;
 import com.fr.base.Style;
 import com.fr.base.core.StyleUtils;
+import com.fr.base.svg.SVGIcon;
 import com.fr.design.actions.core.ActionFactory;
 import com.fr.design.mainframe.ElementCasePane;
 import com.fr.design.style.color.UIToolbarColorButton;
@@ -50,7 +51,7 @@ public class ReportFontForegroundAction extends AbstractStyleAction implements C
 	public JComponent createToolBarComponent() {
 		Object object = this.getValue(UIToolbarColorButton.class.getName());
 		if (object == null || !(object instanceof UIToolbarColorButton)) {
-			UIToolbarColorButton tbButton = new UIToolbarColorButton(BaseUtils.readIcon("/com/fr/design/images/gui/color/foreground.png"));
+			UIToolbarColorButton tbButton = new UIToolbarColorButton(SVGIcon.readSVGIcon("/com/fr/design/images/gui/color/foreground_normal.svg"));
 			this.putValue(UIToolbarColorButton.class.getName(), tbButton);
 			tbButton.set4Toolbar();
 			tbButton.setEnabled(this.isEnabled());
@@ -63,4 +64,4 @@ public class ReportFontForegroundAction extends AbstractStyleAction implements C
 
 		return (JComponent) object;
 	}
-}
+}

designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontItalicAction.java

@@ -3,9 +3,9 @@
  */
 package com.fr.design.actions.cell.style;
 
-import com.fr.base.BaseUtils;
 import com.fr.base.Style;
 import com.fr.base.core.StyleUtils;
+import com.fr.base.svg.SVGIcon;
 import com.fr.general.FRFont;
 
 import com.fr.design.mainframe.ElementCasePane;
@@ -17,7 +17,7 @@ import javax.swing.*;
  */
 public class ReportFontItalicAction extends ReportFontBoldAction {
 
-    private final static Icon[] ICONS = {BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/italic.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/italic_white.png")};
+    private final static Icon[] ICONS = {SVGIcon.readSVGIcon("/com/fr/design/images/m_format/cellstyle/italic_normal.svg"), SVGIcon.readSVGIcon("/com/fr/design/images/m_format/cellstyle/italic_selected.svg")};
 
     public ReportFontItalicAction(ElementCasePane t) {
 		super(t);

designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontUnderlineAction.java

@@ -3,9 +3,9 @@
  */
 package com.fr.design.actions.cell.style;
 
-import com.fr.base.BaseUtils;
 import com.fr.base.Style;
 import com.fr.base.core.StyleUtils;
+import com.fr.base.svg.SVGIcon;
 import com.fr.general.FRFont;
 
 import com.fr.design.mainframe.ElementCasePane;
@@ -18,7 +18,7 @@ import javax.swing.*;
  */
 public class ReportFontUnderlineAction extends ReportFontBoldAction {
 
-    private final static Icon[] ICONS = {BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/underline.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/underline_white.png")};
+    private final static Icon[] ICONS = {SVGIcon.readSVGIcon("/com/fr/design/images/m_format/cellstyle/underline_normal.svg"), SVGIcon.readSVGIcon("/com/fr/design/images/m_format/cellstyle/underline_selected.svg")};
 
     public ReportFontUnderlineAction(ElementCasePane t) {
 		super(t);
@@ -40,4 +40,4 @@ public class ReportFontUnderlineAction extends ReportFontBoldAction {
         return frFont.getUnderline() != Constants.LINE_NONE;
     }
 
-}
+}

designer-realize/src/main/java/com/fr/design/actions/cell/style/StyleBackgroundAction.java

@@ -12,6 +12,7 @@ import javax.swing.event.ChangeListener;
 import com.fr.base.BaseUtils;
 import com.fr.base.Style;
 import com.fr.base.background.ColorBackground;
+import com.fr.base.svg.SVGIcon;
 import com.fr.design.actions.core.ActionFactory;
 import com.fr.general.ComparatorUtils;
 
@@ -24,7 +25,7 @@ import com.fr.design.style.color.UIToolbarColorButton;
 public class StyleBackgroundAction extends AbstractStyleAction implements ChangeListener {
 	public StyleBackgroundAction(ElementCasePane t) {
 		super(t);
-		
+
         this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background"));
     }
 
@@ -49,7 +50,7 @@ public class StyleBackgroundAction extends AbstractStyleAction implements Change
 
         return style;
     }
-    
+
 	@Override
         public boolean isFontStye() {
             return false;
@@ -59,7 +60,7 @@ public class StyleBackgroundAction extends AbstractStyleAction implements Change
         public JComponent createToolBarComponent() {
             Object object = this.getValue(UIToolbarColorButton.class.getName());
             if (object == null || !(object instanceof UIToolbarColorButton)) {
-                UIToolbarColorButton tbButton = new UIToolbarColorButton(BaseUtils.readIcon("/com/fr/design/images/gui/color/background.png"));
+                UIToolbarColorButton tbButton = new UIToolbarColorButton(SVGIcon.readSVGIcon("/com/fr/design/images/gui/color/background_normal.svg"));
                 tbButton.set4Toolbar();
                 this.putValue(UIToolbarColorButton.class.getName(), tbButton);
 
@@ -74,4 +75,4 @@ public class StyleBackgroundAction extends AbstractStyleAction implements Change
 
         return (JComponent) object;
     }
-}
+}

designer-realize/src/main/java/com/fr/design/actions/edit/merge/MergeCellAction.java

@@ -3,7 +3,7 @@
  */
 package com.fr.design.actions.edit.merge;
 
-import com.fr.base.BaseUtils;
+import com.fr.base.svg.SVGIcon;
 import com.fr.design.actions.ElementCaseAction;
 import com.fr.design.menu.KeySetUtils;
 import com.fr.design.mainframe.ElementCasePane;
@@ -21,7 +21,8 @@ public class MergeCellAction extends ElementCaseAction  {
         this.setMenuKeySet(KeySetUtils.MERGE_CELL);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-		this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_edit/merge.png"));
+		this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_edit/merge_normal.svg"));
+		this.setDisabledIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_edit/merge_disabled.svg"));
 	}
 
     /**
@@ -43,4 +44,4 @@ public class MergeCellAction extends ElementCaseAction  {
 		this.setEnabled(reportPane.canMergeCell());
 	}
 
-}
+}

designer-realize/src/main/java/com/fr/design/actions/edit/merge/UnmergeCellAction.java

@@ -4,6 +4,7 @@
 package com.fr.design.actions.edit.merge;
 
 import com.fr.base.BaseUtils;
+import com.fr.base.svg.SVGIcon;
 import com.fr.design.actions.ElementCaseAction;
 import com.fr.design.menu.KeySetUtils;
 import com.fr.design.mainframe.ElementCasePane;
@@ -20,7 +21,8 @@ public class UnmergeCellAction extends ElementCaseAction {
         this.setMenuKeySet(KeySetUtils.UNMERGE_CELL);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_edit/unmerge.png"));
+        this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_edit/unmerge_normal.svg"));
+        this.setDisabledIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_edit/unmerge_disabled.svg"));
     }
 
 	@Override
@@ -42,4 +44,4 @@ public class UnmergeCellAction extends ElementCaseAction {
         return reportPane.unMergeCell();
     }
 
-}
+}

designer-realize/src/main/java/com/fr/design/actions/insert/cell/BiasCellAction.java

@@ -3,7 +3,7 @@
  */
 package com.fr.design.actions.insert.cell;
 
-import com.fr.base.BaseUtils;
+import com.fr.base.svg.SVGIcon;
 import com.fr.design.actions.core.WorkBookSupportable;
 import com.fr.design.mainframe.ElementCasePane;
 import com.fr.design.menu.MenuKeySet;
@@ -30,7 +30,8 @@ public class BiasCellAction extends AbstractCellAction implements WorkBookSuppor
         this.setMenuKeySet(INSERT_SLOPE_LINE);
         this.setName(getMenuKeySet().getMenuKeySetName()+ "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_insert/bias.png"));
+        this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_insert/bias_normal.svg"));
+        this.setDisabledIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_insert/bias_disabled.svg"));
     }
 
     public static final MenuKeySet INSERT_SLOPE_LINE = new MenuKeySet() {

designer-realize/src/main/java/com/fr/design/actions/insert/cell/ChartCellAction.java

@@ -3,7 +3,7 @@
  */
 package com.fr.design.actions.insert.cell;
 
-import com.fr.base.BaseUtils;
+import com.fr.base.svg.SVGIcon;
 import com.fr.design.actions.core.ActionFactory;
 import com.fr.design.actions.core.WorkBookSupportable;
 import com.fr.design.mainframe.ElementCasePane;
@@ -29,7 +29,8 @@ public class ChartCellAction extends AbstractCellAction implements WorkBookSuppo
 		this.setMenuKeySet(INSERT_CHART);
 		this.setName(getMenuKeySet().getMenuKeySetName()+ "...");
 		this.setMnemonic(getMenuKeySet().getMnemonic());
-		this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_insert/chart.png"));
+		this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_insert/chart_normal.svg"));
+		this.setDisabledIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_insert/chart_disabled.svg"));
 	}
 
 	public static final MenuKeySet INSERT_CHART = new MenuKeySet() {

designer-realize/src/main/java/com/fr/design/actions/insert/cell/DSColumnCellAction.java

@@ -1,10 +1,10 @@
 package com.fr.design.actions.insert.cell;
 
+import com.fr.base.svg.SVGIcon;
 import com.fr.design.actions.core.WorkBookSupportable;
 import com.fr.design.dscolumn.DSColumnPane;
 import com.fr.design.mainframe.ElementCasePane;
 import com.fr.design.menu.KeySetUtils;
-import com.fr.general.IOUtils;
 import com.fr.report.cell.cellattr.core.group.DSColumn;
 
 public class DSColumnCellAction extends AbstractCellAction implements WorkBookSupportable {
@@ -22,11 +22,12 @@ public class DSColumnCellAction extends AbstractCellAction implements WorkBookSu
         this.setMenuKeySet(KeySetUtils.INSERT_DATA_COLUMN);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(IOUtils.readIcon("/com/fr/design/images/m_insert/bindColumn.png"));
+        this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_insert/bindColumn_normal.svg"));
+        this.setDisabledIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_insert/bindColumn_disabled.svg"));
     }
 
     @Override
     public Class getCellValueClass() {
         return DSColumn.class;
     }
-}
+}

designer-realize/src/main/java/com/fr/design/actions/insert/cell/FormulaCellAction.java

@@ -4,7 +4,7 @@
 package com.fr.design.actions.insert.cell;
 
 import com.fr.base.BaseFormula;
-import com.fr.base.BaseUtils;
+import com.fr.base.svg.SVGIcon;
 import com.fr.design.actions.core.WorkBookSupportable;
 import com.fr.design.mainframe.ElementCasePane;
 import com.fr.design.menu.MenuKeySet;
@@ -26,7 +26,8 @@ public class FormulaCellAction extends AbstractCellAction implements WorkBookSup
         this.setMenuKeySet(INSERT_FORMULA);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_insert/formula.png"));
+        this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_insert/formula_normal.svg"));
+        this.setDisabledIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_insert/formula_disabled.svg"));
     }
 
     public static final MenuKeySet INSERT_FORMULA = new MenuKeySet() {

designer-realize/src/main/java/com/fr/design/actions/insert/cell/GeneralCellAction.java

@@ -3,7 +3,7 @@
  */
 package com.fr.design.actions.insert.cell;
 
-import com.fr.base.BaseUtils;
+import com.fr.base.svg.SVGIcon;
 import com.fr.design.actions.core.WorkBookSupportable;
 import com.fr.design.mainframe.ElementCasePane;
 import com.fr.design.menu.MenuKeySet;
@@ -28,7 +28,8 @@ public class GeneralCellAction extends AbstractCellAction implements WorkBookSup
         this.setMenuKeySet(INSERT_TEXT);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_insert/text.png"));
+        this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_insert/text_normal.svg"));
+        this.setDisabledIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_insert/text_disabled.svg"));
     }
 
     public static final MenuKeySet INSERT_TEXT = new MenuKeySet() {

designer-realize/src/main/java/com/fr/design/actions/insert/cell/ImageCellAction.java

@@ -3,7 +3,7 @@
  */
 package com.fr.design.actions.insert.cell;
 
-import com.fr.base.BaseUtils;
+import com.fr.base.svg.SVGIcon;
 import com.fr.design.actions.core.WorkBookSupportable;
 import com.fr.design.mainframe.ElementCasePane;
 import com.fr.design.menu.MenuKeySet;
@@ -29,7 +29,8 @@ public class ImageCellAction extends AbstractCellAction implements WorkBookSuppo
         this.setMenuKeySet(INSERT_IMAGE);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_insert/image.png"));
+        this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_insert/image_normal.svg"));
+        this.setDisabledIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_insert/image_disabled.svg"));
     }
 
     public static final MenuKeySet INSERT_IMAGE = new MenuKeySet() {

designer-realize/src/main/java/com/fr/design/actions/insert/cell/RichTextCellAction.java

@@ -1,6 +1,6 @@
 package com.fr.design.actions.insert.cell;
 
-import com.fr.base.BaseUtils;
+import com.fr.base.svg.SVGIcon;
 import com.fr.design.actions.core.WorkBookSupportable;
 import com.fr.design.mainframe.ElementCasePane;
 import com.fr.design.menu.MenuKeySet;
@@ -25,8 +25,8 @@ public class RichTextCellAction extends AbstractCellAction implements WorkBookSu
         this.setMenuKeySet(INSERT_RICHTEXT);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(BaseUtils.readIcon(
+        this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_insert/richtext_normal.svg"));
-                "/com/fr/design/images/m_insert/richtext.png"));
+        this.setDisabledIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_insert/richtext_disabled.svg"));
     }
 
     @Override

designer-realize/src/main/java/com/fr/design/actions/insert/cell/SubReportCellAction.java

@@ -1,6 +1,7 @@
 package com.fr.design.actions.insert.cell;
 
 import com.fr.base.BaseUtils;
+import com.fr.base.svg.SVGIcon;
 import com.fr.design.mainframe.ElementCasePane;
 import com.fr.design.menu.MenuKeySet;
 import com.fr.general.ComparatorUtils;
@@ -24,8 +25,8 @@ public class SubReportCellAction extends AbstractCellAction {
         this.setMenuKeySet(INSERT_SUB_REPORT);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(BaseUtils.readIcon(
+        this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_insert/subReport_normal.svg"));
-                "/com/fr/design/images/m_insert/subReport.png"));
+        this.setDisabledIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_insert/subReport_disabled.svg"));
     }
 
     public static final MenuKeySet INSERT_SUB_REPORT = new MenuKeySet() {

designer-realize/src/main/java/com/fr/design/actions/insert/flot/ChartFloatAction.java

@@ -3,10 +3,10 @@
  */
 package com.fr.design.actions.insert.flot;
 
-import com.fr.base.BaseUtils;
 import com.fr.base.DynamicUnitList;
 import com.fr.base.Style;
 import com.fr.base.chart.BaseChartCollection;
+import com.fr.base.svg.SVGIcon;
 import com.fr.design.actions.ElementCaseAction;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.file.HistoryTemplateListPane;
@@ -48,7 +48,7 @@ public class ChartFloatAction extends ElementCaseAction {
         this.setMenuKeySet(FLOAT_INSERT_CHART);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_insert/chart.png"));
+        this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_insert/chart_normal.svg"));
     }
 
     public static final MenuKeySet FLOAT_INSERT_CHART = new MenuKeySet() {

designer-realize/src/main/java/com/fr/design/actions/insert/flot/FormulaFloatAction.java

@@ -4,8 +4,8 @@
 package com.fr.design.actions.insert.flot;
 
 import com.fr.base.BaseFormula;
-import com.fr.base.BaseUtils;
 import com.fr.base.DynamicUnitList;
+import com.fr.base.svg.SVGIcon;
 import com.fr.design.actions.ElementCaseAction;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
@@ -37,7 +37,7 @@ public class FormulaFloatAction extends ElementCaseAction {
         this.setMenuKeySet(FLOAT_INSERT_FORMULA);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_insert/formula.png"));
+        this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_insert/formula_normal.svg"));
     }
 
     public static final MenuKeySet FLOAT_INSERT_FORMULA = new MenuKeySet() {

designer-realize/src/main/java/com/fr/design/actions/insert/flot/ImageFloatAction.java

@@ -5,6 +5,7 @@ package com.fr.design.actions.insert.flot;
 
 import com.fr.base.BaseUtils;
 import com.fr.base.DynamicUnitList;
+import com.fr.base.svg.SVGIcon;
 import com.fr.design.actions.ElementCaseAction;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
@@ -39,7 +40,7 @@ public class ImageFloatAction extends ElementCaseAction {
         this.setMenuKeySet(FLOAT_INSERT_IMAGE);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_insert/image.png"));
+        this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_insert/image_normal.svg"));
     }
 
     public static final MenuKeySet FLOAT_INSERT_IMAGE = new MenuKeySet() {

designer-realize/src/main/java/com/fr/design/actions/insert/flot/TextBoxFloatAction.java

@@ -3,8 +3,8 @@
  */
 package com.fr.design.actions.insert.flot;
 
-import com.fr.base.BaseUtils;
 import com.fr.base.DynamicUnitList;
+import com.fr.base.svg.SVGIcon;
 import com.fr.design.file.HistoryTemplateListPane;
 import com.fr.design.mainframe.ElementCasePane;
 import com.fr.design.menu.MenuKeySet;
@@ -28,7 +28,7 @@ public class TextBoxFloatAction extends AbstractShapeAction {
         this.setMenuKeySet(FLOAT_INSERT_TEXT);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_insert/text.png"));
+        this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_insert/text_normal.svg"));
     }
 
     public static final MenuKeySet FLOAT_INSERT_TEXT = new MenuKeySet() {

designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePane.java

@@ -8,6 +8,7 @@ import com.fr.base.DynamicUnitList;
 import com.fr.base.Formula;
 import com.fr.base.ScreenResolution;
 import com.fr.base.Style;
+import com.fr.base.svg.SVGIcon;
 import com.fr.base.vcs.DesignerMode;
 import com.fr.design.DesignState;
 import com.fr.design.DesignerEnvManager;
@@ -655,7 +656,7 @@ public abstract class ElementCasePane<T extends TemplateElementCase> extends Tar
             return false;
         }
         Object clipObject = getClipObject();
-        //如果是悬浮元素，则不允许粘贴到表单 
+        //如果是悬浮元素，则不允许粘贴到表单
         if (!DesignerContext.getDesignerFrame().getSelectedJTemplate().accept(clipObject)) {
             return false;
         }
@@ -1330,7 +1331,7 @@ public abstract class ElementCasePane<T extends TemplateElementCase> extends Tar
         MenuDef insertFloatMenu = new MenuDef();
         insertFloatMenu.setName(KeySetUtils.INSERT_FLOAT.getMenuKeySetName());
         insertFloatMenu.setTooltip(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_T_Insert_Float"));
-        insertFloatMenu.setIconPath("/com/fr/design/images/m_insert/floatPop.png");
+        insertFloatMenu.setIconPath("/com/fr/design/images/m_insert/floatPop_normal.svg", true);
 
         UpdateAction[] actions = ActionFactory.createFloatInsertAction(ElementCasePane.class, this);
         for (int i = 0; i < actions.length; i++) {

designer-realize/src/main/java/com/fr/start/preload/ImagePreLoader.java

@@ -81,6 +81,7 @@ public class ImagePreLoader {
             "com/fr/design/images/buttonicon/anas.png",
             "com/fr/design/images/buttonicon/refresh.png",
             "com/fr/design/images/gui/color/foreground.png",
+            "com/fr/design/images/gui/color/foreground_normal.svg",
             "com/fr/design/images/buttonicon/history.png",
             "com/fr/design/images/m_file/close.png",
             "com/fr/design/images/m_file/edit.png",
@@ -182,6 +183,8 @@ public class ImagePreLoader {
             "com/fr/design/images/control/down.png",
             "com/fr/design/images/control/sortAsc.png",
             "com/fr/design/images/m_insert/formula.png",
+            "com/fr/design/images/m_insert/formula_normal.svg",
+            "com/fr/design/images/m_insert/formula_disabled.svg",
             "com/fr/design/images/calender/year_reduce.png",
             "com/fr/design/images/calender/year_reduce_hover.png",
             "com/fr/design/images/calender/year_reduce_click.png",
@@ -273,8 +276,14 @@ public class ImagePreLoader {
             "com/fr/design/images/expand/asc_selected.png",
             "com/fr/design/images/expand/des_selected.png",
             "com/fr/design/images/m_format/cellstyle/bold.png",
+            "com/fr/design/images/m_format/cellstyle/bold_normal.svg",
+            "com/fr/design/images/m_format/cellstyle/bold_selected.svg",
             "com/fr/design/images/m_format/cellstyle/italic.png",
+            "com/fr/design/images/m_format/cellstyle/italic_normal.svg",
+            "com/fr/design/images/m_format/cellstyle/italic_selected.svg",
             "com/fr/design/images/m_format/cellstyle/underline.png",
+            "com/fr/design/images/m_format/cellstyle/underline_normal.svg",
+            "com/fr/design/images/m_format/cellstyle/underline_selected.svg",
             "com/fr/design/images/m_format/cellstyle/strikethrough.png",
             "com/fr/design/images/m_format/cellstyle/shadow.png",
             "com/fr/design/images/m_format/cellstyle/sup.png",
@@ -297,10 +306,16 @@ public class ImagePreLoader {
             "com/fr/design/images/m_format/cellstyle/in_white.png",
             "com/fr/design/images/m_format/cellstyle/h_left_normal.png",
             "com/fr/design/images/m_format/cellstyle/h_left_normal_white.png",
+            "com/fr/design/images/m_format/cellstyle/h_left_normal.svg",
+            "com/fr/design/images/m_format/cellstyle/h_left_selected.svg",
             "com/fr/design/images/m_format/cellstyle/h_center_normal.png",
             "com/fr/design/images/m_format/cellstyle/h_center_normal_white.png",
+            "com/fr/design/images/m_format/cellstyle/h_center_normal.svg",
+            "com/fr/design/images/m_format/cellstyle/h_center_selected.svg",
             "com/fr/design/images/m_format/cellstyle/h_right_normal.png",
             "com/fr/design/images/m_format/cellstyle/h_right_normal_white.png",
+            "com/fr/design/images/m_format/cellstyle/h_right_normal.svg",
+            "com/fr/design/images/m_format/cellstyle/h_right_selected.svg",
             "com/fr/design/images/m_format/cellstyle/h_s_normal.png",
             "com/fr/design/images/m_format/cellstyle/h_s_normal_white.png",
             "com/fr/design/images/m_format/cellstyle/defaultAlignment.png",
@@ -340,13 +355,27 @@ public class ImagePreLoader {
             "com/fr/design/images/m_report/reportEngineAttr.png",
             "com/fr/design/images/m_report/allow_authority_edit.png",
             "com/fr/design/images/m_insert/bindColumn.png",
+            "com/fr/design/images/m_insert/bindColumn_normal.svg",
+            "com/fr/design/images/m_insert/bindColumn_disabled.svg",
             "com/fr/design/images/m_insert/text.png",
+            "com/fr/design/images/m_insert/text_normal.svg",
+            "com/fr/design/images/m_insert/text_disabled.svg",
             "com/fr/design/images/m_insert/richtext.png",
+            "com/fr/design/images/m_insert/richtext_normal.svg",
+            "com/fr/design/images/m_insert/richtext_disabled.svg",
             "com/fr/design/images/m_insert/chart.png",
+            "com/fr/design/images/m_insert/chart_normal.svg",
+            "com/fr/design/images/m_insert/chart_disabled.svg",
             "com/fr/design/images/m_insert/image.png",
+            "com/fr/design/images/m_insert/image_normal.svg",
+            "com/fr/design/images/m_insert/image_disabled.svg",
             "com/fr/design/images/m_insert/bias.png",
+            "/com/fr/design/images/m_insert/bias_normal.svg",
+            "/com/fr/design/images/m_insert/bias_disabled.svg",
             "com/fr/design/images/arrow/arrow_up.png",
             "com/fr/design/images/m_insert/subReport.png",
+            "com/fr/design/images/m_insert/subReport_normal.svg",
+            "com/fr/design/images/m_insert/subReport_disabled.svg",
             "com/fr/design/images/arrow/arrow_down.png",
             "com/fr/design/images/toolbarbtn/toolbarbtnsetting.png",
             "com/fr/design/images/control/addPopup.png",
@@ -360,8 +389,12 @@ public class ImagePreLoader {
             "com/fr/design/images/m_insert/hyperLink.png",
             "com/fr/web/images/flashPrint.png",
             "com/fr/design/images/m_edit/merge.png",
+            "com/fr/design/images/m_edit/merge_normal.svg",
+            "com/fr/design/images/m_edit/merge_disabled.svg",
             "com/fr/web/images/appletPrint.png",
             "com/fr/design/images/m_edit/unmerge.png",
+            "com/fr/design/images/m_edit/unmerge_normal.svg",
+            "com/fr/design/images/m_edit/unmerge_disabled.svg",
             "com/fr/web/images/pdf.png",
             "com/fr/design/images/m_format/cellAttr.png",
             "com/fr/web/images/pdfPrint.png",
@@ -397,14 +430,18 @@ public class ImagePreLoader {
             "com/fr/design/images/m_insert/cell.png",
             "com/fr/design/images/m_insert/float.png",
             "com/fr/design/images/gui/color/background.png",
+            "com/fr/design/images/gui/color/background_normal.svg",
             "com/fr/design/images/m_format/cell.png",
             "com/fr/design/images/data/source/dataDictionary.png",
             "com/fr/design/images/m_format/cellstyle/bold_white.png",
             "com/fr/design/images/m_format/cellstyle/italic_white.png",
             "com/fr/design/images/m_format/cellstyle/underline_white.png",
             "com/fr/design/images/m_format/noboder.png",
+            "com/fr/design/images/m_format/noborder_normal.svg",
             "com/fr/design/images/gui/popup.gif",
+            "com/fr/design/images/gui/popup_normal.svg",
             "com/fr/design/images/m_insert/floatPop.png",
+            "com/fr/design/images/m_insert/floatPop_normal.svg",
             "com/fr/web/images/platform/demo.png",
             "com/fr/base/images/dialog/pagesetup/down.png",
             "com/fr/base/images/dialog/pagesetup/over.png",