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

No.10: 替换了设计器菜单栏-模板中的子菜单项的图标

designer-base/src/main/java/com/fr/design/actions/AllowAuthorityEditAction.java

@@ -1,6 +1,6 @@
 package com.fr.design.actions;
 
-import com.fr.base.BaseUtils;
+import com.fr.base.svg.SVGIcon;
 import com.fr.base.vcs.DesignerMode;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.menu.KeySetUtils;
@@ -22,7 +22,7 @@ public class AllowAuthorityEditAction extends TemplateComponentAction {
         this.setMenuKeySet(KeySetUtils.ALLOW_AUTHORITY_EDIT);
         this.setName(getMenuKeySet().getMenuName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_report/allow_authority_edit.png"));
+        this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_report/allow_authority_edit_normal.svg"));
     }
 
     /**

designer-base/src/main/java/com/fr/design/actions/TableDataSourceAction.java

@@ -1,8 +1,7 @@
 package com.fr.design.actions;
 
 import javax.swing.SwingUtilities;
-
+import com.fr.base.svg.SVGIcon;
-import com.fr.base.BaseUtils;
 import com.fr.design.data.DesignTableDataManager;
 import com.fr.data.TableDataSource;
 import com.fr.design.data.datapane.ReportTableDataPane;
@@ -27,7 +26,7 @@ public class TableDataSourceAction extends TemplateComponentAction<JTemplate<?,
         this.setMenuKeySet(KeySetUtils.TEMPLATE_TABLE_DATA_SOURCE);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_web/datasource.png"));
+        this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_web/datasource_normal.svg"));
     }
 
     /**

designer-base/src/main/java/com/fr/design/actions/edit/RedoAction.java

@@ -23,7 +23,7 @@ public class RedoAction extends UpdateAction implements TemplateComponentActionI
         this.setMenuKeySet(KeySetUtils.REDO);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-		this.setSmallIcon(SVGIcon.readSVGIcon("com/fr/design/images/buttonicon/redo_normal.svg"));
+		this.setSmallIcon(SVGIcon.readSVGIcon("com/fr/design/images/edit/redo_normal.svg"));
 		this.setDisabledIcon(SVGIcon.readSVGIcon("com/fr/design/images/buttonicon/redo_disabled.svg"));
         this.setAccelerator(getMenuKeySet().getKeyStroke());
 	}

designer-base/src/main/java/com/fr/design/actions/edit/UndoAction.java

@@ -23,7 +23,7 @@ public class UndoAction extends UpdateAction implements TemplateComponentActionI
         this.setMenuKeySet(KeySetUtils.UNDO);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(SVGIcon.readSVGIcon("com/fr/design/images/buttonicon/undo_normal.svg"));
+        this.setSmallIcon(SVGIcon.readSVGIcon("com/fr/design/images/edit/undo_normal.svg"));
         this.setDisabledIcon(SVGIcon.readSVGIcon("com/fr/design/images/buttonicon/undo_disabled.svg"));
         this.setAccelerator(getMenuKeySet().getKeyStroke());
     }

designer-base/src/main/java/com/fr/design/actions/file/SaveTemplateAction.java

@@ -5,7 +5,7 @@ package com.fr.design.actions.file;
 
 import java.awt.event.ActionEvent;
 
-import com.fr.base.BaseUtils;
+import com.fr.base.svg.SVGIcon;
 import com.fr.design.actions.JTemplateAction;
 import com.fr.design.mainframe.JTemplate;
 import com.fr.design.menu.KeySetUtils;
@@ -21,7 +21,8 @@ public class SaveTemplateAction extends JTemplateAction<JTemplate<?, ?>> {
         this.setMenuKeySet(KeySetUtils.SAVE_TEMPLATE);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-		this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_file/save.png"));
+		this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_file/save_normal.svg"));
+		this.setDisabledIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_file/save_disabled.svg"));
         this.setAccelerator(getMenuKeySet().getKeyStroke());
 	}
 

designer-base/src/main/resources/com/fr/design/images/edit/redo_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_重做_下拉列表用</title>
+    <g id="icon_重做_下拉列表用" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M7.00012857,1 L7.00041488,4.28941483 C11.5001795,4.81880115 15,8.87653615 15,13.8037024 C15,14.2095383 14.9762561,14.6094758 14.9301652,15.0020289 C14.4180309,11.5986385 11.1305428,8.90901809 7.00070182,8.53101189 L7.00012857,11.7693787 L1,6.38415094 L7.00012857,1 Z" id="Combined-Shape" fill="#333334" transform="translate(8.000000, 8.000150) scale(-1, 1) translate(-8.000000, -8.000150) "></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/edit/undo_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_撤销_下拉列表用</title>
+    <g id="icon_撤销_下拉列表用" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M7.00012857,1 L7.00041488,4.28941483 C11.5001795,4.81880115 15,8.87653615 15,13.8037024 C15,14.2095383 14.9762561,14.6094758 14.9301652,15.0020289 C14.4180309,11.5986385 11.1305428,8.90901809 7.00070182,8.53101189 L7.00012857,11.7693787 L1,6.38415094 L7.00012857,1 Z" id="Combined-Shape" fill="#333334"></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_file/pageSetup_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,1 L15,15 L1,15 L1,1 L15,1 Z M8,2 L2,2 L2,14 L8,14 L8,2 Z M14,2 L9,2 L9,14 L14,14 L14,2 Z M13,11 L13,12 L10,12 L10,11 L13,11 Z M7,10 L7,11 L3,11 L3,10 L7,10 Z M13,8.999 L13,9.999 L10,9.999 L10,8.999 L13,8.999 Z M7,8 L7,9 L3,9 L3,8 L7,8 Z M13,7 L13,8 L10,8 L10,7 L13,7 Z M7,6 L7,7 L3,7 L3,6 L7,6 Z M13,5 L13,6 L10,6 L10,5 L13,5 Z M7,4 L7,5 L3,5 L3,4 L7,4 Z M13,3 L13,4 L10,4 L10,3 L13,3 Z" id="Combined-Shape" fill="#333334"></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_file/save_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_save_disable</title>
+    <g id="icon_save_disable" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" fill-opacity="0.3">
+        <g id="编组" fill="#333334" fill-rule="nonzero">
+            <g id="Combined-Shape">
+                <path d="M13.9931545,1 C14.5492199,1 15,1.44994876 15,2.00684547 L15,13.9931545 C15,14.5492199 14.5500512,15 13.9931545,15 L2.00684547,15 C1.45078007,15 1,14.5500512 1,13.9931545 L1,2.00684547 C1,1.45078007 1.44994876,1 2.00684547,1 L13.9931545,1 Z M4,2.5 L2.5,2.5 L2.5,13.5 L13.5,13.5 L13.5,2.5 L12,2.5 L12,6.00019251 C12,6.55237094 11.5469637,7 11.0029699,7 L4.99703014,7 C4.4463856,7 4,6.55628335 4,6.00019251 L4,2.5 Z M10,3 L9,3 L9,6 L10,6 L10,3 Z"></path>
+            </g>
+        </g>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_file/save_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_save_normal</title>
+    <g id="icon_save_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="编组" fill="#333334" fill-rule="nonzero">
+            <g id="Combined-Shape">
+                <path d="M13.9931545,1 C14.5492199,1 15,1.44994876 15,2.00684547 L15,13.9931545 C15,14.5492199 14.5500512,15 13.9931545,15 L2.00684547,15 C1.45078007,15 1,14.5500512 1,13.9931545 L1,2.00684547 C1,1.45078007 1.44994876,1 2.00684547,1 L13.9931545,1 Z M4,2.5 L2.5,2.5 L2.5,13.5 L13.5,13.5 L13.5,2.5 L12,2.5 L12,6.00019251 C12,6.55237094 11.5469637,7 11.0029699,7 L4.99703014,7 C4.4463856,7 4,6.55628335 4,6.00019251 L4,2.5 Z M10,3 L9,3 L9,6 L10,6 L10,3 Z"></path>
+            </g>
+        </g>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_report/allow_authority_edit_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="M15,0 C15.55,0 16,0.45 16,1 L16,1 L16.0010521,12.8000711 C15.7177367,12.3860351 15.3811267,12.0066036 15.0003609,11.6697216 L15,11 L14.093854,10.9996331 C13.8436767,10.8462863 13.5814309,10.7085331 13.3087888,10.587827 C13.4451757,10.4056761 13.563905,10.2090668 13.6627395,10.0011628 L15,10 L15,6 L12.9493213,5.99961951 C12.3181116,5.38122379 11.4536539,5 10.5,5 C9.5463461,5 8.68188838,5.38122379 8.05067871,5.99961951 L6,6 L6,10 L7.33726046,10.0011628 C7.43609498,10.2090668 7.55482427,10.4056761 7.69098907,10.5885313 C7.41801059,10.7085896 7.15552838,10.8464792 6.90514372,10.9999905 L6,11 L6.000421,11.6686957 C5.6198624,12.0052561 5.28339968,12.3843182 5.00014466,12.7979563 L5,11 L1,11 L1,15 L4.08937193,15.0003709 C4.03060566,15.3251452 4,15.6590638 4,16 L4,16 L1,16 C0.45,16 0,15.55 0,15 L0,15 L0,1 C0,0.45 0.45,0 1,0 L1,0 Z M5,6 L1,6 L1,10 L5,10 L5,6 Z M5,1 L1,1 L1,5 L5,5 L5,1 Z M15,1 L11,1 L11,5 L15,5 L15,1 Z M10,1 L6,1 L6,5 L10,5 L10,1 Z" id="Combined-Shape" fill="#333334"></path>
+        <path d="M10.5,11 C13.537,11 16,13.239 16,16 L5,16 C5,13.239 7.462,11 10.5,11 Z M10.5,6 C11.881,6 13,7.119 13,8.5 C13,9.881 11.881,11 10.5,11 C9.119,11 8,9.881 8,8.5 C8,7.119 9.119,6 10.5,6 Z" id="Combined-Shape" fill="#333334"></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_report/background_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">
+        <polygon id="Fill-1" fill="#FFFFFF" points="11 6 11 2 1 2 1 14 11 14 15 14 15 6"></polygon>
+        <path d="M12,0.9996 L16,5.0006 L16,14.9996 L0,14.9996 L0,0.9996 L12,0.9996 Z M11,1.9996 L1,2.0006 L1,14.0006 L15,14.0006 L15,5.9996 L11,6 L11,1.9996 Z M12,2.4136 L12,4.9996 L14.586,4.9996 L12,2.4136 Z" id="Combined-Shape" fill="#333334"></path>
+        <polygon id="Fill-6" fill="#37BC53" points="1 13.125 6 9 8 11 11 7 15 10 15 14 1 14"></polygon>
+        <path d="M6,5 C6,6.104 5.104,7 4,7 C2.896,7 2,6.104 2,5 C2,3.896 2.896,3 4,3 C5.104,3 6,3.896 6,5" id="Fill-7" fill="#EB1D1F"></path>
+    </g>
+</svg>

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" 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">
+        <circle id="Oval" fill="#419BF9" cx="12" cy="12" r="12"></circle>
+        <path d="M12,5 C12.3865993,5 12.7,5.3187139 12.7,5.69426218 L12.699,11.3 L18.3057378,11.3 C18.6572157,11.3 18.9476905,11.5610788 18.9936622,11.9044479 L19,12 C19,12.3865993 18.6812861,12.7 18.3057378,12.7 L12.699,12.699 L12.7,18.3057378 C12.7,18.6572157 12.4389212,18.9476905 12.0955521,18.9936622 L12,19 C11.6134007,19 11.3,18.6812861 11.3,18.3057378 L11.3,12.699 L5.69426218,12.7 C5.3427843,12.7 5.05230945,12.4389212 5.0063378,12.0955521 L5,12 C5,11.6134007 5.3187139,11.3 5.69426218,11.3 L11.3,11.3 L11.3,5.69426218 C11.3,5.3427843 11.5610788,5.05230945 11.9044479,5.0063378 L12,5 Z" id="Combined-Shape" fill="#FFFFFF" transform="translate(12.000000, 12.000000) rotate(45.000000) translate(-12.000000, -12.000000) "></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_report/footer_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="M14,1 C14.5522847,1 15,1.44771525 15,2 L15,14 C15,14.5522847 14.5522847,15 14,15 L2,15 C1.44771525,15 1,14.5522847 1,14 L1,2 C1,1.44771525 1.44771525,1 2,1 L14,1 Z M14,2 L2,2 L2,14 L14,14 L14,2 Z M4.62,6.17333334 C4.63516114,6.18470419 4.64862915,6.1981722 4.66,6.21333334 L5.76,7.68 C5.82627417,7.76836556 5.80836556,7.89372583 5.72,7.96 C5.68538076,7.98596443 5.64327404,8 5.59999999,8 L5,8 L5,11.5 C5,11.7761424 4.77614237,12 4.5,12 C4.22385763,12 4,11.7761424 4,11.5 L4,8 L3.40000001,8 C3.28954305,8 3.2,7.91045695 3.2,7.8 C3.2,7.75672595 3.21403558,7.71461923 3.24,7.68 L4.34,6.21333334 C4.40627417,6.12496778 4.53163444,6.10705916 4.62,6.17333334 Z M12.5,4 C12.7761424,4 13,4.22385763 13,4.5 C13,4.77614237 12.7761424,5 12.5,5 L3.5,5 C3.22385763,5 3,4.77614237 3,4.5 C3,4.22385763 3.22385763,4 3.5,4 L12.5,4 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero" transform="translate(8.000000, 8.000000) rotate(180.000000) translate(-8.000000, -8.000000) "></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_report/header_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="M14,1 C14.5522847,1 15,1.44771525 15,2 L15,14 C15,14.5522847 14.5522847,15 14,15 L2,15 C1.44771525,15 1,14.5522847 1,14 L1,2 C1,1.44771525 1.44771525,1 2,1 L14,1 Z M14,2 L2,2 L2,14 L14,14 L14,2 Z M4.62,6.17333334 C4.63516114,6.18470419 4.64862915,6.1981722 4.66,6.21333334 L5.76,7.68 C5.82627417,7.76836556 5.80836556,7.89372583 5.72,7.96 C5.68538076,7.98596443 5.64327404,8 5.59999999,8 L5,8 L5,11.5 C5,11.7761424 4.77614237,12 4.5,12 C4.22385763,12 4,11.7761424 4,11.5 L4,8 L3.40000001,8 C3.28954305,8 3.2,7.91045695 3.2,7.8 C3.2,7.75672595 3.21403558,7.71461923 3.24,7.68 L4.34,6.21333334 C4.40627417,6.12496778 4.53163444,6.10705916 4.62,6.17333334 Z M12.5,4 C12.7761424,4 13,4.22385763 13,4.5 C13,4.77614237 12.7761424,5 12.5,5 L3.5,5 C3.22385763,5 3,4.77614237 3,4.5 C3,4.22385763 3.22385763,4 3.5,4 L12.5,4 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_report/linear_attr_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="M7,13 L7,14 L1,14 L1,13 L7,13 Z M13.999,13 L13.999,14 L8,14 L8,13 L13.999,13 Z M7,11 L7,12 L1,12 L1,11 L7,11 Z M13.999,11 L13.999,12 L8,12 L8,11 L13.999,11 Z M7,8.999 L7,10 L1,10 L1,8.999 L7,8.999 Z M13.999,8.999 L13.999,10 L8,10 L8,8.999 L13.999,8.999 Z M7,7 L7,8 L1,8 L1,7 L7,7 Z M13.999,7 L13.999,8 L8,8 L8,7 L13.999,7 Z M7,5 L7,6 L1,6 L1,5 L7,5 Z M13.999,5 L13.999,6 L8,6 L8,5 L13.999,5 Z M7,3 L7,4 L1,4 L1,3 L7,3 Z M13.999,3 L13.999,4 L8,4 L8,3 L13.999,3 Z" id="Combined-Shape" fill="#333334"></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_report/parameter_report_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,1 L15,15 L1,15 L1,1 L15,1 Z M14,2 L2,2 L2,14 L14,14 L14,2 Z M7.3671875,4 C7.89062762,4 8.33398256,4.04394487 8.69726562,4.13183594 C9.06054869,4.219727 9.38281109,4.35742094 9.6640625,4.54492188 C9.99609541,4.76757924 10.2529288,5.04492021 10.4345703,5.37695312 C10.6162118,5.70898604 10.7070312,6.12890371 10.7070312,6.63671875 C10.7070312,7.02343943 10.6396491,7.38183429 10.5048828,7.71191406 C10.3701165,8.04199384 10.1816418,8.32812379 9.93945312,8.5703125 C9.63867037,8.87109525 9.28320518,9.09667894 8.87304688,9.24707031 C8.46288857,9.39746169 7.94531562,9.47265625 7.3203125,9.47265625 L6.16015625,9.47265625 L6.16015625,12.7246094 L5,12.7246094 L5,4 L7.3671875,4 Z M7.30859375,4.99609375 L6.16015625,4.99609375 L6.16015625,8.48242188 L7.13867188,8.48242188 C7.60742422,8.48242188 7.98827979,8.44043011 8.28125,8.35644531 C8.57422021,8.27246052 8.81249908,8.13867279 8.99609375,7.95507812 C9.17968842,7.76757719 9.30956993,7.57031354 9.38574219,7.36328125 C9.46191444,7.15624896 9.5,6.92382941 9.5,6.66601562 C9.5,6.36523287 9.44726615,6.10351674 9.34179688,5.88085938 C9.2363276,5.65820201 9.07617295,5.4765632 8.86132812,5.3359375 C8.67382719,5.21484314 8.45996214,5.12792995 8.21972656,5.07519531 C7.97949099,5.02246067 7.67578309,4.99609375 7.30859375,4.99609375 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
+    </g>
+</svg>

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

@@ -0,0 +1,14 @@
+<?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,1 L15.0007255,8.67222963 C14.7155851,8.31967202 14.3782673,8.01105416 14.0005166,7.75812038 L14,2 L2,2 L2,13 L3.11169428,13.0008196 C3.19135904,13.3515962 3.31200298,13.6868027 3.46832619,14.0011393 L1,14 L1,1 L15,1 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
+        <polygon id="Fill-9" fill="#333334" points="6 6 13 6 13 5 6 5"></polygon>
+        <polygon id="Fill-9-Copy-5" fill="#333334" points="7 8 10 8 10 7 7 7"></polygon>
+        <polygon id="Fill-9-Copy-2" fill="#333334" points="3 6 5 6 5 5 3 5"></polygon>
+        <polygon id="Fill-9-Copy-3" fill="#333334" points="3 8 4 8 4 7 3 7"></polygon>
+        <polygon id="Fill-9-Copy" fill="#333334" points="3 4 13 4 13 3 3 3"></polygon>
+        <path d="M11.5,8 C11.9142136,8 12.25,8.33578644 12.25,8.75 L12.2505732,9.11463068 C12.3918193,9.1590311 12.5276606,9.21563057 12.6568623,9.28319406 L12.9142136,9.02512627 C13.2071068,8.73223305 13.6819805,8.73223305 13.9748737,9.02512627 C14.267767,9.31801948 14.267767,9.79289322 13.9748737,10.0857864 L13.7168059,10.3431377 C13.7843694,10.4723394 13.8409689,10.6081807 13.8853693,10.7494268 L14.25,10.75 C14.6642136,10.75 15,11.0857864 15,11.5 C15,11.9142136 14.6642136,12.25 14.25,12.25 L13.8853693,12.2505732 C13.8409689,12.3918193 13.7843694,12.5276606 13.7168059,12.6568623 L13.9748737,12.9142136 C14.267767,13.2071068 14.267767,13.6819805 13.9748737,13.9748737 C13.6819805,14.267767 13.2071068,14.267767 12.9142136,13.9748737 L12.6568623,13.7168059 C12.5276606,13.7843694 12.3918193,13.8409689 12.2505732,13.8853693 L12.25,14.25 C12.25,14.6642136 11.9142136,15 11.5,15 C11.0857864,15 10.75,14.6642136 10.75,14.25 L10.750421,13.8856816 C10.6088181,13.8412344 10.4726425,13.7845279 10.3431377,13.7168059 L10.0857864,13.9748737 C9.79289322,14.267767 9.31801948,14.267767 9.02512627,13.9748737 C8.73223305,13.6819805 8.73223305,13.2071068 9.02512627,12.9142136 L9.28319406,12.6568623 C9.21563057,12.5276606 9.1590311,12.3918193 9.11463068,12.2505732 L8.75,12.25 C8.33578644,12.25 8,11.9142136 8,11.5 C8,11.0857864 8.33578644,10.75 8.75,10.75 L9.11431839,10.750421 C9.1587656,10.6088181 9.21547206,10.4726425 9.28319406,10.3431377 L9.02512627,10.0857864 C8.73223305,9.79289322 8.73223305,9.31801948 9.02512627,9.02512627 C9.31801948,8.73223305 9.79289322,8.73223305 10.0857864,9.02512627 L10.3431377,9.28319406 C10.4726425,9.21547206 10.6088181,9.1587656 10.750421,9.11431839 L10.75,8.75 C10.75,8.33578644 11.0857864,8 11.5,8 Z M11.5,10.5 C10.9477153,10.5 10.5,10.9477153 10.5,11.5 C10.5,12.0522847 10.9477153,12.5 11.5,12.5 C12.0522847,12.5 12.5,12.0522847 12.5,11.5 C12.5,10.9477153 12.0522847,10.5 11.5,10.5 Z" id="Combined-Shape" fill="#333334"></path>
+        <path d="M5.5,8 C5.79586683,8 6.03571429,8.23984746 6.03571429,8.53571429 L6.0357358,8.79604288 C6.13692693,8.82782659 6.23423638,8.86837541 6.32677434,8.91679953 L6.51015254,8.73223305 C6.71936199,8.52302361 7.05855751,8.52302361 7.26776695,8.73223305 C7.47697639,8.94144249 7.47697639,9.28063801 7.26776695,9.48984746 L7.08320047,9.67322566 C7.13162459,9.76576362 7.17217341,9.86307307 7.20395712,9.9642642 L7.46428571,9.96428571 C7.76015254,9.96428571 8,10.2041332 8,10.5 C8,10.7958668 7.76015254,11.0357143 7.46428571,11.0357143 L7.20395712,11.0357358 C7.17217341,11.1369269 7.13162459,11.2342364 7.08320047,11.3267743 L7.26776695,11.5101525 C7.47697639,11.719362 7.47697639,12.0585575 7.26776695,12.267767 C7.05855751,12.4769764 6.71936199,12.4769764 6.51015254,12.267767 L6.32677434,12.0832005 C6.23423638,12.1316246 6.13692693,12.1721734 6.0357358,12.2039571 L6.03571429,12.4642857 C6.03571429,12.7601525 5.79586683,13 5.5,13 C5.20413317,13 4.96428571,12.7601525 4.96428571,12.4642857 L4.9642642,12.2039571 C4.86307307,12.1721734 4.76576362,12.1316246 4.67322566,12.0832005 L4.48984746,12.267767 C4.28063801,12.4769764 3.94144249,12.4769764 3.73223305,12.267767 C3.52302361,12.0585575 3.52302361,11.719362 3.73223305,11.5101525 L3.91679953,11.3267743 C3.86837541,11.2342364 3.82782659,11.1369269 3.79604288,11.0357358 L3.53571429,11.0357143 C3.23984746,11.0357143 3,10.7958668 3,10.5 C3,10.2041332 3.23984746,9.96428571 3.53571429,9.96428571 L3.79604288,9.9642642 C3.82782659,9.86307307 3.86837541,9.76576362 3.91679953,9.67322566 L3.73223305,9.48984746 C3.52302361,9.28063801 3.52302361,8.94144249 3.73223305,8.73223305 C3.94144249,8.52302361 4.28063801,8.52302361 4.48984746,8.73223305 L4.67322566,8.91679953 C4.76576362,8.86837541 4.86307307,8.82782659 4.9642642,8.79604288 L4.96428571,8.53571429 C4.96428571,8.23984746 5.20413317,8 5.5,8 Z M5.5,9.78571429 C5.10551089,9.78571429 4.78571429,10.1055109 4.78571429,10.5 C4.78571429,10.8944891 5.10551089,11.2142857 5.5,11.2142857 C5.89448911,11.2142857 6.21428571,10.8944891 6.21428571,10.5 C6.21428571,10.1055109 5.89448911,9.78571429 5.5,9.78571429 Z" id="Combined-Shape-Copy" fill="#333334"></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_report/report_write_attr_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">
+        <path d="M15,1 L15.0007255,8.67222963 C14.7155851,8.31967202 14.3782673,8.01105416 14.0005166,7.75812038 L14,4 L1.999,4 L2,13 L7.25644465,13.0010919 C7.38231341,13.3569136 7.55166752,13.6921841 7.75812038,14.0005166 L1,14 L1,1 L15,1 Z M14,2 L2,2 L1.999,3 L14,3 L14,2 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
+        <polygon id="Fill-7" fill="#333334" points="3 8 6 8 6 7 3 7"></polygon>
+        <polygon id="Fill-8" fill="#333334" points="3 11 6 11 6 10 3 10"></polygon>
+        <polygon id="Fill-9" fill="#333334" points="7 6 13 6 13 5 7 5"></polygon>
+        <path d="M11.5,8 C11.9142136,8 12.25,8.33578644 12.25,8.75 L12.2505732,9.11463068 C12.3918193,9.1590311 12.5276606,9.21563057 12.6568623,9.28319406 L12.9142136,9.02512627 C13.2071068,8.73223305 13.6819805,8.73223305 13.9748737,9.02512627 C14.267767,9.31801948 14.267767,9.79289322 13.9748737,10.0857864 L13.7168059,10.3431377 C13.7843694,10.4723394 13.8409689,10.6081807 13.8853693,10.7494268 L14.25,10.75 C14.6642136,10.75 15,11.0857864 15,11.5 C15,11.9142136 14.6642136,12.25 14.25,12.25 L13.8853693,12.2505732 C13.8409689,12.3918193 13.7843694,12.5276606 13.7168059,12.6568623 L13.9748737,12.9142136 C14.267767,13.2071068 14.267767,13.6819805 13.9748737,13.9748737 C13.6819805,14.267767 13.2071068,14.267767 12.9142136,13.9748737 L12.6568623,13.7168059 C12.5276606,13.7843694 12.3918193,13.8409689 12.2505732,13.8853693 L12.25,14.25 C12.25,14.6642136 11.9142136,15 11.5,15 C11.0857864,15 10.75,14.6642136 10.75,14.25 L10.750421,13.8856816 C10.6088181,13.8412344 10.4726425,13.7845279 10.3431377,13.7168059 L10.0857864,13.9748737 C9.79289322,14.267767 9.31801948,14.267767 9.02512627,13.9748737 C8.73223305,13.6819805 8.73223305,13.2071068 9.02512627,12.9142136 L9.28319406,12.6568623 C9.21563057,12.5276606 9.1590311,12.3918193 9.11463068,12.2505732 L8.75,12.25 C8.33578644,12.25 8,11.9142136 8,11.5 C8,11.0857864 8.33578644,10.75 8.75,10.75 L9.11431839,10.750421 C9.1587656,10.6088181 9.21547206,10.4726425 9.28319406,10.3431377 L9.02512627,10.0857864 C8.73223305,9.79289322 8.73223305,9.31801948 9.02512627,9.02512627 C9.31801948,8.73223305 9.79289322,8.73223305 10.0857864,9.02512627 L10.3431377,9.28319406 C10.4726425,9.21547206 10.6088181,9.1587656 10.750421,9.11431839 L10.75,8.75 C10.75,8.33578644 11.0857864,8 11.5,8 Z M11.5,10.5 C10.9477153,10.5 10.5,10.9477153 10.5,11.5 C10.5,12.0522847 10.9477153,12.5 11.5,12.5 C12.0522847,12.5 12.5,12.0522847 12.5,11.5 C12.5,10.9477153 12.0522847,10.5 11.5,10.5 Z" id="Combined-Shape" fill="#333334"></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_report/watermark_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="M8,1 C9.65685425,1 11,2.34314575 11,4 C11,4.45282024 10.8462154,5.520779 10.5386461,7.20387628 C13.0669658,7.62530654 14.8817707,8.65856267 14.9944417,9.87934156 L15,10 L15,12 C15,13.6568542 11.8659932,15 8,15 C4.13400675,15 1,13.6568542 1,12 L1,10 C1,8.72550922 2.85440554,7.63664112 5.46993046,7.20194694 C5.15657924,5.47317393 5,4.40596987 5,4 C5,2.34314575 6.34314575,1 8,1 Z M8,13 C5.45410201,13 3.22564492,12.4175174 2.00061652,11.546547 L2,12 C2,12.3101724 2.46704125,12.7834051 3.44417183,13.2021753 C4.61601314,13.704393 6.24676441,14 8,14 C9.75323559,14 11.3839869,13.704393 12.5558282,13.2021753 C13.5329588,12.7834051 14,12.3101724 14,12 L14.0004144,11.5458138 C12.7756056,12.4171905 10.5466123,13 8,13 Z M5.65136655,8.18488931 L5.50406306,8.2105807 C4.73074063,8.34725966 4.03009249,8.54671583 3.44417183,8.79782469 C2.46704125,9.21659494 2,9.68982759 2,10 C2,10.3101724 2.46704125,10.7834051 3.44417183,11.2021753 C4.61601314,11.704393 6.24676441,12 8,12 C9.75323559,12 11.3839869,11.704393 12.5558282,11.2021753 C13.5329588,10.7834051 14,10.3101724 14,10 C14,9.68982759 13.5329588,9.21659494 12.5558282,8.79782469 C11.9346773,8.53161718 11.1845875,8.32346063 10.355663,8.18660934 C10.2495426,8.73937098 10.1312292,9.34385382 10,10 C9.33333333,10.1333332 8.66666667,10.1999998 8,10.1999998 C7.33333333,10.1999998 6.66666667,10.1333332 6,10 C5.87138189,9.34256849 5.75517074,8.73753159 5.65136655,8.18488931 Z M8,2 C6.8954305,2 6,2.8954305 6,4 C6,4.46041873 6.28799932,6.22090696 6.848912,9.12642181 C7.23297212,9.17549847 7.61658839,9.19999981 8,9.19999981 C8.38437166,9.19999981 8.768949,9.17537561 9.15397302,9.12605269 C9.7143605,6.28050023 10,4.52880068 10,4 C10,2.8954305 9.1045695,2 8,2 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_report/web_report_attribute_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_模板web属性_normal</title>
+    <g id="icon_模板web属性_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M8,0 C12.418278,0 16,3.581722 16,8 C16,8.69297328 15.9118913,9.36536767 15.7462654,10.0065916 C15.6038128,9.60153936 15.4050433,9.223015 15.1593548,8.88041636 C15.1447854,8.86009672 15.1298337,8.83961085 15.1147141,8.81925708 L15.1593548,8.88041636 C15.1095528,8.81097031 15.0578229,8.74300039 15.0042435,8.6765849 L15.1147141,8.81925708 C15.0098527,8.67809384 14.896918,8.54328526 14.7765932,8.41551435 C14.9224972,8.27278513 15,8.13231961 15,8 C15,7.70713232 14.6203252,7.37435899 13.9596622,7.06545983 C13.9793214,7.29253114 13.992026,7.5229856 13.9972612,7.75594267 C13.681183,7.544701 13.3368549,7.37242112 12.9711442,7.24597048 C12.9561266,7.05104587 12.9353581,6.8587073 12.9090998,6.66925786 C12.3370788,6.49377303 11.6674679,6.33931147 10.9265976,6.22321198 C10.9482271,6.48762795 10.9657809,6.75665753 10.978168,7.02993162 C10.6341561,7.06965743 10.3019602,7.14817899 9.98606795,7.26100879 C9.97093999,6.86015182 9.94385092,6.46988324 9.90656653,6.09293523 C9.30208233,6.03358718 8.66255633,6 8,6 C7.33744367,6 6.69791767,6.03358718 6.09272918,6.09345386 C6.03358718,6.69791767 6,7.33744367 6,8 C6,8.66255633 6.03358718,9.30208233 6.09345386,9.90727082 C6.46988324,9.94385092 6.86015182,9.97093999 7.26100879,9.98606795 C7.14817899,10.3019602 7.06965743,10.6341561 7.02993162,10.978168 C6.75659574,10.9657781 6.4875063,10.9482192 6.22337894,10.9257596 C6.60172421,13.3420127 7.38799334,15 8,15 C8.13231961,15 8.27278513,14.9224972 8.41551435,14.7765932 C8.86779068,15.2025123 9.40824751,15.5358341 10.0065916,15.7462654 C9.36536767,15.9118913 8.69297328,16 8,16 C3.581722,16 0,12.418278 0,8 C0,3.581722 3.581722,0 8,0 Z M3.3129188,10.431451 L3.3533003,10.578883 C3.88374058,12.4338589 4.96604492,13.8850734 6.2876264,14.5696231 C5.7922553,13.6497239 5.40583895,12.3416017 5.19036474,10.8105562 C4.51618951,10.714887 3.88596596,10.587064 3.3129188,10.431451 Z M1.17790129,9.56771168 L1.19990249,9.66777997 C1.57004236,11.1821613 2.43286876,12.5033152 3.60887134,13.4517313 C2.94953572,12.5080319 2.4592728,11.3515399 2.20239469,10.0680049 C1.81696808,9.91529238 1.47279496,9.74778671 1.17790129,9.56771168 Z M5.07427738,6.22294433 L4.94309237,6.24414649 C4.25433098,6.35753176 3.62994967,6.50397013 3.09156403,6.66949174 C3.03132173,7.09907222 3,7.54386777 3,8 C3,8.45613223 3.03132173,8.90092778 3.09091439,9.33084476 C3.66400727,9.50651203 4.33393691,9.66098648 5.07514986,9.77706177 C5.02566552,9.20552325 5,8.6107543 5,8 C5,7.3892457 5.02566552,6.79447675 5.07427738,6.22294433 Z M2.04055495,7.06486899 L1.94843242,7.10947246 C1.34458658,7.40576876 1,7.72099324 1,8 C1,8.2929818 1.37997075,8.62590035 2.04111024,8.93490126 C2.01377019,8.62838061 2,8.31633444 2,8 C2,7.68366556 2.01377019,7.37161939 2.04055495,7.06486899 Z M3.60887134,2.54826866 C2.40689538,3.51763167 1.53208209,4.87637896 1.17610051,6.43284146 C1.47068184,6.25327062 1.81537465,6.08538541 2.20247567,5.932768 C2.4592728,4.64846008 2.94953572,3.49196812 3.60887134,2.54826866 Z M12.3911287,2.54826866 C13.0506174,3.49218731 13.5409549,4.64899732 13.7977843,5.93288946 C14.1852141,6.08567221 14.5295703,6.25342478 14.824519,6.4337672 C14.4679179,4.87637896 13.5931046,3.51763167 12.3911287,2.54826866 Z M9.7123736,1.4303769 C10.2077966,2.35037256 10.5942421,3.65867265 10.809703,5.18992545 C11.4838486,5.28509665 12.114601,5.41304007 12.6880713,5.56881794 C12.1735944,3.64378648 11.0690635,2.13311197 9.7123736,1.4303769 Z M6.2876264,1.4303769 C4.93139672,2.13287359 3.827155,3.64276168 3.31272387,5.56783997 C3.88613433,5.41289092 4.51654421,5.28504138 5.19008929,5.19027391 C5.40583895,3.65839833 5.7922553,2.35027611 6.2876264,1.4303769 Z M8,1 C7.38799334,1 6.60172421,2.65798727 6.22321198,5.07340243 C6.79456009,5.02566193 7.38928849,5 8,5 C8.61071151,5 9.20543991,5.02566193 9.77693555,5.07426716 C9.39843877,2.65833096 8.61207009,1 8,1 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
+        <path d="M11.5,8 C11.9142136,8 12.25,8.33578644 12.25,8.75 L12.2505732,9.11463068 C12.3918193,9.1590311 12.5276606,9.21563057 12.6568623,9.28319406 L12.9142136,9.02512627 C13.2071068,8.73223305 13.6819805,8.73223305 13.9748737,9.02512627 C14.267767,9.31801948 14.267767,9.79289322 13.9748737,10.0857864 L13.7168059,10.3431377 C13.7843694,10.4723394 13.8409689,10.6081807 13.8853693,10.7494268 L14.25,10.75 C14.6642136,10.75 15,11.0857864 15,11.5 C15,11.9142136 14.6642136,12.25 14.25,12.25 L13.8853693,12.2505732 C13.8409689,12.3918193 13.7843694,12.5276606 13.7168059,12.6568623 L13.9748737,12.9142136 C14.267767,13.2071068 14.267767,13.6819805 13.9748737,13.9748737 C13.6819805,14.267767 13.2071068,14.267767 12.9142136,13.9748737 L12.6568623,13.7168059 C12.5276606,13.7843694 12.3918193,13.8409689 12.2505732,13.8853693 L12.25,14.25 C12.25,14.6642136 11.9142136,15 11.5,15 C11.0857864,15 10.75,14.6642136 10.75,14.25 L10.750421,13.8856816 C10.6088181,13.8412344 10.4726425,13.7845279 10.3431377,13.7168059 L10.0857864,13.9748737 C9.79289322,14.267767 9.31801948,14.267767 9.02512627,13.9748737 C8.73223305,13.6819805 8.73223305,13.2071068 9.02512627,12.9142136 L9.28319406,12.6568623 C9.21563057,12.5276606 9.1590311,12.3918193 9.11463068,12.2505732 L8.75,12.25 C8.33578644,12.25 8,11.9142136 8,11.5 C8,11.0857864 8.33578644,10.75 8.75,10.75 L9.11431839,10.750421 C9.1587656,10.6088181 9.21547206,10.4726425 9.28319406,10.3431377 L9.02512627,10.0857864 C8.73223305,9.79289322 8.73223305,9.31801948 9.02512627,9.02512627 C9.31801948,8.73223305 9.79289322,8.73223305 10.0857864,9.02512627 L10.3431377,9.28319406 C10.4726425,9.21547206 10.6088181,9.1587656 10.750421,9.11431839 L10.75,8.75 C10.75,8.33578644 11.0857864,8 11.5,8 Z M11.5,10.5 C10.9477153,10.5 10.5,10.9477153 10.5,11.5 C10.5,12.0522847 10.9477153,12.5 11.5,12.5 C12.0522847,12.5 12.5,12.0522847 12.5,11.5 C12.5,10.9477153 12.0522847,10.5 11.5,10.5 Z" id="Combined-Shape" fill="#333334"></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_web/datasource_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">
+        <g id="Group-2" transform="translate(2.000000, 1.000000)" fill="#333334">
+            <path d="M12,8.16666667 L12,11.6666667 C12,12.9553311 9.3137085,14 6,14 C2.6862915,14 0,12.9553311 0,11.6666667 L0,11.6666667 L0,8.16666667 C0,9.45533108 2.6862915,10.5 6,10.5 C9.21903111,10.5 11.8459855,9.51417366 11.9934693,8.2765074 L12,8.16666667 Z M12,3.5 L12,7 C12,8.28866442 9.3137085,9.33333333 6,9.33333333 C2.6862915,9.33333333 0,8.28866442 0,7 L0,7 L0,3.5 C0,4.78866442 2.6862915,5.83333333 6,5.83333333 C9.21903111,5.83333333 11.8459855,4.84750699 11.9934693,3.60984074 L12,3.5 Z M6,0 C9.3137085,0 12,1.04466892 12,2.33333333 C12,3.62199775 9.3137085,4.66666667 6,4.66666667 C2.6862915,4.66666667 0,3.62199775 0,2.33333333 C0,1.04466892 2.6862915,0 6,0 Z" id="Combined-Shape"></path>
+        </g>
+    </g>
+</svg>

designer-realize/src/main/java/com/fr/design/actions/report/ReportBackgroundAction.java

@@ -3,9 +3,8 @@
  */
 package com.fr.design.actions.report;
 
-import com.fr.base.BaseUtils;
+import com.fr.base.svg.SVGIcon;
 import com.fr.design.actions.ReportComponentAction;
-import com.fr.design.dialog.BasicDialog;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.ReportComponent;
 import com.fr.design.menu.KeySetUtils;
@@ -23,7 +22,7 @@ public class ReportBackgroundAction extends ReportComponentAction<ReportComponen
         this.setMenuKeySet(KeySetUtils.REPORT_BACKGROUND);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_report/background.png"));
+        this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_report/background_normal.svg"));
     }
 
     /**

designer-realize/src/main/java/com/fr/design/actions/report/ReportColumnsAction.java

@@ -1,6 +1,6 @@
 package com.fr.design.actions.report;
 
-import com.fr.base.BaseUtils;
+import com.fr.base.svg.SVGIcon;
 import com.fr.design.actions.ReportComponentAction;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.WorkSheetDesigner;
@@ -16,7 +16,7 @@ public class ReportColumnsAction extends ReportComponentAction<WorkSheetDesigner
         this.setMenuKeySet(KeySetUtils.REPORT_COLUMN);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_report/linearAttr.png"));
+        this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_report/linear_attr_normal.svg"));
     }
 
     /**

designer-realize/src/main/java/com/fr/design/actions/report/ReportEngineAttrAction.java

@@ -1,5 +1,6 @@
 package com.fr.design.actions.report;
 
+import com.fr.base.svg.SVGIcon;
 import com.fr.design.actions.ReportComponentAction;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
@@ -7,7 +8,6 @@ import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.WorkSheetDesigner;
 import com.fr.design.menu.KeySetUtils;
 import com.fr.design.report.LayerReportPane;
-import com.fr.general.IOUtils;
 import com.fr.report.worksheet.WorkSheet;
 
 public class ReportEngineAttrAction extends ReportComponentAction<WorkSheetDesigner> {
@@ -17,7 +17,7 @@ public class ReportEngineAttrAction extends ReportComponentAction<WorkSheetDesig
         this.setMenuKeySet(KeySetUtils.REPORT_ENGINE);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-		this.setSmallIcon(IOUtils.readIcon("/com/fr/design/images/m_report/reportEngineAttr.png"));
+		this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_report/report_engine_attr_normal.svg"));
         this.generateAndSetSearchText(LayerReportPane.class.getName());
 
     }

designer-realize/src/main/java/com/fr/design/actions/report/ReportExportAttrAction.java

@@ -1,12 +1,12 @@
 package com.fr.design.actions.report;
 
+import com.fr.base.svg.SVGIcon;
 import com.fr.design.actions.JWorkBookAction;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.JWorkBook;
 import com.fr.design.menu.KeySetUtils;
 import com.fr.design.report.ReportExportAttrPane;
-import com.fr.general.IOUtils;
 import com.fr.main.TemplateWorkBook;
 
 import java.awt.event.ActionEvent;
@@ -18,7 +18,7 @@ public class ReportExportAttrAction extends JWorkBookAction {
         this.setMenuKeySet(KeySetUtils.REPORT_EXPORT_ATTR);
         this.setName(getMenuKeySet().getMenuKeySetName()+"...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(IOUtils.readIcon("/com/fr/design/images/m_report/exportAttr.png"));
+        this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_file/export_normal.svg"));
         this.generateAndSetSearchText(ReportExportAttrPane.class.getName());
     }
 

designer-realize/src/main/java/com/fr/design/actions/report/ReportFooterAction.java

@@ -3,7 +3,7 @@
  */
 package com.fr.design.actions.report;
 
