Merge pull request #11698 in DESIGN/design from feature/x to bugfix/11.0

* commit 'f969948de79a1bd05bd2fade55bb3714f537eb2f':
  REPORT-89253 命名和读取规范化处理,回退右下角异常小标记
  REPORT-89253 修正插入悬浮元素图标项文件路径
  REPORT-89253 设计器替换高清svg图标第2次提交
  REPORT-89253 设计器替换高清svg图标-第1次提交
  REPORT-91743 设计器通过关闭模板A的方式触发保存，设计器页面显示还是模板A的内容
  REPORT-91743 设计器通过关闭模板A的方式触发保存，设计器页面显示还是模板A的内容
  REPORT-91486 不打开任何报表进入设计器，选项弹窗触发下保存，模板tab栏会自动弹出来
  REPORT-91591 单元格控件的自定义样式设置--代码格式调整
  REPORT-91316 不打开任何报表的情况下，编辑工具栏点不动
  REPORT-91591 单元格控件的自定义样式设置
  REPORT-80651 模板版本管理重构一期 - 优化代码结构
  REPORT-80651 模板版本管理重构一期 - 修改代码
  REPORT-80651 模板版本管理重构一期 - 代码格式
  REPORT-80651 模板版本管理重构一期

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

@@ -21,7 +21,7 @@ public class CopyAction extends TemplateComponentAction {
 
         this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_M_Edit_Copy"));
         this.setMnemonic('C');
-        this.setSmallIcon("/com/fr/design/images/m_edit/copy");
+        this.setSmallIcon("/com/fr/design/standard/copy/copy");
         this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_C, DEFAULT_MODIFIER));
         this.setEnabled(!DesignModeContext.isBanCopyAndCut());
     }

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

@@ -25,7 +25,7 @@ public class CutAction extends TemplateComponentAction {
 
         this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_M_Edit_Cut"));
         this.setMnemonic('T');
-        this.setSmallIcon("/com/fr/design/images/m_edit/cut");
+        this.setSmallIcon("/com/fr/design/standard/cut/cut");
         this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_X, DEFAULT_MODIFIER));
         this.setEnabled(!DesignModeContext.isBanCopyAndCut());
     }

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

@@ -24,7 +24,7 @@ public class PasteAction extends TemplateComponentAction {
 
         this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_Edit_Paste"));
         this.setMnemonic('P');
-        this.setSmallIcon("/com/fr/design/images/m_edit/paste");
+        this.setSmallIcon("/com/fr/design/standard/paste/paste");
         this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_V, DEFAULT_MODIFIER));
     }
 

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

