REPORT-89253 设计器替换高清svg图标第2次提交

designer-base/src/main/java/com/fr/design/constants/UIConstants.java

@@ -57,7 +57,7 @@ public interface UIConstants {
      * Cell default cursor.
      */
     public static final Cursor CELL_DEFAULT_CURSOR = Toolkit.getDefaultToolkit().createCustomCursor(
-            IOUtils.readImage("/com/fr/base/images/cell/cursor/cell_default.png"),
+            SVGLoader.load("/com/fr/design/standard/cell_default.svg"),
             new Point(16, 16), "CellDefaultCursor");
     public static final Cursor DRAW_CURSOR = Toolkit.getDefaultToolkit().createCustomCursor(
             IOUtils.readImage("/com/fr/base/images/cell/cursor/cursor_draw.png"),

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

@@ -89,9 +89,9 @@ public class MultiTemplateTabPane extends JComponent {
     private static Icon LIST_DOWN = IconUtils.readIcon("/com/fr/design/standard/list/list_normal.svg");
     private static Icon MOUSE_OVER_LIST_DOWN = IconUtils.readIcon("/com/fr/design/standard/list/list_pressed.svg");
     private static Icon MOUSE_PRESS_LIST_DOWN = IconUtils.readIcon("/com/fr/design/standard/list/list_pressed.svg");
-    private static Icon CLOSE = BaseUtils.readIcon("/com/fr/design/images/buttonicon/close_icon.png");
+    private static Icon CLOSE = IconUtils.readIcon("/com/fr/design/standard/close/close_normal.svg");
-    private static Icon MOUSE_OVER_CLOSE = BaseUtils.readIcon("/com/fr/design/images/buttonicon/mouseoverclose icon.png");
+    private static Icon MOUSE_OVER_CLOSE = IconUtils.readIcon("/com/fr/design/standard/close/close_mouseover.svg");
-    private static Icon MOUSE_PRESS_CLOSE = BaseUtils.readIcon("/com/fr/design/images/buttonicon/pressclose icon.png");
+    private static Icon MOUSE_PRESS_CLOSE = IconUtils.readIcon("/com/fr/design/standard/close/close_press.svg");
     private static final Icon WHITE_SAVING_CLOSE_ICON = new ImageIcon(IOUtils.readImage("/com/fr/design/images/file/white_saving_close.gif"));
     private static final Icon GREY_SAVING_CLOSE_ICON = new ImageIcon(IOUtils.readImage("/com/fr/design/images/file/grey_saving_close.gif"));
     private static final String ELLIPSIS = "...";

designer-base/src/main/java/com/fr/design/gui/UILookAndFeel.java

@@ -160,10 +160,10 @@ public class UILookAndFeel extends MetalLookAndFeel {
         table.put("Tree.collapsedIcon", loadIcon("TreePlusIcon.png", this));
         table.put("Tree.openIcon", loadIcon("TreeFolderOpenedIcon.png", this));
         table.put("Tree.closedIcon", loadIcon("TreeFolderClosedIcon.png", this));
-        table.put("Tree.leafIcon", loadIcon("TreeLeafIcon.png", this));
+        table.put("Tree.leafIcon", loadIcon("TreeLeafIcon.svg", this));
         table.put("FileView.directoryIcon", loadIcon("DirectoryIcon.png", this));
         table.put("FileView.computerIcon", loadIcon("ComputerIcon.png", this));
-        table.put("FileView.fileIcon", loadIcon("FileIcon.png", this));
+        table.put("FileView.fileIcon", loadIcon("FileIcon.svg", this));
         table.put("FileView.floppyDriveIcon", loadIcon("FloppyIcon.png", this));
         table.put("FileView.hardDriveIcon", loadIcon("HarddiskIcon.png", this));
         table.put("FileChooser.detailsViewIcon", loadIcon("FileDetailsIcon.png", this));

designer-base/src/main/java/com/fr/design/gui/itree/UITreeUI.java

@@ -1,6 +1,7 @@
 package com.fr.design.gui.itree;
 
 import com.fr.base.BaseUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.utils.ThemeUtils;
 
 import javax.swing.*;
@@ -27,8 +28,8 @@ public class UITreeUI extends MetalTreeUI {
 
     protected void installDefaults() {
         super.installDefaults();
-        setExpandedIcon(BaseUtils.readIcon("/com/fr/design/images/buttonicon/minus.png"));
+        setExpandedIcon(IconUtils.readIcon("/com/fr/design/standard/fileicon/minus.svg"));
-        setCollapsedIcon(BaseUtils.readIcon("/com/fr/design/images/buttonicon/plus.png"));
+        setCollapsedIcon(IconUtils.readIcon("/com/fr/design/standard/fileicon/plus.svg"));
         if (tree.getCellRenderer() instanceof DefaultTreeCellRenderer) {
             DefaultTreeCellRenderer r = (DefaultTreeCellRenderer) tree.getCellRenderer();
             r.setBackgroundNonSelectionColor(ThemeUtils.TEXT_BG_COLOR);

designer-base/src/main/java/com/fr/design/gui/itree/filetree/FileTreeIcon.java

@@ -1,6 +1,7 @@
 package com.fr.design.gui.itree.filetree;
 
 import com.fr.base.BaseUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.icon.LocalFileIcon;
 import com.fr.design.icon.LockIcon;
@@ -24,9 +25,9 @@ public class FileTreeIcon {
 
     public static final Icon BLANK_IMAGE_ICON = BaseUtils.readIcon("/com/fr/design/images/gui/blank.gif");
 
-    public static final Icon FOLDER_IMAGE_ICON = BaseUtils.readIcon("/com/fr/design/images/gui/folder.png");
+    public static final Icon FOLDER_IMAGE_ICON = IconUtils.readIcon("/com/fr/design/standard/fileicon/folder.svg");
     public static final Icon FOLDER_HALF_IMAGE_ICON =
-            BaseUtils.readIcon("/com/fr/design/images/gui/filetree_folder_half_authority_normal.png");
+            IconUtils.readIcon("/com/fr/design/standard/fileicon/filetree_folder_half_authority_normal.svg");
 
     public static final Icon FILE_IMAGE_ICON = UIManager.getIcon("FileView.fileIcon");
 
@@ -45,14 +46,14 @@ public class FileTreeIcon {
     public static final Icon CHT_FILE_IMAGE_ICON = BaseUtils.readIcon("/com/fr/design/images/gui/cht.png");
 
     public static final Icon MODERN_CPT_FILE_IMAGE_ICON =
-            BaseUtils.readIcon("/com/fr/design/images/gui/modern_style_cpt_file_icon_16x16.png");
+            IconUtils.readIcon("/com/fr/design/standard/fileicon/modern_style_cpt_file_icon_16x16.svg");
     public static final Icon MODERN_FRM_FILE_IMAGE_ICON =
-            BaseUtils.readIcon("/com/fr/design/images/gui/modern_style_frm_file_icon_16x16.png");
+            IconUtils.readIcon("/com/fr/design/standard/fileicon/modern_style_frm_file_icon_16x16.svg");
     public static final Icon MODERN_CHT_FILE_IMAGE_ICON =
-            BaseUtils.readIcon("/com/fr/design/images/gui/modern_style_cht_file_icon_16x16.png");
+            IconUtils.readIcon("/com/fr/design/standard/fileicon/modern_style_cht_file_icon_16x16.svg");
 
-    public static final Icon CPTX_ICON = BaseUtils.readIcon("/com/fr/nx/app/designer/cptx_file_icon.png");
+    public static final Icon CPTX_ICON = IconUtils.readIcon("/com/fr/design/standard/fileicon/cptx_file_icon.svg");
-    public static final Icon CPTX_LOCKED_ICON = BaseUtils.readIcon("/com/fr/nx/app/designer/cptx_file_icon_locked.png");
+    public static final Icon CPTX_LOCKED_ICON = IconUtils.readIcon("/com/fr/design/standard/fileicon/cptx_file_icon_locked.svg");
 
     public static final LockIcon FOLDER_LOCK_ICON =
             new LockIcon(BaseUtils.readImage("/com/fr/design/images/gui/fold.png"));

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

@@ -35,7 +35,7 @@ public class UIToolbarColorButton extends UICombinationButton implements PopupHi
     private UIObserverListener uiObserverListener;
 
     public UIToolbarColorButton(Icon icon) {
-        super(new UIColorButton(icon), new UIButton(IconUtils.readIcon("/com/fr/design/images/gui/popup")));
+        super(new UIColorButton(icon), new UIButton(IconUtils.readIcon("/com/fr/design/standard/popup")));
         getLeftButton().setEventBanned(true);
         getRightButton().addFocusListener(new FocusListener() {
 

designer-base/src/main/java/com/fr/file/FileNodeFILE.java

@@ -2,6 +2,7 @@ package com.fr.file;
 
 import com.fr.base.BaseUtils;
 import com.fr.base.FRContext;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.file.TemplateResourceManager;
 import com.fr.io.FineEncryptUtils;
 import com.fr.base.io.XMLEncryptUtils;
@@ -168,7 +169,7 @@ public class FileNodeFILE implements FILE {
         }
 
         if (ComparatorUtils.equals(node.getEnvPath(), ProjectConstants.REPORTLETS_NAME)) {
-            return BaseUtils.readIcon("/com/fr/base/images/oem/logo.png");
+            return IconUtils.readIcon("/com/fr/base/images/oem/logo.svg");
         } else {
 
             if (!hasFullAuth) {

designer-base/src/main/resources/com/fr/design/images/lookandfeel/FileIcon.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="M10,1 L14,5.001 L14,15 L2,15 L2,1 L10,1 Z M9,2 L3,2 L3,14 L13,14 L13,6.0002 L9,6.0002 L9,2 Z M10,2.414 L10,5 L12.586,5 L10,2.414 Z" id="Combined-Shape" fill="#333334"></path>
+        <path d="M4,13 L4,3 L8,3 L8,7 L12,7 L12,13 L4,13 Z" id="Combined-Shape" fill="#FEFBDE"></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/lookandfeel/TreeLeafIcon.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="M10,1 L14,5.001 L14,15 L2,15 L2,1 L10,1 Z M9,2 L3,2 L3,14 L13,14 L13,6.0002 L9,6.0002 L9,2 Z M10,2.414 L10,5 L12.586,5 L10,2.414 Z" id="Combined-Shape" fill="#333334"></path>
+        <path d="M4,13 L4,3 L8,3 L8,7 L12,7 L12,13 L4,13 Z" id="Combined-Shape" fill="#FEFBDE"></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/standard/background_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="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>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/standard/bias/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/standard/bias/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/standard/bindcolunm/bind_column_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/standard/bindcolunm/bind_column_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/standard/cell_default.svg

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="32px" height="32px" viewBox="0 0 32 32" 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">
+        <g id="编组" transform="translate(8.000000, 7.000000)" fill-rule="nonzero">
+            <g id="编组-2">
+                <path d="M12,0 L12,1 L13,1 L13,4 L16,4 L16,5 L17,5 L17,13 L13,13 L13,17 L5,17 L5,16 L4,16 L4,13 L1,13 L1,12 L0,12 L0,4 L4,4 L4,0 L12,0 Z M12,2 L5,2 L5,5 L1,5 L2,11 L5,12 L5,14 L12,14 L12,10 L16,10 L14,6 L12,5 L12,2 Z" id="形状结合" fill="#FFFFFF"></path>
+                <path d="M12,2 L6,2 L6,6 L2,6 L2,12 L6,12 L6,16 L12,16 L12,12 L16,12 L16,6 L12,6 L12,2 Z M11,3 L11,7 L15,7 L15,11 L11,11 L11,15 L7,15 L7,11 L3,11 L3,7 L7,7 L7,3 L11,3 Z" id="形状结合备份" fill="#333334"></path>
+                <path d="M10.5,1.5 L10.5,5.49912498 L14.5,5.50012498 L14.5,10.500125 L10.499125,10.499125 L10.500125,14.5 L5.50012495,14.5 L5.49912498,10.499125 L1.5,10.500125 L1.5,5.50012498 L5.5,5.49912498 L5.5,1.5 L10.5,1.5 Z" id="形状结合" stroke="#333334" fill="#FFFFFF"></path>
+            </g>
+        </g>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/standard/chart/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/standard/chart/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/standard/close/close_mouseover.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_关闭_hover</title>
+    <g id="icon_关闭_hover" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" fill-opacity="0.39567854">
+        <g id="icon/close/normal备份" transform="translate(1.000000, 1.000000)" fill="#333334">
+            <path d="M7,0 C10.8659932,0 14,3.13400675 14,7 C14,10.8659932 10.8659932,14 7,14 C3.13400675,14 0,10.8659932 0,7 C0,3.13400675 3.13400675,0 7,0 Z M4.17839611,3.47128933 C3.97899431,3.27188753 3.65972824,3.26920395 3.46446609,3.46446609 L3.46446609,3.46446609 L3.40822459,3.53231989 C3.27681432,3.72475773 3.29437332,4.0014801 3.47128933,4.17839611 L3.47128933,4.17839611 L6.29289322,7 L3.47128933,9.82160389 C3.27188753,10.0210057 3.26920395,10.3402718 3.46446609,10.5355339 L3.46446609,10.5355339 L3.53231989,10.5917754 C3.72475773,10.7231857 4.0014801,10.7056267 4.17839611,10.5287107 L4.17839611,10.5287107 L7,7.70710678 L9.82160389,10.5287107 C10.0210057,10.7281125 10.3402718,10.7307961 10.5355339,10.5355339 L10.5355339,10.5355339 L10.5917754,10.4676801 C10.7231857,10.2752423 10.7056267,9.9985199 10.5287107,9.82160389 L10.5287107,9.82160389 L7.70710678,7 L10.5287107,4.17839611 C10.7281125,3.97899431 10.7307961,3.65972824 10.5355339,3.46446609 L10.5355339,3.46446609 L10.4676801,3.40822459 C10.2752423,3.27681432 9.9985199,3.29437332 9.82160389,3.47128933 L9.82160389,3.47128933 L7,6.29289322 Z" id="形状结合"></path>
+        </g>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/standard/close/close_normal.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M11.5356 4.46454C11.3403 4.26928 11.0237 4.26928 10.8285 4.46454L8.00002 7.29299L5.17155 4.46452C4.97628 4.26925 4.6597 4.26925 4.46444 4.46452C4.26918 4.65978 4.26918 4.97636 4.46444 5.17162L7.29292 8.0001L4.46452 10.8285C4.26925 11.0238 4.26925 11.3403 4.46452 11.5356C4.65978 11.7309 4.97636 11.7309 5.17162 11.5356L8.00002 8.70721L10.8284 11.5356C11.0237 11.7308 11.3402 11.7308 11.5355 11.5356C11.7308 11.3403 11.7308 11.0237 11.5355 10.8285L8.70713 8.0001L11.5356 5.17164C11.7308 4.97638 11.7308 4.6598 11.5356 4.46454Z" fill="#333334"/>
+</svg>

designer-base/src/main/resources/com/fr/design/standard/close/close_press.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_关闭_hover</title>
+    <g id="icon_关闭_hover" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" fill-opacity="0.39567854">
+        <g id="icon/close/normal备份" transform="translate(1.000000, 1.000000)" fill="#333334">
+            <path d="M7,0 C10.8659932,0 14,3.13400675 14,7 C14,10.8659932 10.8659932,14 7,14 C3.13400675,14 0,10.8659932 0,7 C0,3.13400675 3.13400675,0 7,0 Z M4.17839611,3.47128933 C3.97899431,3.27188753 3.65972824,3.26920395 3.46446609,3.46446609 L3.46446609,3.46446609 L3.40822459,3.53231989 C3.27681432,3.72475773 3.29437332,4.0014801 3.47128933,4.17839611 L3.47128933,4.17839611 L6.29289322,7 L3.47128933,9.82160389 C3.27188753,10.0210057 3.26920395,10.3402718 3.46446609,10.5355339 L3.46446609,10.5355339 L3.53231989,10.5917754 C3.72475773,10.7231857 4.0014801,10.7056267 4.17839611,10.5287107 L4.17839611,10.5287107 L7,7.70710678 L9.82160389,10.5287107 C10.0210057,10.7281125 10.3402718,10.7307961 10.5355339,10.5355339 L10.5355339,10.5355339 L10.5917754,10.4676801 C10.7231857,10.2752423 10.7056267,9.9985199 10.5287107,9.82160389 L10.5287107,9.82160389 L7.70710678,7 L10.5287107,4.17839611 C10.7281125,3.97899431 10.7307961,3.65972824 10.5355339,3.46446609 L10.5355339,3.46446609 L10.4676801,3.40822459 C10.2752423,3.27681432 9.9985199,3.29437332 9.82160389,3.47128933 L9.82160389,3.47128933 L7,6.29289322 Z" id="形状结合"></path>
+        </g>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/standard/fileicon/cptx_file_icon.svg

@@ -0,0 +1,14 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M2 1V15H14V5.001L10 1H2Z" fill="white"/>
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M2 15V1H10L14 5.001V15H2ZM9 2H3V14H13V6.00024H10H9V5.00024V2ZM10 2.41412V5.00024H12.5854L10 2.41412Z" fill="#333334"/>
+    <rect x="4" y="2" width="1" height="1" fill="#419BF9"/>
+    <rect x="4" y="4" width="1" height="1" fill="#419BF9"/>
+    <rect x="4" y="6" width="1" height="1" fill="#419BF9"/>
+    <rect x="5" y="3" width="1" height="1" fill="#419BF9"/>
+    <rect x="5" y="5" width="1" height="1" fill="#419BF9"/>
+    <rect x="5" y="7" width="1" height="1" fill="#419BF9"/>
+    <rect x="4" y="8" width="2" height="3" fill="#419BF9"/>
+    <rect x="6" y="7" width="8" height="8" fill="white"/>
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M9 8.00061C7.89543 8.00061 7 8.89604 7 10.0006V15.0006H9.625V12.375H11.375V10.625H9.625V8.00061H9Z" fill="#1D7ADC"/>
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M11.375 8.00061H9.625V10.6256H11.375V15.0006C12.8247 15.0006 14 13.8254 14 12.3756V10.6256V8.00061H11.375Z" fill="#41C9FD"/>
+</svg>

designer-base/src/main/resources/com/fr/design/standard/fileicon/cptx_file_icon_locked.svg

@@ -0,0 +1,13 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M2 1H14V15H2V1Z" fill="white"/>
+    <path opacity="0.3" fill-rule="evenodd" clip-rule="evenodd" d="M2 1H14V15H2V1ZM3 2V14H13V2H3Z" fill="#333334"/>
+    <rect x="4" y="2" width="1" height="1" fill="#419BF9"/>
+    <rect x="4" y="4" width="1" height="1" fill="#419BF9"/>
+    <rect x="4" y="6" width="1" height="1" fill="#419BF9"/>
+    <rect x="5" y="3" width="1" height="1" fill="#419BF9"/>
+    <rect x="5" y="5" width="1" height="1" fill="#419BF9"/>
+    <rect x="5" y="7" width="1" height="1" fill="#419BF9"/>
+    <rect x="4" y="8" width="2" height="3" fill="#419BF9"/>
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M13 8H9V10H8V15H14V10H13V8Z" fill="white"/>
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M9 8H13V10H14V15H8V10H9V8ZM10 10H12V9H10V10ZM13 11H9V14H13V11ZM10 12H12V13H10V12Z" fill="#333334"/>
+</svg>

designer-base/src/main/resources/com/fr/design/standard/fileicon/filetree_folder_half_authority_normal.svg

@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M15 3V4.26865C14.7056 4.09787 14.364 4 14 4H9C8.82859 4 8.52433 3.8119 8.44779 3.65851L8.33972 3.44439C8.01578 2.79516 7.33248 2.27588 6.60445 2.08203C6.72592 2.02928 6.85971 2 7 2H14C14.55 2 15 2.45 15 3ZM14 14C14.55 14 15 13.55 15 13V6C15 5.45 14.55 5 14 5H9C8.45 5 7.799 4.598 7.553 4.105L7.447 3.895C7.201 3.402 6.55 3 6 3H2C1.45 3 1 3.45 1 4V13C1 13.55 1.45 14 2 14H14Z" fill="#419BF9" fill-opacity="0.5"/>
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M15 8.34052C15 8.34052 14 9 12 9C9 9 6 7 4 7C2 7 1 8.34052 1 8.34052V13C1 13.5523 1.44772 14 2 14H14C14.5523 14 15 13.5523 15 13V8.34052Z" fill="#419BF9"/>
+</svg>

designer-base/src/main/resources/com/fr/design/standard/fileicon/folder.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M15 3V4.26865C14.7056 4.09787 14.364 4 14 4H9C8.82859 4 8.52433 3.8119 8.44779 3.65851L8.33972 3.44439C8.01578 2.79516 7.33248 2.27588 6.60445 2.08203C6.72592 2.02928 6.85971 2 7 2H14C14.55 2 15 2.45 15 3ZM14 14C14.55 14 15 13.55 15 13V6C15 5.45 14.55 5 14 5H9C8.45 5 7.799 4.598 7.553 4.105L7.447 3.895C7.201 3.402 6.55 3 6 3H2C1.45 3 1 3.45 1 4V13C1 13.55 1.45 14 2 14H14Z" fill="#419BF9"/>
+</svg>

designer-base/src/main/resources/com/fr/design/standard/fileicon/minus.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M11.5858 5C12.4767 5 12.9229 6.07714 12.2929 6.70711L8 11L3.70711 6.70711C3.07714 6.07714 3.52331 5 4.41421 5L11.5858 5Z" fill="#AEAEAE"/>
+</svg>

designer-base/src/main/resources/com/fr/design/standard/fileicon/modern_style_cht_file_icon_16x16.svg

@@ -0,0 +1,9 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <rect width="16" height="16" fill="url(#pattern0)"/>
+    <defs>
+        <pattern id="pattern0" patternContentUnits="objectBoundingBox" width="1" height="1">
+            <use xlink:href="#image0_112_11271" transform="scale(0.0208333)"/>
+        </pattern>
+        <image id="image0_112_11271" width="48" height="48" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c6QAAA6ZJREFUaAXtWk1LG0EYnnyQJlHRkJOXIHgQzwo9hkIrbT0UrCTQQ4kEpKBeCoVA/oCn/oMWf4IgFKGFnnsw1dCACiUgSZOYD03Md+Km77Mw6a5m0zUmbgI78GZ2592dfZ73eWd2mA1rtVrspi0sLBjHx8fNjLGhsenpaZPb7TbexGpAg7QYDAYrnU+R2ciMUp+GxwB5TXYFI8wNjgURbpfFxUUAntre3v7sdDpftB1DcHB+fv41GAx+IChRss4ETk5OQMAG8D6fjw6Hp+zs7DwjNA6yBFmBI5OlSLFYRLusjV84JLUJ+CjNDRzPMIPlGG/WbfBwjCIBGSGdgCwcGpzIptF+PD/7/IliN87974q+Xh16CvUauX7dN/IK9H0MdIus69NvRfeZf1bR180x8groBLrJ+xC+kVegp0H8/sdTxeAGFT2DcYy8AjqBwSSG+l51BdTHajBX6goMJq7qe9UVUB+rwVypKzCYuKrvdeQV6Gkx9/HxN+UQ7Su7zpRdHT3SrfTra2xOM2wtynbmeiLQ8Wn3aJRu8UtBN5tN1mg0WL1eZ+VyGU8QwU9OTrafpikBgEVkARS19Byga7Wa6IPf4XBgVxq7z9V8Pj8cBAC6VCqxy8tLVq1WxWhbrVZmNBqZyWRiFotFjH4kEimura29I9R/zGZzeXl5WXsCiDYiiyjPzv7bkRAEQSRTKBRYOp1mh4eHpbdUCHGEyKVcLld9d3e3/VlJ01kICiDyvAB8pVIRFUmlUuzg4ADg35D/J6kRn5ubq9BHGIFfj1qzMcAV4N8qQIaDp89JYuT9fj/Ahwl8cn5+vkZqtCPPSWhKADMM8hyphFnm4uKCcfDr6+v/BQ8SmqUQ0gX5b7fbxYGczWZZIpFgoVCopBY8CGiiAE8fEEDJZDIsmUyyo6Oj0sbGhqrIizfSjyYKgAAGL/Ie4OPxuJjzBN5LmEJjY2OJpaWljjnPgfNaEwI856FALBZj4XC4uLm5+RrgyVKrq6v1vb29WwOWg5bWD55CiD4GLxRA9I+Pj4tbW1sAH5mYmMiurKw06ZuwKvAgIlOA/h+BNtk8i4Z+FgxeKIC37+np6RWBf0X9/6KXVJrAN+4CHrhkCtCLQsDLI5fLfaGOXvYTOO8LBLDOoSVELBAIeKg9SuBzXq/3zuDRZ6c/ezyidiz37GRYvva7QHVYnSxvs9muPB7PndJGCugWATjp7cjX3bK1t/TGex6DgDAzMyNEo1Fxod9rf38Bej/nGNO7QyAAAAAASUVORK5CYII="/>
+    </defs>
+</svg>

designer-base/src/main/resources/com/fr/design/standard/fileicon/modern_style_cpt_file_icon_16x16.svg

@@ -0,0 +1,9 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <rect width="16" height="16" fill="url(#pattern0)"/>
+    <defs>
+        <pattern id="pattern0" patternContentUnits="objectBoundingBox" width="1" height="1">
+            <use xlink:href="#image0_112_11270" transform="scale(0.0208333)"/>
+        </pattern>
+        <image id="image0_112_11270" width="48" height="48" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c6QAAAfdJREFUaAXtmjFLAzEUx1P1oFRqCyJIEVRwaREEu0uL4AfQyc3VzY+gn6R0cxInVwsuLgfddGsnEUVoKUJV5MwrnMiRpPfepb0XaZZrk0ve/5f/a5I7mgmCQLhc5lwWD9oXVAC+77O0pVqtZqJ6/6cDIaUkDj+mepUZoY3vvAMzAK23U2pQrkLU2K3uu6htLIr71w/0EJWiJ5Y8fEIkAuj2PsX57Yu4fhyI/vB7JDq42BbHd29ogHLBEzf7K+h+ZID281DUGp1f4ejIkQ4P/a9ITbyveM/kuDDzNsXHk6q+iwQAaROmjHrY6dWSACDnuRQ0QE/+WLnMPkwiGoDLzIc60KtQMTsf9lVeYS9o7BaUbbBHbF49KduolWiAcYHqcmnVFdgjbBfnU2gGYDslsOPNHMDOmO37nXfA+jI6iaXS5JrzDrAByBOexsAZNgAHpawpU7RtLABg9s/Kea1IU0PqACD+cm9ZrOXMh0QdBAlgZ5Vm918RIPxoPTd6kK/IB3pqIS2j7dMtajzROSyR+6o6khxQDZRWHckBG2JNL2wx47vkQFMF5gpAU77qP3EVQCsegLg7YBTPHWCseM4AscRzBYgtniMASjw3ALR4TgAk8QBgPErY2u4hkKGQxcOYae8DicQDgM6BOjROusjjQStpjIzrf7f5AQo/bEzI1dqQAAAAAElFTkSuQmCC"/>
+    </defs>
+</svg>

designer-base/src/main/resources/com/fr/design/standard/fileicon/modern_style_frm_file_icon_16x16.svg

@@ -0,0 +1,9 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <rect width="16" height="16" fill="url(#pattern0)"/>
+    <defs>
+        <pattern id="pattern0" patternContentUnits="objectBoundingBox" width="1" height="1">
+            <use xlink:href="#image0_112_11272" transform="scale(0.0208333)"/>
+        </pattern>
+        <image id="image0_112_11272" width="48" height="48" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c6QAAAU9JREFUaAXtWrERgzAMDLm0VKnIACzABNkkZUZKyyZZgAUYIFSZgVjcqeGMsQQc+mA3csBY/9LLdjiyvu9PyO2MDJ6wX3wEmqYxmZaqqrIx3v/MALMsy5K7u9q2bSf9eyXEo/M8565ZCy+hRGBvbcFnIFjEvuh2Xee7vNq1oihEc5nLgNtEsQmI0LvB5jJwOALiIuYI3V5f7g7287wOVlqEPIl2cUgS4gjuZeEzoK4B1vw48lotj+eJ/Q2fAXgCagmlZTRW5DPj4CUET0BdA2kZndF27G14CcETENcAHZelf/ti5aAZJyZATtxLVo2vTZ45noTWCuNaMkTKQO0LHgqB2tXdA5XAJHgiZD0DQfDWCcyCt0wgCrxVAtHgLRIQgbdGQAzeEgEVeCIQPMyttd2To0BTg6c5994HFoEnAlMZuNPNrZs7HryX+sjQP7f5AY0MQx/xGb2cAAAAAElFTkSuQmCC"/>
+    </defs>
+</svg>

designer-base/src/main/resources/com/fr/design/standard/fileicon/plus.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M5 4.41421C5 3.52331 6.07714 3.07714 6.70711 3.70711L11 8L6.70711 12.2929C6.07714 12.9229 5 12.4767 5 11.5858V4.41421Z" fill="#AEAEAE"/>
+</svg>

designer-base/src/main/resources/com/fr/design/standard/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/standard/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/standard/formula/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/standard/formula/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/standard/image/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/standard/image/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/standard/merge/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/standard/merge/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/standard/noboder.svg

@@ -0,0 +1,3 @@
+<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M1.5 12.5V13.5H0.5V12.5H1.5ZM13.5 12.5V13.5H12.5V12.5H13.5ZM7.5 12.5V13.5H6.5V12.5H7.5ZM3.5 12.5V13.5H2.5V12.5H3.5ZM5.501 12.5V13.5H4.5V12.5H5.501ZM9.5 12.5V13.5H8.5V12.5H9.5ZM11.5 12.5V13.5H10.5V12.5H11.5ZM1.5 10.5V11.5H0.5V10.5H1.5ZM13.5 10.5V11.5H12.5V10.5H13.5ZM7.5 10.5V11.5H6.5V10.5H7.5ZM1.5 8.499V9.5H0.5V8.499H1.5ZM13.5 8.499V9.5H12.5V8.499H13.5ZM7.5 8.499V9.5H6.5V8.499H7.5ZM1.5 6.5V7.5H0.5V6.5H1.5ZM13.5 6.5V7.5H12.5V6.5H13.5ZM7.5 6.5V7.5H6.5V6.5H7.5ZM3.5 6.5V7.5H2.5V6.5H3.5ZM5.501 6.5V7.5H4.5V6.5H5.501ZM9.5 6.5V7.5H8.5V6.5H9.5ZM11.5 6.5V7.5H10.5V6.5H11.5ZM1.5 4.5V5.5H0.5V4.5H1.5ZM13.5 4.5V5.5H12.5V4.5H13.5ZM7.5 4.5V5.5H6.5V4.5H7.5ZM1.5 2.5V3.5H0.5V2.5H1.5ZM13.5 2.5V3.5H12.5V2.5H13.5ZM7.5 2.5V3.5H6.5V2.5H7.5ZM1.5 0.5V1.5H0.5V0.5H1.5ZM13.5 0.5V1.5H12.5V0.5H13.5ZM7.5 0.5V1.5H6.5V0.5H7.5ZM3.5 0.5V1.5H2.5V0.5H3.5ZM5.501 0.5V1.5H4.5V0.5H5.501ZM9.5 0.5V1.5H8.5V0.5H9.5ZM11.5 0.5V1.5H10.5V0.5H11.5Z" fill="#333334"/>
+</svg>

designer-base/src/main/resources/com/fr/design/standard/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/standard/richtext/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/standard/richtext/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/standard/subreport/sub_report_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/standard/subreport/sub_report_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/standard/text/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/standard/text/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/standard/uimode/view_normal.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" 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="M8,3 C10.9455187,3 13.6121853,4.6 16,7.8 C13.6121853,11 10.9455187,12.6 8,12.6 C5.05448133,12.6 2.38781467,11 0,7.8 C2.38781467,4.6 5.05448133,3 8,3 Z M8,4.6 C6.2326888,4.6 4.8,6.0326888 4.8,7.8 C4.8,9.5673112 6.2326888,11 8,11 C9.7673112,11 11.2,9.5673112 11.2,7.8 C11.2,6.0326888 9.7673112,4.6 8,4.6 Z M8,6.2 C8.8836556,6.2 9.6,6.9163444 9.6,7.8 C9.6,8.6836556 8.8836556,9.4 8,9.4 C7.1163444,9.4 6.4,8.6836556 6.4,7.8 C6.4,6.9163444 7.1163444,6.2 8,6.2 Z" id="形状结合" fill="#484848"></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/standard/uimode/view_pressed.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" 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="M8,3 C10.9455187,3 13.6121853,4.6 16,7.8 C13.6121853,11 10.9455187,12.6 8,12.6 C5.05448133,12.6 2.38781467,11 0,7.8 C2.38781467,4.6 5.05448133,3 8,3 Z M8,4.6 C6.2326888,4.6 4.8,6.0326888 4.8,7.8 C4.8,9.5673112 6.2326888,11 8,11 C9.7673112,11 11.2,9.5673112 11.2,7.8 C11.2,6.0326888 9.7673112,4.6 8,4.6 Z M8,6.2 C8.8836556,6.2 9.6,6.9163444 9.6,7.8 C9.6,8.6836556 8.8836556,9.4 8,9.4 C7.1163444,9.4 6.4,8.6836556 6.4,7.8 C6.4,6.9163444 7.1163444,6.2 8,6.2 Z" id="形状结合" fill="#484848"></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/standard/unmerge/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/standard/unmerge/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-realize/src/main/java/com/fr/design/actions/cell/BorderAction.java

@@ -3,10 +3,10 @@
  */
 package com.fr.design.actions.cell;
 
-import com.fr.base.BaseUtils;
 import com.fr.base.CellBorderStyle;
 import com.fr.base.NameStyle;
 import com.fr.base.Style;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.actions.ElementCaseAction;
 import com.fr.design.actions.core.ActionFactory;
 import com.fr.design.mainframe.ElementCasePane;
@@ -60,7 +60,7 @@ public class BorderAction extends ElementCaseAction implements ChangeListener {
     public JComponent createToolBarComponent() {
         Object object = this.getValue(UIToolbarBorderButton.class.getName());
         if (object == null || !(object instanceof UIToolbarBorderButton)) {
-            UIToolbarBorderButton borderStylePane = new UIToolbarBorderButton(BaseUtils.readIcon("/com/fr/design/images/m_format/noboder.png"), this.getEditingComponent());
+            UIToolbarBorderButton borderStylePane = new UIToolbarBorderButton(IconUtils.readIcon("/com/fr/design/standard/noboder.svg"), this.getEditingComponent());
             this.putValue(UIToolbarBorderButton.class.getName(), borderStylePane);
             borderStylePane.setEnabled(this.isEnabled());
             borderStylePane.set4Toolbar();

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

@@ -47,7 +47,7 @@ public class UIToolbarBorderButton extends UICombinationButton implements PopupH
 	private JPopupMenu popupWin;
 
 	public UIToolbarBorderButton(Icon icon, ElementCasePane reportPane) {
-		super(new UIButton(icon), new UIButton(IconUtils.readIcon("/com/fr/design/images/gui/popup")));
+		super(new UIButton(icon), new UIButton(IconUtils.readIcon("/com/fr/design/standard/popup")));
 		this.reportPane = reportPane;
 	}
 

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

@@ -51,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(IconUtils.readIcon("/com/fr/design/images/gui/color/foreground"));
+			UIToolbarColorButton tbButton = new UIToolbarColorButton(IconUtils.readIcon("/com/fr/design/standard/foreground_normal.svg"));
 			this.putValue(UIToolbarColorButton.class.getName(), tbButton);
 			tbButton.set4Toolbar();
 			tbButton.setEnabled(this.isEnabled());

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

@@ -60,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(IconUtils.readIcon("/com/fr/design/images/gui/color/background"));
+                UIToolbarColorButton tbButton = new UIToolbarColorButton(IconUtils.readIcon("com/fr/design/standard/background_normal.svg"));
                 tbButton.set4Toolbar();
                 this.putValue(UIToolbarColorButton.class.getName(), tbButton);
 

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

@@ -21,7 +21,7 @@ public class MergeCellAction extends ElementCaseAction  {
         this.setMenuKeySet(KeySetUtils.MERGE_CELL);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-		this.setSmallIcon("/com/fr/design/images/m_edit/merge");
+		this.setSmallIcon("/com/fr/design/standard/merge/merge");
 	}
 
     /**

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

@@ -20,7 +20,7 @@ public class UnmergeCellAction extends ElementCaseAction {
         this.setMenuKeySet(KeySetUtils.UNMERGE_CELL);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon("/com/fr/design/images/m_edit/unmerge");
+        this.setSmallIcon("/com/fr/design/standard/unmerge/unmerge");
     }
 
 	@Override

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

@@ -30,7 +30,7 @@ public class BiasCellAction extends AbstractCellAction implements WorkBookSuppor
         this.setMenuKeySet(INSERT_SLOPE_LINE);
         this.setName(getMenuKeySet().getMenuKeySetName()+ "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon("/com/fr/design/images/m_insert/bias");
+        this.setSmallIcon("/com/fr/design/standard/bias/bias");
     }
 
     public static final MenuKeySet INSERT_SLOPE_LINE = new MenuKeySet() {

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

@@ -29,7 +29,7 @@ public class ChartCellAction extends AbstractCellAction implements WorkBookSuppo
 		this.setMenuKeySet(INSERT_CHART);
 		this.setName(getMenuKeySet().getMenuKeySetName()+ "...");
 		this.setMnemonic(getMenuKeySet().getMnemonic());
-		this.setSmallIcon("/com/fr/design/images/m_insert/chart");
+		this.setSmallIcon("/com/fr/design/standard/chart/chart");
 	}
 
 	public static final MenuKeySet INSERT_CHART = new MenuKeySet() {

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

@@ -22,7 +22,7 @@ public class DSColumnCellAction extends AbstractCellAction implements WorkBookSu
         this.setMenuKeySet(KeySetUtils.INSERT_DATA_COLUMN);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon("/com/fr/design/images/m_insert/bindColumn");
+        this.setSmallIcon("/com/fr/design/standard/bindcolunm/bind_column");
     }
 
     @Override

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

@@ -26,7 +26,7 @@ public class FormulaCellAction extends AbstractCellAction implements WorkBookSup
         this.setMenuKeySet(INSERT_FORMULA);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon("/com/fr/design/images/m_insert/formula");
+        this.setSmallIcon("/com/fr/design/standard/formula/formula");
     }
 
     public static final MenuKeySet INSERT_FORMULA = new MenuKeySet() {

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

@@ -29,7 +29,7 @@ public class GeneralCellAction extends AbstractCellAction implements WorkBookSup
         this.setMenuKeySet(INSERT_TEXT);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon("/com/fr/design/images/m_insert/text");
+        this.setSmallIcon("/com/fr/design/standard/text/text");
     }
 
     public static final MenuKeySet INSERT_TEXT = new MenuKeySet() {

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

@@ -29,7 +29,7 @@ public class ImageCellAction extends AbstractCellAction implements WorkBookSuppo
         this.setMenuKeySet(INSERT_IMAGE);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon("/com/fr/design/images/m_insert/image");
+        this.setSmallIcon("/com/fr/design/standard/image/image");
     }
 
     public static final MenuKeySet INSERT_IMAGE = new MenuKeySet() {

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

@@ -25,7 +25,7 @@ public class RichTextCellAction extends AbstractCellAction implements WorkBookSu
         this.setMenuKeySet(INSERT_RICHTEXT);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon("/com/fr/design/images/m_insert/richtext");
+        this.setSmallIcon("/com/fr/design/standard/richtext/richtext");
     }
 
     @Override

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

@@ -24,7 +24,7 @@ public class SubReportCellAction extends AbstractCellAction {
         this.setMenuKeySet(INSERT_SUB_REPORT);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon("/com/fr/design/images/m_insert/subReport");
+        this.setSmallIcon("/com/fr/design/standard/subreport/sub_report");
     }
 
     public static final MenuKeySet INSERT_SUB_REPORT = new MenuKeySet() {

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

@@ -49,7 +49,7 @@ public class ChartFloatAction extends ElementCaseAction {
         this.setMenuKeySet(FLOAT_INSERT_CHART);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon("/com/fr/design/images/m_insert/chart");
+        this.setSmallIcon("/com/fr/design/standard/chart/m_insert/chart");
     }
 
     public static final MenuKeySet FLOAT_INSERT_CHART = new MenuKeySet() {

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

@@ -37,7 +37,7 @@ public class FormulaFloatAction extends ElementCaseAction {
         this.setMenuKeySet(FLOAT_INSERT_FORMULA);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon("/com/fr/design/images/m_insert/formula");
+        this.setSmallIcon("/com/fr/design/standard/formula/formula");
     }
 
     public static final MenuKeySet FLOAT_INSERT_FORMULA = new MenuKeySet() {

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

@@ -40,7 +40,7 @@ public class ImageFloatAction extends ElementCaseAction {
         this.setMenuKeySet(FLOAT_INSERT_IMAGE);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon("/com/fr/design/images/m_insert/image");
+        this.setSmallIcon("/com/fr/design/standard/image/image");
     }
 
     public static final MenuKeySet FLOAT_INSERT_IMAGE = new MenuKeySet() {

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

@@ -28,7 +28,7 @@ public class TextBoxFloatAction extends AbstractShapeAction {
         this.setMenuKeySet(FLOAT_INSERT_TEXT);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon("/com/fr/design/images/m_insert/text");
+        this.setSmallIcon("/com/fr/design/standard/text/text");
     }
 
     public static final MenuKeySet FLOAT_INSERT_TEXT = new MenuKeySet() {

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

@@ -1347,7 +1347,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");
+        insertFloatMenu.setIconPath("/com/fr/design/standard/floatpop");
 
         UpdateAction[] actions = ActionFactory.createFloatInsertAction(ElementCasePane.class, this);
         for (int i = 0; i < actions.length; i++) {