-import com.fr.base.BaseUtils;
+import com.fr.base.svg.SVGIcon;
 import com.fr.design.actions.ReportComponentAction;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.headerfooter.EditFooterPane;
@@ -29,7 +29,7 @@ public class ReportFooterAction extends ReportComponentAction<ReportComponent> {
         this.setMenuKeySet(KeySetUtils.REPORT_FOOTER);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_report/footer.png"));
+        this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_report/footer_normal.svg"));
     }
 
     /**

designer-realize/src/main/java/com/fr/design/actions/report/ReportHeaderAction.java

@@ -3,7 +3,7 @@
  */
 package com.fr.design.actions.report;
 
-import com.fr.base.BaseUtils;
+import com.fr.base.svg.SVGIcon;
 import com.fr.design.actions.ReportComponentAction;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.headerfooter.EditHeaderPane;
@@ -32,7 +32,7 @@ public class ReportHeaderAction extends ReportComponentAction<ReportComponent> {
         this.setMenuKeySet(KeySetUtils.REPORT_HEADER);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_report/header.png"));
+        this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_report/header_normal.svg"));
     }
 
     /**

designer-realize/src/main/java/com/fr/design/actions/report/ReportPageSetupAction.java

@@ -3,6 +3,7 @@
  */
 package com.fr.design.actions.report;
 