@@ -22,7 +22,7 @@ public class DelFileAction extends UpdateAction {
     public DelFileAction() {
 
         this.setName(Toolkit.i18nText("Fine-Design_Basic_Remove"));
-        this.setSmallIcon("/com/fr/design/images/FileDealerPaneIcon/remove");
+        this.setSmallIcon("/com/fr/design/standard/remove/remove");
     }
 
     @Override

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

@@ -28,7 +28,7 @@ public class LocateAction extends UpdateAction {
 
     public LocateAction() {
         this.setName(Toolkit.i18nText("Fine-Design_Basic_Locate"));
-        this.setSmallIcon("/com/fr/design/images/FileDealerPaneIcon/locate.png");
+        this.setSmallIcon("/com/fr/design/standard/locate", false);
     }
 
     @Override

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

@@ -40,7 +40,8 @@ public class PreferenceAction extends UpdateAction {
                 DesignerEnvManager.loadLogSetting();
                 DesignerEnvManager.getEnvManager().saveXMLFile();
                 JTemplate jt = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
-                if (jt != null) {
+                //不能只单纯判断!=null,JTemplate还有可能是JNullTemplate.NULL,这个时候模板也是空内容的
+                if (JTemplate.isValid(jt)) {
                     jt.refreshToolArea();
                 }
                 preferencePane.showRestartDialog();

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

@@ -356,8 +356,6 @@ public class PreferencePane extends BasicPane {
         useIntervalCheckBox = new UICheckBox();
 
         //gc面板
-        JPanel gcControlPane = createGcControlPane();
-
         JPanel enableVcsPanel = new JPanel(FRGUIPaneFactory.createLeftZeroLayout());
         enableVcsPanel.add(vcsEnableCheckBox);
         enableVcsPanel.add(remindVcsLabel);
@@ -390,7 +388,31 @@ public class PreferencePane extends BasicPane {
         vcsPane.add(enableVcsPanel);
         vcsPane.add(intervalPanel);
         vcsPane.add(saveCommitCheckBox);
+
+        initGcControlPane(vcsPane);
+    }
+
+    private void initGcControlPane(JPanel vcsPane) {
+        JPanel gcControlPane = createGcControlPane();
+        new SwingWorker<Boolean, Boolean>() {
+            @Override
+            protected Boolean doInBackground() throws Exception {
+                return WorkContext.getCurrent().get(VcsOperator.class).isLegacyMode();
+            }
+
+            @Override
+            protected void done() {
+                try {
+                    if (Boolean.TRUE.equals(get())) {
+                        // 老版本时才显示gc选项
                         vcsPane.add(gcControlPane);
+                        vcsPane.updateUI();
+                    }
+                } catch (Exception e) {
+                    FineLoggerFactory.getLogger().error(e, "[Vcs] retrieve legacy mode error: {}", e.getMessage());
+                }
+            }
+        }.execute();
     }
 
     /**

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

@@ -62,7 +62,7 @@ public class RenameAction extends UpdateAction {
     public RenameAction() {
 
         this.setName(Toolkit.i18nText("Fine-Design_Basic_Rename"));
-        this.setSmallIcon("/com/fr/design/images/FileDealerPaneIcon/rename");
+        this.setSmallIcon("/com/fr/design/standard/rename/rename");
     }
 
     @Override

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

@@ -4,14 +4,13 @@
 package com.fr.design.constants;
 
 import com.fr.base.svg.IconUtils;
-import com.fr.base.svg.SVGIcon;
+import com.fr.base.svg.SVGLoader;
 import com.fr.general.IOUtils;
 import com.fr.stable.Constants;
 import com.fr.stable.StringUtils;
 
 import javax.swing.BorderFactory;
 import javax.swing.Icon;
-import javax.swing.ImageIcon;
 import javax.swing.border.Border;
 import java.awt.BasicStroke;
 import java.awt.Color;
@@ -56,7 +55,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_normal.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"),
@@ -161,16 +160,16 @@ public interface UIConstants {
 
     public static final BufferedImage DRAG_BAR_RIGHT = IOUtils.readImage("com/fr/design/images/control/barm.png");
     public static final BufferedImage DRAG_BAR_LEFT = IOUtils.readImage("com/fr/design/images/control/barl.png");
-    public static final BufferedImage DRAG_UP_NORMAL = IOUtils.readImage("com/fr/design/images/control/upnor.png");
-    public static final BufferedImage DRAG_UP_PRESS = IOUtils.readImage("com/fr/design/images/control/uppre.png");
-    public static final BufferedImage DRAG_DOWN_NORMAL = IOUtils.readImage("com/fr/design/images/control/downnor.png");
-    public static final BufferedImage DRAG_DOWN_PRESS = IOUtils.readImage("com/fr/design/images/control/downpre.png");
-    public static final BufferedImage DRAG_RIGHT_NORMAL = IOUtils.readImage("com/fr/design/images/control/rightnor.png");
-    public static final BufferedImage DRAG_RIGHT_PRESS = IOUtils.readImage("com/fr/design/images/control/rightpre.png");
-    public static final BufferedImage DRAG_LEFT_NORMAL = IOUtils.readImage("com/fr/design/images/control/leftnor.png");
-    public static final BufferedImage DRAG_LEFT_PRESS = IOUtils.readImage("com/fr/design/images/control/leftpre.png");
+    public static final Image DRAG_UP_NORMAL = SVGLoader.load("/com/fr/design/standard/triangle.arrow/up_normal.svg");
+    public static final Image DRAG_UP_PRESS = SVGLoader.load("/com/fr/design/standard/triangle.arrow/up_hover.svg");
+    public static final Image DRAG_DOWN_NORMAL = SVGLoader.load("/com/fr/design/standard/triangle.arrow/down_normal.svg");
+    public static final Image DRAG_DOWN_PRESS = SVGLoader.load("/com/fr/design/standard/triangle.arrow/down_hover.svg");
+    public static final Image DRAG_RIGHT_NORMAL = SVGLoader.load("/com/fr/design/standard/drag/right_normal.svg");
+    public static final Image DRAG_RIGHT_PRESS = SVGLoader.load("/com/fr/design/standard/drag/right_pressed.svg");
+    public static final Image DRAG_LEFT_NORMAL = SVGLoader.load("/com/fr/design/standard/drag/left_normal.svg");
+    public static final Image DRAG_LEFT_PRESS = SVGLoader.load("/com/fr/design/standard/drag/left_pressed.svg");
     public static final BufferedImage DRAG_DOT = IOUtils.readImage("com/fr/design/images/control/dot.png");
-    public static final BufferedImage DRAG_LINE = IOUtils.readImage("com/fr/design/images/control/dot-line.png");
+    public static final Image DRAG_LINE = SVGLoader.load("/com/fr/design/standard/dot_line_normal.svg");
     public static final BufferedImage ACCESSIBLE_EDITOR_DOT = IOUtils.readImage("com/fr/design/images/control/dot.png");
     public static final BufferedImage DRAG_DOT_VERTICAL = IOUtils.readImage("com/fr/design/images/control/dotv.png");
     public static final BufferedImage POP_BUTTON_DOWN = IOUtils.readImage("com/fr/design/images/buttonicon/popdownarrow.png");
@@ -187,20 +186,22 @@ public interface UIConstants {
     public static final Icon CHOOSEN_ICON = IOUtils.readIcon("com/fr/design/images/buttonicon/select_item.png");
     public static final Icon PRE_WIDGET_ICON = IOUtils.readIcon("com/fr/design/images/buttonicon/prewidget.png");
     public static final Icon PRE_WIDGET_NORMAL_ICON = IconUtils.readIcon("com/fr/design/images/buttonicon/prewidget");
-    public static final Icon EDIT_NORMAL_ICON = IOUtils.readIcon("com/fr/design/images/buttonicon/editn.png");
-    public static final Icon EDIT_PRESSED_ICON = IOUtils.readIcon("com/fr/design/images/buttonicon/editp.png");
-    public static final Icon HIDE_NORMAL_ICON = IOUtils.readIcon("com/fr/design/images/buttonicon/hiden.png");
-    public static final Icon HIDE_PRESSED_ICON = IOUtils.readIcon("com/fr/design/images/buttonicon/hidep.png");
-    public static final Icon VIEW_NORMAL_ICON = IOUtils.readIcon("com/fr/design/images/buttonicon/viewn.png");
-    public static final Icon VIEW_PRESSED_ICON = IOUtils.readIcon("com/fr/design/images/buttonicon/viewp.png");
-    public static final Icon RUN_BIG_ICON = IOUtils.readIcon("com/fr/design/images/buttonicon/run24.png");
-    public static final Icon RUN_SMALL_ICON = IOUtils.readIcon("com/fr/design/images/buttonicon/runs.png");
-    public static final Icon PAGE_BIG_ICON = IOUtils.readIcon("com/fr/design/images/buttonicon/pageb24.png");
-    public static final Icon WRITE_BIG_ICON = IOUtils.readIcon("com/fr/design/images/buttonicon/writeb24.png");
-    public static final Icon ANA_BIG_ICON = IOUtils.readIcon("com/fr/design/images/buttonicon/anab24.png");
-    public static final Icon PAGE_SMALL_ICON = IOUtils.readIcon("com/fr/design/images/buttonicon/pages.png");
-    public static final Icon WRITE_SMALL_ICON = IOUtils.readIcon("com/fr/design/images/buttonicon/writes.png");
-    public static final Icon ANA_SMALL_ICON = IOUtils.readIcon("com/fr/design/images/buttonicon/anas.png");
+    public static final Icon EDIT_NORMAL_ICON = IconUtils.readIcon("/com/fr/design/standard/uimode/edit");
+    public static final Icon EDIT_PRESSED_ICON = IconUtils.readIcon("/com/fr/design/standard/uimode/edit");
+    public static final Icon HIDE_NORMAL_ICON = IconUtils.readIcon("/com/fr/design/standard/uimode/hide");
+    public static final Icon HIDE_PRESSED_ICON = IconUtils.readIcon("/com/fr/design/standard/uimode/hide");
+    public static final Icon VIEW_NORMAL_ICON = IconUtils.readIcon("/com/fr/design/standard/uimode/view");
+    //public static final Icon VIEW_PRESSED_ICON = IconUtils.readIcon("/com/fr/design/standard/uimode/view");
+
+    public static final Icon RUN_BIG_ICON = IconUtils.readIcon("/com/fr/design/standard/preview/run24.svg");
+    public static final Icon RUN_SMALL_ICON = IconUtils.readIcon("/com/fr/design/standard/preview/runs.svg");
+    public static final Icon PAGE_BIG_ICON = IconUtils.readIcon("/com/fr/design/standard/preview/pageb24.svg");
+    public static final Icon WRITE_BIG_ICON = IconUtils.readIcon("/com/fr/design/standard/preview/writeb24.svg");
+    public static final Icon ANA_BIG_ICON = IconUtils.readIcon("/com/fr/design/standard/preview/anab24.svg");
+    public static final Icon PAGE_SMALL_ICON = IconUtils.readIcon("/com/fr/design/standard/preview/pages.svg");
+    public static final Icon WRITE_SMALL_ICON = IconUtils.readIcon("/com/fr/design/standard/preview/writes.svg");
+    public static final Icon ANA_SMALL_ICON = IconUtils.readIcon("/com/fr/design/standard/preview/anas.svg");
+
     public static final Icon REFRESH_ICON = IOUtils.readIcon("com/fr/design/images/buttonicon/refresh.png");
     public static final Icon FONT_ICON = IOUtils.readIcon("/com/fr/design/images/gui/color/foreground.png");
     public static final Icon AUTO_FONT_ICON = IOUtils.readIcon("/com/fr/design/images/gui/color/autoForeground.png");

designer-base/src/main/java/com/fr/design/data/BasicTableDataTreePane.java

@@ -2,6 +2,7 @@ package com.fr.design.data;
 
 import com.fr.base.BaseUtils;
 import com.fr.base.TableData;
+import com.fr.base.svg.IconUtils;
 import com.fr.data.MultiResultTableData;
 import com.fr.data.TableDataSource;
 import com.fr.design.DesignModelAdapter;
@@ -114,7 +115,7 @@ public abstract class BasicTableDataTreePane extends DockingView implements Resp
      */
     @Override
     public Icon getViewIcon() {
-        return BaseUtils.readIcon(IconPathConstants.DS_ICON_PATH);
+        return IconUtils.readIcon(IconPathConstants.DS_ICON_PATH);
     }
 
     /**
@@ -424,7 +425,7 @@ public abstract class BasicTableDataTreePane extends DockingView implements Resp
         public PreviewTableDataAction(TableDataTree dataTree) {
             this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview"));
             this.setMnemonic('p');
-            this.setSmallIcon("/com/fr/design/images/m_file/preview");
+            this.setSmallIcon("/com/fr/design/standard/previewdateset/preview");
             this.dataTree = dataTree;
         }
 
@@ -463,7 +464,7 @@ public abstract class BasicTableDataTreePane extends DockingView implements Resp
         public ConnectionTableAction() {
             this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Server_Define_Data_Connection"));
             this.setMnemonic('D');
-            this.setSmallIcon("/com/fr/design/images/m_web/connection");
+            this.setSmallIcon("/com/fr/design/standard/connection", false);
         }
 
         @Override

designer-base/src/main/java/com/fr/design/data/datapane/TableDataCreatorProducer.java

@@ -33,33 +33,33 @@ public class TableDataCreatorProducer {
     public TableDataNameObjectCreator[] createReportTableDataCreator() {
         TableDataNameObjectCreator dataBase = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Database_Query"),
                 "ds",
-                "/com/fr/design/images/data/database.png", DBTableData.class, DBTableDataPane.class);
+                "/com/fr/design/standard/database_normal.svg", DBTableData.class, DBTableDataPane.class);
         TableDataNameObjectCreator ds_Class = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Class"),
                 "Class",
-                "/com/fr/design/images/data/source/classTableData.png", ClassTableData.class, ClassTableDataPane.class);
+                "/com/fr/design/standard/class_table_data_normal.svg", ClassTableData.class, ClassTableDataPane.class);
         TableDataNameObjectCreator table = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Embedded"),
                 "Embedded",
-                "/com/fr/design/images/data/dataTable.png", EmbeddedTableData.class, EmbeddedTableDataPane.class);
+                "/com/fr/design/standard/data_table_normal.svg", EmbeddedTableData.class, EmbeddedTableDataPane.class);
         TableDataNameObjectCreator multiTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Relation"),
                 "Multi",
-                "/com/fr/design/images/data/multi.png", ConditionTableData.class, MultiTDTableDataPane.class) {
+                "/com/fr/design/standard/multi_normal.svg", ConditionTableData.class, MultiTDTableDataPane.class) {
             public boolean isNeedParameterWhenPopulateJControlPane() {
                 return true;
             }
         };
         TableDataNameObjectCreator fileTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_File"),
                 "File",
-                "/com/fr/design/images/data/file.png", FileTableData.class, FileTableDataSmallHeightPane.class);
+                "/com/fr/design/standard/file_normal.svg", FileTableData.class, FileTableDataSmallHeightPane.class);
         TableDataNameObjectCreator treeTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Tree"),
                 "Tree",
-                "/com/fr/design/images/data/tree.png", RecursionTableData.class, TreeTableDataPane.class) {
+                "/com/fr/design/standard/tree_normal.svg", RecursionTableData.class, TreeTableDataPane.class) {
             public boolean isNeedParameterWhenPopulateJControlPane() {
                 return true;
             }
         };
         TableDataNameObjectCreator storeProcedure = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Stored_Procedure"),
                 "Proc",
-                "/com/fr/design/images/data/store_procedure.png",
+                "/com/fr/design/standard/store_procedure_normal.svg",
                 StoreProcedure.class, ProcedureDataPane.class) {
             @Override
             public boolean shouldInsertSeparator() {
@@ -72,33 +72,33 @@ public class TableDataCreatorProducer {
 
     public TableDataNameObjectCreator[] createServerTableDataCreator() {
         TableDataNameObjectCreator dataBase = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Database_Query"),
-                "/com/fr/design/images/data/dock/serverdatabase.png", DBTableData.class,
+                "/com/fr/design/standard/server_database_normal.svg", DBTableData.class,
                 DBTableDataPane.class);
         TableDataNameObjectCreator ds_Class = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Class"),
-                "/com/fr/design/images/data/dock/serverclasstabledata.png", ClassTableData.class,
+                "/com/fr/design/standard/class_table_data_normal.svg", ClassTableData.class,
                 ClassTableDataPane.class);
         TableDataNameObjectCreator table = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Embedded"),
-                "/com/fr/design/images/data/dock/serverdatatable.png", EmbeddedTableData.class,
+                "/com/fr/design/standard/data_table_normal.svg", EmbeddedTableData.class,
                 EmbeddedTableDataPane.class);
         TableDataNameObjectCreator fileTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_File"),
-                "/com/fr/design/images/data/file.png", FileTableData.class,
+                "/com/fr/design/standard/file_normal.svg", FileTableData.class,
                 FileTableDataSmallPane.class);
         TableDataNameObjectCreator treeTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Tree"),
-                "/com/fr/design/images/data/tree.png",
+                "/com/fr/design/standard/tree_normal.svg",
                 RecursionTableData.class, GlobalTreeTableDataPane.class) {
             public boolean isNeedParameterWhenPopulateJControlPane() {
                 return true;
             }
         };
         TableDataNameObjectCreator multiTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Relation"),
-                "/com/fr/design/images/data/multi.png",
+                "/com/fr/design/standard/multi_normal.svg",
                 ConditionTableData.class, GlobalMultiTDTableDataPane.class) {
             public boolean isNeedParameterWhenPopulateJControlPane() {
                 return true;
             }
         };
         TableDataNameObjectCreator storeProcedure = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Stored_Procedure"),
-                "/com/fr/design/images/data/store_procedure.png",
+                "/com/fr/design/standard/store_procedure_normal.svg",
                 StoreProcedure.class, ProcedureDataPane.class) {
             @Override
             public boolean shouldInsertSeparator() {

designer-base/src/main/java/com/fr/design/data/datapane/TableDataNameObjectCreator.java

@@ -1,6 +1,8 @@
 package com.fr.design.data.datapane;
 
 import com.fr.base.BaseUtils;
+import com.fr.base.svg.IconUtils;
+import com.fr.base.svg.SVGLoader;
 import com.fr.data.impl.DBTableData;
 import com.fr.design.actions.tabledata.TableDataAction;
 import com.fr.design.beans.BasicBeanPane;
@@ -39,7 +41,7 @@ public class TableDataNameObjectCreator extends NameObjectCreator {
     public TableDataNameObjectCreator(TableDataAction action) {
         super(action.getDisplayName(), action.getIconPath(), action.getTableDataClass(), action.getUpdateTableDataPaneClass());
         this.iconPath = action.getIconPath();
-        menuImage = BaseUtils.readImage(iconPath);
+        menuImage = SVGLoader.load(iconPath);
         isNeedInsertSeparator = action.isNeedInsertSeparator();
         prefix = action.getPrefix();
     }
@@ -54,7 +56,7 @@ public class TableDataNameObjectCreator extends NameObjectCreator {
         super(menuName, iconPath, clazz, updatePane);
         if (iconPath != null) {
             this.iconPath = iconPath;
-            menuImage = BaseUtils.readImage(iconPath);
+            menuImage = SVGLoader.load(iconPath);
         }
     }
 
@@ -62,7 +64,7 @@ public class TableDataNameObjectCreator extends NameObjectCreator {
         super(menuName, iconPath, clazz, updatePane);
         if (iconPath != null) {
             this.iconPath = iconPath;
-            menuImage = BaseUtils.readImage(iconPath);
+            menuImage = SVGLoader.load(iconPath);
         }
         this.prefix = prefix;
     }
@@ -71,7 +73,7 @@ public class TableDataNameObjectCreator extends NameObjectCreator {
         super(menuName, iconPath, clazz, clazz4Init, updatePane);
         if (iconPath != null) {
             this.iconPath = iconPath;
-            menuImage = BaseUtils.readImage(iconPath);
+            menuImage = SVGLoader.load(iconPath);
         }
     }
 
@@ -79,7 +81,7 @@ public class TableDataNameObjectCreator extends NameObjectCreator {
         super(menuName, iconPath, clazz, clazz4Init, updatePane);
         if (iconPath != null) {
             this.iconPath = iconPath;
-            menuImage = BaseUtils.readImage(iconPath);
+            menuImage = SVGLoader.load(iconPath);
         }
         this.prefix = prefix;
     }

designer-base/src/main/java/com/fr/design/data/datapane/TableDataTree.java

@@ -1,10 +1,9 @@
 package com.fr.design.data.datapane;
 
-import com.fr.base.BaseUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.data.MultiResultTableData;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.data.datapane.management.search.TableDataTreeSearchManager;
-import com.fr.design.data.tabledata.wrapper.AbstractTableDataWrapper;
 import com.fr.design.data.tabledata.wrapper.TableDataWrapper;
 import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode;
 import com.fr.design.gui.itree.refreshabletree.UserObjectRefreshJTree;
@@ -55,7 +54,7 @@ public class TableDataTree extends UserObjectRefreshJTree<TableDataSourceOP> {
             Object userObj = treeNode.getUserObject();
             if (userObj instanceof String) {
                 // p:这个是column field.
-                this.setIcon(BaseUtils.readIcon("com/fr/design/images/data/field.png"));
+                this.setIcon(IconUtils.readIcon("/com/fr/design/standard/field"));
                 this.setText((String) userObj);
             } else if (userObj instanceof NameObject) {
                 NameObject nameObject = (NameObject) userObj;
@@ -66,14 +65,14 @@ public class TableDataTree extends UserObjectRefreshJTree<TableDataSourceOP> {
                 } else if (nameObject.getObject() instanceof Integer) {
                     int num = (Integer) nameObject.getObject();
                     if (num == TableDataSourceOP.SERVER_TABLE_DATA) {
-                        this.setIcon(BaseUtils.readIcon(IconPathConstants.STD_SHOW_ICON_PATH));
+                        this.setIcon(IconUtils.readIcon(IconPathConstants.STD_SHOW_ICON_PATH));
                     } else if (num == TableDataSourceOP.STORE_PRECEDURE_DATA) {
-                        this.setIcon(BaseUtils.readIcon(IconPathConstants.SP_SHOW_ICON_PATH));
+                        this.setIcon(IconUtils.readIcon(IconPathConstants.SP_SHOW_ICON_PATH));
                     } else {
-                        this.setIcon(BaseUtils.readIcon(IconPathConstants.DS_QUERY_ICON_PATH));
+                        this.setIcon(IconUtils.readIcon(IconPathConstants.DS_QUERY_ICON_PATH));
                     }
                 } else {
-                    this.setIcon(BaseUtils.readIcon("/com/fr/design/images/data/store_procedure.png"));
+                    this.setIcon(IconUtils.readIcon("/com/fr/design/images/data/store_procedure.png"));
                 }
             } else if (userObj == PENDING) {
                 this.setIcon(null);

designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java

@@ -229,7 +229,7 @@ public class TableDataTreePane extends BasicTableDataTreePane {
     private TreeSearchToolbarPane initToolBarPane() {
         // toolbar
         addMenuDef = new MenuDef(Toolkit.i18nText("Fine-Design_Basic_Action_Add"));
-        addMenuDef.setIconPath("/com/fr/design/images/control/addPopup");
+        addMenuDef.setIconPath("/com/fr/design/standard/addpopup/addPopup");
         createAddMenuDef();
         // 创建插件监听
         createPluginListener();
@@ -895,7 +895,7 @@ public class TableDataTreePane extends BasicTableDataTreePane {
 
         @Override
         public String getIconResource() {
-            return "/com/fr/design/images/control/batch_esd_on";
+            return "/com/fr/design/standard/batchesdon/batch_esd_on";
         }
 
         @Override
@@ -942,7 +942,7 @@ public class TableDataTreePane extends BasicTableDataTreePane {
 
         @Override
         public String getIconResource() {
-            return "/com/fr/design/images/control/batch_esd_off";
+            return "/com/fr/design/standard/batchesdoff/batch_esd_off";
         }
 
         @Override
@@ -1036,7 +1036,7 @@ public class TableDataTreePane extends BasicTableDataTreePane {
         public EditAction() {
             this.setName(Toolkit.i18nText("Fine-Design_Basic_Edit"));
             this.setMnemonic('E');
-            this.setSmallIcon("/com/fr/design/images/control/edit");
+            this.setSmallIcon("/com/fr/design/standard/editdataset/edit");
         }
 
         @Override
@@ -1101,7 +1101,7 @@ public class TableDataTreePane extends BasicTableDataTreePane {
         public RemoveAction() {
             this.setName(Toolkit.i18nText("Fine-Design_Basic_Remove"));
             this.setMnemonic('R');
-            this.setSmallIcon("/com/fr/design/images/control/remove");
+            this.setSmallIcon("/com/fr/design/standard/remove/remove");
         }
 
         @Override
@@ -1177,7 +1177,7 @@ public class TableDataTreePane extends BasicTableDataTreePane {
         public CopyAction() {
             this.setName(Toolkit.i18nText("Fine-Design_Basic_Copy"));
             this.setMnemonic('C');
-            this.setSmallIcon("/com/fr/design/images/m_edit/copy");
+            this.setSmallIcon("/com/fr/design/standard/copy/copy");
         }
 
         @Override
@@ -1227,7 +1227,7 @@ public class TableDataTreePane extends BasicTableDataTreePane {
         public SwitchAction() {
             this.setName(Toolkit.i18nText("Fine-Design_Basic_Search"));
             this.setMnemonic('S');
-            this.setSmallIcon("/com/fr/design/images/data/search");
+            this.setSmallIcon("/com/fr/design/standard/search", false);
         }
 
         @Override

designer-base/src/main/java/com/fr/design/data/datapane/management/search/pane/TreeSearchToolbarPane.java

@@ -103,7 +103,7 @@ public class TreeSearchToolbarPane extends JPanel implements TreeSearchStatusCha
         searchPane.setBorder(BorderFactory.createLineBorder(UIConstants.TOOLBAR_BORDER_COLOR));
         searchPane.setBackground(Color.WHITE);
         // 左侧搜索图标
-        UILabel searchLabel = new UILabel(IconUtils.readIcon("/com/fr/design/images/data/search"));
+        UILabel searchLabel = new UILabel(IconUtils.readIcon("/com/fr/design/standard/search"));
         searchLabel.setBorder(BorderFactory.createEmptyBorder(0, 12, 0, 0));
         searchLabel.addMouseListener(new MouseAdapter() {
             @Override
@@ -149,7 +149,7 @@ public class TreeSearchToolbarPane extends JPanel implements TreeSearchStatusCha
         });
         this.searchTextField.addKeyListener(enterPressed);
         // 右侧返回图标
-        UILabel returnLabel = new UILabel(IconUtils.readIcon("/com/fr/design/images/data/clear"));
+        UILabel returnLabel = new UILabel(IconUtils.readIcon("/com/fr/design/standard/clear"));
         returnLabel.setToolTipText(Toolkit.i18nText("Fine-Design_Tree_Search_Return"));
         returnLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 11));
         returnLabel.addMouseListener(new MouseAdapter() {

designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/MultiResultTableDataWrapperHelper.java

@@ -1,6 +1,7 @@
 package com.fr.design.data.tabledata.wrapper;
 
 import com.fr.base.TableData;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.data.datapane.TableDataCreatorProducer;
 import com.fr.design.data.datapane.TableDataNameObjectCreator;
 import com.fr.design.fun.ServerTableDataDefineProvider;
@@ -8,7 +9,6 @@ import com.fr.design.fun.TableDataDefineProvider;
 import com.fr.event.Event;
 import com.fr.event.EventDispatcher;
 import com.fr.event.Listener;
-import com.fr.general.IOUtils;
 import com.fr.plugin.context.PluginContext;
 import com.fr.plugin.observer.PluginEventType;
 import com.fr.stable.Filter;
@@ -25,7 +25,7 @@ import java.util.Map;
  */
 class MultiResultTableDataWrapperHelper {
     private static final Map<Class<? extends TableData>, Icon> TABLE_DATA_ICON_PATHS = new HashMap<>();
-    private static final String DEFAULT_MULTI_RESULT_TD_ICON = "/com/fr/design/images/data/multi.png";
+    private static final String DEFAULT_MULTI_RESULT_TD_ICON = "/com/fr/design/standard/multi";
 
 
     static {
@@ -45,10 +45,10 @@ class MultiResultTableDataWrapperHelper {
         return TABLE_DATA_ICON_PATHS.computeIfAbsent(tableDataClass, cls -> {
             for (TableDataNameObjectCreator creator : TableDataCreatorProducer.getInstance().createReportTableDataCreator()) {
                 if (creator.createObject().getClass().isAssignableFrom(tableDataClass)) {
-                    return IOUtils.readIcon(creator.getIconPath());
+                    return IconUtils.readIcon(creator.getIconPath());
                 }
             }
-            return IOUtils.readIcon(DEFAULT_MULTI_RESULT_TD_ICON);
+            return IconUtils.readIcon(DEFAULT_MULTI_RESULT_TD_ICON);
         });
     }
 }

designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/ServerTableDataWrapper.java

@@ -2,6 +2,8 @@ package com.fr.design.data.tabledata.wrapper;
 
 import com.fr.base.BaseUtils;
 import com.fr.base.TableData;
+import com.fr.base.svg.IconUtils;
+import com.fr.base.svg.SVGLoader;
 import com.fr.data.impl.ClassTableData;
 import com.fr.data.impl.DBTableData;
 import com.fr.data.impl.EmbeddedTableData;
@@ -24,20 +26,22 @@ public final class ServerTableDataWrapper extends AbstractTableDataWrapper {
 	@Override
 	public Icon getIcon() {
 		if (tabledata instanceof DBTableData) {
-			if (StringUtils.isBlank(((DBTableData) tabledata).getQuery()))
-				return new WarningIcon(BaseUtils.readImage("/com/fr/design/images/data/dock/serverdatabase.png"));
-			else
-				return BaseUtils.readIcon("/com/fr/design/images/data/dock/serverdatabase.png");
+			if (StringUtils.isBlank(((DBTableData) tabledata).getQuery())) {
+				return new WarningIcon(BaseUtils.readImage("/com/fr/design/images/gui/warning.png"));
+			}
+			else {
+				return IconUtils.readIcon("/com/fr/design/standard/server_database");
+			}
 		} else if (tabledata instanceof ClassTableData) {
-			return BaseUtils.readIcon("/com/fr/design/images/data/dock/serverclasstabledata.png");
+			return IconUtils.readIcon("/com/fr/design/standard/class_table_data");
 		} else if (tabledata instanceof EmbeddedTableData) {
-			return BaseUtils.readIcon("/com/fr/design/images/data/dock/serverdatatable.png");
+			return IconUtils.readIcon("/com/fr/design/standard/data_table");
 		}else if(tabledata instanceof RecursionTableData){
-			return BaseUtils.readIcon("/com/fr/design/images/data/tree.png");
+			return IconUtils.readIcon("/com/fr/design/standard/tree");
 		} else if (tabledata instanceof StoreProcedure) {
-            return BaseUtils.readIcon("/com/fr/design/images/data/store_procedure.png");
+            return IconUtils.readIcon("/com/fr/design/standard/store_procedure");
         }
-		return BaseUtils.readIcon("/com/fr/design/images/data/dock/serverdatabase.png");
+		return IconUtils.readIcon("/com/fr/design/standard/server_database");
 	}
 
     /**

designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/StoreProcedureDataWrapper.java

@@ -1,7 +1,7 @@
 package com.fr.design.data.tabledata.wrapper;
 
-import com.fr.base.BaseUtils;
 import com.fr.base.TableData;
+import com.fr.base.svg.IconUtils;
 import com.fr.data.impl.storeproc.ProcedureDataModel;
 import com.fr.data.impl.storeproc.StoreProcedure;
 import com.fr.data.operator.DataOperator;
@@ -150,7 +150,7 @@ public final class StoreProcedureDataWrapper implements TableDataWrapper {
 
     @Override
     public Icon getIcon() {
-        return BaseUtils.readIcon("/com/fr/design/images/data/store_procedure.png");
+        return IconUtils.readIcon("/com/fr/design/standard/store_procedure");
     }
 
     /**

designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/StoreProcedureNameWrapper.java

@@ -1,7 +1,7 @@
 package com.fr.design.data.tabledata.wrapper;
 
-import com.fr.base.BaseUtils;
 import com.fr.base.TableData;
+import com.fr.base.svg.IconUtils;
 import com.fr.data.impl.storeproc.ProcedureDataModel;
 import com.fr.data.impl.storeproc.StoreProcedure;
 import com.fr.design.data.DesignTableDataManager;
@@ -71,7 +71,7 @@ public final class StoreProcedureNameWrapper implements TableDataWrapper {
 
     @Override
     public Icon getIcon() {
-        return BaseUtils.readIcon("/com/fr/design/images/data/store_procedure.png");
+        return IconUtils.readIcon("/com/fr/design/standard/store_procedure");
     }
 
     private void createStore(boolean needLoadingBar) {

designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/TableDataFactory.java

@@ -55,15 +55,15 @@ public abstract class TableDataFactory {
      * 同一类型的只能加一次,就加最上层的类,因为要排序。如果将所有的 FileTableData都加进来，那么FileTableData的排序就不正确了
      */
     static {
-        defaultMap.put(DBTableData.class.getName(), new TableDataNameObjectCreator(null, "/com/fr/design/images/data/database.png", DBTableData.class, DBTableDataPane.class));
-        defaultMap.put(ClassTableData.class.getName(), new TableDataNameObjectCreator(null, "/com/fr/design/images/data/source/classTableData.png", ClassTableData.class, ClassTableDataPane.class));
-        defaultMap.put(EmbeddedTableData.class.getName(), new TableDataNameObjectCreator(null, "/com/fr/design/images/data/dataTable.png", EmbeddedTableData.class, EmbeddedTableDataPane.class));
-        defaultMap.put(DecoratedTableData.class.getName(), new TableDataNameObjectCreator(null, "/com/fr/design/images/data/multi.png", DecoratedTableData.class, DecoratedTableDataPane.class));
+        defaultMap.put(DBTableData.class.getName(), new TableDataNameObjectCreator(null, "/com/fr/design/standard/database_normal.svg", DBTableData.class, DBTableDataPane.class));
+        defaultMap.put(ClassTableData.class.getName(), new TableDataNameObjectCreator(null, "/com/fr/design/standard/class_table_data_normal.svg", ClassTableData.class, ClassTableDataPane.class));
+        defaultMap.put(EmbeddedTableData.class.getName(), new TableDataNameObjectCreator(null, "/com/fr/design/standard/data_table_normal.svg", EmbeddedTableData.class, EmbeddedTableDataPane.class));
+        defaultMap.put(DecoratedTableData.class.getName(), new TableDataNameObjectCreator(null, "/com/fr/design/standard/multi_normal.svg", DecoratedTableData.class, DecoratedTableDataPane.class));
         defaultMap.put(StoreProcedure.class.getName(), new TableDataNameObjectCreator(null, "/com/fr/design/images/data/store_procedure.png", StoreProcedure.class, ProcedureDataPane.class));
-        defaultMap.put(MultiTDTableData.class.getName(), new TableDataNameObjectCreator(null, "/com/fr/design/images/data/multi.png", MultiTDTableData.class, MultiTDTableDataPane.class));
-        defaultMap.put(FileTableData.class.getName(), new TableDataNameObjectCreator(null, "/com/fr/design/images/data/file.png", FileTableData.class, FileTableDataPane.class));
-        defaultMap.put(RecursionTableData.class.getName(), new TableDataNameObjectCreator(null, "/com/fr/design/images/data/tree.png", RecursionTableData.class, TreeTableDataPane.class));
-        defaultMap.put(MultiFieldTableData.class.getName(), new TableDataNameObjectCreator(null, "/com/fr/design/images/data/database.png", MultiFieldTableData.class, null));
+        defaultMap.put(MultiTDTableData.class.getName(), new TableDataNameObjectCreator(null, "/com/fr/design/standard/multi_normal.svg", MultiTDTableData.class, MultiTDTableDataPane.class));
+        defaultMap.put(FileTableData.class.getName(), new TableDataNameObjectCreator(null, "/com/fr/design/standard/file_normal.svg", FileTableData.class, FileTableDataPane.class));
+        defaultMap.put(RecursionTableData.class.getName(), new TableDataNameObjectCreator(null, "/com/fr/design/standard/tree_normal.svg", RecursionTableData.class, TreeTableDataPane.class));
+        defaultMap.put(MultiFieldTableData.class.getName(), new TableDataNameObjectCreator(null, "/com/fr/design/standard/database_normal.svg", MultiFieldTableData.class, null));
         map.putAll(defaultMap);
     }
 
@@ -151,7 +151,7 @@ public abstract class TableDataFactory {
         if (tableDataNameObjectCreator != null && tableDataNameObjectCreator.getIconPath() != null) {
             return tableDataNameObjectCreator.getIconPath();
         }
-        return "/com/fr/design/images/data/database.png";
+        return "/com/fr/design/standard/database_normal.svg";
     }
 
     /**

designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/TemplateTableDataWrapper.java

@@ -2,8 +2,9 @@ package com.fr.design.data.tabledata.wrapper;
 
 import javax.swing.Icon;
 
-import com.fr.base.BaseUtils;
 import com.fr.base.TableData;
+import com.fr.base.svg.IconUtils;
+import com.fr.base.svg.SVGLoader;
 import com.fr.data.impl.DBTableData;
 import com.fr.design.icon.WarningIcon;
 import com.fr.stable.StringUtils;
@@ -20,9 +21,9 @@ public final class TemplateTableDataWrapper extends AbstractTableDataWrapper {
 	@Override
 	public Icon getIcon() {
 		if (tabledata instanceof DBTableData && StringUtils.isBlank(((DBTableData) tabledata).getQuery())) {
-			return new WarningIcon(BaseUtils.readImage("/com/fr/design/images/data/database.png"));
+			return new WarningIcon(SVGLoader.load("/com/fr/design/standard/database_normal.svg"));
 		}
-		return BaseUtils.readIcon(TableDataFactory.getIconPath(tabledata));
+		return IconUtils.readIcon(TableDataFactory.getIconPath(tabledata));
 	}
 
 	@Override

designer-base/src/main/java/com/fr/design/extra/exe/callback/handle/PluginTaskResultErrorDialog.java

@@ -53,7 +53,7 @@ public class PluginTaskResultErrorDialog extends JDialog {
     private void initContentPane() {
         this.contentPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         // error图标
-        errorLabel = new UILabel(IconUtils.readIcon("/com/fr/design/standard/system/error_tips.svg"));
+        errorLabel = new UILabel(IconUtils.readIcon("/com/fr/design/standard/system/error_tips"));
         errorLabel.setPreferredSize(LABEL);
         errorLabel.setBorder(BorderFactory.createEmptyBorder(10, 20, 40, 20));
         // 提示内容

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

@@ -3,6 +3,7 @@ package com.fr.design.file;
 
 import com.fr.base.BaseUtils;
 import com.fr.base.GraphHelper;
+import com.fr.base.svg.IconUtils;
 import com.fr.base.vcs.DesignerMode;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.actions.file.LocateAction;
@@ -85,12 +86,12 @@ import static javax.swing.JOptionPane.WARNING_MESSAGE;
  **/
 public class MultiTemplateTabPane extends JComponent {
 
-    private static Icon LIST_DOWN = BaseUtils.readIcon("/com/fr/design/images/buttonicon/list_normal.png");
-    private static Icon MOUSE_OVER_LIST_DOWN = BaseUtils.readIcon("/com/fr/design/images/buttonicon/list_pressed.png");
-    private static Icon MOUSE_PRESS_LIST_DOWN = BaseUtils.readIcon("/com/fr/design/images/buttonicon/list_pressed.png");
-    private static Icon CLOSE = BaseUtils.readIcon("/com/fr/design/images/buttonicon/close_icon.png");
-    private static Icon MOUSE_OVER_CLOSE = BaseUtils.readIcon("/com/fr/design/images/buttonicon/mouseoverclose icon.png");
-    private static Icon MOUSE_PRESS_CLOSE = BaseUtils.readIcon("/com/fr/design/images/buttonicon/pressclose icon.png");
+    private static Icon LIST_DOWN = IconUtils.readIcon("/com/fr/design/standard/list/list");
+    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 = IconUtils.readIcon("/com/fr/design/standard/close/close");
+    private static Icon MOUSE_OVER_CLOSE = IconUtils.readIcon("/com/fr/design/standard/close/close_mouseover.svg");
+    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 = "...";
@@ -1171,6 +1172,10 @@ public class MultiTemplateTabPane extends JComponent {
                         return;
                     }
                 }
+                //参考CloseCurrentTemplateAction，在closeFormat与closeSpecifiedTemplate之前要先设定isCloseCurrent，这样关闭之后才会自动切换tab
+                if (checkCurrentClose(template)) {
+                    setIsCloseCurrent(true);
+                }
                 closeFormat(template);
                 closeSpecifiedTemplate(template);
                 DesignerContext.getDesignerFrame().getContentFrame().repaint();
@@ -1204,6 +1209,11 @@ public class MultiTemplateTabPane extends JComponent {
 
     }
 
+    private boolean checkCurrentClose(JTemplate template) {
+        JTemplate currentTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
+        return JTemplate.isValid(currentTemplate) && ComparatorUtils.equals(template.getPath(), currentTemplate.getPath());
+    }
+
     private class MultiTemplateTabMouseMotionListener implements MouseMotionListener {
         /**
          * 鼠标拖拽

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/controlpane/AbstractNameableCreator.java

@@ -1,6 +1,7 @@
 package com.fr.design.gui.controlpane;
 
 import com.fr.base.BaseUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.NameObject;
@@ -25,14 +26,14 @@ public abstract class AbstractNameableCreator implements NameableCreator {
 
 	public AbstractNameableCreator(String menuName, String iconPath, Class clazz) {
 		this.menuName = menuName;
-		this.menuIcon = BaseUtils.readIcon(iconPath);
+		this.menuIcon = IconUtils.readIcon(iconPath);
 		this.clazzOfObject = clazz;
 		this.clazzOfInitCase = clazz;
 	}
 	
 	public AbstractNameableCreator(String menuName, String iconPath, Class clazz, Class<? extends BasicBeanPane> clazzOfEditor) {
 		this.menuName = menuName;
-		this.menuIcon = BaseUtils.readIcon(iconPath);
+		this.menuIcon = IconUtils.readIcon(iconPath);
 		this.clazzOfObject = clazz;
 		this.clazzOfEditor = clazzOfEditor;
 		this.clazzOfInitCase = clazz;
@@ -40,7 +41,7 @@ public abstract class AbstractNameableCreator implements NameableCreator {
 	
 	public AbstractNameableCreator(String menuName, String iconPath, Class clazz, Class clazz4Init, Class<? extends BasicBeanPane> clazzOfEditor) {
 		this.menuName = menuName;
-		this.menuIcon = BaseUtils.readIcon(iconPath);
+		this.menuIcon = IconUtils.readIcon(iconPath);
 		this.clazzOfObject = clazz;
 		this.clazzOfEditor = clazzOfEditor;
 		this.clazzOfInitCase = clazz;

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

@@ -327,7 +327,7 @@ public class UIEastResizableContainer extends JPanel {
                     button = UIConstants.DRAG_RIGHT_PRESS;
                 }
             }
-            g.drawImage(button, 18, 7, 5, 10, null);
+            g.drawImage(button, 18, 7, this);
         }
     }
 }

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

@@ -282,7 +282,7 @@ public class UIModeControlContainer extends JLayeredPane {
             setLayout(new FlowLayout(FlowLayout.CENTER, 10, -3));
             setBackground(UIConstants.NORMAL_BACKGROUND);
             add(new UILabel("<html><font size='5' face='Microsoft YaHei' color='#999999999'><B>" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Parameter_Panel") + "</B></font></html>"));
-            UIButton viewButton = new UIButton(UIConstants.VIEW_NORMAL_ICON, UIConstants.VIEW_PRESSED_ICON, UIConstants.VIEW_PRESSED_ICON) {
+            UIButton viewButton = new UIButton(UIConstants.VIEW_NORMAL_ICON, UIConstants.VIEW_NORMAL_ICON, UIConstants.VIEW_NORMAL_ICON) {
                 @Override
                 public Dimension getPreferredSize() {
                     return new Dimension(32, 32);

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

@@ -3,6 +3,7 @@ package com.fr.design.gui.icontainer;
 import com.fr.base.vcs.DesignerMode;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.utils.SvgPaintUtils;
 import com.fr.stable.Constants;
 import com.fr.design.utils.gui.GUICoreUtils;
 
@@ -406,13 +407,17 @@ public class UIResizableContainer extends JPanel {
 
         @Override
         public void paint(Graphics g) {
+
             Image upButton = (upModel == UIConstants.MODEL_NORMAL ? UIConstants.DRAG_UP_NORMAL : UIConstants.DRAG_UP_PRESS);
             Image downButton = (downModel == UIConstants.MODEL_NORMAL ? UIConstants.DRAG_DOWN_NORMAL : UIConstants.DRAG_DOWN_PRESS);
-
+            int width = getWidth();
+            int height = getHeight();
             g.drawImage(UIConstants.DRAG_BAR_LIGHT, 0, 0, getWidth(), getHeight(), null);
-            g.drawImage(UIConstants.DRAG_LINE, (getWidth() - toolPaneHeight) / 2, 3, toolPaneHeight, 5, null);
-            g.drawImage(upButton, ARROW_MARGIN, 3, toolPaneHeight, 5, null);
-            g.drawImage(downButton, getWidth() - toolPaneHeight - ARROW_MARGIN, 3, toolPaneHeight, 5, null);
+            SvgPaintUtils.beforePaint((Graphics2D) g);
+            g.drawImage(UIConstants.DRAG_LINE, (getWidth() - toolPaneHeight) / 2, 3, this);
+            g.drawImage(upButton, ARROW_MARGIN, 1, this);
+            g.drawImage(downButton, getWidth() - toolPaneHeight - ARROW_MARGIN, 1, this);
+            SvgPaintUtils.afterPaint((Graphics2D) g);
         }
     }
 
@@ -509,7 +514,7 @@ public class UIResizableContainer extends JPanel {
                         button = UIConstants.DRAG_LEFT_PRESS;
                     }
                 }
-                g.drawImage(button, 3, ARROW_MARGIN_VERTICAL, 5, toolPaneHeight, null);
+                g.drawImage(button, -1, ARROW_MARGIN_VERTICAL, this);
             } else {
                 g.drawImage(UIConstants.DRAG_BAR_LIGHT, 0, 0, toolPaneHeight, getHeight(), null);
                 if (containerWidth == toolPaneHeight) {
@@ -525,7 +530,7 @@ public class UIResizableContainer extends JPanel {
                         button = UIConstants.DRAG_RIGHT_PRESS;
                     }
                 }
-                g.drawImage(button, 2, ARROW_MARGIN_VERTICAL, 5, toolPaneHeight, null);
+                g.drawImage(button, 2, ARROW_MARGIN_VERTICAL, this);
             }
             if (isLeftRightDragEnabled) {
                 g.drawImage(UIConstants.DRAG_DOT_VERTICAL, 2, getHeight() / 2, 5, toolPaneHeight, null);

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"));
-        setCollapsedIcon(BaseUtils.readIcon("/com/fr/design/images/buttonicon/plus.png"));
+        setExpandedIcon(IconUtils.readIcon("/com/fr/design/standard/fileicon/minus.svg"));
+        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/folder_half_authority.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/cpt_icon.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/frm_icon.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/cht_icon.svg");
 
-    public static final Icon CPTX_ICON = BaseUtils.readIcon("/com/fr/nx/app/designer/cptx_file_icon.png");
-    public static final Icon CPTX_LOCKED_ICON = BaseUtils.readIcon("/com/fr/nx/app/designer/cptx_file_icon_locked.png");
+    public static final Icon CPTX_ICON = IconUtils.readIcon("/com/fr/design/standard/fileicon/cptx_icon.svg");
+    public static final Icon CPTX_LOCKED_ICON = IconUtils.readIcon("/com/fr/design/standard/fileicon/cptx_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/icon/IconPathConstants.java

@@ -15,21 +15,21 @@ public class IconPathConstants {
 
     public static final String ADD_POPMENU_ICON_PATH = "/com/fr/design/images/control/addPopup.png";
 
-    public static final String DS_ICON_PATH = "/com/fr/design/images/data/datasource.png";
+    public static final String DS_ICON_PATH = "/com/fr/design/standard/server_database";
     public static final String CLASS_TD_ICON_PATH = "/com/fr/design/images/data/source/classTableData.png";
     public static final String EMB_TD_ICON_PATH = "/com/fr/design/images/data/dataTable.png";
     public static final String DS_RELATION_TD_ICON_PATH = "/com/fr/design/images/data/multi.png";
     public static final String FILE_TD_ICON_PATH = "/com/fr/design/images/data/file.png";
     public static final String DS_TREE_TD_ICON_PATH = "/com/fr/design/images/data/tree.png";
-    public static final String DS_QUERY_ICON_PATH = "/com/fr/design/images/data/database.png";
+    public static final String DS_QUERY_ICON_PATH = "/com/fr/design/standard/database";
     public static final String PREVIEW_ICON_PATH = "/com/fr/design/images/m_file/preview.png";
     public static final String TD_EDIT_ICON_PATH = "/com/fr/design/images/control/edit.png";
     public static final String TD_EL_SHARE_HELP_ICON_PATH = "/com/fr/design/images/control/help_open.png";
     public static final String TD_EL_SHARE_CLOSE_ICON_PATH = "/com/fr/design/images/control/help_close.png";
     public static final String TD_REMOVE_ICON_PATH = "/com/fr/design/images/control/remove.png";
     public static final String TD_CONNECTION_ICON_PATH = "/com/fr/design/images/m_web/connection.png";
-    public static final String SP_SHOW_ICON_PATH = "/com/fr/design/images/data/store_procedure.png";
-    public static final String STD_SHOW_ICON_PATH = "/com/fr/design/images/data/dock/serverdatabase.png";
+    public static final String SP_SHOW_ICON_PATH = "/com/fr/design/standard/store_procedure";
+    public static final String STD_SHOW_ICON_PATH = "/com/fr/design/standard/server_database";
     public static final String XMLA_ICON_PATH = "/com/fr/design/images/data/cube.png";
     public static final String FORBID_ICON_PATH = "/com/fr/web/images/form/forbid.png";
     public static final String EDIT_ICON_PATH = "/com/fr/design/images/control/newEdit.png";

designer-base/src/main/java/com/fr/design/icon/WarningIcon.java

@@ -5,10 +5,7 @@ import com.fr.log.FineLoggerFactory;
 
 import javax.swing.GrayFilter;
 import javax.swing.ImageIcon;
-import java.awt.Component;
-import java.awt.Graphics;
-import java.awt.Image;
-import java.awt.MediaTracker;
+import java.awt.*;
 import java.awt.image.ImageObserver;
 
 /**

designer-base/src/main/java/com/fr/design/javascript/JavaScriptActionPane.java

@@ -48,8 +48,7 @@ public abstract class JavaScriptActionPane extends UIComboBoxPane<JavaScript> {
         contentDBManiPane.add(createDBManipulationPane());
         paneList.add(new Commit2DBJavaScriptPane(this, contentDBManiPane));
         paneList.add(initEmaiPane());
-        boolean workbook = DesignerContext.getDesignerFrame().getSelectedJTemplate().isJWorkBook();
-        if (workbook) {
+        if (isWorkBookValid()) {
             paneList.add(new ExportJavaScriptPane());
         }
         paneList.add(new MobilePopupPane());
@@ -66,6 +65,16 @@ public abstract class JavaScriptActionPane extends UIComboBoxPane<JavaScript> {
         return paneList;
     }
 
+    /**
+     * 选中的JTemplate是否有效并且是否是工作簿
+     *
+     * @return 选中的JTemplate有效并且是工作簿则返回true
+     */
+    private boolean isWorkBookValid() {
+        return DesignerContext.getDesignerFrame().getSelectedJTemplate() != null
+                && DesignerContext.getDesignerFrame().getSelectedJTemplate().isJWorkBook();
+    }
+
     protected EmailPane initEmaiPane() {
         return new EmailPane();
     }

designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java

@@ -427,7 +427,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
         public NewFolderAction() {
 
             this.setName(KeySetUtils.NEW_FOLDER.getMenuKeySetName());
-            this.setSmallIcon("/com/fr/design/images/FileDealerPaneIcon/new_folder");
+            this.setSmallIcon("/com/fr/design/standard/newfolder/new_folder");
         }
 
         @Override
@@ -452,7 +452,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
         public SwitchAction() {
             this.setName(Toolkit.i18nText("Fine-Design_Basic_Search"));
             this.setMnemonic('S');
-            this.setSmallIcon("/com/fr/design/images/data/search");
+            this.setSmallIcon("/com/fr/design/standard/search_normal");
         }
 
         @Override
@@ -469,7 +469,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
 
         public CollapseAllAction() {
             this.setName(Toolkit.i18nText("Fine-Design_Basic_Collapse_All"));
-            this.setSmallIcon("/com/fr/design/images/FileDealerPaneIcon/collapse-all.png");
+            this.setSmallIcon("/com/fr/design/standard/collapse_all", false);
         }
 
         @Override
@@ -485,7 +485,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
     private class VcsAction extends UpdateAction {
 
         public VcsAction() {
-            this.setSmallIcon("/com/fr/design/images/FileDealerPaneIcon/vcs_list");
+            this.setSmallIcon("/com/fr/design/standard/vcslist/vcs_list");
         }
 
         @Override
@@ -567,7 +567,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
         public ShowInExplorerAction() {
 
             this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Show_In_Containing_Folder"));
-            this.setSmallIcon("/com/fr/design/images/FileDealerPaneIcon/view_folder");
+            this.setSmallIcon("/com/fr/design/standard/viewfolder/view_folder");
         }
 
         @Override
@@ -584,7 +584,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
         public RefreshTreeAction() {
 
             this.setName(Toolkit.i18nText("Fine-Design_Basic_Refresh"));
-            this.setSmallIcon("/com/fr/design/images/FileDealerPaneIcon/refresh");
+            this.setSmallIcon("/com/fr/design/standard/refresh", false);
         }
 
         @Override

designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java

@@ -729,7 +729,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
         private Set<PropertyMode> enableModes;
 
         // 完整icon路径为 ICON_BASE_DIR + btnIconName + iconSuffix
-        private static final String ICON_BASE_DIR = "/com/fr/design/images/buttonicon/propertiestab/";
+        private static final String ICON_BASE_DIR = "/com/fr/design/standard/propertiestab/";
         private static final String ICON_SUFFIX_NORMAL = "_normal.svg";
         private static final String ICON_SUFFIX_DISABLED = "_disabled.svg";
         private static final String ICON_SUFFIX_SELECTED = "_selected.svg";

designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java

@@ -8,6 +8,7 @@ import com.fr.base.io.BaseBook;
 import com.fr.base.iofile.attr.DesignBanCopyAttrMark;
 import com.fr.base.iofile.attr.TemplateIdAttrMark;
 import com.fr.base.iofile.attr.TemplateThemeAttrMark;
+import com.fr.base.svg.IconUtils;
 import com.fr.base.theme.TemplateTheme;
 import com.fr.base.theme.TemplateThemeCompatible;
 import com.fr.base.theme.TemplateThemeConfig;
@@ -72,7 +73,6 @@ import com.fr.file.StashedFILE;
 import com.fr.form.ui.NoneWidget;
 import com.fr.form.ui.Widget;
 import com.fr.general.ComparatorUtils;
-import com.fr.general.IOUtils;
 import com.fr.locale.InterProviderFactory;
 import com.fr.log.FineLoggerFactory;
 import com.fr.nx.app.designer.toolbar.TemplateTransformer;
@@ -1573,7 +1573,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
     }
 
     protected UIButton createTemplateThemeButton() {
-        UIButton button = new UIButton(IOUtils.readIcon("/com/fr/design/icon/icon_predefined_style.png")) {
+        UIButton button = new UIButton(IconUtils.readIcon("/com/fr/design/standard/template_theme")) {
             @Override
             public Dimension getPreferredSize() {
                 FontMetrics metrics = getFontMetrics(getFont());

designer-base/src/main/java/com/fr/design/mainframe/ToolBarNewTemplatePane.java

@@ -1,6 +1,6 @@
 package com.fr.design.mainframe;
 
-import com.fr.base.BaseUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.file.NewTemplatePane;
 
 import javax.swing.Icon;
@@ -21,16 +21,16 @@ public class ToolBarNewTemplatePane extends NewTemplatePane {
 
     @Override
     public Icon getNew() {
-        return BaseUtils.readIcon("/com/fr/design/images/buttonicon/addicon.png");
+        return IconUtils.readIcon("/com/fr/design/standard/addicon/addicon");
     }
 
     @Override
     public Icon getMouseOverNew() {
-        return BaseUtils.readIcon("/com/fr/design/images/buttonicon/add_press.png");
+        return IconUtils.readIcon("/com/fr/design/standard/addicon/add_press.svg");
     }
 
     @Override
     public Icon getMousePressNew() {
-        return BaseUtils.readIcon("/com/fr/design/images/buttonicon/add_press.png");
+        return IconUtils.readIcon("/com/fr/design/standard/addicon/add_press.svg");
     }
 }

designer-base/src/main/java/com/fr/design/mainframe/check/CheckButton.java

@@ -1,6 +1,7 @@
 package com.fr.design.mainframe.check;
 
 import com.fr.base.BaseUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ilable.UILabel;
@@ -44,7 +45,7 @@ public class CheckButton extends UIButton {
     private UILabel imageLabel;
 
     public CheckButton() {
-        this.setIcon(BaseUtils.readIcon("/com/fr/design/images/buttonicon/check.png"));
+        this.setIcon(IconUtils.readIcon("/com/fr/design/standard/font_miss_check"));
         this.setToolTipText(Toolkit.i18nText("Fine_Designer_Check_Font"));
         this.set4ToolbarButton();
         this.addActionListener(checkListener);

designer-base/src/main/java/com/fr/design/mainframe/manager/search/searcher/control/pane/TemplateTreeSearchToolbarPane.java

@@ -107,7 +107,7 @@ public class TemplateTreeSearchToolbarPane extends JPanel implements TreeSearchS
         searchPane.setBorder(BorderFactory.createLineBorder(UIConstants.TOOLBAR_BORDER_COLOR));
         searchPane.setBackground(Color.WHITE);
         // 左侧搜索图标
-        UILabel searchLabel = new UILabel(IconUtils.readIcon("/com/fr/design/images/data/search"));
+        UILabel searchLabel = new UILabel(IconUtils.readIcon("/com/fr/design/standard/search"));
         searchLabel.setBorder(BorderFactory.createEmptyBorder(0, 12, 0, 0));
         searchLabel.addMouseListener(new MouseAdapter() {
             @Override
@@ -118,7 +118,7 @@ public class TemplateTreeSearchToolbarPane extends JPanel implements TreeSearchS
         // 中间输入框
         initSearchTextField();
         // 右侧返回图标
-        UILabel returnLabel = new UILabel(IconUtils.readIcon("/com/fr/design/images/data/clear"));
+        UILabel returnLabel = new UILabel(IconUtils.readIcon("/com/fr/design/standard/clear"));
         returnLabel.setToolTipText(Toolkit.i18nText("Fine-Design_Tree_Search_Return"));
         returnLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 11));
         returnLabel.addMouseListener(new MouseAdapter() {

designer-base/src/main/java/com/fr/design/mainframe/vcs/common/VcsHelper.java

@@ -25,6 +25,7 @@ import com.fr.workspace.server.vcs.filesystem.VcsFileSystem;
 import com.fr.workspace.server.vcs.git.config.GcConfig;
 
 import javax.swing.Icon;
+import javax.swing.SwingUtilities;
 import javax.swing.border.EmptyBorder;
 import java.awt.Color;
 import java.util.List;
@@ -137,20 +138,18 @@ public class VcsHelper implements JTemplateActionListener {
                 String fileName = getEditingFilename();
                 VcsOperator operator = WorkContext.getCurrent().get(VcsOperator.class);
                 VcsEntity entity = operator.getFileVersionByIndex(fileName, 0);
+                boolean replace = needDeleteVersion(entity);
                 int latestFileVersion = 0;
                 if (entity != null) {
                     latestFileVersion = entity.getVersion();
                 }
                 if (jt.getEditingFILE() instanceof VcsCacheFileNodeFile) {
-                    operator.saveVersionFromCache(getCurrentUsername(), fileName, StringUtils.EMPTY, latestFileVersion + 1);
+                    operator.saveVersionFromCache(getCurrentUsername(), fileName, StringUtils.EMPTY, latestFileVersion + 1, replace);
                     String path = DesignerFrameFileDealerPane.getInstance().getSelectedOperation().getFilePath();
-                    FileVersionTable.getInstance().updateModel(1, WorkContext.getCurrent().get(VcsOperator.class).getVersions(path.replaceFirst(VCS_FILE_SLASH, StringUtils.EMPTY)));
+                    List<VcsEntity> updatedList = WorkContext.getCurrent().get(VcsOperator.class).getVersions(path.replaceFirst(VCS_FILE_SLASH, StringUtils.EMPTY));
+                    SwingUtilities.invokeLater(() -> FileVersionTable.getInstance().updateModel(1, updatedList));
                 } else {
-                    operator.saveVersion(getCurrentUsername(), fileName, StringUtils.EMPTY, latestFileVersion + 1);
-                }
-                VcsEntity oldEntity = WorkContext.getCurrent().get(VcsOperator.class).getFileVersionByIndexAndUsername(fileName, getCurrentUsername(), 1);
-                if (needDeleteVersion(oldEntity)) {
-                    operator.deleteVersion(oldEntity.getFilename(), oldEntity.getVersion());
+                    operator.saveVersion(getCurrentUsername(), fileName, StringUtils.EMPTY, latestFileVersion + 1, replace);
                 }
                 if (GcConfig.getInstance().isGcEnable()) {
                     operator.gc();

designer-base/src/main/java/com/fr/design/notification/ui/NotificationCenterPane.java

@@ -1,5 +1,6 @@
 package com.fr.design.notification.ui;
 
+import com.fr.base.svg.IconUtils;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.ibutton.UIButton;
@@ -20,7 +21,7 @@ public class NotificationCenterPane extends BasicPane {
         setPreferredSize(new Dimension(24, 24));
         setLayout(new BorderLayout());
         notificationCenterButton = new UIButton();
-        notificationCenterButton.setIcon(IOUtils.readIcon("/com/fr/design/notification/ui/notificationCenter.png"));
+        notificationCenterButton.setIcon(IconUtils.readIcon("/com/fr/design/standard/notification/notification"));
         notificationCenterButton.setToolTipText(Toolkit.i18nText("Fine-Design_Basic_Show_Notification"));
         notificationCenterButton.set4ToolbarButton();
         notificationCenterButton.setRolloverEnabled(false);
@@ -41,9 +42,9 @@ public class NotificationCenterPane extends BasicPane {
 
     public void refreshButton() {
         if (NotificationCenter.getInstance().getNotificationsCount() > 0) {
-            notificationCenterButton.setIcon(IOUtils.readIcon("/com/fr/design/notification/ui/notificationCenterDot.png"));
+            notificationCenterButton.setIcon(IconUtils.readIcon("/com/fr/design/standard/notification/notification_dot.svg"));
         } else {
-            notificationCenterButton.setIcon(IOUtils.readIcon("/com/fr/design/notification/ui/notificationCenter.png"));
+            notificationCenterButton.setIcon(IconUtils.readIcon("/com/fr/design/standard/notification/notification"));
         }
     }
 

designer-base/src/main/java/com/fr/design/preview/FormPreview.java

@@ -18,12 +18,12 @@ public class FormPreview extends AbstractPreviewProvider {
 
     @Override
     public String iconPathForPopupItem() {
-        return  "com/fr/design/images/buttonicon/runs.png";
+        return  "/com/fr/design/standard/preview/runs.svg";
     }
 
     @Override
     public String iconPathForLarge() {
-        return  "com/fr/design/images/buttonicon/run24.png";
+        return  "/com/fr/design/standard/preview/run24.svg";
     }
 
     @Override

designer-base/src/main/java/com/fr/design/preview/MobilePreview.java

@@ -19,12 +19,12 @@ public class MobilePreview extends AbstractPreviewProvider {
 
     @Override
     public String iconPathForPopupItem() {
-        return "com/fr/design/images/buttonicon/mobile.png";
+        return "/com/fr/design/standard/preview/mobile.svg";
     }
 
     @Override
     public String iconPathForLarge() {
-        return "com/fr/design/images/buttonicon/mobileb24.png";
+        return "/com/fr/design/standard/preview/mobileb24.svg";
     }
 
     @Override

designer-base/src/main/java/com/fr/design/preview/PagePreview.java

@@ -17,12 +17,12 @@ public class PagePreview extends AbstractPreviewProvider {
 
     @Override
     public String iconPathForPopupItem() {
-        return "com/fr/design/images/buttonicon/pages.png";
+        return "/com/fr/design/standard/preview/pages.svg";
     }
 
     @Override
     public String iconPathForLarge() {
-        return "com/fr/design/images/buttonicon/pageb24.png";
+        return "/com/fr/design/standard/preview/pageb24.svg";
     }
 
     @Override

designer-base/src/main/java/com/fr/design/preview/ViewPreview.java

@@ -20,12 +20,12 @@ public class ViewPreview extends AbstractPreviewProvider {
 
     @Override
     public String iconPathForPopupItem() {
-        return "com/fr/design/images/buttonicon/anas.png";
+        return "/com/fr/design/standard/preview/anas.svg";
     }
 
     @Override
     public String iconPathForLarge() {
-        return "com/fr/design/images/buttonicon/anab24.png";
+        return "/com/fr/design/standard/preview/anab24.svg";
     }
 
     @Override

designer-base/src/main/java/com/fr/design/preview/WritePreview.java

@@ -20,12 +20,12 @@ public class WritePreview extends AbstractPreviewProvider {
 
     @Override
     public String iconPathForPopupItem() {
-        return "com/fr/design/images/buttonicon/writes.png";
+        return "/com/fr/design/standard/preview/writes.svg";
     }
 
     @Override
     public String iconPathForLarge() {
-        return "com/fr/design/images/buttonicon/writeb24.png";
+        return "/com/fr/design/standard/preview/writeb24.svg";
     }
 
     @Override

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/java/com/fr/startup/ui/StartupPageWindow.java

@@ -363,7 +363,7 @@ public class StartupPageWindow extends JFrame {
                 for (String recentFile : recentFiles) {
                     JPanel recentItemPanel = new JPanel();
                     recentItemPanel.setLayout(new FlowLayout(FlowLayout.LEFT, ITEM_VERTICAL_GAP, 0));
-                    recentItemPanel.add(new UILabel(IconUtils.readIcon("/com/fr/design/standard/system/cpt.svg")));
+                    recentItemPanel.add(new UILabel(IconUtils.readIcon("/com/fr/design/standard/system/cpt")));
                     UILabel recentFileLabel = new UILabel(recentFile);
                     Color recentFileLabelForeground = recentFileLabel.getForeground();
                     recentItemPanel.add(recentFileLabel);

designer-base/src/main/java/com/fr/startup/ui/StartupPageWorkspacePanel.java

@@ -525,7 +525,7 @@ public class StartupPageWorkspacePanel extends JPanel {
         selectAndCreatePanel.setBorder(new EmptyBorder(0, 0, 0, 0));
         selectAndCreatePanel.setLayout(new BorderLayout());
         {
-            UILabel label = new UILabel(IconUtils.readIcon("/com/fr/design/standard/system/add.svg"));
+            UILabel label = new UILabel(IconUtils.readIcon("/com/fr/design/standard/system/add"));
             label.setPreferredSize(new Dimension(ARC_DIAMETER, ARC_DIAMETER));
             label.setForeground(HOVER_COLOR);
             selectAndCreatePanel.add(label, BorderLayout.CENTER);
@@ -540,7 +540,7 @@ public class StartupPageWorkspacePanel extends JPanel {
                 @Override
                 public void mouseExited(MouseEvent e) {
                     borderColorRef.set(null);
-                    label.setIcon(IconUtils.readIcon("/com/fr/design/standard/system/add.svg"));
+                    label.setIcon(IconUtils.readIcon("/com/fr/design/standard/system/add"));
                     repaintAll();
                 }
                 @Override

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/standard/add_worksheet_normal.svg

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="22px" height="12px" viewBox="0 0 22 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon_sheet_添加一页_normal</title>
+    <g id="icon_sheet_添加一页_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M22,0.0004 L20.0367403,2.61866614 C19.7176826,2.45251885 19.3802905,2.31673535 19.0283951,2.2151467 L20,1 L1,1 L1,11 L12,11 L12.6797985,10.1508283 C12.9113978,10.571067 13.196355,10.9577711 13.5255391,11.3018093 L13,12.0004 L0,12.0004 L0,0.0004 L22,0.0004 Z" id="Combined-Shape" fill="#333334"></path>
+        <line x1="17" y1="6" x2="17" y2="11" id="Fill-8" fill="#16C153"></line>
+        <g id="Group" transform="translate(13.000000, 3.000000)">
+            <path d="M9,4.5 C9,6.985 6.985,9 4.5,9 C2.015,9 0,6.985 0,4.5 C0,2.015 2.015,0 4.5,0 C6.985,0 9,2.015 9,4.5" id="Fill-6" fill="#16C153"></path>
+            <path d="M4.5,1.5 C4.776,1.5 5,1.724 5,2 L5,4 L7,4 C7.276,4 7.5,4.224 7.5,4.5 C7.5,4.776 7.276,5 7,5 L5,5 L5,7 C5,7.276 4.776,7.5 4.5,7.5 C4.224,7.5 4,7.276 4,7 L4,5 L2,5 C1.724,5 1.5,4.776 1.5,4.5 C1.5,4.224 1.724,4 2,4 L4,4 L4,2 C4,1.724 4.224,1.5 4.5,1.5 Z" id="Combined-Shape" fill="#FFFFFF"></path>
+        </g>
+        <line x1="15" y1="9" x2="20" y2="9" id="Fill-12" fill="#16C153"></line>
+        <g id="Group-Copy" transform="translate(2.000000, 2.000000)">
+            <path d="M3,8 L0,8 L0,1.50473881 C0,0.673694512 0.665797234,0 1.5,0 L3,0 L3,3 L5,3 L5,5 L3,5 L3,8 Z" id="Combined-Shape" fill="#0353A1"></path>
+            <path d="M8,6.49526119 C8,7.32630549 7.33420277,8 6.5,8 L5,8 L5,3 L3,3 L3,0 L8,0 L8,6.49526119 Z" id="Combined-Shape" fill="#34A8E0"></path>
+        </g>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/standard/addicon/add_press.svg

@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="16" height="16" rx="2" fill="#DADADD"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9 1H6H5H2H1V2V5V6V9V10V13V14H2H5H6H7V13H6V10H7V9H6V6H9V7H10V6H13V7H14V1H13H10H9ZM13 2V5H10V2H13ZM9 2H6V5H9V2ZM2 2H5V5H2V2ZM2 6H5V9H2V6ZM2 10H5V13H2V10ZM14.5 11C14.7761 11 15 11.2239 15 11.5C15 11.7761 14.7761 12 14.5 12H12V14.5C12 14.7761 11.7761 15 11.5 15C11.2239 15 11 14.7761 11 14.5V12H8.5C8.22386 12 8 11.7761 8 11.5C8 11.2239 8.22386 11 8.5 11H11V8.5C11 8.22386 11.2239 8 11.5 8C11.7761 8 12 8.22386 12 8.5V11H14.5Z" fill="#333334"/>
+</svg>

designer-base/src/main/resources/com/fr/design/standard/addicon/addicon_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="M9 1H6H5H2H1V2V5V6V9V10V13V14H2H5H6H7V13H6V10H7V9H6V6H9V7H10V6H13V7H14V1H13H10H9ZM13 2V5H10V2H13ZM9 2H6V5H9V2ZM2 2H5V5H2V2ZM2 6H5V9H2V6ZM2 10H5V13H2V10ZM14.5 11C14.7761 11 15 11.2239 15 11.5C15 11.7761 14.7761 12 14.5 12H12V14.5C12 14.7761 11.7761 15 11.5 15C11.2239 15 11 14.7761 11 14.5V12H8.5C8.22386 12 8 11.7761 8 11.5C8 11.2239 8.22386 11 8.5 11H11V8.5C11 8.22386 11.2239 8 11.5 8C11.7761 8 12 8.22386 12 8.5V11H14.5Z" fill="#333334"/>
+</svg>

designer-base/src/main/resources/com/fr/design/standard/addpopup/addPopup_disabled.svg

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="16px" viewBox="0 0 24 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组</title>
+    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.3">
+        <g id="工具栏/导入数据集" transform="translate(-8.000000, -6.000000)">
+            <g id="编组" transform="translate(8.000000, 6.000000)">
+                <g fill="#333334" id="Combined-Shape">
+                    <path d="M8,2 C8.38659932,2 8.7,2.32097101 8.7,2.69703907 L8.7,7.3 L13.3029609,7.3 C13.6558446,7.3 13.9474813,7.56107882 13.9936369,7.90444795 L14,8 C14,8.38659932 13.679029,8.7 13.3029609,8.7 L8.7,8.699 L8.7,13.3029609 C8.7,13.6558446 8.43892118,13.9474813 8.09555205,13.9936369 L8,14 C7.61340068,14 7.3,13.679029 7.3,13.3029609 L7.3,8.699 L2.69703907,8.7 C2.34415536,8.7 2.05251868,8.43892118 2.00636315,8.09555205 L2,8 C2,7.61340068 2.32097101,7.3 2.69703907,7.3 L7.3,7.3 L7.3,2.69703907 C7.3,2.34415536 7.56107882,2.05251868 7.90444795,2.00636315 L8,2 Z"></path>
+                </g>
+                <g transform="translate(16.000000, 4.000000)" fill="#8F8F92" id="Rectangle-6">
+                    <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" transform="translate(4.000000, 4.000000) rotate(90.000000) translate(-4.000000, -4.000000) "></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/standard/addpopup/addPopup_normal.svg

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="16px" viewBox="0 0 24 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组备份</title>
+    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="编组备份">
+            <g id="Combined-Shape" fill="#333334">
+                <path d="M8,2 C8.38659932,2 8.7,2.32097101 8.7,2.69703907 L8.7,7.3 L13.3029609,7.3 C13.6558446,7.3 13.9474813,7.56107882 13.9936369,7.90444795 L14,8 C14,8.38659932 13.679029,8.7 13.3029609,8.7 L8.7,8.699 L8.7,13.3029609 C8.7,13.6558446 8.43892118,13.9474813 8.09555205,13.9936369 L8,14 C7.61340068,14 7.3,13.679029 7.3,13.3029609 L7.3,8.699 L2.69703907,8.7 C2.34415536,8.7 2.05251868,8.43892118 2.00636315,8.09555205 L2,8 C2,7.61340068 2.32097101,7.3 2.69703907,7.3 L7.3,7.3 L7.3,2.69703907 C7.3,2.34415536 7.56107882,2.05251868 7.90444795,2.00636315 L8,2 Z"></path>
+            </g>
+            <g id="Rectangle-6" transform="translate(16.000000, 4.000000)" fill="#8F8F92">
+                <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" transform="translate(4.000000, 4.000000) rotate(90.000000) translate(-4.000000, -4.000000) "></path>
+            </g>
+        </g>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/standard/alpha_fine_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="M6.90857 12.5269C3.871 12.5269 1.40857 10.0644 1.40857 7.02686C1.40857 3.98929 3.871 1.52686 6.90857 1.52686C9.94614 1.52686 12.4086 3.98929 12.4086 7.02686C12.4086 8.28787 11.9842 9.44977 11.2705 10.3775L14.3701 13.5236C14.6528 13.8062 14.6528 14.2645 14.3701 14.5472C14.0874 14.8298 13.6292 14.8298 13.3465 14.5472L10.2452 11.3995C9.31981 12.1067 8.16326 12.5269 6.90857 12.5269ZM11.4086 7.02686C11.4086 9.51214 9.39385 11.5269 6.90857 11.5269C4.42329 11.5269 2.40857 9.51214 2.40857 7.02686C2.40857 4.54157 4.42329 2.52686 6.90857 2.52686C9.39385 2.52686 11.4086 4.54157 11.4086 7.02686Z" fill="#333334"/>
+</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/batchesdoff/batch_esd_off_disabled.svg

@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g opacity="0.3">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M14 3.33333C14 4.622 11.3137 5.66667 8 5.66667C4.68629 5.66667 2 4.622 2 3.33333C2 2.04467 4.68629 1 8 1C11.3137 1 14 2.04467 14 3.33333ZM8 6.83333C11.3137 6.83333 14 5.78866 14 4.5V7.75777C15.206 8.56504 16 9.93979 16 11.5C16 13.9853 13.9853 16 11.5 16C10.4205 16 9.42985 15.6199 8.65446 14.9863C8.43951 14.9953 8.22115 15 8 15C4.68629 15 2 13.9553 2 12.6667V9.16667C2 10.3228 4.16235 11.2826 7.00012 11.4677C7.00293 11.0674 7.058 10.6796 7.15887 10.3106C4.24338 10.1515 2 9.17765 2 8V4.5C2 5.78866 4.68629 6.83333 8 6.83333ZM11.5 8C12.3224 8 13.0785 8.28364 13.6759 8.75842C14.4827 9.3996 15 10.3894 15 11.5C15 13.433 13.433 15 11.5 15C11.1026 15 10.7208 14.9338 10.3648 14.8118C8.98898 14.3403 8 13.0356 8 11.5C8 11.0905 8.07035 10.6973 8.19961 10.3321C8.68044 8.97334 9.97655 8 11.5 8ZM12.9142 9.37868L13.6213 10.0858L12.2071 11.5L13.6213 12.9142L12.9142 13.6213L11.5 12.2071L10.0858 13.6213L9.37868 12.9142L10.7929 11.5L9.37868 10.0858L10.0858 9.37868L11.5 10.7929L12.9142 9.37868Z" fill="#333334"/>
+</g>
+</svg>

designer-base/src/main/resources/com/fr/design/standard/batchesdoff/batch_esd_off_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="M14 3.33333C14 4.622 11.3137 5.66667 8 5.66667C4.68629 5.66667 2 4.622 2 3.33333C2 2.04467 4.68629 1 8 1C11.3137 1 14 2.04467 14 3.33333ZM8 6.83333C11.3137 6.83333 14 5.78866 14 4.5V7.75777C15.206 8.56504 16 9.93979 16 11.5C16 13.9853 13.9853 16 11.5 16C10.4205 16 9.42985 15.6199 8.65446 14.9863C8.43951 14.9953 8.22115 15 8 15C4.68629 15 2 13.9553 2 12.6667V9.16667C2 10.3228 4.16235 11.2826 7.00012 11.4677C7.00293 11.0674 7.058 10.6796 7.15887 10.3106C4.24338 10.1515 2 9.17765 2 8V4.5C2 5.78866 4.68629 6.83333 8 6.83333ZM11.5 8C12.3224 8 13.0785 8.28364 13.6759 8.75842C14.4827 9.3996 15 10.3894 15 11.5C15 13.433 13.433 15 11.5 15C11.1026 15 10.7208 14.9338 10.3648 14.8118C8.98898 14.3403 8 13.0356 8 11.5C8 11.0905 8.07035 10.6973 8.19961 10.3321C8.68044 8.97334 9.97655 8 11.5 8ZM12.9142 9.37868L13.6213 10.0858L12.2071 11.5L13.6213 12.9142L12.9142 13.6213L11.5 12.2071L10.0858 13.6213L9.37868 12.9142L10.7929 11.5L9.37868 10.0858L10.0858 9.37868L11.5 10.7929L12.9142 9.37868Z" fill="#333334"/>
+</svg>

designer-base/src/main/resources/com/fr/design/standard/batchesdon/batch_esd_on_disabled.svg

@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g opacity="0.3">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M14 3.33333C14 4.622 11.3137 5.66667 8 5.66667C4.68629 5.66667 2 4.622 2 3.33333C2 2.04467 4.68629 1 8 1C11.3137 1 14 2.04467 14 3.33333ZM8 6.83333C11.3137 6.83333 14 5.78866 14 4.5V7.75777C15.206 8.56504 16 9.93979 16 11.5C16 13.9853 13.9853 16 11.5 16C10.4205 16 9.42985 15.6199 8.65446 14.9863C8.43951 14.9953 8.22115 15 8 15C4.68629 15 2 13.9553 2 12.6667V9.16667C2 10.3228 4.16235 11.2826 7.00012 11.4677C7.00293 11.0674 7.058 10.6796 7.15887 10.3106C4.24338 10.1515 2 9.17765 2 8V4.5C2 5.78866 4.68629 6.83333 8 6.83333ZM11.5 8C12.3224 8 13.0785 8.28364 13.6759 8.75842C14.4827 9.3996 15 10.3894 15 11.5C15 13.433 13.433 15 11.5 15C11.1026 15 10.7208 14.9338 10.3648 14.8118C8.98898 14.3403 8 13.0356 8 11.5C8 11.0905 8.07035 10.6973 8.19961 10.3321C8.68044 8.97334 9.97655 8 11.5 8ZM10.6482 13.5372L13.4434 11.5L10.6482 9.53723V13.5372Z" fill="#333334"/>
+</g>
+</svg>

designer-base/src/main/resources/com/fr/design/standard/batchesdon/batch_esd_on_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="M14 3.33333C14 4.622 11.3137 5.66667 8 5.66667C4.68629 5.66667 2 4.622 2 3.33333C2 2.04467 4.68629 1 8 1C11.3137 1 14 2.04467 14 3.33333ZM8 6.83333C11.3137 6.83333 14 5.78866 14 4.5V7.75777C15.206 8.56504 16 9.93979 16 11.5C16 13.9853 13.9853 16 11.5 16C10.4205 16 9.42985 15.6199 8.65446 14.9863C8.43951 14.9953 8.22115 15 8 15C4.68629 15 2 13.9553 2 12.6667V9.16667C2 10.3228 4.16235 11.2826 7.00012 11.4677C7.00293 11.0674 7.058 10.6796 7.15887 10.3106C4.24338 10.1515 2 9.17765 2 8V4.5C2 5.78866 4.68629 6.83333 8 6.83333ZM11.5 8C12.3224 8 13.0785 8.28364 13.6759 8.75842C14.4827 9.3996 15 10.3894 15 11.5C15 13.433 13.433 15 11.5 15C11.1026 15 10.7208 14.9338 10.3648 14.8118C8.98898 14.3403 8 13.0356 8 11.5C8 11.0905 8.07035 10.6973 8.19961 10.3321C8.68044 8.97334 9.97655 8 11.5 8ZM10.6482 13.5372L13.4434 11.5L10.6482 9.53723V13.5372Z" fill="#333334"/>
+</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/bold/bold_normal.svg

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

designer-base/src/main/resources/com/fr/design/standard/bold/bold_selected.svg

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

designer-base/src/main/resources/com/fr/design/standard/cell_default_normal.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/cellstyle/h_center_normal.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon_对齐 居中对齐_normal</title>
+    <g id="icon_对齐-居中对齐_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M13,13 L13,14 L3,14 L3,13 L13,13 Z M15,11 L15,12 L1,12 L1,11 L15,11 Z M13,9 L13,10 L3,10 L3,9 L13,9 Z M15,7 L15,8 L1,8 L1,7 L15,7 Z M13,5 L13,6 L3,6 L3,5 L13,5 Z M15,3 L15,4 L1,4 L1,3 L15,3 Z" id="Combined-Shape" fill="#333334"></path>
+    </g>
+</svg>

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon_对齐 居中对齐_selected</title>
+    <g id="icon_对齐-居中对齐_selected" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M13,13 L13,14 L3,14 L3,13 L13,13 Z M15,11 L15,12 L1,12 L1,11 L15,11 Z M13,9 L13,10 L3,10 L3,9 L13,9 Z M15,7 L15,8 L1,8 L1,7 L15,7 Z M13,5 L13,6 L3,6 L3,5 L13,5 Z M15,3 L15,4 L1,4 L1,3 L15,3 Z" id="Combined-Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon_对齐 左对齐_normal</title>
+    <g id="icon_对齐-左对齐_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M11,13 L11,14 L1,14 L1,13 L11,13 Z M15,11 L15,12 L1,12 L1,11 L15,11 Z M11,9 L11,10 L1,10 L1,9 L11,9 Z M15,7 L15,8 L1,8 L1,7 L15,7 Z M11,5 L11,6 L1,6 L1,5 L11,5 Z M15,3 L15,4 L1,4 L1,3 L15,3 Z" id="Combined-Shape" fill="#333334"></path>
+    </g>
+</svg>

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon_对齐 左对齐_selected</title>
+    <g id="icon_对齐-左对齐_selected" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M11,13 L11,14 L1,14 L1,13 L11,13 Z M15,11 L15,12 L1,12 L1,11 L15,11 Z M11,9 L11,10 L1,10 L1,9 L11,9 Z M15,7 L15,8 L1,8 L1,7 L15,7 Z M11,5 L11,6 L1,6 L1,5 L11,5 Z M15,3 L15,4 L1,4 L1,3 L15,3 Z" id="Combined-Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon_对齐 右对齐_normal</title>
+    <g id="icon_对齐-右对齐_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M15,13 L15,14 L5,14 L5,13 L15,13 Z M15,11 L15,12 L1,12 L1,11 L15,11 Z M15,9 L15,10 L5,10 L5,9 L15,9 Z M15,7 L15,8 L1,8 L1,7 L15,7 Z M15,5 L15,6 L5,6 L5,5 L15,5 Z M15,3 L15,4 L1,4 L1,3 L15,3 Z" id="Combined-Shape" fill="#333334"></path>
+    </g>
+</svg>

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon_对齐 右对齐_selected</title>
+    <g id="icon_对齐-右对齐_selected" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M15,13 L15,14 L5,14 L5,13 L15,13 Z M15,11 L15,12 L1,12 L1,11 L15,11 Z M15,9 L15,10 L5,10 L5,9 L15,9 Z M15,7 L15,8 L1,8 L1,7 L15,7 Z M15,5 L15,6 L5,6 L5,5 L15,5 Z M15,3 L15,4 L1,4 L1,3 L15,3 Z" id="Combined-Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/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/class_table_data_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="M2 1C1.44772 1 1 1.44771 1 2V11C1 11.5523 1.44772 12 2 12H5V14H1.5C1.22386 14 1 14.2239 1 14.5C1 14.7761 1.22386 15 1.5 15H14.5C14.7761 15 15 14.7761 15 14.5C15 14.2239 14.7761 14 14.5 14H11V12H14C14.5523 12 15 11.5523 15 11V2C15 1.44772 14.5523 1 14 1H2ZM2 11V2H14V11H2Z" fill="#333334"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3 3H6V4H5V8H6V9H5H4H3V8H4V4H3V3Z" fill="#419BF9"/>
+</svg>

designer-base/src/main/resources/com/fr/design/standard/clear_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="M7.89949494,0.899494937 C8.28609426,0.899494937 8.59949494,1.21820884 8.59949494,1.59375711 L8.59849494,7.19949494 L14.2052328,7.19949494 C14.5567106,7.19949494 14.8471855,7.46057376 14.8931571,7.80394288 L14.8994949,7.89949494 C14.8994949,8.28609426 14.580781,8.59949494 14.2052328,8.59949494 L8.59849494,8.59849494 L8.59949494,14.2052328 C8.59949494,14.5567106 8.33841611,14.8471855 7.99504699,14.8931571 L7.89949494,14.8994949 C7.51289561,14.8994949 7.19949494,14.580781 7.19949494,14.2052328 L7.19949494,8.59849494 L1.59375711,8.59949494 C1.24227924,8.59949494 0.951804388,8.33841611 0.905832732,7.99504699 L0.899494937,7.89949494 C0.899494937,7.51289561 1.21820884,7.19949494 1.59375711,7.19949494 L7.19949494,7.19949494 L7.19949494,1.59375711 C7.19949494,1.24227924 7.46057376,0.951804388 7.80394288,0.905832732 L7.89949494,0.899494937 Z"
+              id="Combined-Shape" fill="#333334"
+              transform="translate(7.899495, 7.899495) rotate(45.000000) translate(-7.899495, -7.899495) "></path>
+    </g>
+</svg>

designer-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/collapse_all_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="M4 2.98995L4.98995 2L7.99497 5.00502L11 2L11.9899 2.98995L7.99497 6.98492L4 2.98995Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4 13L4.98995 13.99L7.99497 10.985L11 13.99L11.9899 13L7.99497 9.00507L4 13Z" fill="black"/>
+</svg>

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

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="13px" viewBox="0 0 14 13" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon_定义数据连接_normal备份</title>
+    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="编组" transform="translate(-1.000000, -2.000000)" fill="#333334" fill-rule="nonzero">
+            <g id="Combined-Shape">
+                <path d="M13.9931545,2 C14.5492199,2 15,2.44371665 15,2.99980749 L15,6.00019251 C15,6.18235446 14.9510312,6.35313811 14.8654084,6.50022573 C14.9510251,6.64542671 15,6.81651267 15,6.99980749 L15,8.323 L13.9999505,7.11184475 L13.9999505,7.11184475 L14,6.99980749 L14,6.99980749 L13.676,6.999 L12.677,6 L13.9814047,6.00000045 C13.9891898,6.00000015 13.9931545,6 13.9931545,6 C13.9949083,6 13.9962286,5.72209937 13.9972169,5.33545502 L13.997985,4.98135981 C13.9981003,4.91922053 13.9982094,4.85584834 13.9983125,4.79173639 L13.9988633,4.40213303 C13.9989441,4.33703474 13.9990197,4.27218304 13.9990902,4.2080711 L14,2.99980749 L14,2.99980749 L2.00684547,3 L2.00684547,3 C2.00509174,3 2.00377141,3.27790063 2.00278313,3.66454498 L2.00201498,4.01864019 C2.00189972,4.08077947 2.00179065,4.14415166 2.00168746,4.20826361 L2.00113666,4.59786697 C2.00105585,4.66296526 2.00098034,4.72781696 2.00090983,4.7919289 L2.00000644,5.98367135 C2.00000205,5.99452107 2,6.00019251 2,6.00019251 L8.635,6 L7.636,6.999 L2.00684547,7 L2.00684547,7 C2.00509174,7 2.00377141,7.27790063 2.00278313,7.66454498 L2.00201498,8.01864019 C2.00189972,8.08077947 2.00179065,8.14415166 2.00168746,8.20826361 L2.00113666,8.59786697 C2.00105585,8.66296526 2.00098034,8.72781696 2.00090983,8.7919289 L2.00000644,9.98367135 C2.00000205,9.99452107 2,10.0001925 2,10.0001925 L5.75694924,10.0007296 C5.72425189,10.333731 5.73933308,10.670427 5.80214822,10.9998606 L2.00684547,11 L2.00684547,11 C2.00509174,11 2.00377141,11.2779006 2.00278313,11.664545 L2.00201498,12.0186402 C2.00189972,12.0807795 2.00179065,12.1441517 2.00168746,12.2082636 L2.00113666,12.597867 C2.00105585,12.6629653 2.00098034,12.727817 2.00090983,12.7919289 L2.00000644,13.9836714 C2.00000205,13.9945211 2,14.0001925 2,14.0001925 L5.121,14 L6.121,15 L2.00684547,15 C1.45078007,15 1,14.5562834 1,14.0001925 L1,10.9998075 C1,10.8176455 1.04896881,10.6468619 1.13459156,10.4997743 C1.04897491,10.3545733 1,10.1834873 1,10.0001925 L1,6.99980749 C1,6.81764554 1.04896881,6.64686189 1.13459156,6.49977427 C1.04897491,6.35457329 1,6.18348733 1,6.00019251 L1,2.99980749 C1,2.44762906 1.44994876,2 2.00684547,2 L13.9931545,2 Z M15,12.363 L15,14.0001925 C15,14.5523709 14.5500512,15 13.9931545,15 L11.974132,15.0005781 C12.3954832,14.8298301 12.7902338,14.5737273 13.131728,14.232233 L13.131728,14.232233 L13.363,14 L13.9814047,14.0000004 C13.9891898,14.0000002 13.9931545,14 13.9931545,14 C13.9948594,14 13.9961547,13.7373643 13.9971335,13.3675055 L15,12.363 Z M11.0104076,6.45405845 L11.7175144,7.16116524 L10.3033009,8.5753788 L12.4246212,10.6966991 L13.8388348,9.28248558 L14.5459415,9.98959236 L13.131728,11.4038059 L13.4852814,11.7573593 L12.0710678,13.1715729 C11.2900192,13.9526215 10.0216881,13.9506203 9.24411633,13.1730485 L8.8890873,12.8180195 L7.47487373,14.232233 L6.76776695,13.5251263 L8.18198052,12.1109127 L7.82695148,11.7558837 C7.04671787,10.9756501 7.04193321,9.7154261 7.82842712,8.92893219 L9.24264069,7.51471863 L9.59619408,7.86827202 L11.0104076,6.45405845 Z M9.24264069,8.92893219 L8.53553391,9.63603897 C8.14170149,10.0298714 8.14220916,10.6569278 8.53405826,11.0487769 L9.95122311,12.4659417 C10.3392305,12.8539491 10.9743965,12.8540307 11.363961,12.4644661 L12.0710678,11.7573593 L9.24264069,8.92893219 Z M4,4 L4,5 L3,5 L3,4 L4,4 Z M6,4 L6,5 L5,5 L5,4 L6,4 Z"></path>
+            </g>
+        </g>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/standard/copy/copy_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="M6,0 L9,3 L9,4 L13,4 L16,7 L16,16 L6,16 L6,11 L0,11 L0,0 L6,0 Z M8,4.999 L7,5 L6.999,10 L7,10 L7,11 L6.999,11 L7,15 L15,15 L14.999,8 L12,8 L12,4.999 L9,4.999 L9,5 L8,5 L8,4.999 Z M11,6 L11,9 L14,9 L14,14 L8,14 L8,6 L11,6 Z M5,1 L1,1 L1,10 L6,10 L6,4 L5,4 L5,1 Z M4,2 L4,5 L5,5 L5,9 L2,9 L2,2 L4,2 Z M13,5.414 L13,7 L14.585,7 L13,5.414 Z M6,1.415 L6,3 L7.586,3 L6,1.415 Z" id="形状结合" fill="#333334"></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/standard/copy/copy_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="M6,0 L9,3 L9,5 L13,5 L15,7 L15,16 L7,16 L7,11 L0,11 L0,0 L6,0 Z" id="Combined-Shape" fill="#FFFFFF"></path>
+        <path d="M16,16 L6,16 L6,4 L13,4 L16,7 L16,16 Z M12,4.999 L7,5 L7,15 L15,15 L14.999,8 L12,8 L12,4.999 Z M13,5.414 L13,7 L14.585,7 L13,5.414 Z" id="Combined-Shape" fill="#48494B" fill-rule="nonzero"></path>
+        <path d="M6,0 L9,3 L9,5 L8,5 L8,4 L5,4 L5,1 L1,1 L1,10 L7,10 L7,11 L0,11 L0,0 L6,0 Z M6,1.415 L6,3 L7.586,3 L6,1.415 Z" id="Combined-Shape" fill="#48494B" fill-rule="nonzero"></path>
+        <path d="M8,6 L11,6 L11,9 L14,9 L14,14 L8,14 L8,6 Z M4,2 L4,5 L5,5 L5,9 L2,9 L2,2 L4,2 Z" id="Combined-Shape" fill="#FEF6DE"></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/standard/cut/cut_disabled.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_剪切_disabled</title>
+    <g id="icon_剪切_disabled" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.3">
+        <g id="Group" fill="#333334">
+            <path d="M3.51936865,0 L7.999,5.952 L12.4806877,0.000625592417 C12.4806877,0.000625592417 12.9382732,0.000625592417 12.9943831,0.431985374 L12.9995493,0.549061611 C12.9135928,3.04508847 12.1467387,4.16795083 11.2925568,5.28865864 L11.1806953,5.43493839 L9.16,7.494 L10.2816001,8.98350711 L10.723868,9.55112954 C11.2570654,9.20227675 11.891107,9 12.5714286,9 C14.4649763,9 16,10.5670034 16,12.5 C16,14.4329966 14.4649763,16 12.5714286,16 C10.6778809,16 9.14285714,14.4329966 9.14285714,12.5 C9.14285714,11.74944 9.37428928,11.0540601 9.76827966,10.4841689 L7.999,8.679 L6.23103458,10.4831773 C6.62544216,11.0532534 6.85714286,11.7490047 6.85714286,12.5 C6.85714286,14.4329966 5.32211914,16 3.42857143,16 C1.53502371,16 0,14.4329966 0,12.5 C0,10.5670034 1.53502371,9 3.42857143,9 C4.10846943,9 4.74214496,9.20202493 5.2751359,9.55047806 L5.71732093,8.9841327 L6.838,7.495 L4.81822572,5.43535545 C3.95757207,4.31224329 3.15843901,3.24562813 3.01539531,0.867253057 L3.00050704,0.549478673 C2.98120584,0 3.51936865,0 3.51936865,0 Z M12.5714286,10.75 C11.6246547,10.75 10.8571429,11.5335017 10.8571429,12.5 C10.8571429,13.4664983 11.6246547,14.25 12.5714286,14.25 C13.5182024,14.25 14.2857143,13.4664983 14.2857143,12.5 C14.2857143,11.5335017 13.5182024,10.75 12.5714286,10.75 Z M3.42857143,10.75 C2.48179757,10.75 1.71428571,11.5335017 1.71428571,12.5 C1.71428571,13.4664983 2.48179757,14.25 3.42857143,14.25 C4.37534529,14.25 5.14285714,13.4664983 5.14285714,12.5 C5.14285714,11.5335017 4.37534529,10.75 3.42857143,10.75 Z" id="形状结合"></path>
+        </g>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/standard/cut/cut_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">
+        <g id="Group">
+            <path d="M3.51936865,0 L7.999,5.952 L12.4806877,0.000625592417 C12.4806877,0.000625592417 12.9382732,0.000625592417 12.9943831,0.431985374 L12.9995493,0.549061611 C12.9098555,3.15361137 12.0787686,4.26299526 11.1806953,5.43493839 L11.1806953,5.43493839 L9.16,7.494 L10.2816001,8.98350711 L11.1762673,10.1304265 L10.2747879,11 L7.999,8.679 L5.72413312,10.9995829 L4.82265364,10.1300095 L5.71732093,8.9841327 L6.838,7.495 L4.81822572,5.43535545 C3.95757207,4.31224329 3.15843901,3.24562813 3.01539531,0.867253057 L3.00050704,0.549478673 C2.98120584,0 3.51936865,0 3.51936865,0 L3.51936865,0 Z" id="Combined-Shape" fill="#48494B"></path>
+            <path d="M12.5714286,14.25 C13.5182024,14.25 14.2857143,13.4664983 14.2857143,12.5 C14.2857143,11.5335017 13.5182024,10.75 12.5714286,10.75 C11.6246547,10.75 10.8571429,11.5335017 10.8571429,12.5 C10.8571429,13.4664983 11.6246547,14.25 12.5714286,14.25 Z M12.5714286,16 C10.6778809,16 9.14285714,14.4329966 9.14285714,12.5 C9.14285714,10.5670034 10.6778809,9 12.5714286,9 C14.4649763,9 16,10.5670034 16,12.5 C16,14.4329966 14.4649763,16 12.5714286,16 Z M3.42857143,14.25 C4.37534529,14.25 5.14285714,13.4664983 5.14285714,12.5 C5.14285714,11.5335017 4.37534529,10.75 3.42857143,10.75 C2.48179757,10.75 1.71428571,11.5335017 1.71428571,12.5 C1.71428571,13.4664983 2.48179757,14.25 3.42857143,14.25 Z M3.42857143,16 C1.53502371,16 0,14.4329966 0,12.5 C0,10.5670034 1.53502371,9 3.42857143,9 C5.32211914,9 6.85714286,10.5670034 6.85714286,12.5 C6.85714286,14.4329966 5.32211914,16 3.42857143,16 Z" id="Combined-Shape" fill="#419BF9" fill-rule="nonzero"></path>
+        </g>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/standard/data_table_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="M8 1H9V3H15V4H9V12H15V13H9V15H8V13H2V12H8V4H2V3H8V1ZM15 10C15 10.5523 13.8807 11 12.5 11C11.1193 11 10 10.5523 10 10V8.5C10 9.05229 11.1193 9.5 12.5 9.5C13.8807 9.5 15 9.05229 15 8.5V10ZM12.5 9C13.8807 9 15 8.55228 15 8V6.5C15 7.05228 13.8807 7.5 12.5 7.5C11.1193 7.5 10 7.05228 10 6.5V8C10 8.55228 11.1193 9 12.5 9ZM15 6C15 6.55228 13.8807 7 12.5 7C11.1193 7 10 6.55228 10 6C10 5.44772 11.1193 5 12.5 5C13.8807 5 15 5.44772 15 6ZM4.5 11C5.88071 11 7 10.5523 7 10V8.5C7 9.05229 5.88071 9.5 4.5 9.5C3.11929 9.5 2 9.05229 2 8.5V10C2 10.5523 3.11929 11 4.5 11ZM7 8C7 8.55228 5.88071 9 4.5 9C3.11929 9 2 8.55228 2 8V6.5C2 7.05228 3.11929 7.5 4.5 7.5C5.88071 7.5 7 7.05228 7 6.5V8ZM4.5 7C5.88071 7 7 6.55228 7 6C7 5.44772 5.88071 5 4.5 5C3.11929 5 2 5.44772 2 6C2 6.55228 3.11929 7 4.5 7Z" fill="#419BF9"/>
+</svg>

designer-base/src/main/resources/com/fr/design/standard/database_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="M8 5.66667C11.3137 5.66667 14 4.622 14 3.33333C14 2.04467 11.3137 1 8 1C4.68629 1 2 2.04467 2 3.33333C2 4.622 4.68629 5.66667 8 5.66667ZM2 8V4.5C2.00006 5.78865 4.68633 6.83329 8 6.83329C11.3137 6.83329 13.9999 5.78865 14 4.5V8V8.00076C14 9.28942 11.3137 10.3341 8 10.3341C4.68629 10.3341 2 9.28942 2 8.00076V8ZM2 9.16663V12.6666V12.6674C2 13.956 4.68629 15.0007 8 15.0007C11.3137 15.0007 14 13.956 14 12.6674V12.6666V9.16663C13.9999 10.4553 11.3137 11.4999 8 11.4999C4.68633 11.4999 2.00006 10.4553 2 9.16663Z" fill="#419BF9"/>
+</svg>

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

@@ -0,0 +1,3 @@
+<svg width="10" height="5" viewBox="0 0 10 5" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8 1H2V2H8V1ZM8 3.00061H2V4.00061H8V3.00061Z" fill="#AEAEAE"/>
+</svg>

designer-base/src/main/resources/com/fr/design/standard/drag/left_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 opacity="0.4" fill-rule="evenodd" clip-rule="evenodd" d="M10 4.48284C10 4.30466 9.78457 4.21543 9.65858 4.34142L6 8L9.65858 11.6586C9.78457 11.7846 10 11.6953 10 11.5172V4.48284Z" fill="#333334"/>
+</svg>