REPORT-107973 设计器样式翻新-主页及组件视觉样式翻新

【问题原因】rt
【改动思路】rt

designer-base/src/main/java/com/fine/theme/light/ui/FineLightIconSet.java

@@ -28,7 +28,23 @@ public class FineLightIconSet extends AbstractIconSet {
                 new SvgIconSource("redo", "com/fine/theme/icon/redo.svg", true),
                 new SvgIconSource("version_save", "com/fine/theme/icon/version_save.svg", true),
                 new SvgIconSource("font_miss_check", "com/fine/theme/icon/font_miss_check.svg", true),
-                new SvgIconSource("template_theme", "com/fine/theme/icon/template_theme.svg", true)
+                new SvgIconSource("template_theme", "com/fine/theme/icon/template_theme.svg", true),
+                new SvgIconSource("database", "com/fr/design/standard/database.svg", true),
+                new SvgIconSource("preview", "com/fr/design/standard/previewdateset/preview.svg", false),
+                new SvgIconSource("connection", "com/fr/design/standard/connection.svg", true),
+                new SvgIconSource("class_table_data", "com/fr/design/standard/class_table_data.svg", true),
+                new SvgIconSource("data_table", "com/fr/design/standard/data_table.svg", true),
+                new SvgIconSource("multi", "com/fr/design/standard/multi.svg", true),
+                new SvgIconSource("file", "com/fr/design/standard/file.svg", true),
+                new SvgIconSource("tree", "com/fr/design/standard/tree.svg", true),
+                new SvgIconSource("store_procedure", "/com/fr/design/standard/store_procedure.svg", true),
+                new SvgIconSource("batch_esd_on", "com/fr/design/standard/batchesdon/batch_esd_on.svg", true),
+                new SvgIconSource("batch_esd_off", "com/fr/design/standard/batchesdoff/batch_esd_off.svg", true),
+                new SvgIconSource("edit", "com/fr/design/standard/editdataset/edit.svg", true),
+                new SvgIconSource("remove", "com/fr/design/standard/remove/remove.svg", true),
+                new SvgIconSource("search", "/com/fr/design/standard/search.svg", true),
+                new SvgIconSource("server_database", "com/fr/design/standard/server_database.svg", true),
+                new SvgIconSource("field", "com/fr/design/standard/field.svg", true)
         );
     }
 }

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

@@ -1,5 +1,6 @@
 package com.fr.design.actions.file;
 