+import com.fr.base.svg.SVGIcon;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.actions.ReportComponentAction;
 import com.fr.design.dialog.BasicDialog;
@@ -27,7 +28,7 @@ public class ReportPageSetupAction extends ReportComponentAction<ReportComponent
         this.setMenuKeySet(KeySetUtils.REPORT_PAGE_SETUP);
         this.setName(getMenuKeySet().getMenuKeySetName()+"...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(IOUtils.readIcon("/com/fr/design/images/m_file/pageSetup.png"));
+        this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_file/pageSetup_normal.svg"));
         this.generateAndSetSearchText(PageSetupPane.class.getName());
     }
 

designer-realize/src/main/java/com/fr/design/actions/report/ReportParameterAction.java

@@ -3,8 +3,8 @@
  */
 package com.fr.design.actions.report;
 
-import com.fr.base.BaseUtils;
 import com.fr.base.Parameter;
+import com.fr.base.svg.SVGIcon;
 import com.fr.design.DesignModelAdapter;
 import com.fr.design.actions.JWorkBookAction;
 import com.fr.design.dialog.BasicDialog;
@@ -28,7 +28,7 @@ public class ReportParameterAction extends JWorkBookAction {
         this.setMenuKeySet(KeySetUtils.REPORT_PARAMETER_ATTR);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_report/p.png"));
+        this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_report/parameter_report_normal.svg"));
     }
 
     /**

designer-realize/src/main/java/com/fr/design/actions/report/ReportPrintSettingAction.java

@@ -1,7 +1,7 @@
 package com.fr.design.actions.report;
 
-import com.fr.base.IconManager;
 import com.fr.base.print.PrintSettingsAttrMark;
+import com.fr.base.svg.SVGIcon;
 import com.fr.design.actions.JWorkBookAction;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
@@ -9,7 +9,6 @@ import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.JWorkBook;
 import com.fr.design.menu.MenuKeySet;
 import com.fr.design.webattr.printsettings.ReportPrintSettingPane;
-import com.fr.general.IOUtils;
 
 import com.fr.main.impl.WorkBook;
 import com.fr.report.core.ReportUtils;
@@ -27,7 +26,7 @@ public class ReportPrintSettingAction extends JWorkBookAction {
         this.setMenuKeySet(REPORT_APP_ATTR);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(IOUtils.readIcon(IconManager.PRINT.getPath()));
+        this.setSmallIcon(SVGIcon.readSVGIcon("com/fr/web/images/print_normal.svg"));
         this.setSearchText(ReportPrintSettingPane.class.getName());
     }
 

designer-realize/src/main/java/com/fr/design/actions/report/ReportWatermarkAction.java

@@ -1,7 +1,7 @@
 package com.fr.design.actions.report;
 
-import com.fr.base.BaseUtils;
 import com.fr.base.iofile.attr.WatermarkAttr;
+import com.fr.base.svg.SVGIcon;
 import com.fr.design.actions.JWorkBookAction;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.mainframe.DesignerContext;
@@ -27,7 +27,7 @@ public class ReportWatermarkAction extends JWorkBookAction {
         this.setMenuKeySet(KeySetUtils.REPORT_WATERMARK);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_report/watermark.png"));
+        this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_report/watermark_normal.svg"));
         this.generateAndSetSearchText(WatermarkPane.class.getName());
     }
 

designer-realize/src/main/java/com/fr/design/actions/report/ReportWebAttrAction.java

@@ -3,6 +3,7 @@
  */
 package com.fr.design.actions.report;
 
+import com.fr.base.svg.SVGIcon;
 import com.fr.design.actions.JWorkBookAction;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
@@ -10,7 +11,6 @@ import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.JWorkBook;
 import com.fr.design.menu.KeySetUtils;
 import com.fr.design.webattr.ReportWebAttrPane;
-import com.fr.general.IOUtils;
 import com.fr.main.TemplateWorkBook;
 import com.fr.transaction.CallBackAdaptor;
 import com.fr.transaction.Configurations;
@@ -29,7 +29,7 @@ public class ReportWebAttrAction extends JWorkBookAction {
         this.setMenuKeySet(KeySetUtils.REPORT_WEB_ATTR);
         this.setName(getMenuKeySet().getMenuKeySetName()+"...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-		this.setSmallIcon(IOUtils.readIcon("/com/fr/design/images/m_report/webreportattribute.png"));
+		this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_report/web_report_attribute_normal.svg"));
 		this.generateAndSetSearchText(ReportWebAttrPane.class.getName());
 	}
 

designer-realize/src/main/java/com/fr/design/actions/report/ReportWriteAttrAction.java

@@ -1,5 +1,6 @@
 package com.fr.design.actions.report;
 
+import com.fr.base.svg.SVGIcon;
 import com.fr.design.actions.ReportComponentAction;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
@@ -26,7 +27,7 @@ public class ReportWriteAttrAction extends ReportComponentAction<WorkSheetDesign
         this.setMenuKeySet(KeySetUtils.REPORT_WRITE);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(IOUtils.readIcon("/com/fr/design/images/m_report/reportWriteAttr.png"));
+        this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_report/report_write_attr_normal.svg"));
         this.generateAndSetSearchText(ReportWriteAttrPane.class.getName());
 
     }

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