+import com.fine.theme.icon.LazyIcon;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.file.FileOperations;
@@ -22,7 +23,7 @@ public class DelFileAction extends UpdateAction {
     public DelFileAction() {
 
         this.setName(Toolkit.i18nText("Fine-Design_Basic_Remove"));
-        this.setSmallIcon("/com/fr/design/standard/remove/remove");
+        this.setSmallIcon(new LazyIcon("remove"));
     }
 
     @Override

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

@@ -1,6 +1,6 @@
 package com.fr.design.actions.server;
 
-import com.fr.base.BaseUtils;
+import com.fine.theme.icon.LazyIcon;
 import com.fr.design.DesignModelAdapter;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.data.DesignTableDataManager;
@@ -11,7 +11,6 @@ import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.DesignerFrame;
 import com.fr.file.ProcedureConfig;
-
 import com.fr.transaction.CallBackAdaptor;
 import com.fr.transaction.Configurations;
 import com.fr.transaction.WorkerFacade;
@@ -22,7 +21,7 @@ public class ProcedureListAction extends UpdateAction {
     public ProcedureListAction() {
         this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Stored_Procedure") + "(P)" + "...");
         this.setMnemonic('P');
-        this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/data/store_procedure.png"));
+        this.setSmallIcon(new LazyIcon("store_procedure"));
     }
 
     /**

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

@@ -1,6 +1,6 @@
 package com.fr.design.data;
 
-import com.fr.base.BaseUtils;
+import com.fine.theme.icon.LazyIcon;
 import com.fr.base.TableData;
 import com.fr.base.svg.IconUtils;
 import com.fr.data.MultiResultTableData;
@@ -431,7 +431,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/standard/previewdateset/preview");
+            this.setSmallIcon(new LazyIcon("preview"));
             this.dataTree = dataTree;
         }
 
@@ -508,7 +508,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/standard/connection", false);
+            this.setSmallIcon(new LazyIcon("connection"));
         }
 
         @Override

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

@@ -4,11 +4,25 @@
 
 package com.fr.design.data.datapane;
 
-import com.fr.data.impl.*;
+import com.fine.theme.icon.LazyIcon;
+import com.fr.data.impl.ClassTableData;
+import com.fr.data.impl.ConditionTableData;
+import com.fr.data.impl.DBTableData;
+import com.fr.data.impl.EmbeddedTableData;
+import com.fr.data.impl.FileTableData;
+import com.fr.data.impl.RecursionTableData;
 import com.fr.data.impl.storeproc.StoreProcedure;
 import com.fr.design.ExtraDesignClassManager;
-import com.fr.design.data.tabledata.tabledatapane.*;
-
+import com.fr.design.data.tabledata.tabledatapane.ClassTableDataPane;
+import com.fr.design.data.tabledata.tabledatapane.DBTableDataPane;
+import com.fr.design.data.tabledata.tabledatapane.EmbeddedTableDataPane;
+import com.fr.design.data.tabledata.tabledatapane.FileTableDataSmallHeightPane;
+import com.fr.design.data.tabledata.tabledatapane.FileTableDataSmallPane;
+import com.fr.design.data.tabledata.tabledatapane.GlobalMultiTDTableDataPane;
+import com.fr.design.data.tabledata.tabledatapane.GlobalTreeTableDataPane;
+import com.fr.design.data.tabledata.tabledatapane.MultiTDTableDataPane;
+import com.fr.design.data.tabledata.tabledatapane.ProcedureDataPane;
+import com.fr.design.data.tabledata.tabledatapane.TreeTableDataPane;
 import com.fr.stable.ArrayUtils;
 
 import java.util.ArrayList;
@@ -33,33 +47,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/standard/database_normal.svg", DBTableData.class, DBTableDataPane.class);
+                new LazyIcon("database"), 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/standard/class_table_data_normal.svg", ClassTableData.class, ClassTableDataPane.class);
+                new LazyIcon("class_table_data"), ClassTableData.class, ClassTableDataPane.class);
         TableDataNameObjectCreator table = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Embedded"),
                 "Embedded",
-                "/com/fr/design/standard/data_table_normal.svg", EmbeddedTableData.class, EmbeddedTableDataPane.class);
+                new LazyIcon("data_table"), EmbeddedTableData.class, EmbeddedTableDataPane.class);
         TableDataNameObjectCreator multiTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Relation"),
                 "Multi",
-                "/com/fr/design/standard/multi_normal.svg", ConditionTableData.class, MultiTDTableDataPane.class) {
+                new LazyIcon("multi"), 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/standard/file_normal.svg", FileTableData.class, FileTableDataSmallHeightPane.class);
+                new LazyIcon("file"), FileTableData.class, FileTableDataSmallHeightPane.class);
         TableDataNameObjectCreator treeTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Tree"),
                 "Tree",
-                "/com/fr/design/standard/tree_normal.svg", RecursionTableData.class, TreeTableDataPane.class) {
+                new LazyIcon("tree"), 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/standard/store_procedure_normal.svg",
+                new LazyIcon("store_procedure"),
                 StoreProcedure.class, ProcedureDataPane.class) {
             @Override
             public boolean shouldInsertSeparator() {
@@ -72,33 +86,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/standard/server_database_normal.svg", DBTableData.class,
+                new LazyIcon("server_database"), DBTableData.class,
                 DBTableDataPane.class);
         TableDataNameObjectCreator ds_Class = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Class"),
-                "/com/fr/design/standard/class_table_data_normal.svg", ClassTableData.class,
+                new LazyIcon("class_table_data"), ClassTableData.class,
                 ClassTableDataPane.class);
         TableDataNameObjectCreator table = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Embedded"),
-                "/com/fr/design/standard/data_table_normal.svg", EmbeddedTableData.class,
+                new LazyIcon("data_table"), EmbeddedTableData.class,
                 EmbeddedTableDataPane.class);
         TableDataNameObjectCreator fileTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_File"),
-                "/com/fr/design/standard/file_normal.svg", FileTableData.class,
+                new LazyIcon("file"), FileTableData.class,
                 FileTableDataSmallPane.class);
         TableDataNameObjectCreator treeTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Tree"),
-                "/com/fr/design/standard/tree_normal.svg",
+                new LazyIcon("tree"),
                 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/standard/multi_normal.svg",
+                new LazyIcon("multi"),
                 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/standard/store_procedure_normal.svg",
+                new LazyIcon("store_procedure"),
                 StoreProcedure.class, ProcedureDataPane.class) {
             @Override
             public boolean shouldInsertSeparator() {

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

@@ -1,7 +1,5 @@
 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;
@@ -52,6 +50,9 @@ public class TableDataNameObjectCreator extends NameObjectCreator {
         prefix = action.getPrefix();
     }
 
+    /**
+     * 改用{@link TableDataNameObjectCreator#TableDataNameObjectCreator(String, Icon, Class, Class)}
+     */
     public TableDataNameObjectCreator(String menuName, String iconPath, Class clazz, Class<? extends BasicBeanPane> updatePane) {
         super(menuName, iconPath, clazz, updatePane);
         if (iconPath != null) {
@@ -60,6 +61,14 @@ public class TableDataNameObjectCreator extends NameObjectCreator {
         }
     }
 
+    public TableDataNameObjectCreator(String menuName, Icon icon, Class clazz, Class<? extends BasicBeanPane> updatePane) {
+        super(menuName, icon, clazz, updatePane);
+    }
+
+    /**
+     * 改用{@link TableDataNameObjectCreator#TableDataNameObjectCreator(String, String, Icon, Class, Class)}
+     */
+    @Deprecated
     public TableDataNameObjectCreator(String menuName, String prefix, String iconPath, Class clazz, Class<? extends BasicBeanPane> updatePane) {
         super(menuName, iconPath, clazz, updatePane);
         if (iconPath != null) {
@@ -69,6 +78,15 @@ public class TableDataNameObjectCreator extends NameObjectCreator {
         this.prefix = prefix;
     }
 
+    public TableDataNameObjectCreator(String menuName, String prefix, Icon icon, Class clazz, Class<? extends BasicBeanPane> updatePane) {
+        super(menuName, icon, clazz, updatePane);
+        this.prefix = prefix;
+    }
+
+    /**
+     * 改用{@link TableDataNameObjectCreator#TableDataNameObjectCreator(String, Icon, Class, Class, Class)}
+     */
+    @Deprecated
     public TableDataNameObjectCreator(String menuName, String iconPath, Class clazz, Class clazz4Init, Class<? extends BasicBeanPane> updatePane) {
         super(menuName, iconPath, clazz, clazz4Init, updatePane);
         if (iconPath != null) {
@@ -77,6 +95,14 @@ public class TableDataNameObjectCreator extends NameObjectCreator {
         }
     }
 
+    public TableDataNameObjectCreator(String menuName, Icon icon, Class clazz, Class clazz4Init, Class<? extends BasicBeanPane> updatePane) {
+        super(menuName, icon, clazz, clazz4Init, updatePane);
+    }
+
+    /**
+     * 改用{@link TableDataNameObjectCreator#TableDataNameObjectCreator(String, String, Icon, Class, Class, Class)}
+     */
+    @Deprecated
     public TableDataNameObjectCreator(String menuName, String prefix, String iconPath, Class clazz, Class clazz4Init, Class<? extends BasicBeanPane> updatePane) {
         super(menuName, iconPath, clazz, clazz4Init, updatePane);
         if (iconPath != null) {
@@ -86,6 +112,11 @@ public class TableDataNameObjectCreator extends NameObjectCreator {
         this.prefix = prefix;
     }
 
+    public TableDataNameObjectCreator(String menuName, String prefix, Icon icon, Class clazz, Class clazz4Init, Class<? extends BasicBeanPane> updatePane) {
+        super(menuName, icon, clazz, clazz4Init, updatePane);
+        this.prefix = prefix;
+    }
+
 
     @Override
     protected void doSthChanged4Icon(Object ob) {

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

@@ -1,5 +1,6 @@
 package com.fr.design.data.datapane;
 
+import com.fine.theme.icon.LazyIcon;
 import com.fr.base.svg.IconUtils;
 import com.fr.data.MultiResultTableData;
 import com.fr.design.data.datapane.management.search.TableDataTreeSearchManager;
@@ -52,7 +53,7 @@ public class TableDataTree extends UserObjectRefreshJTree<TableDataSourceOP> {
             Object userObj = treeNode.getUserObject();
             if (userObj instanceof String) {
                 // p:这个是column field.
-                this.setIcon(IconUtils.readIcon("/com/fr/design/standard/field"));
+                this.setIcon(new LazyIcon("field"));
                 this.setText((String) userObj);
             } else if (userObj instanceof NameObject) {
                 NameObject nameObject = (NameObject) userObj;
@@ -70,7 +71,7 @@ public class TableDataTree extends UserObjectRefreshJTree<TableDataSourceOP> {
                         this.setIcon(IconUtils.readIcon(IconPathConstants.DS_QUERY_ICON_PATH));
                     }
                 } else {
-                    this.setIcon(IconUtils.readIcon("/com/fr/design/images/data/store_procedure.png"));
+                    this.setIcon(new LazyIcon("store_procedure"));
                 }
             } else if (userObj == PENDING) {
                 this.setIcon(null);

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

@@ -1,5 +1,6 @@
 package com.fr.design.data.datapane;
 
+import com.fine.theme.icon.LazyIcon;
 import com.fr.base.TableData;
 import com.fr.data.MultiResultTableData;
 import com.fr.data.TableDataSource;
@@ -896,7 +897,7 @@ public class TableDataTreePane extends BasicTableDataTreePane {
 
         @Override
         public String getIconResource() {
-            return "/com/fr/design/standard/batchesdon/batch_esd_on";
+            return "batch_esd_on";
         }
 
         @Override
@@ -943,7 +944,7 @@ public class TableDataTreePane extends BasicTableDataTreePane {
 
         @Override
         public String getIconResource() {
-            return "/com/fr/design/standard/batchesdoff/batch_esd_off";
+            return "batch_esd_off";
         }
 
         @Override
@@ -971,7 +972,7 @@ public class TableDataTreePane extends BasicTableDataTreePane {
         public AbstractESDAction() {
             this.setName(getName());
             this.setMnemonic('R');
-            this.setSmallIcon(getIconResource());
+            this.setSmallIcon(new LazyIcon(getIconResource()));
         }
 
         @Override
@@ -1037,7 +1038,7 @@ public class TableDataTreePane extends BasicTableDataTreePane {
         public EditAction() {
             this.setName(Toolkit.i18nText("Fine-Design_Basic_Edit"));
             this.setMnemonic('E');
-            this.setSmallIcon("/com/fr/design/standard/editdataset/edit");
+            this.setSmallIcon(new LazyIcon("edit"));
         }
 
         @Override
@@ -1102,7 +1103,7 @@ public class TableDataTreePane extends BasicTableDataTreePane {
         public RemoveAction() {
             this.setName(Toolkit.i18nText("Fine-Design_Basic_Remove"));
             this.setMnemonic('R');
-            this.setSmallIcon("/com/fr/design/standard/remove/remove");
+            this.setSmallIcon(new LazyIcon("remove"));
         }
 
         @Override
@@ -1178,7 +1179,7 @@ public class TableDataTreePane extends BasicTableDataTreePane {
         public CopyAction() {
             this.setName(Toolkit.i18nText("Fine-Design_Basic_Copy"));
             this.setMnemonic('C');
-            this.setSmallIcon("/com/fr/design/standard/copy/copy");
+            this.setSmallIcon(new LazyIcon("copy"));
         }
 
         @Override
@@ -1194,7 +1195,7 @@ public class TableDataTreePane extends BasicTableDataTreePane {
         public PasteAction() {
             this.setName(Toolkit.i18nText("Fine-Design_Basic_Action_Paste_Name"));
             this.setMnemonic('P');
-            this.setSmallIcon("/com/fr/design/images/m_edit/paste");
+            this.setSmallIcon(new LazyIcon("paste"));
         }
 
         @Override
@@ -1228,7 +1229,7 @@ public class TableDataTreePane extends BasicTableDataTreePane {
         public SwitchAction() {
             this.setName(Toolkit.i18nText("Fine-Design_Basic_Search"));
             this.setMnemonic('S');
-            this.setSmallIcon("/com/fr/design/standard/search", false);
+            this.setSmallIcon(new LazyIcon("search"));
         }
 
         @Override

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

@@ -1,18 +1,19 @@
 package com.fr.design.data.datapane.management.search.pane;
 
+import com.fine.theme.icon.LazyIcon;
 import com.fr.base.svg.IconUtils;
 import com.fr.design.DesignModelAdapter;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.data.datapane.TableDataTreePane;
 import com.fr.design.data.datapane.management.search.TableDataTreeSearchManager;
-import com.fr.design.search.event.TreeSearchStatusChangeEvent;
-import com.fr.design.search.event.TreeSearchStatusChangeListener;
-import com.fr.design.search.TreeSearchStatus;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.gui.itoolbar.UIToolbar;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.search.TreeSearchStatus;
+import com.fr.design.search.event.TreeSearchStatusChangeEvent;
+import com.fr.design.search.event.TreeSearchStatusChangeListener;
 import com.fr.stable.StringUtils;
 
 import javax.swing.BorderFactory;
@@ -103,7 +104,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/standard/search"));
+        UILabel searchLabel = new UILabel(new LazyIcon("search"));
         searchLabel.setBorder(BorderFactory.createEmptyBorder(0, 12, 0, 0));
         searchLabel.addMouseListener(new MouseAdapter() {
             @Override

designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ProcedureListPane.java

@@ -1,5 +1,6 @@
 package com.fr.design.data.tabledata.tabledatapane;
 
+import com.fine.theme.icon.LazyIcon;
 import com.fr.data.TableDataSource;
 import com.fr.data.impl.storeproc.StoreProcedure;
 import com.fr.design.data.DesignTableDataManager;
@@ -14,7 +15,7 @@ import com.fr.stable.Nameable;
 import com.fr.stable.StringUtils;
 import com.fr.stable.core.PropertyChangeAdapter;
 
-import javax.swing.*;
+import javax.swing.DefaultListModel;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -101,7 +102,7 @@ public class ProcedureListPane extends JListControlPane {
 	 * @return 面板组件
 	 */
 	public NameableCreator[] createNameableCreators() {
-		return new NameableCreator[] { new NameObjectCreator("Proc", "/com/fr/design/images/data/store_procedure.png", StoreProcedure.class,
+		return new NameableCreator[]{new NameObjectCreator("Proc", new LazyIcon("store_procedure"), StoreProcedure.class,
 				ProcedureDataPane.class) };
 	}
 

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

@@ -1,7 +1,7 @@
 package com.fr.design.data.tabledata.wrapper;
 
+import com.fine.theme.icon.LazyIcon;
 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;
@@ -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/standard/multi";
+    private static final String DEFAULT_MULTI_RESULT_TD_ICON = "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 IconUtils.readIcon(creator.getIconPath());
+                    return creator.menuIcon();
                 }
             }
-            return IconUtils.readIcon(DEFAULT_MULTI_RESULT_TD_ICON);
+            return new LazyIcon(DEFAULT_MULTI_RESULT_TD_ICON);
         });
     }
 }

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

@@ -1,8 +1,7 @@
 package com.fr.design.data.tabledata.wrapper;
 
-import com.fr.base.BaseUtils;
+import com.fine.theme.icon.LazyIcon;
 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;
@@ -12,7 +11,7 @@ import com.fr.data.impl.storeproc.StoreProcedure;
 import com.fr.design.icon.WarningIcon;
 import com.fr.stable.StringUtils;
 
-import javax.swing.*;
+import javax.swing.Icon;
 
 public final class ServerTableDataWrapper extends AbstractTableDataWrapper {
 	public ServerTableDataWrapper(TableData tabledata) {
@@ -27,21 +26,21 @@ public final class ServerTableDataWrapper extends AbstractTableDataWrapper {
 	public Icon getIcon() {
 		if (tabledata instanceof DBTableData) {
 			if (StringUtils.isBlank(((DBTableData) tabledata).getQuery())) {
-				return new WarningIcon(SVGLoader.load("/com/fr/design/standard/server_database_normal.svg"));
+				return new WarningIcon(SVGLoader.load("/com/fr/design/standard/server_database.svg"));
 			}
 			else {
-				return IconUtils.readIcon("/com/fr/design/standard/server_database");
+				return new LazyIcon("server_database");
 			}
 		} else if (tabledata instanceof ClassTableData) {
-			return IconUtils.readIcon("/com/fr/design/standard/class_table_data");
+			return new LazyIcon("class_table_data");
 		} else if (tabledata instanceof EmbeddedTableData) {
-			return IconUtils.readIcon("/com/fr/design/standard/data_table");
+			return new LazyIcon("data_table");
 		}else if(tabledata instanceof RecursionTableData){
-			return IconUtils.readIcon("/com/fr/design/standard/tree");
+			return new LazyIcon("tree");
 		} else if (tabledata instanceof StoreProcedure) {
-            return IconUtils.readIcon("/com/fr/design/standard/store_procedure");
+			return new LazyIcon("store_procedure");
         }
-		return IconUtils.readIcon("/com/fr/design/standard/server_database");
+		return new LazyIcon("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.fine.theme.icon.LazyIcon;
 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 IconUtils.readIcon("/com/fr/design/standard/store_procedure");
+        return new LazyIcon("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.fine.theme.icon.LazyIcon;
 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 IconUtils.readIcon("/com/fr/design/standard/store_procedure");
+        return new LazyIcon("store_procedure");
     }
 
     private void createStore(boolean needLoadingBar) {

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

@@ -1,5 +1,6 @@
 package com.fr.design.data.tabledata.wrapper;
 
+import com.fine.theme.icon.LazyIcon;
 import com.fr.base.TableData;
 import com.fr.data.TableDataSource;
 import com.fr.data.impl.ClassTableData;
@@ -29,6 +30,7 @@ import com.fr.stable.StringUtils;
 import com.fr.workspace.WorkContext;
 import com.fr.workspace.server.authority.user.UserAuthority;
 
+import javax.swing.Icon;
 import java.lang.reflect.Constructor;
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -55,15 +57,15 @@ public abstract class TableDataFactory {
      * 同一类型的只能加一次,就加最上层的类,因为要排序。如果将所有的 FileTableData都加进来，那么FileTableData的排序就不正确了
      */
     static {
-        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/standard/store_procedure_normal.svg", StoreProcedure.class, ProcedureDataPane.class));
-        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));
+        defaultMap.put(DBTableData.class.getName(), new TableDataNameObjectCreator(null, new LazyIcon("database"), DBTableData.class, DBTableDataPane.class));
+        defaultMap.put(ClassTableData.class.getName(), new TableDataNameObjectCreator(null, new LazyIcon("class_table_data"), ClassTableData.class, ClassTableDataPane.class));
+        defaultMap.put(EmbeddedTableData.class.getName(), new TableDataNameObjectCreator(null, new LazyIcon("data_table"), EmbeddedTableData.class, EmbeddedTableDataPane.class));
+        defaultMap.put(DecoratedTableData.class.getName(), new TableDataNameObjectCreator(null, new LazyIcon("multi"), DecoratedTableData.class, DecoratedTableDataPane.class));
+        defaultMap.put(StoreProcedure.class.getName(), new TableDataNameObjectCreator(null, new LazyIcon("store_procedure"), StoreProcedure.class, ProcedureDataPane.class));
+        defaultMap.put(MultiTDTableData.class.getName(), new TableDataNameObjectCreator(null, new LazyIcon("multi"), MultiTDTableData.class, MultiTDTableDataPane.class));
+        defaultMap.put(FileTableData.class.getName(), new TableDataNameObjectCreator(null, new LazyIcon("file"), FileTableData.class, FileTableDataPane.class));
+        defaultMap.put(RecursionTableData.class.getName(), new TableDataNameObjectCreator(null, new LazyIcon("tree"), RecursionTableData.class, TreeTableDataPane.class));
+        defaultMap.put(MultiFieldTableData.class.getName(), new TableDataNameObjectCreator(null, new LazyIcon("database"), MultiFieldTableData.class, null));
         map.putAll(defaultMap);
     }
 
@@ -143,15 +145,26 @@ public abstract class TableDataFactory {
     /**
      * 获取数据集所对应的图标路径
      *
-     * @param tabledata
-     * @return
+     * 获取图标直接使用 {@link #getIcon(TableData)}
      */
+    @Deprecated
     public static String getIconPath(TableData tabledata) {
         TableDataNameObjectCreator tableDataNameObjectCreator = getTableDataNameObjectCreator(tabledata);
         if (tableDataNameObjectCreator != null && tableDataNameObjectCreator.getIconPath() != null) {
             return tableDataNameObjectCreator.getIconPath();
         }
-        return "/com/fr/design/standard/database_normal.svg";
+        return "database";
+    }
+
+    /**
+     * 获取数据集所对应的图标
+     */
+    public static Icon getIcon(TableData tabledata) {
+        TableDataNameObjectCreator tableDataNameObjectCreator = getTableDataNameObjectCreator(tabledata);
+        if (tableDataNameObjectCreator != null && tableDataNameObjectCreator.menuIcon() != null) {
+            return tableDataNameObjectCreator.menuIcon();
+        }
+        return new LazyIcon(getIconPath(tabledata));
     }
 
     /**

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

@@ -1,14 +1,13 @@
 package com.fr.design.data.tabledata.wrapper;
 
-import javax.swing.Icon;
-
 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;
 
+import javax.swing.Icon;
+
 public final class TemplateTableDataWrapper extends AbstractTableDataWrapper {
 	public TemplateTableDataWrapper(TableData tabledata) {
 		super(tabledata);
@@ -21,9 +20,9 @@ public final class TemplateTableDataWrapper extends AbstractTableDataWrapper {
 	@Override
 	public Icon getIcon() {
 		if (tabledata instanceof DBTableData && StringUtils.isBlank(((DBTableData) tabledata).getQuery())) {
-			return new WarningIcon(SVGLoader.load("/com/fr/design/standard/database_normal.svg"));
+			return new WarningIcon(SVGLoader.load("/com/fr/design/standard/database.svg"));
 		}
-		return IconUtils.readIcon(TableDataFactory.getIconPath(tabledata));
+		return TableDataFactory.getIcon(tabledata);
 	}
 
 	@Override

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

@@ -1,13 +1,12 @@
 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;
 import com.fr.js.JavaScript;
 
-import javax.swing.*;
+import javax.swing.Icon;
 
 
 public abstract class AbstractNameableCreator implements NameableCreator {
@@ -24,6 +23,10 @@ public abstract class AbstractNameableCreator implements NameableCreator {
 		this.clazzOfEditor = clazzOfEditor;
 	}
 
+	/**
+	 * 改用 {@link AbstractNameableCreator#AbstractNameableCreator(String, Icon, Class)}
+	 */
+	@Deprecated
 	public AbstractNameableCreator(String menuName, String iconPath, Class clazz) {
 		this.menuName = menuName;
 		this.menuIcon = IconUtils.readIcon(iconPath);
@@ -31,6 +34,17 @@ public abstract class AbstractNameableCreator implements NameableCreator {
 		this.clazzOfInitCase = clazz;
 	}
 
+	public AbstractNameableCreator(String menuName, Icon icon, Class clazz) {
+		this.menuName = menuName;
+		this.menuIcon = icon;
+		this.clazzOfObject = clazz;
+		this.clazzOfInitCase = clazz;
+	}
+
+	/**
+	 * 改用{@link AbstractNameableCreator#AbstractNameableCreator(String, Icon, Class, Class)}
+	 */
+	@Deprecated
 	public AbstractNameableCreator(String menuName, String iconPath, Class clazz, Class<? extends BasicBeanPane> clazzOfEditor) {
 		this.menuName = menuName;
 		this.menuIcon = IconUtils.readIcon(iconPath);
@@ -39,6 +53,18 @@ public abstract class AbstractNameableCreator implements NameableCreator {
 		this.clazzOfInitCase = clazz;
 	}
 
+	public AbstractNameableCreator(String menuName, Icon icon, Class clazz, Class<? extends BasicBeanPane> clazzOfEditor) {
+		this.menuName = menuName;
+		this.menuIcon = icon;
+		this.clazzOfObject = clazz;
+		this.clazzOfEditor = clazzOfEditor;
+		this.clazzOfInitCase = clazz;
+	}
+
+	/**
+	 * 改用{@link AbstractNameableCreator#AbstractNameableCreator(String, Icon, Class, Class, Class)}
+	 */
+	@Deprecated
 	public AbstractNameableCreator(String menuName, String iconPath, Class clazz, Class clazz4Init, Class<? extends BasicBeanPane> clazzOfEditor) {
 		this.menuName = menuName;
 		this.menuIcon = IconUtils.readIcon(iconPath);
@@ -48,6 +74,15 @@ public abstract class AbstractNameableCreator implements NameableCreator {
 		this.clazzOfInitCase = clazz4Init;
 	}
 
+	public AbstractNameableCreator(String menuName, Icon icon, Class clazz, Class clazz4Init, Class<? extends BasicBeanPane> clazzOfEditor) {
+		this.menuName = menuName;
+		this.menuIcon = icon;
+		this.clazzOfObject = clazz;
+		this.clazzOfEditor = clazzOfEditor;
+		this.clazzOfInitCase = clazz;
+		this.clazzOfInitCase = clazz4Init;
+	}
+
 	/**
 	 * get menuName
 	 * @return

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

@@ -1,10 +1,12 @@
 package com.fr.design.gui.controlpane;
 
-import com.fr.general.NameObject;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.gui.ilist.ListModelElement;
+import com.fr.general.NameObject;
 import com.fr.stable.Nameable;
 
+import javax.swing.Icon;
+
 
 public class NameObjectCreator extends AbstractNameableCreator {
 	
@@ -16,18 +18,44 @@ public class NameObjectCreator extends AbstractNameableCreator {
 		super(menuName, clazz, updatePane);
 	}
 
+	/**
+	 * 改用{@link NameObjectCreator#NameObjectCreator(String, Icon, Class)}
+	 */
+	@Deprecated
 	public NameObjectCreator(String menuName, String iconPath, Class clazz) {
 		super(menuName, iconPath, clazz);
 	}
 
+	public NameObjectCreator(String menuName, Icon icon, Class clazz) {
+		super(menuName, icon, clazz);
+	}
+
+	/**
+	 * 改用{@link NameObjectCreator#NameObjectCreator(String, Icon, Class, Class)}
+	 */
+	@Deprecated
 	public NameObjectCreator(String menuName, String iconPath, Class clazz, Class<? extends BasicBeanPane> updatePane) {
 		super(menuName, iconPath, clazz, updatePane);
 	}
 
+	public NameObjectCreator(String menuName, Icon icon, Class clazz, Class<? extends BasicBeanPane> updatePane) {
+		super(menuName, icon, clazz, updatePane);
+	}
+
+	/**
+	 * 改用{@link NameObjectCreator#NameObjectCreator(String, Icon, Class, Class, Class)}
+	 */
+	@Deprecated
 	public NameObjectCreator(String menuName, String iconPath, Class clazz, Class clazz4Init, Class<? extends BasicBeanPane> updatePane) {
 		super(menuName, iconPath, clazz, clazz4Init, updatePane);
 	}
 
+	public NameObjectCreator(String menuName, Icon icon, Class clazz, Class clazz4Init, Class<? extends BasicBeanPane> updatePane) {
+		super(menuName, icon, clazz, clazz4Init, updatePane);
+	}
+
+
+
 	/**
 	 * create Nameable
 	 * @param helper

designer-base/src/main/java/com/fr/design/gui/controlpane/shortcutfactory/OldShortCutFactory.java

@@ -79,7 +79,7 @@ public class OldShortCutFactory extends AbstractShortCutFactory {
         AddItemMenuDef(NameableCreator[] creators) {
             this.setName(com.fr.design.i18n.Toolkit.i18nText(("Fine-Design_Basic_Action_Add")));
             this.setMnemonic('A');
-            this.setIconPath("/com/fr/design/images/control/addPopup.png");
+            this.setIconPath("addPopup");
             wrapActionListener(creators);
         }
 

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

@@ -1,5 +1,6 @@
 package com.fr.design.gui.ilist;
 
+import com.fine.theme.icon.LazyIcon;
 import com.fr.base.BaseUtils;
 import com.fr.data.core.DataCoreUtils;
 import com.fr.data.core.db.TableProcedure;
@@ -251,7 +252,7 @@ public class TableViewList extends UIList {
             } else if (ComparatorUtils.equals(type, TableProcedure.VIEW)) {
                 icon = BaseUtils.readIcon("/com/fr/design/images/data/views.png");
             } else {
-                icon = BaseUtils.readIcon("/com/fr/design/images/data/store_procedure.png");
+                icon = new LazyIcon("store_procedure");
             }
             this.setIcon(icon);
 

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

@@ -1,5 +1,6 @@
 package com.fr.design.mainframe;
 
+import com.fine.theme.icon.LazyIcon;
 import com.fr.base.BaseUtils;
 import com.fr.base.extension.FileExtension;
 import com.fr.base.vcs.DesignerMode;
@@ -452,7 +453,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/standard/search", false);
+            this.setSmallIcon(new LazyIcon("search"));
         }
 
         @Override

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

@@ -1,10 +1,8 @@
 package com.fr.design.mainframe.manager.search.searcher.control.pane;
 
+import com.fine.theme.icon.LazyIcon;
 import com.fr.base.svg.IconUtils;
 import com.fr.design.constants.UIConstants;
-import com.fr.design.search.event.TreeSearchStatusChangeEvent;
-import com.fr.design.search.event.TreeSearchStatusChangeListener;
-import com.fr.design.search.TreeSearchStatus;
 import com.fr.design.file.TemplateTreePane;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itextfield.UITextField;
@@ -12,6 +10,9 @@ import com.fr.design.gui.itoolbar.UIToolbar;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.manager.search.TemplateTreeSearchManager;
+import com.fr.design.search.TreeSearchStatus;
+import com.fr.design.search.event.TreeSearchStatusChangeEvent;
+import com.fr.design.search.event.TreeSearchStatusChangeListener;
 import com.fr.stable.StringUtils;
 
 import javax.swing.BorderFactory;
@@ -107,7 +108,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/standard/search"));
+        UILabel searchLabel = new UILabel(new LazyIcon("search"));
         searchLabel.setBorder(BorderFactory.createEmptyBorder(0, 12, 0, 0));
         searchLabel.addMouseListener(new MouseAdapter() {
             @Override

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

@@ -0,0 +1,7 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path fill-rule="evenodd" clip-rule="evenodd"
+          d="M26 10.9854C23.773 12.4987 19.9023 13.5 15.5 13.5C11.0977 13.5 7.22698 12.4987 5 10.9854V15.7174C5 16.0287 5.14747 16.4163 5.60484 16.866C6.06567 17.3191 6.78393 17.7732 7.75227 18.1759C9.68452 18.9795 12.4232 19.5 15.5 19.5C15.8059 19.5 16.1083 19.4973 16.4068 19.4919L16.4068 21.4922C16.1069 21.4974 15.8045 21.5 15.5 21.5C12.2255 21.5 9.2142 20.9499 6.98428 20.0226C6.24717 19.716 5.5745 19.3596 5 18.9529V23.7174C5 24.0287 5.14747 24.4162 5.60484 24.8659C6.06567 25.3191 6.78393 25.7732 7.75227 26.1759C9.68452 26.9795 12.4232 27.5 15.5 27.5C15.8058 27.5 16.1082 27.4949 16.4068 27.4848L16.4069 29.4858C16.1071 29.4952 15.8047 29.5 15.5 29.5C12.2255 29.5 9.2142 28.9499 6.98428 28.0225C5.87152 27.5598 4.90564 26.9833 4.20262 26.2921C3.49612 25.5974 3 24.7268 3 23.7174V8C3 4.96243 8.59644 2.5 15.5 2.5C22.4036 2.5 28 4.96243 28 8V17H25.9562C25.9872 16.9036 26 16.8096 26 16.7174V10.9854ZM26 8C26 8.10165 25.9616 8.35355 25.5758 8.75482C25.1806 9.16597 24.5129 9.62747 23.5334 10.0585C21.5799 10.918 18.7413 11.5 15.5 11.5C12.2587 11.5 9.42006 10.918 7.46664 10.0585C6.48712 9.62747 5.81939 9.16597 5.42416 8.75482C5.03843 8.35355 5 8.10165 5 8C5 7.89835 5.03843 7.64645 5.42416 7.24518C5.81939 6.83403 6.48712 6.37253 7.46664 5.94154C9.42006 5.08204 12.2587 4.5 15.5 4.5C18.7413 4.5 21.5799 5.08204 23.5334 5.94154C24.5129 6.37253 25.1806 6.83403 25.5758 7.24518C25.9616 7.64645 26 7.89835 26 8Z"
+          fill="#0B172A" fill-opacity="0.9"/>
+    <path d="M26.4856 28.8995L23.3036 25.7174L20.1215 28.8995C19.731 29.29 19.0978 29.29 18.7073 28.8995C18.3168 28.509 18.3168 27.8758 18.7073 27.4853L21.8893 24.3032L18.7074 21.1213C18.3169 20.7308 18.3169 20.0976 18.7074 19.7071C19.098 19.3166 19.7311 19.3166 20.1217 19.7071L23.3036 22.889L26.4855 19.7071C26.876 19.3166 27.5092 19.3166 27.8997 19.7071C28.2902 20.0976 28.2902 20.7308 27.8997 21.1213L24.7178 24.3032L27.8998 27.4853C28.2904 27.8758 28.2904 28.509 27.8998 28.8995C27.5093 29.29 26.8761 29.29 26.4856 28.8995Z"
+          fill="#0B172A" fill-opacity="0.9"/>
+</svg>

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

@@ -1,3 +0,0 @@
-<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.svg

@@ -0,0 +1,8 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path fill-rule="evenodd" clip-rule="evenodd"
+          d="M5 10.9854V15.7174C5 16.0287 5.14747 16.4163 5.60484 16.866C6.06567 17.3191 6.78393 17.7732 7.75227 18.1759C9.68452 18.9795 12.4232 19.5 15.5 19.5C15.8059 19.5 16.1083 19.4973 16.4067 19.4919V21.4922C16.1069 21.4974 15.8045 21.5 15.5 21.5C12.2255 21.5 9.2142 20.9499 6.98428 20.0226C6.24717 19.716 5.5745 19.3596 5 18.9529V23.7174C5 24.0287 5.14747 24.4162 5.60484 24.8659C6.06567 25.3191 6.78393 25.7732 7.75227 26.1759C9.68452 26.9795 12.4232 27.5 15.5 27.5C15.8057 27.5 16.1081 27.4949 16.4067 27.4848V29.4859C16.107 29.4952 15.8047 29.5 15.5 29.5C12.2255 29.5 9.2142 28.9499 6.98428 28.0225C5.87152 27.5598 4.90564 26.9833 4.20262 26.2921C3.49612 25.5974 3 24.7268 3 23.7174V8C3 4.96243 8.59644 2.5 15.5 2.5C22.4036 2.5 28 4.96243 28 8V17.6072L26 16.3215V10.9854C23.773 12.4987 19.9023 13.5 15.5 13.5C11.0977 13.5 7.22698 12.4987 5 10.9854ZM25.5758 8.75482C25.9616 8.35355 26 8.10165 26 8C26 7.89835 25.9616 7.64645 25.5758 7.24518C25.1806 6.83403 24.5129 6.37253 23.5334 5.94154C21.5799 5.08204 18.7413 4.5 15.5 4.5C12.2587 4.5 9.42006 5.08204 7.46664 5.94154C6.48712 6.37253 5.81939 6.83403 5.42416 7.24518C5.03843 7.64645 5 7.89835 5 8C5 8.10165 5.03843 8.35355 5.42416 8.75482C5.81939 9.16597 6.48712 9.62747 7.46664 10.0585C9.42006 10.918 12.2587 11.5 15.5 11.5C18.7413 11.5 21.5799 10.918 23.5334 10.0585C24.5129 9.62747 25.1806 9.16597 25.5758 8.75482Z"
+          fill="#0B172A" fill-opacity="0.9"/>
+    <path fill-rule="evenodd" clip-rule="evenodd"
+          d="M20.3408 15.3483C19.5417 14.8436 18.5 15.4178 18.5 16.3629V28.1208C18.5 29.0858 19.5812 29.6561 20.3776 29.1112L29.3137 22.9971C30.0258 22.5098 30.0063 21.4528 29.2768 20.9921L20.3408 15.3483ZM20.5 26.6041V17.8143L27.1802 22.0334L20.5 26.6041Z"
+          fill="#0B172A" fill-opacity="0.9"/>
+</svg>

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

@@ -1,3 +0,0 @@
-<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/class_table_data.svg

@@ -0,0 +1,15 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M2.5 5C2.5 3.89543 3.39543 3 4.5 3H27.5C28.6046 3 29.5 3.89543 29.5 5V22C29.5 23.1046 28.6046 24 27.5 24H4.5C3.39543 24 2.5 23.1046 2.5 22V5Z"
+          fill="#5493F2"/>
+    <path fill-rule="evenodd" clip-rule="evenodd"
+          d="M27.5001 4.5H4.50012C4.22398 4.5 4.00012 4.72386 4.00012 5V22C4.00012 22.2761 4.22398 22.5 4.50012 22.5H27.5001C27.7762 22.5 28.0001 22.2761 28.0001 22V5C28.0001 4.72386 27.7762 4.5 27.5001 4.5ZM4.50012 3C3.39555 3 2.50012 3.89543 2.50012 5V22C2.50012 23.1046 3.39555 24 4.50012 24H27.5001C28.6046 24 29.5001 23.1046 29.5001 22V5C29.5001 3.89543 28.6046 3 27.5001 3L4.50012 3Z"
+          fill="#105DD1"/>
+    <path d="M12 23H20V27H12V23Z" fill="#105DD1"/>
+    <path d="M5 28C5 27.4477 5.44772 27 6 27H26C26.5523 27 27 27.4477 27 28C27 28.5523 26.5523 29 26 29H6C5.44772 29 5 28.5523 5 28Z"
+          fill="#105DD1"/>
+    <path d="M6 8C6 7.44772 6.44772 7 7 7H11C11.5523 7 12 7.44772 12 8C12 8.55228 11.5523 9 11 9H7C6.44772 9 6 8.55228 6 8Z"
+          fill="white"/>
+    <path d="M6 18C6 17.4477 6.44772 17 7 17H11C11.5523 17 12 17.4477 12 18C12 18.5523 11.5523 19 11 19H7C6.44772 19 6 18.5523 6 18Z"
+          fill="white"/>
+    <path d="M8 8H10V17H8V8Z" fill="white"/>
+</svg>

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

@@ -1,4 +0,0 @@
-<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/connection.svg

@@ -0,0 +1,12 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M7 8C7.55228 8 8 7.55228 8 7C8 6.44772 7.55228 6 7 6C6.44772 6 6 6.44772 6 7C6 7.55228 6.44772 8 7 8Z"
+          fill="#0B172A" fill-opacity="0.9"/>
+    <path d="M11 8C11.5523 8 12 7.55228 12 7C12 6.44772 11.5523 6 11 6C10.4477 6 10 6.44772 10 7C10 7.55228 10.4477 8 11 8Z"
+          fill="#0B172A" fill-opacity="0.9"/>
+    <path fill-rule="evenodd" clip-rule="evenodd"
+          d="M4 2C2.89543 2 2 2.89543 2 4V26C2 27.1046 2.89543 28 4 28H12.3801C12.4394 27.4881 12.6697 26.986 13.0689 26.5868L13.6556 26H4V20H13.7936C13.9286 19.3178 14.218 18.6444 14.6617 18H4V12H29V3C29 2.44772 28.5523 2 28 2H4ZM27 4H4V10H27V4Z"
+          fill="#0B172A" fill-opacity="0.9"/>
+    <path fill-rule="evenodd" clip-rule="evenodd"
+          d="M29.6226 18.8558C30.0131 19.2463 30.0131 19.8795 29.6226 20.27L28.0207 21.8719L29.4235 23.2747L25.7895 26.9088C24.2274 28.4709 21.6947 28.4709 20.1326 26.9088L19.4369 26.2131L16.851 28.799C16.4604 29.1895 15.8273 29.1895 15.4368 28.799C15.0462 28.4085 15.0462 27.7753 15.4368 27.3848L18.0227 24.7989L17.3269 24.1031C15.7648 22.541 15.7648 20.0083 17.3269 18.4463L20.961 14.8122L22.3638 16.215L23.9657 14.6131C24.3562 14.2226 24.9894 14.2226 25.3799 14.6131C25.7704 15.0036 25.7704 15.6368 25.3799 16.0273L23.778 17.6292L26.6065 20.4577L28.2084 18.8558C28.5989 18.4652 29.2321 18.4652 29.6226 18.8558ZM20.961 17.6406L26.5951 23.2747L24.3753 25.4946C23.5942 26.2756 22.3279 26.2756 21.5468 25.4946L18.7412 22.6889C17.9601 21.9078 17.9601 20.6415 18.7412 19.8605L20.961 17.6406Z"
+          fill="#0B172A" fill-opacity="0.9"/>
+</svg>

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

@@ -1,11 +0,0 @@
-<?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/data_table.svg

@@ -0,0 +1,20 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M23.8214 13.1429C26.6814 13.1429 29 12.2154 29 11.0714C29 9.92741 26.6814 9 23.8214 9C20.9613 9 18.6428 9.92741 18.6428 11.0714C18.6428 12.2154 20.9613 13.1429 23.8214 13.1429Z"
+          fill="#2576EF"/>
+    <path d="M29 12.1071C29 13.2512 26.6814 14.1786 23.8214 14.1786C20.9613 14.1786 18.6428 13.2512 18.6428 12.1071V15.2143C18.6428 16.3583 20.9613 17.2857 23.8214 17.2857C26.6814 17.2857 29 16.3583 29 15.2143V12.1071Z"
+          fill="#2576EF"/>
+    <path d="M23.8214 18.3214C26.6814 18.3214 29 17.394 29 16.25V19.3571C29 20.5012 26.6814 21.4286 23.8214 21.4286C20.9613 21.4286 18.6428 20.5012 18.6428 19.3571V16.25C18.6428 17.394 20.9613 18.3214 23.8214 18.3214Z"
+          fill="#2576EF"/>
+    <path d="M8.17857 13.1429C11.0386 13.1429 13.3571 12.2154 13.3571 11.0714C13.3571 9.92741 11.0386 9 8.17857 9C5.31853 9 3 9.92741 3 11.0714C3 12.2154 5.31853 13.1429 8.17857 13.1429Z"
+          fill="#2576EF"/>
+    <path d="M13.3571 12.1071C13.3571 13.2512 11.0386 14.1786 8.17857 14.1786C5.31853 14.1786 3 13.2512 3 12.1071V15.2143C3 16.3583 5.31853 17.2857 8.17857 17.2857C11.0386 17.2857 13.3571 16.3583 13.3571 15.2143V12.1071Z"
+          fill="#2576EF"/>
+    <path d="M8.17857 18.3214C11.0386 18.3214 13.3571 17.394 13.3571 16.25V19.3571C13.3571 20.5012 11.0386 21.4286 8.17857 21.4286C5.31853 21.4286 3 20.5012 3 19.3571V16.25C3 17.394 5.31853 18.3214 8.17857 18.3214Z"
+          fill="#2576EF"/>
+    <path d="M15 3C15 2.44771 15.4477 2 16 2C16.5523 2 17 2.44772 17 3V29C17 29.5523 16.5523 30 16 30C15.4477 30 15 29.5523 15 29V3Z"
+          fill="#2576EF"/>
+    <path d="M2 6C2 5.44772 2.48215 5 3.07692 5H28.9231C29.5178 5 30 5.44772 30 6C30 6.55228 29.5178 7 28.9231 7H3.07692C2.48216 7 2 6.55228 2 6Z"
+          fill="#2576EF"/>
+    <path d="M2 24C2 23.4477 2.48215 23 3.07692 23H28.9231C29.5178 23 30 23.4477 30 24C30 24.5523 29.5178 25 28.9231 25H3.07692C2.48216 25 2 24.5523 2 24Z"
+          fill="#2576EF"/>
+</svg>

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

@@ -1,3 +0,0 @@
-<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.svg

@@ -0,0 +1,12 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path fill-rule="evenodd" clip-rule="evenodd"
+          d="M13.5593 22.8709C13.3962 21.2812 13.6809 19.6543 14.4133 18.1947C8.05837 18.0792 3 16.098 3 13.671V18.3742C3 20.6915 7.61113 22.6023 13.5593 22.8709ZM15.1573 16.9803C15.105 16.9805 15.0525 16.9806 15 16.9806C8.37258 16.9806 3 14.9529 3 12.4516V7.92258C3 10.4239 8.37258 12.4516 15 12.4516C21.6274 12.4516 27 10.4239 27 7.92258V12.4516C27 13.156 26.5739 13.8229 25.8137 14.4175C22.633 12.8171 18.6554 13.3446 16 16C15.6901 16.3099 15.4092 16.6378 15.1573 16.9803ZM26.584 14.8574C26.7249 14.948 26.8636 15.0431 27 15.1429V13.671C27 14.0815 26.8553 14.4793 26.584 14.8574ZM13.8239 24.2753C14.2022 25.6395 14.9276 26.9276 16 28C16.3465 28.3465 16.7154 28.6567 17.1022 28.9307C16.4197 28.9763 15.7172 29 15 29C8.37258 29 3 26.9723 3 24.471V19.7677C3 22.1193 7.74847 24.0523 13.8239 24.2753ZM27 6.52903C27 9.03035 21.6274 11.0581 15 11.0581C8.37258 11.0581 3 9.03035 3 6.52903C3 4.02772 8.37258 2 15 2C21.6274 2 27 4.02772 27 6.52903Z"
+          fill="#5493F2"/>
+    <path d="M25.7606 27.1748C25.37 26.7843 25.37 26.1511 25.7606 25.7606C26.1511 25.37 26.7843 25.37 27.1748 25.7606L29.9289 28.5147C30.3194 28.9052 30.3194 29.5384 29.9289 29.9289C29.5384 30.3194 28.9052 30.3194 28.5147 29.9289L25.7606 27.1748Z"
+          fill="#315CB2"/>
+    <path d="M26.8137 17.1863C29.4722 19.8448 29.4722 24.1552 26.8137 26.8137C24.1552 29.4723 19.8448 29.4723 17.1863 26.8137C14.5277 24.1552 14.5277 19.8448 17.1863 17.1863C19.8448 14.5277 24.1552 14.5277 26.8137 17.1863Z"
+          fill="#E8F4FF"/>
+    <path fill-rule="evenodd" clip-rule="evenodd"
+          d="M25.3995 25.3995C27.277 23.522 27.277 20.478 25.3995 18.6005C23.522 16.723 20.478 16.723 18.6005 18.6005C16.723 20.478 16.723 23.522 18.6005 25.3995C20.478 27.277 23.522 27.277 25.3995 25.3995ZM26.8137 26.8137C29.4722 24.1552 29.4722 19.8448 26.8137 17.1863C24.1552 14.5277 19.8448 14.5277 17.1863 17.1863C14.5277 19.8448 14.5277 24.1552 17.1863 26.8137C19.8448 29.4723 24.1552 29.4723 26.8137 26.8137Z"
+          fill="#105DD1"/>
+</svg>

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

@@ -1,3 +0,0 @@
-<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/editdataset/edit.svg

@@ -0,0 +1,6 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M29.1833 2.80874C28.577 2.20242 27.5939 2.20243 26.9876 2.80874L14.5896 15.2067L13.4382 18.5539L16.7853 17.4024L29.1833 5.00442C29.7896 4.3981 29.7896 3.41506 29.1833 2.80874Z"
+          fill="#0B172A" fill-opacity="0.9"/>
+    <path d="M5 2.99997H22.6338L20.6338 4.99997H5L5 27H27V11.3503L29 9.35031V27C29 28.1045 28.1046 29 27 29H5C3.89543 29 3 28.1045 3 27V4.99997C3 3.8954 3.89543 2.99997 5 2.99997Z"
+          fill="#0B172A" fill-opacity="0.9"/>
+</svg>

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

@@ -1,5 +1,5 @@
 <?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">
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg">
     <title>icon_编辑_disable</title>
     <g id="icon_编辑_disable" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.299107143">
         <path d="M9.95422984,2.34704298 L13.4897637,5.88257688 L6.18790578,13.1844348 L0.884604926,14.9522018 L2.65237188,9.64890094 L9.95422984,2.34704298 Z M13.4897637,1.6399362 L14.1968705,2.34704298 C14.9368113,3.08698374 14.9757555,4.2624679 14.3137033,5.04825533 L14.1968705,5.1754701 L10.6613366,1.6399362 C11.4423852,0.858887612 12.7087152,0.858887612 13.4897637,1.6399362 Z" id="形状结合" fill="#333334"></path>

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

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>icon_编辑_normal</title>
-    <g id="icon_编辑_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <path d="M9.95422984,2.34704298 L13.4897637,5.88257688 L6.18790578,13.1844348 L0.884604926,14.9522018 L2.65237188,9.64890094 L9.95422984,2.34704298 Z M13.4897637,1.6399362 L14.1968705,2.34704298 C14.9368113,3.08698374 14.9757555,4.2624679 14.3137033,5.04825533 L14.1968705,5.1754701 L10.6613366,1.6399362 C11.4423852,0.858887612 12.7087152,0.858887612 13.4897637,1.6399362 Z" id="形状结合" fill="#333334"></path>
-        <rect id="矩形" fill="#333334" x="7" y="14" width="7" height="1"></rect>
-    </g>
-</svg>

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

@@ -0,0 +1,11 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M2 11C2 9.89543 2.89543 9 4 9H28C29.1046 9 30 9.89543 30 11V21C30 22.1046 29.1046 23 28 23H4C2.89543 23 2 22.1046 2 21V11Z"
+          fill="#DEEAFD"/>
+    <path fill-rule="evenodd" clip-rule="evenodd"
+          d="M28 10.5H4C3.72386 10.5 3.5 10.7239 3.5 11V21C3.5 21.2761 3.72386 21.5 4 21.5H28C28.2761 21.5 28.5 21.2761 28.5 21V11C28.5 10.7239 28.2761 10.5 28 10.5ZM4 9C2.89543 9 2 9.89543 2 11V21C2 22.1046 2.89543 23 4 23H28C29.1046 23 30 22.1046 30 21V11C30 9.89543 29.1046 9 28 9H4Z"
+          fill="#2576EF"/>
+    <path d="M7 16C7 15.1716 7.67157 14.5 8.5 14.5C9.32843 14.5 10 15.1716 10 16C10 16.8284 9.32843 17.5 8.5 17.5C7.67157 17.5 7 16.8284 7 16Z"
+          fill="#2576EF"/>
+    <path d="M12 16C12 15.4477 12.4477 15 13 15H20C20.5523 15 21 15.4477 21 16C21 16.5523 20.5523 17 20 17H13C12.4477 17 12 16.5523 12 16Z"
+          fill="#2576EF"/>
+</svg>

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

@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g id="icon &#230;&#143;&#146;&#229;&#133;&#165;&#230;&#149;&#176;&#230;&#141;&#174;&#229;&#136;&#151;">
-<path id="&#229;&#189;&#162;&#231;&#138;&#182;&#231;&#187;&#147;&#229;&#144;&#136;" fill-rule="evenodd" clip-rule="evenodd" d="M6 5H15V10H6H5H1V5H5H6ZM5 6H2V9H5V6ZM6 9V6H14V9H6ZM3 7H4V8H3V7ZM13 7H7V8H13V7Z" fill="#333334"/>
-</g>
-</svg>

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

@@ -0,0 +1,25 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M6.5 8.65C6.5 7.60066 7.39543 6.75 8.5 6.75H22.5C23.6046 6.75 24.5 7.60066 24.5 8.65V12.1786V22.85C24.5 23.8993 23.6046 24.75 22.5 24.75H8.5C7.39543 24.75 6.5 23.8993 6.5 22.85V8.65Z"
+          fill="#BBE9FE"/>
+    <path d="M2.5 3.85C2.5 2.96635 3.21634 2.25 4.1 2.25L19.4 2.25C20.2837 2.25 21 2.96634 21 3.85V7.46431V19.15C21 20.0337 20.2837 20.75 19.4 20.75H4.1C3.21634 20.75 2.5 20.0337 2.5 19.15V3.85Z"
+          fill="#BBE9FE"/>
+    <path fill-rule="evenodd" clip-rule="evenodd"
+          d="M19.5 19.15V3.85006C19.5 3.79483 19.4552 3.75006 19.4 3.75006H4.1C4.04477 3.75006 4 3.79483 4 3.85006V19.15C4 19.2053 4.04477 19.25 4.1 19.25H19.4C19.4552 19.25 19.5 19.2053 19.5 19.15ZM4.1 2.25006C3.21634 2.25006 2.5 2.96641 2.5 3.85006V19.15C2.5 20.0337 3.21634 20.75 4.1 20.75H19.4C20.2837 20.75 21 20.0337 21 19.15V3.85006C21 2.96641 20.2837 2.25006 19.4 2.25006H4.1Z"
+          fill="#2089CF" fill-opacity="0.6"/>
+    <path d="M6.5 7.85C6.5 6.96635 7.21634 6.25 8.1 6.25L23.4 6.25C24.2837 6.25 25 6.96634 25 7.85V11.9643V23.65C25 24.5337 24.2837 25.25 23.4 25.25H8.1C7.21634 25.25 6.5 24.5337 6.5 23.65V7.85Z"
+          fill="#B0E5FD"/>
+    <path fill-rule="evenodd" clip-rule="evenodd"
+          d="M23.5 23.65V7.85C23.5 7.79477 23.4552 7.75 23.4 7.75L8.1 7.75002C8.04477 7.75002 8 7.79479 8 7.85002V23.65C8 23.7053 8.04477 23.75 8.1 23.75L23.4 23.75C23.4552 23.75 23.5 23.7052 23.5 23.65ZM8.1 6.25002C7.21634 6.25002 6.5 6.96637 6.5 7.85002V23.65C6.5 24.5337 7.21634 25.25 8.1 25.25L23.4 25.25C24.2837 25.25 25 24.5337 25 23.65V7.85C25 6.96634 24.2837 6.25 23.4 6.25L8.1 6.25002Z"
+          fill="#2089CF" fill-opacity="0.8"/>
+    <path d="M10.5 12.35C10.5 11.4663 11.2163 10.75 12.1 10.75H26.9C27.7837 10.75 28.5 11.4663 28.5 12.35V16.4643V28.15C28.5 29.0337 27.7837 29.75 26.9 29.75H12.1C11.2163 29.75 10.5 29.0337 10.5 28.15V12.35Z"
+          fill="#7BD5FC"/>
+    <path fill-rule="evenodd" clip-rule="evenodd"
+          d="M27.5 28.15V11.8501C27.5 11.7948 27.4552 11.7501 27.4 11.7501L12.1 11.75C12.0448 11.75 12 11.7948 12 11.85V28.15C12 28.2052 12.0448 28.25 12.1 28.25L27.4 28.25C27.4552 28.25 27.5 28.2053 27.5 28.15ZM12.1 10.25C11.2163 10.25 10.5 10.9663 10.5 11.85V28.15C10.5 29.0336 11.2163 29.75 12.1 29.75L27.4 29.75C28.2837 29.75 29 29.0337 29 28.15V11.8501C29 10.9664 28.2837 10.2501 27.4 10.2501L12.1 10.25Z"
+          fill="#2089CF"/>
+    <path fill-rule="evenodd" clip-rule="evenodd"
+          d="M13.75 15.75C13.75 15.3358 14.0858 15 14.5 15H19.5C19.9142 15 20.25 15.3358 20.25 15.75C20.25 16.1642 19.9142 16.5 19.5 16.5H14.5C14.0858 16.5 13.75 16.1642 13.75 15.75Z"
+          fill="#2089CF"/>
+    <path fill-rule="evenodd" clip-rule="evenodd"
+          d="M13.75 18.75C13.75 18.3358 14.0858 18 14.5 18H22.5C22.9142 18 23.25 18.3358 23.25 18.75C23.25 19.1642 22.9142 19.5 22.5 19.5H14.5C14.0858 19.5 13.75 19.1642 13.75 18.75Z"
+          fill="#2089CF"/>
+</svg>

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

@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M1.94004 5.50638C1.89488 5.4124 1.92949 5.29951 2.01956 5.24699L8.72535 1.33665C8.80731 1.28886 8.91156 1.30523 8.97493 1.37583L15.6979 8.86554C15.7763 8.95287 15.763 9.08862 15.6692 9.15908L7.06432 15.6187C6.96348 15.6944 6.81859 15.659 6.76398 15.5454L1.94004 5.50638Z" fill="#1D7ADC"/>
-<path d="M0.979038 4.40742C0.947034 4.30741 0.997821 4.19968 1.09533 4.16073L8.29403 1.28529C8.38108 1.25052 8.48061 1.28088 8.53344 1.35831L14.0933 9.50801C14.1602 9.6061 14.1274 9.74055 14.0229 9.79683L4.57899 14.8805C4.46881 14.9398 4.33184 14.8845 4.29371 14.7653L0.979038 4.40742Z" fill="#419BF9"/>
-<path d="M0.452189 3.13159C0.434595 3.02898 0.498656 2.93003 0.599477 2.90409L7.8417 1.04073C7.93381 1.01703 8.02987 1.06148 8.07143 1.14702L12.326 9.90434C12.3772 10.0096 12.3273 10.1362 12.2181 10.1783L2.54365 13.9121C2.42582 13.9575 2.29586 13.8838 2.27451 13.7593L0.452189 3.13159Z" fill="#91C7FF"/>
-</svg>

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

@@ -0,0 +1,21 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M3 4.8C3 3.80589 3.77711 3 4.73571 3H27.2643C28.2229 3 29 3.80589 29 4.8V10.2C29 11.1941 28.2229 12 27.2643 12H4.73571C3.77711 12 3 11.1941 3 10.2V4.8Z"
+          fill="#9987DF"/>
+    <path fill-rule="evenodd" clip-rule="evenodd"
+          d="M27.2643 4.3H4.73571C4.53923 4.3 4.3 4.47889 4.3 4.8V10.2C4.3 10.5211 4.53923 10.7 4.73571 10.7H27.2643C27.4608 10.7 27.7 10.5211 27.7 10.2V4.8C27.7 4.47889 27.4608 4.3 27.2643 4.3ZM4.73571 3C3.77711 3 3 3.80589 3 4.8V10.2C3 11.1941 3.77711 12 4.73571 12H27.2643C28.2229 12 29 11.1941 29 10.2V4.8C29 3.80589 28.2229 3 27.2643 3H4.73571Z"
+          fill="#6A52CE"/>
+    <path d="M3 21.8C3 20.8059 3.77711 20 4.73571 20H27.2643C28.2229 20 29 20.8059 29 21.8V27.2C29 28.1941 28.2229 29 27.2643 29H4.73571C3.77711 29 3 28.1941 3 27.2V21.8Z"
+          fill="#9987DF"/>
+    <path fill-rule="evenodd" clip-rule="evenodd"
+          d="M27.2643 21.3H4.73571C4.53923 21.3 4.3 21.4789 4.3 21.8V27.2C4.3 27.5211 4.53923 27.7 4.73571 27.7H27.2643C27.4608 27.7 27.7 27.5211 27.7 27.2V21.8C27.7 21.4789 27.4608 21.3 27.2643 21.3ZM4.73571 20C3.77711 20 3 20.8059 3 21.8V27.2C3 28.1941 3.77711 29 4.73571 29H27.2643C28.2229 29 29 28.1941 29 27.2V21.8C29 20.8059 28.2229 20 27.2643 20H4.73571Z"
+          fill="#6A52CE"/>
+    <path fill-rule="evenodd" clip-rule="evenodd"
+          d="M8 11.25C8.41421 11.25 8.75 11.5858 8.75 12V15.25H23.75C24.3023 15.25 24.75 15.6977 24.75 16.25V20.5C24.75 20.9142 24.4142 21.25 24 21.25C23.5858 21.25 23.25 20.9142 23.25 20.5V16.75H8.25C7.69772 16.75 7.25 16.3023 7.25 15.75V12C7.25 11.5858 7.58579 11.25 8 11.25Z"
+          fill="#6A52CE"/>
+    <path fill-rule="evenodd" clip-rule="evenodd"
+          d="M7.25 7.5C7.25 7.08579 7.58579 6.75 8 6.75H13C13.4142 6.75 13.75 7.08579 13.75 7.5C13.75 7.91421 13.4142 8.25 13 8.25H8C7.58579 8.25 7.25 7.91421 7.25 7.5Z"
+          fill="white"/>
+    <path fill-rule="evenodd" clip-rule="evenodd"
+          d="M18.25 24.5C18.25 24.0858 18.5858 23.75 19 23.75H24C24.4142 23.75 24.75 24.0858 24.75 24.5C24.75 24.9142 24.4142 25.25 24 25.25H19C18.5858 25.25 18.25 24.9142 18.25 24.5Z"
+          fill="white"/>
+</svg>

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

@@ -1,11 +0,0 @@
-<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 1H2C1.44772 1 1 1.44772 1 2V14C1 14.5523 1.44772 15 2 15H14C14.5523 15 15 14.5523 15 14V2C15 1.44772 14.5523 1 14 1ZM2 14V2H14V14H2Z" fill="#333334"/>
-<rect x="2" y="5" width="2" height="2" fill="#FBB03B"/>
-<rect x="9" y="5" width="2" height="2" fill="#FBB03B"/>
-<rect x="2" y="9" width="2" height="2" fill="#FBB03B"/>
-<rect x="9" y="9" width="2" height="2" fill="#FBB03B"/>
-<rect x="4" y="6" width="3" height="1" fill="#333334"/>
-<rect x="11" y="6" width="3" height="1" fill="#333334"/>
-<rect x="4" y="10" width="3" height="1" fill="#333334"/>
-<rect x="11" y="10" width="3" height="1" fill="#333334"/>
-</svg>

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

@@ -0,0 +1,7 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M28 14.0234V4C28 2.89543 27.1046 2 26 2H10.9199C10.336 2 9.78132 2.25513 9.40136 2.69842L4.48149 8.43827C4.17078 8.80075 4 9.26243 4 9.73985V27C4 28.1046 4.89543 29 6 29H15.3558C14.7333 28.6102 14.1448 28.1446 13.6034 27.6032C13.4082 27.4081 13.2229 27.2068 13.0475 27H6L6 9.73985L10.9199 4L26 4V12.3018C26.5675 12.6715 27.1053 13.1053 27.6033 13.6033C27.7404 13.7404 27.8726 13.8805 28 14.0234Z"
+          fill="#0B172A" fill-opacity="0.9"/>
+    <path fill-rule="evenodd" clip-rule="evenodd"
+          d="M26.6519 25.2377C28.9469 22.2501 28.7265 17.9515 25.9908 15.2158C23.0154 12.2404 18.1913 12.2404 15.2158 15.2158C12.2404 18.1912 12.2404 23.0153 15.2158 25.9907C17.9516 28.7264 22.2501 28.9468 25.2376 26.6519L27.7929 29.2071C28.1834 29.5976 28.8166 29.5976 29.2071 29.2071C29.5976 28.8166 29.5976 28.1834 29.2071 27.7929L26.6519 25.2377ZM24.5766 24.5765C26.7709 22.3821 26.7709 18.8244 24.5766 16.63C22.3822 14.4356 18.8244 14.4356 16.6301 16.63C14.4357 18.8244 14.4357 22.3821 16.63 24.5765C18.8244 26.7709 22.3822 26.7709 24.5766 24.5765Z"
+          fill="#0B172A" fill-opacity="0.9"/>
+</svg>

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

@@ -1,5 +1,5 @@
 <?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">
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg">
     <title>icon_预览_disabled</title>
     <g id="icon_预览_disabled" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.3">
         <path d="M9.5,7 C11.432875,7 13,8.567125 13,10.5 C13,11.1075915 12.845147,11.679042 12.5727578,12.1770349 C12.6203353,12.2075319 12.6650188,12.2450114 12.7069,12.287 L13.7129,13.293 C14.1039,13.684 14.1039,14.316 13.7129,14.707 C13.5179,14.902 13.2619,15 13.0059,15 C12.7499,15 12.4939,14.902 12.2989,14.707 L11.2929,13.701 C11.251507,13.6597129 11.2144961,13.6157024 11.1818672,13.5695439 C10.6844106,13.8436886 10.110446,14 9.5,14 C7.567125,14 6,12.432875 6,10.5 C6,8.567125 7.567125,7 9.5,7 Z M10,1 L14,5 L14,8 L13,8 L13,6 L9,6 L9,2 L3,2 L3,14 L7,14 L7,15 L2,15 L2,1 L10,1 Z M9.5,8 C10.8783333,8 12,9.12166667 12,10.5 C12,11.8783333 10.8783333,13 9.5,13 C8.12166667,13 7,11.8783333 7,10.5 C7,9.12166667 8.12166667,8 9.5,8 Z M12.587,5 L10,2.414 L10,5 L12.587,5 Z" id="Combined-Shape" fill="#333334"></path>

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

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>icon_预览_normal</title>
-    <g id="icon_预览_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <path d="M9.5,7 C11.432875,7 13,8.567125 13,10.5 C13,11.1075915 12.845147,11.679042 12.5727578,12.1770349 C12.6203353,12.2075319 12.6650188,12.2450114 12.7069,12.287 L13.7129,13.293 C14.1039,13.684 14.1039,14.316 13.7129,14.707 C13.5179,14.902 13.2619,15 13.0059,15 C12.7499,15 12.4939,14.902 12.2989,14.707 L11.2929,13.701 C11.251507,13.6597129 11.2144961,13.6157024 11.1818672,13.5695439 C10.6844106,13.8436886 10.110446,14 9.5,14 C7.567125,14 6,12.432875 6,10.5 C6,8.567125 7.567125,7 9.5,7 Z M10,1 L14,5 L14,8 L13,8 L13,6 L9,6 L9,2 L3,2 L3,14 L7,14 L7,15 L2,15 L2,1 L10,1 Z M9.5,8 C10.8783333,8 12,9.12166667 12,10.5 C12,11.8783333 10.8783333,13 9.5,13 C8.12166667,13 7,11.8783333 7,10.5 C7,9.12166667 8.12166667,8 9.5,8 Z M12.587,5 L10,2.414 L10,5 L12.587,5 Z" id="Combined-Shape" fill="#333334"></path>
-    </g>
-</svg>

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

@@ -0,0 +1,9 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M14.1 13C14.1 12.3925 13.6075 11.9 13 11.9C12.3925 11.9 11.9 12.3925 11.9 13V23C11.9 23.6075 12.3925 24.1 13 24.1C13.6075 24.1 14.1 23.6075 14.1 23V13Z"
+          fill="#0B172A" fill-opacity="0.9"/>
+    <path d="M19 11.9C19.6075 11.9 20.1 12.3925 20.1 13V23C20.1 23.6075 19.6075 24.1 19 24.1C18.3925 24.1 17.9 23.6075 17.9 23V13C17.9 12.3925 18.3925 11.9 19 11.9Z"
+          fill="#0B172A" fill-opacity="0.9"/>
+    <path fill-rule="evenodd" clip-rule="evenodd"
+          d="M9 6V4C9 2.89543 9.89543 2 11 2H21C22.1046 2 23 2.89543 23 4V6H29C29.5523 6 30 6.44772 30 7C30 7.55228 29.5523 8 29 8H27V28C27 29.1046 26.1046 30 25 30H7C5.89543 30 5 29.1046 5 28V8H3C2.44771 8 2 7.55228 2 7C2 6.44772 2.44772 6 3 6H9ZM11 4H21V6H11V4ZM7 8L7 28H25V8H7Z"
+          fill="#0B172A" fill-opacity="0.9"/>
+</svg>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg">
     <title>icon_删除_normal</title>
     <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.3">
         <g id="工具栏/导入数据集" transform="translate(-78.000000, -7.000000)" fill="#333334">

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

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="14px" viewBox="0 0 14 14" 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="Combined-Shape" transform="translate(-1.000000, -1.000000)" fill="#333334">
-            <path d="M11,1 L11,3 L15,3 L15,4 L13,4 L13,15 L3,15 L3,4 L1,4 L1,3 L5,3 L5,1 L11,1 Z M12,4 L4,4 L4,14 L12,14 L12,4 Z M7,6 L7,12 L6,12 L6,6 L7,6 Z M10,6 L10,12 L9,12 L9,6 L10,6 Z M10,2 L6,2 L6,3 L10,3 L10,2 Z"></path>
-        </g>
-    </g>
-</svg>

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

@@ -1,5 +1,5 @@
 <?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">
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg">
     <title>icon_搜索_normal</title>
     <g id="icon_搜索_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M6.5,1 C9.53756612,1 12,3.46243388 12,6.5 C12,7.75769341 11.577854,8.91678934 10.8675261,9.84332369 L14.7880061,13.764409 C15.0706646,14.0470675 15.0706646,14.5053476 14.7880061,14.7880061 C14.5053476,15.0706646 14.0470675,15.0706646 13.764409,14.7880061 L9.84332369,10.8675261 C8.91678934,11.577854 7.75769341,12 6.5,12 C3.46243388,12 1,9.53756612 1,6.5 C1,3.46243388 3.46243388,1 6.5,1 Z M6.5,2 C4.01471863,2 2,4.01471863 2,6.5 C2,8.98528137 4.01471863,11 6.5,11 C8.98528137,11 11,8.98528137 11,6.5 C11,4.01471863 8.98528137,2 6.5,2 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>

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

@@ -0,0 +1,36 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M3 4.1C3 3.21634 3.71634 2.5 4.6 2.5H27.4C28.2837 2.5 29 3.21634 29 4.1V8.9C29 9.78366 28.2837 10.5 27.4 10.5H4.6C3.71634 10.5 3 9.78366 3 8.9V4.1Z"
+          fill="#5493F2"/>
+    <path fill-rule="evenodd" clip-rule="evenodd"
+          d="M27.4 3.7H4.6C4.37909 3.7 4.2 3.87909 4.2 4.1V8.9C4.2 9.12091 4.37909 9.3 4.6 9.3H27.4C27.6209 9.3 27.8 9.12091 27.8 8.9V4.1C27.8 3.87909 27.6209 3.7 27.4 3.7ZM4.6 2.5C3.71634 2.5 3 3.21634 3 4.1V8.9C3 9.78366 3.71634 10.5 4.6 10.5H27.4C28.2837 10.5 29 9.78366 29 8.9V4.1C29 3.21634 28.2837 2.5 27.4 2.5H4.6Z"
+          fill="#1E65CD"/>
+    <path fill-rule="evenodd" clip-rule="evenodd"
+          d="M3 13.6C3 12.7163 3.71634 12 4.6 12H27.4C28.2837 12 29 12.7163 29 13.6V18.4C29 19.1461 28.4893 19.773 27.7984 19.95C26.498 18.1646 24.3673 17 21.9565 17C19.5234 17 17.3754 18.1863 16.0786 20H4.6C3.71634 20 3 19.2837 3 18.4V13.6ZM12.874 21.5H4.6C3.71634 21.5 3 22.2163 3 23.1V27.9C3 28.7837 3.71634 29.5 4.6 29.5H10.9664C10.356 28.6062 10 27.5313 10 26.375C10 24.2912 11.1561 22.472 12.874 21.5ZM27.9272 29.4111C27.7621 29.4687 27.5847 29.5 27.4 29.5H23.3779L18 28.5C16.8369 28.5 16.492 28.8245 16.4169 28.7709C16.3555 28.7271 16.4743 28.4311 16.4743 27.5C16.4743 26.6611 16.0498 25.7635 15.6851 24.9924C15.1494 23.8597 14.7428 23 16 23C16.1308 23 16.1965 23.1231 16.2629 23.2476C16.3241 23.3623 16.3859 23.4782 16.5 23.5C16.5352 23.5067 16.7146 23.6402 16.9213 23.794C17.4639 24.1977 18.1947 24.7415 17 23.5C17.022 23.4132 17.267 23.327 17.5093 23.2418C17.7413 23.1603 17.9708 23.0796 18 23C18.4893 21.6664 19.076 21.8003 20.0969 22.0332C20.5986 22.1477 21.2051 22.2861 21.9565 22.2861C22.651 22.2861 23.1889 22.2057 23.6169 22.1417C24.6907 21.9812 25.0726 21.9241 25.5 23.5C27.2389 23.8532 28 24.566 28 26.375C28 26.7806 28.0282 27.1712 28.0546 27.5371C28.1095 28.2974 28.1566 28.951 27.9272 29.4111Z"
+          fill="#5493F2"/>
+    <path fill-rule="evenodd" clip-rule="evenodd"
+          d="M27.4 13.2H4.6C4.37909 13.2 4.2 13.3791 4.2 13.6V18.4C4.2 18.6209 4.37909 18.8 4.6 18.8H17.1632C16.757 19.1579 16.3928 19.5605 16.0786 20H4.6C3.71634 20 3 19.2837 3 18.4V13.6C3 12.7163 3.71634 12 4.6 12H27.4C28.2837 12 29 12.7163 29 13.6V18.4C29 19.1461 28.4893 19.773 27.7984 19.95C27.4924 19.53 27.1405 19.1443 26.7498 18.8H27.4C27.6209 18.8 27.8 18.6209 27.8 18.4V13.6C27.8 13.3791 27.6209 13.2 27.4 13.2ZM27.9272 29.4111C27.7621 29.4687 27.5847 29.5 27.4 29.5H23.3779L18 28.5C16.8369 28.5 16.492 28.8245 16.4169 28.7709C16.3785 28.7435 16.4105 28.6177 16.4399 28.3H27.4C27.6209 28.3 27.8 28.1209 27.8 27.9V25.0526C27.9351 25.4122 28 25.8469 28 26.375C28 26.7806 28.0282 27.1712 28.0546 27.5371C28.1095 28.2974 28.1566 28.951 27.9272 29.4111ZM12.874 21.5H4.6C3.71634 21.5 3 22.2163 3 23.1V27.9C3 28.7837 3.71634 29.5 4.6 29.5H10.9664C10.7129 29.1288 10.5033 28.7265 10.3449 28.3H4.6C4.37909 28.3 4.2 28.1209 4.2 27.9V23.1C4.2 22.8791 4.37909 22.7 4.6 22.7H11.3941C11.814 22.2235 12.3142 21.8167 12.874 21.5ZM18.1229 22.7H25.2257C24.8783 21.9531 24.4618 22.0154 23.6169 22.1417C23.1889 22.2057 22.651 22.2861 21.9565 22.2861C21.2051 22.2861 20.5986 22.1477 20.0969 22.0332C19.1599 21.8194 18.5887 21.6891 18.1229 22.7Z"
+          fill="#1E65CD"/>
+    <path fill-rule="evenodd" clip-rule="evenodd"
+          d="M26.2105 30H15.7895C13.6966 30 12 28.3584 12 26.3333C12 24.3083 13.6966 22.6667 15.7895 22.6667C16.1722 22.6667 16.5417 22.7216 16.8899 22.8237C17.453 20.6277 19.5037 19 21.9474 19C24.361 19 26.3913 20.5879 26.9834 22.743C28.7056 23.0883 30 24.5646 30 26.3333C30 28.2032 28.5535 29.7461 26.6842 29.9716V30H26.2105Z"
+          fill="#57C4FB"/>
+    <path d="M8.5 6.5C8.5 6.91421 8.16421 7.25 7.75 7.25C7.33579 7.25 7 6.91421 7 6.5C7 6.08579 7.33579 5.75 7.75 5.75C8.16421 5.75 8.5 6.08579 8.5 6.5Z"
+          fill="white"/>
+    <path d="M8.5 16C8.5 16.4142 8.16421 16.75 7.75 16.75C7.33579 16.75 7 16.4142 7 16C7 15.5858 7.33579 15.25 7.75 15.25C8.16421 15.25 8.5 15.5858 8.5 16Z"
+          fill="white"/>
+    <path d="M8.5 25.5C8.5 25.9142 8.16421 26.25 7.75 26.25C7.33579 26.25 7 25.9142 7 25.5C7 25.0858 7.33579 24.75 7.75 24.75C8.16421 24.75 8.5 25.0858 8.5 25.5Z"
+          fill="white"/>
+    <path d="M12 6.5C12 6.91421 11.6642 7.25 11.25 7.25C10.8358 7.25 10.5 6.91421 10.5 6.5C10.5 6.08579 10.8358 5.75 11.25 5.75C11.6642 5.75 12 6.08579 12 6.5Z"
+          fill="white"/>
+    <path d="M12 16C12 16.4142 11.6642 16.75 11.25 16.75C10.8358 16.75 10.5 16.4142 10.5 16C10.5 15.5858 10.8358 15.25 11.25 15.25C11.6642 15.25 12 15.5858 12 16Z"
+          fill="white"/>
+    <path d="M8.5 6.5C8.5 6.91421 8.16421 7.25 7.75 7.25C7.33579 7.25 7 6.91421 7 6.5C7 6.08579 7.33579 5.75 7.75 5.75C8.16421 5.75 8.5 6.08579 8.5 6.5Z"
+          stroke="white" stroke-width="0.5"/>
+    <path d="M8.5 16C8.5 16.4142 8.16421 16.75 7.75 16.75C7.33579 16.75 7 16.4142 7 16C7 15.5858 7.33579 15.25 7.75 15.25C8.16421 15.25 8.5 15.5858 8.5 16Z"
+          stroke="white" stroke-width="0.5"/>
+    <path d="M8.5 25.5C8.5 25.9142 8.16421 26.25 7.75 26.25C7.33579 26.25 7 25.9142 7 25.5C7 25.0858 7.33579 24.75 7.75 24.75C8.16421 24.75 8.5 25.0858 8.5 25.5Z"
+          stroke="white" stroke-width="0.5"/>
+    <path d="M12 6.5C12 6.91421 11.6642 7.25 11.25 7.25C10.8358 7.25 10.5 6.91421 10.5 6.5C10.5 6.08579 10.8358 5.75 11.25 5.75C11.6642 5.75 12 6.08579 12 6.5Z"
+          stroke="white" stroke-width="0.5"/>
+    <path d="M12 16C12 16.4142 11.6642 16.75 11.25 16.75C10.8358 16.75 10.5 16.4142 10.5 16C10.5 15.5858 10.8358 15.25 11.25 15.25C11.6642 15.25 12 15.5858 12 16Z"
+          stroke="white" stroke-width="0.5"/>
+</svg>

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

@@ -1,7 +0,0 @@
-<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="M12 10.3333C13.6569 10.3333 15 9.811 15 9.16667C15 8.52233 13.6569 8 12 8C10.3431 8 9 8.52233 9 9.16667C9 9.811 10.3431 10.3333 12 10.3333ZM9 11.5V9.75C9.00105 10.394 10.3438 10.9159 12 10.9159C13.6562 10.9159 14.9989 10.394 15 9.75V11.5V11.5004C15 12.1447 13.6569 12.667 12 12.667C10.3431 12.667 9 12.1447 9 11.5004V11.5ZM9 12.0834V13.8334V13.8338C9 14.4781 10.3431 15.0004 12 15.0004C13.6569 15.0004 15 14.4781 15 13.8338V13.8334V12.0834C14.9989 12.7274 13.6562 13.2493 12 13.2493C10.3438 13.2493 9.00105 12.7274 9 12.0834Z" fill="#419BF9"/>
-<path d="M12.3529 7.1084V3C12.3529 2.44772 11.9052 2 11.3529 2H7.93112C7.50858 2 7.09081 2.08926 6.70516 2.26193L2.59135 4.10388C2.23157 4.26497 2 4.62238 2 5.01657V13.159C2 13.7113 2.44772 14.159 3 14.159H7.7439" stroke="#333334"/>
-<rect x="4" y="6" width="3.95642" height="1" fill="#333334"/>
-<rect x="4" y="8" width="3.95642" height="1" fill="#333334"/>
-<rect x="4" y="10" width="3.95642" height="2" fill="#333334"/>
-</svg>

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

@@ -0,0 +1,20 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M2.5 4.5C2.5 3.39543 3.39543 2.5 4.5 2.5H27.5C28.6046 2.5 29.5 3.39543 29.5 4.5V27.5C29.5 28.6046 28.6046 29.5 27.5 29.5H4.5C3.39543 29.5 2.5 28.6046 2.5 27.5V4.5Z"
+          fill="#B3E6E1"/>
+    <path fill-rule="evenodd" clip-rule="evenodd"
+          d="M27.5 4H4.5C4.22386 4 4 4.22386 4 4.5V27.5C4 27.7761 4.22386 28 4.5 28H27.5C27.7761 28 28 27.7761 28 27.5V4.5C28 4.22386 27.7761 4 27.5 4ZM4.5 2.5C3.39543 2.5 2.5 3.39543 2.5 4.5V27.5C2.5 28.6046 3.39543 29.5 4.5 29.5H27.5C28.6046 29.5 29.5 28.6046 29.5 27.5V4.5C29.5 3.39543 28.6046 2.5 27.5 2.5H4.5Z"
+          fill="#159B94"/>
+    <path d="M2.5 4.5C2.5 3.39543 3.39543 2.5 4.5 2.5H27.5C28.6046 2.5 29.5 3.39543 29.5 4.5V10.5H2.5L2.5 4.5Z"
+          fill="#64BFBB"/>
+    <path fill-rule="evenodd" clip-rule="evenodd"
+          d="M27.5 4H4.5C4.22386 4 4 4.22386 4 4.5V9H28V4.5C28 4.22386 27.7761 4 27.5 4ZM4.5 2.5C3.39543 2.5 2.5 3.39543 2.5 4.5V10.5H29.5V4.5C29.5 3.39543 28.6046 2.5 27.5 2.5H4.5Z"
+          fill="#159B94"/>
+    <path d="M7 15C7 14.4477 7.44772 14 8 14H12C12.5523 14 13 14.4477 13 15C13 15.5523 12.5523 16 12 16H8C7.44772 16 7 15.5523 7 15Z"
+          fill="#159B94"/>
+    <path d="M7 19C7 18.4477 7.44772 18 8 18H12C12.5523 18 13 18.4477 13 19C13 19.5523 12.5523 20 12 20H8C7.44772 20 7 19.5523 7 19Z"
+          fill="#159B94"/>
+    <path d="M7 23C7 22.4477 7.44772 22 8 22H24C24.5523 22 25 22.4477 25 23C25 23.5523 24.5523 24 24 24H8C7.44772 24 7 23.5523 7 23Z"
+          fill="#159B94"/>
+    <path d="M15 19C15 18.4477 15.4477 18 16 18H19C19.5523 18 20 18.4477 20 19C20 19.5523 19.5523 20 19 20H16C15.4477 20 15 19.5523 15 19Z"
+          fill="#159B94"/>
+</svg>

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

@@ -1,8 +0,0 @@
-<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 1H1C0.447715 1 0 1.44772 0 2V14C0 14.5523 0.447715 15 1 15H14C14.5523 15 15 14.5523 15 14V2C15 1.44772 14.5523 1 14 1ZM1 14V2H14V14H1Z" fill="#2289F4"/>
-<rect x="1" y="2" width="13" height="2" fill="#98CAFF"/>
-<rect x="2" y="5" width="3" height="2" fill="#2289F4"/>
-<rect x="2" y="8" width="3" height="2" fill="#2289F4"/>
-<rect x="2" y="11" width="10" height="2" fill="#2289F4"/>
-<rect x="6" y="8" width="3" height="2" fill="#2289F4"/>
-</svg>

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

@@ -0,0 +1,48 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M20.786 19.7541L11.2852 19.9766L7 22.9875C8.86248 24.4036 12.6792 24.6016 12.6792 24.6016C13.3329 26.9592 12.1768 28.7463 11.1027 29.8246C10.74 30.1887 11.0029 31 11.5168 31H19.6655C20.0647 31 20.3051 30.5505 20.1128 30.2006C18.3042 26.9105 19.854 25.2608 19.854 25.2608L22.3393 24.1893C22.7787 23.9998 23.1356 23.6591 23.3453 23.2289L25.4063 19L26 21.6781L20.786 19.7541ZM9.00433 22.5591C10.0131 22.3798 10.7101 21.7054 10.7101 21.7054C10.8485 21.78 12.6792 23.598 12.6792 23.598C10.5 23.0233 9.00433 22.5591 9.00433 22.5591ZM15.3587 23.4422C14.3499 23.547 12.4007 22.2199 12.4007 22.0104C12.4007 22.0104 13.898 22.0648 16.786 21.8848C16.786 21.8848 16.3691 23.3375 15.3587 23.4422ZM18.5617 24.1467C18.0749 24.2127 17.7931 23.9932 17.6313 23.7062C17.3262 23.1667 17.5246 22.5971 18.1015 22.1014L18.5617 21.7054L19.6405 21.5555C19.6405 21.5555 20.0591 22.6337 21.6598 23.3081C21.6598 23.3081 19.7789 23.9817 18.5617 24.1467Z"
+          fill="#4D2600"/>
+    <path fill-rule="evenodd" clip-rule="evenodd"
+          d="M25.1875 8.78125C25.1875 12.5264 22.1514 15.5625 18.4062 15.5625C14.6611 15.5625 11.625 12.5264 11.625 8.78125C11.625 5.03606 14.6611 2 18.4062 2C22.1514 2 25.1875 5.03606 25.1875 8.78125Z"
+          fill="#A9BE28"/>
+    <path fill-rule="evenodd" clip-rule="evenodd"
+          d="M18.4062 2.75C15.0753 2.75 12.375 5.45028 12.375 8.78125C12.375 12.1122 15.0753 14.8125 18.4062 14.8125C21.7372 14.8125 24.4375 12.1122 24.4375 8.78125C24.4375 5.45028 21.7372 2.75 18.4062 2.75ZM10.875 8.78125C10.875 4.62185 14.2468 1.25 18.4062 1.25C22.5657 1.25 25.9375 4.62185 25.9375 8.78125C25.9375 12.9407 22.5657 16.3125 18.4062 16.3125C14.2468 16.3125 10.875 12.9407 10.875 8.78125Z"
+          fill="#8BA21A"/>
+    <path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd"
+          d="M18.5 15.5618C22.202 15.5117 25.1875 12.4951 25.1875 8.78123C25.1875 5.06734 22.202 2.05077 18.5 2.00061V15.5618Z"
+          fill="#8BA21A"/>
+    <path fill-rule="evenodd" clip-rule="evenodd"
+          d="M16 10C16 12.762 13.762 15 11 15C8.238 15 6 12.762 6 10C6 7.238 8.238 5 11 5C13.762 5 16 7.238 16 10Z"
+          fill="#A9BE28"/>
+    <path fill-rule="evenodd" clip-rule="evenodd"
+          d="M11 5.75C8.65221 5.75 6.75 7.65221 6.75 10C6.75 12.3478 8.65221 14.25 11 14.25C13.3478 14.25 15.25 12.3478 15.25 10C15.25 7.65221 13.3478 5.75 11 5.75ZM5.25 10C5.25 6.82379 7.82379 4.25 11 4.25C14.1762 4.25 16.75 6.82379 16.75 10C16.75 13.1762 14.1762 15.75 11 15.75C7.82379 15.75 5.25 13.1762 5.25 10Z"
+          fill="#8BA21A"/>
+    <path fill-rule="evenodd" clip-rule="evenodd"
+          d="M29.5625 15.7812C29.5625 19.5264 26.5264 22.5625 22.7812 22.5625C19.0361 22.5625 16 19.5264 16 15.7812C16 12.0361 19.0361 9 22.7812 9C26.5264 9 29.5625 12.0361 29.5625 15.7812Z"
+          fill="#A9BE28"/>
+    <path fill-rule="evenodd" clip-rule="evenodd"
+          d="M22.7812 9.75C19.4503 9.75 16.75 12.4503 16.75 15.7812C16.75 19.1122 19.4503 21.8125 22.7812 21.8125C26.1122 21.8125 28.8125 19.1122 28.8125 15.7812C28.8125 12.4503 26.1122 9.75 22.7812 9.75ZM15.25 15.7812C15.25 11.6218 18.6218 8.25 22.7812 8.25C26.9407 8.25 30.3125 11.6218 30.3125 15.7812C30.3125 19.9407 26.9407 23.3125 22.7812 23.3125C18.6218 23.3125 15.25 19.9407 15.25 15.7812Z"
+          fill="#8BA21A"/>
+    <path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd"
+          d="M23 22.5611C26.8751 22.5088 30.0002 19.3512 30.0002 15.4637C30.0002 11.5762 26.8751 8.4186 23 8.36621V22.5611Z"
+          fill="#8BA21A"/>
+    <path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd"
+          d="M11 15.1392C13.7678 15.1017 16 12.8464 16 10.0696C16 7.29288 13.7678 5.0375 11 5V15.1392Z" fill="#8BA21A"/>
+    <path fill-rule="evenodd" clip-rule="evenodd"
+          d="M14 17C14 20.314 11.314 23 8 23C4.686 23 2 20.314 2 17C2 13.686 4.686 11 8 11C11.314 11 14 13.686 14 17Z"
+          fill="#A9BE28"/>
+    <path fill-rule="evenodd" clip-rule="evenodd"
+          d="M8 11.75C5.10021 11.75 2.75 14.1002 2.75 17C2.75 19.8998 5.10021 22.25 8 22.25C10.8998 22.25 13.25 19.8998 13.25 17C13.25 14.1002 10.8998 11.75 8 11.75ZM1.25 17C1.25 13.2718 4.27179 10.25 8 10.25C11.7282 10.25 14.75 13.2718 14.75 17C14.75 20.7282 11.7282 23.75 8 23.75C4.27179 23.75 1.25 20.7282 1.25 17Z"
+          fill="#8BA21A"/>
+    <path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd"
+          d="M8 23.1671C11.3214 23.1221 14.0001 20.4157 14.0001 17.0835C14.0001 13.7514 11.3214 11.045 8 11V23.1671Z"
+          fill="#8BA21A"/>
+    <path fill-rule="evenodd" clip-rule="evenodd"
+          d="M22.7333 19.5667C22.7333 22.9912 19.9577 25.7667 16.5333 25.7667C13.1088 25.7667 10.3333 22.9912 10.3333 19.5667C10.3333 16.1422 13.1088 13.3667 16.5333 13.3667C19.9577 13.3667 22.7333 16.1422 22.7333 19.5667Z"
+          fill="#A9BE28"/>
+    <path fill-rule="evenodd" clip-rule="evenodd"
+          d="M16.5333 14.1167C13.523 14.1167 11.0833 16.5564 11.0833 19.5667C11.0833 22.577 13.523 25.0167 16.5333 25.0167C19.5435 25.0167 21.9833 22.577 21.9833 19.5667C21.9833 16.5564 19.5435 14.1167 16.5333 14.1167ZM9.58325 19.5667C9.58325 15.728 12.6946 12.6167 16.5333 12.6167C20.3719 12.6167 23.4833 15.728 23.4833 19.5667C23.4833 23.4054 20.3719 26.5167 16.5333 26.5167C12.6946 26.5167 9.58325 23.4054 9.58325 19.5667Z"
+          fill="#8BA21A"/>
+    <path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd"
+          d="M17 26.1671C20.3214 26.1221 23.0001 23.4157 23.0001 20.0835C23.0001 16.7514 20.3214 14.045 17 14V26.1671Z"
+          fill="#8BA21A"/>
+</svg>

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

@@ -1,14 +0,0 @@
-<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="M13 3.5C13 5.433 11.433 7 9.5 7C7.567 7 6 5.433 6 3.5C6 1.567 7.567 0 9.5 0C11.433 0 13 1.567 13 3.5Z" fill="#8DC21F"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M9.5 0C11.433 0 13 1.567 13 3.5C13 5.433 11.433 7 9.5 7V0Z" fill="#86B21B"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M8 4.5C8 5.881 6.881 7 5.5 7C4.119 7 3 5.881 3 4.5C3 3.119 4.119 2 5.5 2C6.881 2 8 3.119 8 4.5Z" fill="#8DC21F"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M5.5 2C6.881 2 8 3.119 8 4.5C8 5.881 6.881 7 5.5 7V2Z" fill="#86B21B"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M7 8C7 9.657 5.657 11 4 11C2.343 11 1 9.657 1 8C1 6.343 2.343 5 4 5C5.657 5 7 6.343 7 8Z" fill="#8DC21F"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M4 5C5.657 5 7 6.343 7 8C7 9.657 5.657 11 4 11V5Z" fill="#86B21B"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M15 7.5C15 9.433 13.433 11 11.5 11C9.567 11 8 9.433 8 7.5C8 5.567 9.567 4 11.5 4C13.433 4 15 5.567 15 7.5Z" fill="#8DC21F"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M11.5 4C13.433 4 15 5.567 15 7.5C15 9.433 13.433 11 11.5 11V4Z" fill="#86B21B"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M4 12H5V13H6V14H5V15H11V14H10V13H11V12H12V11H11V12H10H9V14H7V13V12H5V11H4V12Z" fill="#333334"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M7 14H9V12H7V14Z" fill="#FBB03B"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M11 9C11 10.657 9.657 12 8 12C6.343 12 5 10.657 5 9C5 7.343 6.343 6 8 6C9.657 6 11 7.343 11 9Z" fill="#8DC21F"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M8 6C9.657 6 11 7.343 11 9C11 10.657 9.657 12 8 12V6Z" fill="#86B21B"/>
-</svg>