@@ -348,6 +348,8 @@ public class ImagePreLoader {
             "com/fr/design/images/buttonicon/new_form3.png",
             "com/fr/design/images/buttonicon/new_form_for_dock_normal.svg",
             "com/fr/design/images/m_file/save.png",
+            "com/fr/design/images/m_file/save_normal.svg",
+            "com/fr/design/images/m_file/save_disabled.svg",
             "com/fr/design/images/m_file/saveAs.png",
             "com/fr/design/images/m_file/saveAs_normal.svg",
             "com/fr/design/images/m_edit/undo.png",
@@ -360,19 +362,31 @@ public class ImagePreLoader {
             "com/fr/design/images/m_file/text.png",
             "com/fr/design/images/m_web/datasource.png",
             "com/fr/design/images/m_report/webreportattribute.png",
+            "com/fr/design/images/m_report/web_report_attribute_normal.svg",
             "com/fr/design/images/m_report/exportAttr.png",
             "com/fr/design/images/m_report/p.png",
+            "com/fr/design/images/m_report/parameter_report_normal.svg",
             "com/fr/design/images/m_report/mobile.png",
             "com/fr/web/images/print.png",
+            "com/fr/web/images/print_normal.svg",
             "com/fr/design/images/m_report/watermark.png",
+            "com/fr/design/images/m_report/watermark_normal.svg",
             "com/fr/design/images/m_file/pageSetup.png",
+            "com/fr/design/images/m_file/pageSetup_normal.svg",
             "com/fr/design/images/m_report/header.png",
+            "com/fr/design/images/m_report/header_normal.svg",
             "com/fr/design/images/m_report/footer.png",
+            "com/fr/design/images/m_report/footer_normal.svg",
             "com/fr/design/images/m_report/background.png",
+            "com/fr/design/images/m_report/background_normal.svg",
             "com/fr/design/images/m_report/reportWriteAttr.png",
+            "com/fr/design/images/m_report/report_write_attr_normal.svg",
             "com/fr/design/images/m_report/linearAttr.png",
+            "com/fr/design/images/m_report/linear_attr_normal.svg",
             "com/fr/design/images/m_report/reportEngineAttr.png",
+            "com/fr/design/images/m_report/report_engine_attr_normal.svg",
             "com/fr/design/images/m_report/allow_authority_edit.png",
+            "com/fr/design/images/m_report/allow_authority_edit_normal.svg",
             "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",