Merging in latest from upstream (DESIGN/design:refs/heads/newui)

* commit '7bd690685090ac252c11d47a22ff86dbb0a58ab4':
  控件管理/报表填报属性/超级链接/服务器参数
  lock图标逻辑修改
  插入单元列排序按钮NPE fix
  控件管理/报表填报属性/超级链接/服务器参数
  REPORT-127436【NewUI】fix:参数面板/画布区域/editor相关图标替换&未置顶弹窗修复&预定义控件图标调整
  控件管理/报表填报属性/超级链接/服务器参数
  控件管理/报表填报属性/超级链接/服务器参数

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

@@ -1,8 +1,8 @@
 package com.fine.theme.light.ui;
 
+import com.fine.theme.icon.LazyIcon;
 import com.fine.theme.utils.FineClientProperties;
 import com.formdev.flatlaf.ui.FlatMenuItemUI;
-import com.fr.design.editlock.EditLockUtils;
 
 import javax.swing.JComponent;
 import javax.swing.plaf.ComponentUI;
@@ -35,7 +35,9 @@ public class FineMenuItemUI extends FlatMenuItemUI {
 
         Object itemType = c.getClientProperty(FineClientProperties.MENU_ITEM_TYPE);
         if (FineClientProperties.MENU_ITEM_TYPE_LOCK.equals(itemType)) {
-            g.drawImage(EditLockUtils.LOCKED_IMAGE, c.getWidth() - rightMargin - iconSize, (c.getHeight() - iconSize) / 2, iconSize, iconSize, null);
+            LazyIcon icon = new LazyIcon("locked");
+
+            icon.paintIcon(c, g, c.getWidth() - rightMargin - iconSize, (c.getHeight() - iconSize) / 2);
         }
     }
 }

designer-base/src/main/java/com/fr/design/data/datapane/preview/sql/PreviewPerformedSqlPane.java

@@ -162,6 +162,10 @@ public class PreviewPerformedSqlPane extends JDialog implements ActionListener {
             public void windowClosing(WindowEvent e) {
                 close();
             }
+            @Override
+            public void windowActivated(WindowEvent e) {
+                toFront();
+            }
         });
 
         GUICoreUtils.centerWindow(this);

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

@@ -62,6 +62,8 @@ import com.fr.stable.ArrayUtils;
 import com.fr.stable.ParameterProvider;
 import com.fr.stable.StringUtils;
 import com.fr.workspace.WorkContext;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.BorderFactory;
@@ -647,6 +649,12 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> implemen
                     checkParameter();
                 }
             });
+            dialog.addWindowListener(new WindowAdapter() {
+                @Override
+                public void windowActivated(WindowEvent e) {
+                    dialog.toFront();
+                }
+            });
             dialog.setVisible(true);
         }
     }

designer-base/src/main/java/com/fr/design/editor/ValueEditorPane.java

@@ -129,6 +129,7 @@ public class ValueEditorPane extends BasicPane implements UIObserver, GlobalName
         if (this.cards.length == 1) {
             this.remove(arrowButton);
         }
+
     }
 
     public void setCurrentEditor(Class editorClass) {

designer-base/src/main/java/com/fr/design/editor/editor/BooleanEditor.java

@@ -108,7 +108,7 @@ public class BooleanEditor extends Editor<Boolean> {
 
 	@Override
 	public String getIconId() {
-		return "type_boolean";
+		return "type_boolean_popup";
 	}
 
 	@Override

designer-base/src/main/java/com/fr/design/editor/editor/ColumnIndexEditor.java

@@ -59,7 +59,7 @@ public class ColumnIndexEditor extends Editor<Object> {
 
     @Override
     public String getIconId(){
-        return "ds_column_index";
+        return "dsColumnIndex_popup";
     }
 
     /**

designer-base/src/main/java/com/fr/design/editor/editor/ColumnNameEditor.java

@@ -78,7 +78,7 @@ public class ColumnNameEditor extends ColumnIndexEditor {
 
     @Override
     public String getIconId() {
-        return "ds_column_name";
+        return "dsColumnName_popup";
     }
 
 }

designer-base/src/main/java/com/fr/design/editor/editor/ColumnRowEditor.java

@@ -70,7 +70,7 @@ public class ColumnRowEditor extends Editor<ColumnRow> {
 
     @Override
     public String getIconId() {
-        return "cellelement";
+        return "cellelement_popup";
     }
 
     @Override

designer-base/src/main/java/com/fr/design/editor/editor/ColumnSelectedEditor.java

@@ -89,7 +89,7 @@ public class ColumnSelectedEditor extends Editor<SimpleDSColumn> implements Prep
 
 	@Override
 	public String getIconId() {
-		return "ds_column";
+		return "bind_column_popup";
 	}
 
 	@Override

designer-base/src/main/java/com/fr/design/editor/editor/DateEditor.java

@@ -171,7 +171,7 @@ public class DateEditor extends Editor<Date> {
 
 	@Override
 	public String getIconId() {
-		return "date";
+		return "date_popup";
 	}
 	
 	public void setUIDatePickerStyle(int style){

designer-base/src/main/java/com/fr/design/editor/editor/FormulaEditor.java

@@ -142,7 +142,7 @@ public class FormulaEditor extends Editor<BaseFormula> {
 
     @Override
     public String getIconId() {
-        return "formula";
+        return "formula_popup";
     }
 
     /**

designer-base/src/main/java/com/fr/design/editor/editor/IntegerEditor.java

@@ -37,7 +37,7 @@ public class IntegerEditor extends NumberEditor<Integer> {
 
 	@Override
 	public String getIconId(){
-		return "ds_column_index";
+		return "dsColumnIndex_popup";
 	}
 
 	@Override

designer-base/src/main/java/com/fr/design/editor/editor/NumberEditor.java

@@ -112,7 +112,7 @@ public abstract class NumberEditor<T extends Number> extends Editor<T> {
 
 	@Override
 	public String getIconId(){
-		return "type_double";
+		return "type_double_popup";
 	}
 
 	/**

designer-base/src/main/java/com/fr/design/editor/editor/OldColumnIndexEditor.java

@@ -107,7 +107,7 @@ public class OldColumnIndexEditor extends Editor {
 
 	@Override
 	public String getIconId() {
-		return "ds_column";
+		return "bind_column_popup";
 	}
 
 	@Override

designer-base/src/main/java/com/fr/design/editor/editor/ParameterEditor.java

@@ -58,7 +58,7 @@ public class ParameterEditor extends Editor<Parameter> {
 
 	@Override
 	public String getIconId() {
-		return "param";
+		return "param_popup";
 	}
 
 	@Override

designer-base/src/main/java/com/fr/design/editor/editor/SpinnerIntegerEditor.java

@@ -49,7 +49,7 @@ public class SpinnerIntegerEditor extends Editor<Integer> {
 
     @Override
     public String getIconId(){
-        return "ds_column_index";
+        return "dsColumnIndex_popup";
     }
 
     KeyListener textKeyListener = new KeyAdapter() {

designer-base/src/main/java/com/fr/design/editor/editor/TextEditor.java

@@ -149,7 +149,7 @@ public class TextEditor extends Editor<String> {
 
     @Override
     public String getIconId() {
-        return "ds_column_name";
+        return "dsColumnName_popup";
     }
 
     /**

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

@@ -1,8 +1,8 @@
 package com.fr.design.gui.core;
 
+import com.fine.theme.icon.LazyIcon;
 import javax.swing.Icon;
 
-import com.fr.base.BaseUtils;
 import com.fr.form.ui.NameWidget;
 import com.fr.form.ui.Widget;
 
@@ -21,7 +21,7 @@ public class UserDefinedWidgetOption extends WidgetOption {
 
 	@Override
 	public Icon optionIcon() {
-		return BaseUtils.readIcon("/com/fr/design/images/data/user_widget.png");
+		return new LazyIcon("customButton");
 	}
 
 	@Override

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

@@ -1,5 +1,6 @@
 package com.fr.design.gui.core;
 
+import com.fine.theme.icon.LazyIcon;
 import com.fr.base.BaseUtils;
 import com.fr.form.ui.Button;
 import com.fr.form.ui.CheckBox;
@@ -113,7 +114,7 @@ public abstract class WidgetOption implements Serializable {
             String name = nameIt.next();
             WidgetConfig widgetConfig = mgr.getWidgetConfig(name);
             if (widgetConfig instanceof UserDefinedWidgetConfig) {
-                list.add(WidgetOptionFactory.createByWidgetClass(name, BaseUtils.readIcon("/com/fr/design/images/data/user_widget.png"),
+                list.add(WidgetOptionFactory.createByWidgetClass(name, new LazyIcon("customButton"),
                         ((UserDefinedWidgetConfig) widgetConfig).getWidget().getClass()));
             }
         }

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

@@ -1,7 +1,6 @@
 package com.fr.design.gui.core;
 
 import com.fine.theme.icon.LazyIcon;
-import com.fr.base.BaseUtils;
 import com.fr.base.svg.IconUtils;
 import com.fr.form.ui.Widget;
 
@@ -10,7 +9,7 @@ import javax.swing.Icon;
 public class WidgetOptionFactory {
 
     public static WidgetOption createByWidgetClass(String optionName, Class<? extends Widget> widgetClass) {
-        return new CustomWidgetOption(optionName, BaseUtils.readIcon("/com/fr/design/images/data/user_widget.png"), widgetClass);
+        return new CustomWidgetOption(optionName, new LazyIcon("customButton"), widgetClass);
     }
 
     public static WidgetOption createByWidgetClass(String optionName, Icon optionIcon, Class<? extends Widget> widgetClass) {

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

@@ -33,7 +33,6 @@ public class UILockMenuItem extends UIMenuItem implements EditLockChangeListener
         this.lockedTooltips = lockedTooltips;
         this.normalTooltips = normalTooltips;
         this.lockItem = lockItem;
-        this.putClientProperty(FineClientProperties.MENU_ITEM_TYPE, FineClientProperties.MENU_ITEM_TYPE_LOCK);
     }
 
     public LockItem getLockItem() {
@@ -43,6 +42,11 @@ public class UILockMenuItem extends UIMenuItem implements EditLockChangeListener
     @Override
     public void updateLockedState(EditLockChangeEvent event) {
         this.setToolTipText(event.isLocked() ? lockedTooltips : normalTooltips);
+        if (event.isLocked()) {
+            this.putClientProperty(FineClientProperties.MENU_ITEM_TYPE, FineClientProperties.MENU_ITEM_TYPE_LOCK);
+        } else {
+            this.putClientProperty(FineClientProperties.MENU_ITEM_TYPE, null);
+        }
         this.repaint();
     }
 }

designer-base/src/main/java/com/fr/design/mainframe/widget/editors/DataBindingEditor.java

@@ -159,6 +159,6 @@ public class DataBindingEditor extends Editor<DataBinding> {
 
     @Override
     public String getIconId() {
-        return "bind_column";
+        return "bind_column_popup";
     }
 }

designer-base/src/main/java/com/fr/design/mainframe/widget/editors/DataTableEditor.java

@@ -83,7 +83,7 @@ public class DataTableEditor extends Editor<DataTableConfig> {
 
 	@Override
 	public String getIconId() {
-		return "bind_column";
+		return "bind_column_popup";
 	}
 
 }

designer-base/src/main/java/com/fr/design/widget/IconDefinePane.java

@@ -11,6 +11,8 @@ import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.web.CustomIconPane;
 import com.fr.form.ui.WidgetInfoConfig;
 
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
 import javax.swing.Icon;
 import javax.swing.JPanel;
 import javax.swing.ImageIcon;
@@ -47,6 +49,12 @@ public class IconDefinePane extends BasicPane {
                         IconDefinePane.this.repaint();
                     }
                 });
+                editDialog.addWindowFocusListener(new WindowAdapter() {
+                    @Override
+                    public void windowGainedFocus(WindowEvent e) {
+                        editDialog.toFront();
+                    }
+                });
                 editDialog.setVisible(true);
             }
         });

designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java

@@ -21,7 +21,6 @@ import com.fr.design.data.tabledata.tabledatapane.FormatExplanationPane;
 import com.fr.design.dialog.AttrScrollPane;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.BasicPane;
-import com.fr.design.dialog.BasicScrollPane;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.editor.ValueEditorPane;
@@ -39,7 +38,6 @@ import com.fr.design.i18n.Toolkit;
 import com.fr.design.javascript.JavaScriptActionPane;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.DesignerContext;
-import com.fr.design.scrollruler.ModLineBorder;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.DateUtils;
@@ -56,8 +54,9 @@ import com.fr.write.config.InsertConfig;
 import com.fr.write.config.IntelliDMLConfig;
 import com.fr.write.config.UpdateConfig;
 
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
 import javax.swing.AbstractCellEditor;
-import javax.swing.BorderFactory;
 import javax.swing.DefaultCellEditor;
 import javax.swing.DefaultComboBoxModel;
 import javax.swing.Icon;
@@ -80,8 +79,6 @@ import java.awt.BorderLayout;
 import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.FlowLayout;
-import java.awt.GridLayout;
-import java.awt.Image;
 import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -98,7 +95,6 @@ import java.util.EventObject;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static com.fine.swing.ui.layout.Layouts.fix;
 import static com.fine.swing.ui.layout.Layouts.row;
 import static com.fine.swing.ui.layout.Layouts.cell;
 import static com.fine.swing.ui.layout.Layouts.column;
@@ -345,6 +341,12 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
                         refreshConditionList();
                     }
                 });
+                dialog.addWindowFocusListener(new WindowAdapter() {
+                    @Override
+                    public void windowGainedFocus(WindowEvent e) {
+                        dialog.toFront();
+                    }
+                });
                 dialog.setVisible(true);
             }
         });

designer-base/src/main/resources/com/fine/theme/icon/editor/bind_column_popup.svg

@@ -0,0 +1,16 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_11529_155501)">
+<path d="M5.28571 7.39286C5.28571 6.91947 5.66947 6.53571 6.14286 6.53571C6.61624 6.53571 7 6.91947 7 7.39286C7 7.86624 6.61624 8.25 6.14286 8.25C5.66947 8.25 5.28571 7.86624 5.28571 7.39286Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path d="M8.71429 7.39286C8.71429 6.91947 9.09804 6.53571 9.57143 6.53571H14.7143C15.1877 6.53571 15.5714 6.91947 15.5714 7.39286C15.5714 7.86624 15.1877 8.25 14.7143 8.25H9.57143C9.09804 8.25 8.71429 7.86624 8.71429 7.39286Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M1 3.45C1 2.78726 1.53726 2.25 2.2 2.25H23.8C24.4627 2.25 25 2.78726 25 3.45V11.3357C25 11.9985 24.4627 12.5357 23.8 12.5357H2.2C1.53726 12.5357 1 11.9985 1 11.3357V3.45ZM23.2857 10.8214H2.71429V3.96429H23.2857V10.8214Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path d="M6.14286 19.8214C5.66947 19.8214 5.28571 20.2052 5.28571 20.6786C5.28571 21.152 5.66947 21.5357 6.14286 21.5357C6.61624 21.5357 7 21.152 7 20.6786C7 20.2052 6.61624 19.8214 6.14286 19.8214Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path d="M9.57143 19.8214C9.09804 19.8214 8.71429 20.2052 8.71429 20.6786C8.71429 21.152 9.09804 21.5357 9.57143 21.5357H14.7143C15.1877 21.5357 15.5714 21.152 15.5714 20.6786C15.5714 20.2052 15.1877 19.8214 14.7143 19.8214H9.57143Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M1 16.7357C1 16.073 1.53726 15.5357 2.2 15.5357H23.8C24.4627 15.5357 25 16.073 25 16.7357V24.6214C25 25.2842 24.4627 25.8214 23.8 25.8214H2.2C1.53726 25.8214 1 25.2842 1 24.6214V16.7357ZM2.71429 17.25H23.2857V24.1071H2.71429V17.25Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path d="M24.2851 30C24.0316 30 23.9047 29.6935 24.0839 29.5143L29.5143 24.0839C29.6935 23.9047 30 24.0316 30 24.2851V29.6C30 29.8209 29.8209 30 29.6 30H24.2851Z" fill="#0A1C38" fill-opacity="0.9"/>
+</g>
+<defs>
+<clipPath id="clip0_11529_155501">
+<rect width="32" height="32" fill="white"/>
+</clipPath>
+</defs>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/editor/bind_column_popup_diable.svg

@@ -0,0 +1,16 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_11570_135385)">
+<path d="M5.28571 7.39286C5.28571 6.91947 5.66947 6.53571 6.14286 6.53571C6.61624 6.53571 7 6.91947 7 7.39286C7 7.86624 6.61624 8.25 6.14286 8.25C5.66947 8.25 5.28571 7.86624 5.28571 7.39286Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path d="M8.71429 7.39286C8.71429 6.91947 9.09804 6.53571 9.57143 6.53571H14.7143C15.1877 6.53571 15.5714 6.91947 15.5714 7.39286C15.5714 7.86624 15.1877 8.25 14.7143 8.25H9.57143C9.09804 8.25 8.71429 7.86624 8.71429 7.39286Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M1 3.45C1 2.78726 1.53726 2.25 2.2 2.25H23.8C24.4627 2.25 25 2.78726 25 3.45V11.3357C25 11.9985 24.4627 12.5357 23.8 12.5357H2.2C1.53726 12.5357 1 11.9985 1 11.3357V3.45ZM23.2857 10.8214H2.71429V3.96429H23.2857V10.8214Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path d="M6.14286 19.8214C5.66947 19.8214 5.28571 20.2052 5.28571 20.6786C5.28571 21.152 5.66947 21.5357 6.14286 21.5357C6.61624 21.5357 7 21.152 7 20.6786C7 20.2052 6.61624 19.8214 6.14286 19.8214Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path d="M9.57143 19.8214C9.09804 19.8214 8.71429 20.2052 8.71429 20.6786C8.71429 21.152 9.09804 21.5357 9.57143 21.5357H14.7143C15.1877 21.5357 15.5714 21.152 15.5714 20.6786C15.5714 20.2052 15.1877 19.8214 14.7143 19.8214H9.57143Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M1 16.7357C1 16.073 1.53726 15.5357 2.2 15.5357H23.8C24.4627 15.5357 25 16.073 25 16.7357V24.6214C25 25.2842 24.4627 25.8214 23.8 25.8214H2.2C1.53726 25.8214 1 25.2842 1 24.6214V16.7357ZM2.71429 17.25H23.2857V24.1071H2.71429V17.25Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path d="M24.2851 30C24.0316 30 23.9047 29.6935 24.0839 29.5143L29.5143 24.0839C29.6935 23.9047 30 24.0316 30 24.2851V29.6C30 29.8209 29.8209 30 29.6 30H24.2851Z" fill="#0A1C38" fill-opacity="0.29"/>
+</g>
+<defs>
+<clipPath id="clip0_11570_135385">
+<rect width="32" height="32" fill="white"/>
+</clipPath>
+</defs>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/editor/cellelement_popup.svg

@@ -0,0 +1,11 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_11529_155504)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.2857 3.71429H3.71429V24.2857L9.71429 24.2857V19.1429H3.7147V17.4286H17.4283V3.71429H19.1426V17.4286H24.2857V11.4286H19.1433V9.7143H24.2857V3.71429ZM11.4286 19.1429V24.2857L17.4283 24.2857V19.1429H11.4286ZM24.2857 19.1429H19.1426V24.2857L24.2857 24.2857V19.1429ZM3.71429 2C2.76751 2 2 2.76751 2 3.71429V24.2857C2 25.2325 2.76751 26 3.71429 26H24.2857C25.2325 26 26 25.2325 26 24.2857V3.71429C26 2.76751 25.2325 2 24.2857 2H3.71429Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path d="M24.2851 30C24.0316 30 23.9047 29.6935 24.0839 29.5143L29.5143 24.0839C29.6935 23.9047 30 24.0316 30 24.2851V29.6C30 29.8209 29.8209 30 29.6 30H24.2851Z" fill="#0A1C38" fill-opacity="0.9"/>
+</g>
+<defs>
+<clipPath id="clip0_11529_155504">
+<rect width="32" height="32" fill="white"/>
+</clipPath>
+</defs>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/editor/cellelement_popup_disable.svg

@@ -0,0 +1,11 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_11570_135265)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.2857 3.71429H3.71429V24.2857L9.71429 24.2857V19.1429H3.7147V17.4286H17.4283V3.71429H19.1426V17.4286H24.2857V11.4286H19.1433V9.7143H24.2857V3.71429ZM11.4286 19.1429V24.2857L17.4283 24.2857V19.1429H11.4286ZM24.2857 19.1429H19.1426V24.2857L24.2857 24.2857V19.1429ZM3.71429 2C2.76751 2 2 2.76751 2 3.71429V24.2857C2 25.2325 2.76751 26 3.71429 26H24.2857C25.2325 26 26 25.2325 26 24.2857V3.71429C26 2.76751 25.2325 2 24.2857 2H3.71429Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path d="M24.2851 30C24.0316 30 23.9047 29.6935 24.0839 29.5143L29.5143 24.0839C29.6935 23.9047 30 24.0316 30 24.2851V29.6C30 29.8209 29.8209 30 29.6 30H24.2851Z" fill="#0A1C38" fill-opacity="0.29"/>
+</g>
+<defs>
+<clipPath id="clip0_11570_135265">
+<rect width="32" height="32" fill="white"/>
+</clipPath>
+</defs>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/editor/date_popup.svg

@@ -0,0 +1,16 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_11564_41626)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.71428 1.00001C9.2409 1.00001 8.85714 1.38377 8.85714 1.85715V3.57144H3.71429C2.76751 3.57144 2 4.33895 2 5.28572L2 24.1428C2 25.0896 2.76751 25.8571 3.71429 25.8571H24.2857C25.2325 25.8571 26 25.0896 26 24.1428V5.28572C26 4.33895 25.2325 3.57144 24.2857 3.57144H19.1429V1.85714C19.1429 1.38376 18.7591 1.00001 18.2857 1C17.8123 0.999994 17.4286 1.38375 17.4286 1.85714V3.57144H10.5714V1.85715C10.5714 1.38377 10.1877 1.00001 9.71428 1.00001ZM17.4286 5.28569V6.99999C17.4286 7.47337 17.8123 7.85713 18.2857 7.85713C18.7591 7.85713 19.1429 7.47338 19.1429 6.99999V5.28569L24.2857 5.28569V24.1428H3.71429V5.28569L8.85714 5.28569V6.99999C8.85714 7.47338 9.2409 7.85713 9.71428 7.85713C10.1877 7.85713 10.5714 7.47337 10.5714 6.99999V5.28569H17.4286Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path d="M6.28516 11.2857C6.28516 10.8123 6.66891 10.4286 7.1423 10.4286H8.85658C9.32997 10.4286 9.71373 10.8123 9.71373 11.2857V13C9.71373 13.4734 9.32997 13.8572 8.85658 13.8572H7.1423C6.66891 13.8572 6.28516 13.4734 6.28516 13V11.2857Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path d="M12.2852 11.2857C12.2852 10.8123 12.6689 10.4286 13.1423 10.4286H14.8566C15.33 10.4286 15.7137 10.8123 15.7137 11.2857V13C15.7137 13.4734 15.33 13.8572 14.8566 13.8572H13.1423C12.6689 13.8572 12.2852 13.4734 12.2852 13V11.2857Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path d="M18.2852 11.2857C18.2852 10.8123 18.6689 10.4286 19.1423 10.4286H20.8566C21.33 10.4286 21.7137 10.8123 21.7137 11.2857V13C21.7137 13.4734 21.33 13.8572 20.8566 13.8572H19.1423C18.6689 13.8572 18.2852 13.4734 18.2852 13V11.2857Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path d="M6.28516 18.1429C6.28516 17.6695 6.66891 17.2857 7.1423 17.2857H8.85658C9.32997 17.2857 9.71373 17.6695 9.71373 18.1429V19.8572C9.71373 20.3305 9.32997 20.7143 8.85658 20.7143H7.1423C6.66891 20.7143 6.28516 20.3305 6.28516 19.8572V18.1429Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path d="M12.2852 18.1429C12.2852 17.6695 12.6689 17.2857 13.1423 17.2857H14.8566C15.33 17.2857 15.7137 17.6695 15.7137 18.1429V19.8572C15.7137 20.3305 15.33 20.7143 14.8566 20.7143H13.1423C12.6689 20.7143 12.2852 20.3305 12.2852 19.8572V18.1429Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path d="M24.2851 30C24.0316 30 23.9047 29.6935 24.0839 29.5143L29.5143 24.0839C29.6935 23.9047 30 24.0316 30 24.2851V29.6C30 29.8209 29.8209 30 29.6 30H24.2851Z" fill="#0A1C38" fill-opacity="0.9"/>
+</g>
+<defs>
+<clipPath id="clip0_11564_41626">
+<rect width="32" height="32" fill="white"/>
+</clipPath>
+</defs>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/editor/date_popup_disable.svg

@@ -0,0 +1,16 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_11570_135396)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.71428 1.00001C9.2409 1.00001 8.85714 1.38377 8.85714 1.85715V3.57144H3.71429C2.76751 3.57144 2 4.33895 2 5.28572L2 24.1428C2 25.0896 2.76751 25.8571 3.71429 25.8571H24.2857C25.2325 25.8571 26 25.0896 26 24.1428V5.28572C26 4.33895 25.2325 3.57144 24.2857 3.57144H19.1429V1.85714C19.1429 1.38376 18.7591 1.00001 18.2857 1C17.8123 0.999994 17.4286 1.38375 17.4286 1.85714V3.57144H10.5714V1.85715C10.5714 1.38377 10.1877 1.00001 9.71428 1.00001ZM17.4286 5.28569V6.99999C17.4286 7.47337 17.8123 7.85713 18.2857 7.85713C18.7591 7.85713 19.1429 7.47338 19.1429 6.99999V5.28569L24.2857 5.28569V24.1428H3.71429V5.28569L8.85714 5.28569V6.99999C8.85714 7.47338 9.2409 7.85713 9.71428 7.85713C10.1877 7.85713 10.5714 7.47337 10.5714 6.99999V5.28569H17.4286Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path d="M6.28516 11.2857C6.28516 10.8123 6.66891 10.4286 7.1423 10.4286H8.85658C9.32997 10.4286 9.71373 10.8123 9.71373 11.2857V13C9.71373 13.4734 9.32997 13.8572 8.85658 13.8572H7.1423C6.66891 13.8572 6.28516 13.4734 6.28516 13V11.2857Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path d="M12.2852 11.2857C12.2852 10.8123 12.6689 10.4286 13.1423 10.4286H14.8566C15.33 10.4286 15.7137 10.8123 15.7137 11.2857V13C15.7137 13.4734 15.33 13.8572 14.8566 13.8572H13.1423C12.6689 13.8572 12.2852 13.4734 12.2852 13V11.2857Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path d="M18.2852 11.2857C18.2852 10.8123 18.6689 10.4286 19.1423 10.4286H20.8566C21.33 10.4286 21.7137 10.8123 21.7137 11.2857V13C21.7137 13.4734 21.33 13.8572 20.8566 13.8572H19.1423C18.6689 13.8572 18.2852 13.4734 18.2852 13V11.2857Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path d="M6.28516 18.1429C6.28516 17.6695 6.66891 17.2857 7.1423 17.2857H8.85658C9.32997 17.2857 9.71373 17.6695 9.71373 18.1429V19.8572C9.71373 20.3305 9.32997 20.7143 8.85658 20.7143H7.1423C6.66891 20.7143 6.28516 20.3305 6.28516 19.8572V18.1429Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path d="M12.2852 18.1429C12.2852 17.6695 12.6689 17.2857 13.1423 17.2857H14.8566C15.33 17.2857 15.7137 17.6695 15.7137 18.1429V19.8572C15.7137 20.3305 15.33 20.7143 14.8566 20.7143H13.1423C12.6689 20.7143 12.2852 20.3305 12.2852 19.8572V18.1429Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path d="M24.2851 30C24.0316 30 23.9047 29.6935 24.0839 29.5143L29.5143 24.0839C29.6935 23.9047 30 24.0316 30 24.2851V29.6C30 29.8209 29.8209 30 29.6 30H24.2851Z" fill="#0A1C38" fill-opacity="0.29"/>
+</g>
+<defs>
+<clipPath id="clip0_11570_135396">
+<rect width="32" height="32" fill="white"/>
+</clipPath>
+</defs>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/editor/dsColumnIndex_popup.svg

@@ -0,0 +1,11 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_11529_155433)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.71429 3.71429H24.2857V24.2857H3.71429V3.71429ZM2 3.71429C2 2.76751 2.76751 2 3.71429 2H24.2857C25.2325 2 26 2.76751 26 3.71429V24.2857C26 25.2325 25.2325 26 24.2857 26H3.71429C2.76751 26 2 25.2325 2 24.2857V3.71429ZM15.0392 8.18536L9.12363 15.7143H15.0392L15.0392 8.18536ZM16.7535 17.4286H20C20.4734 17.4286 20.8571 17.0448 20.8571 16.5714C20.8571 16.098 20.4734 15.7143 20 15.7143H16.7535V5.85714C16.7535 5.38376 16.3697 5 15.8963 5C15.8774 5 15.8585 5.00062 15.8399 5.00183C15.573 4.98661 15.3016 5.09648 15.1215 5.3257L6.75198 15.9778C6.48583 16.3166 6.51477 16.8008 6.81939 17.1054C6.9077 17.1937 7.01005 17.2582 7.11889 17.2995C7.25023 17.3813 7.40531 17.4286 7.57143 17.4286H15.0392V21.7143C15.0392 22.1877 15.423 22.5714 15.8963 22.5714C16.3697 22.5714 16.7535 22.1877 16.7535 21.7143V17.4286Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path d="M24.2851 30C24.0316 30 23.9047 29.6935 24.0839 29.5143L29.5143 24.0839C29.6935 23.9047 30 24.0316 30 24.2851V29.6C30 29.8209 29.8209 30 29.6 30H24.2851Z" fill="#0A1C38" fill-opacity="0.9"/>
+</g>
+<defs>
+<clipPath id="clip0_11529_155433">
+<rect width="32" height="32" fill="white"/>
+</clipPath>
+</defs>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/editor/dsColumnIndex_popup_disable.svg

@@ -0,0 +1,11 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_11570_135311)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.71429 3.71429H24.2857V24.2857H3.71429V3.71429ZM2 3.71429C2 2.76751 2.76751 2 3.71429 2H24.2857C25.2325 2 26 2.76751 26 3.71429V24.2857C26 25.2325 25.2325 26 24.2857 26H3.71429C2.76751 26 2 25.2325 2 24.2857V3.71429ZM15.0392 8.18536L9.12363 15.7143H15.0392L15.0392 8.18536ZM16.7535 17.4286H20C20.4734 17.4286 20.8571 17.0448 20.8571 16.5714C20.8571 16.098 20.4734 15.7143 20 15.7143H16.7535V5.85714C16.7535 5.38376 16.3697 5 15.8963 5C15.8774 5 15.8585 5.00062 15.8399 5.00183C15.573 4.98661 15.3016 5.09648 15.1215 5.3257L6.75198 15.9778C6.48583 16.3166 6.51477 16.8008 6.81939 17.1054C6.9077 17.1937 7.01005 17.2582 7.11889 17.2995C7.25023 17.3813 7.40531 17.4286 7.57143 17.4286H15.0392V21.7143C15.0392 22.1877 15.423 22.5714 15.8963 22.5714C16.3697 22.5714 16.7535 22.1877 16.7535 21.7143V17.4286Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path d="M24.2851 30C24.0316 30 23.9047 29.6935 24.0839 29.5143L29.5143 24.0839C29.6935 23.9047 30 24.0316 30 24.2851V29.6C30 29.8209 29.8209 30 29.6 30H24.2851Z" fill="#0A1C38" fill-opacity="0.29"/>
+</g>
+<defs>
+<clipPath id="clip0_11570_135311">
+<rect width="32" height="32" fill="white"/>
+</clipPath>
+</defs>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/editor/dsColumnName_popup.svg

@@ -0,0 +1,11 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_11529_155380)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.35 5.85C9.35 5.38056 9.73056 5 10.2 5C10.6694 5 11.05 5.38056 11.05 5.85V11.8H16.15C17.0889 11.8 17.85 12.5611 17.85 13.5V20.3C17.85 21.2389 17.0889 22 16.15 22H11.05C10.1111 22 9.35 21.2389 9.35 20.3V13.5V5.85ZM16.15 20.3H11.05V13.5H16.15V20.3ZM6.8 16.9H1.7L1.7 20.3H6.8V16.9ZM6.8 15.2H1.7C0.761116 15.2 0 15.9611 0 16.9V20.3C0 21.2389 0.761116 22 1.7 22H6.8C7.73888 22 8.5 21.2389 8.5 20.3L8.5 19.45L8.5 16.9L8.5 16.8983V13.5C8.5 12.5611 7.73888 11.8 6.8 11.8H1.7H0.85C0.380558 11.8 0 12.1806 0 12.65C0 13.1194 0.380558 13.5 0.85 13.5H1.7H6.8L6.8 15.2ZM20.4 11.8H26.35C26.8194 11.8 27.2 12.1806 27.2 12.65C27.2 13.1194 26.8194 13.5 26.35 13.5H20.4V20.3H26.35C26.8194 20.3 27.2 20.6806 27.2 21.15C27.2 21.6194 26.8194 22 26.35 22H20.4C19.4611 22 18.7 21.2389 18.7 20.3V13.5C18.7 12.5611 19.4611 11.8 20.4 11.8Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path d="M24.2851 30C24.0316 30 23.9047 29.6935 24.0839 29.5143L29.5143 24.0839C29.6935 23.9047 30 24.0316 30 24.2851V29.6C30 29.8209 29.8209 30 29.6 30H24.2851Z" fill="#0A1C38" fill-opacity="0.9"/>
+</g>
+<defs>
+<clipPath id="clip0_11529_155380">
+<rect width="32" height="32" fill="white"/>
+</clipPath>
+</defs>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/editor/dsColumnName_popup_disable.svg

@@ -0,0 +1,11 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_11570_135355)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.35 5.85C9.35 5.38056 9.73056 5 10.2 5C10.6694 5 11.05 5.38056 11.05 5.85V11.8H16.15C17.0889 11.8 17.85 12.5611 17.85 13.5V20.3C17.85 21.2389 17.0889 22 16.15 22H11.05C10.1111 22 9.35 21.2389 9.35 20.3V13.5V5.85ZM16.15 20.3H11.05V13.5H16.15V20.3ZM6.8 16.9H1.7L1.7 20.3H6.8V16.9ZM6.8 15.2H1.7C0.761116 15.2 0 15.9611 0 16.9V20.3C0 21.2389 0.761116 22 1.7 22H6.8C7.73888 22 8.5 21.2389 8.5 20.3L8.5 19.45L8.5 16.9L8.5 16.8983V13.5C8.5 12.5611 7.73888 11.8 6.8 11.8H1.7H0.85C0.380558 11.8 0 12.1806 0 12.65C0 13.1194 0.380558 13.5 0.85 13.5H1.7H6.8L6.8 15.2ZM20.4 11.8H26.35C26.8194 11.8 27.2 12.1806 27.2 12.65C27.2 13.1194 26.8194 13.5 26.35 13.5H20.4V20.3H26.35C26.8194 20.3 27.2 20.6806 27.2 21.15C27.2 21.6194 26.8194 22 26.35 22H20.4C19.4611 22 18.7 21.2389 18.7 20.3V13.5C18.7 12.5611 19.4611 11.8 20.4 11.8Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path d="M24.2851 30C24.0316 30 23.9047 29.6935 24.0839 29.5143L29.5143 24.0839C29.6935 23.9047 30 24.0316 30 24.2851V29.6C30 29.8209 29.8209 30 29.6 30H24.2851Z" fill="#0A1C38" fill-opacity="0.29"/>
+</g>
+<defs>
+<clipPath id="clip0_11570_135355">
+<rect width="32" height="32" fill="white"/>
+</clipPath>
+</defs>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/editor/param_popup.svg

@@ -0,0 +1,12 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_11529_155503)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.2857 3.71428H3.71431L3.71428 24.2857L24.2857 24.2857V3.71428ZM3.71431 2C2.76754 2 2.00003 2.76751 2.00003 3.71428L2 24.2857C2 25.2325 2.76751 26 3.71429 26H24.2857C25.2325 26 26 25.2325 26 24.2857V3.71431C26 2.76754 25.2325 2.00002 24.2857 2.00002L3.71431 2Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.85742 7.14288C8.85742 6.66949 9.24118 6.28574 9.71456 6.28574H14.8574C17.6977 6.28574 20.0003 8.58827 20.0003 11.4286C20.0003 14.2689 17.6977 16.5715 14.8574 16.5715H10.5717V20.8572C10.5717 21.3306 10.188 21.7143 9.71456 21.7143C9.24118 21.7143 8.85742 21.3306 8.85742 20.8572V7.14288ZM10.5717 8.00002H14.8574C16.751 8.00002 18.286 9.53505 18.286 11.4286C18.286 13.3221 16.751 14.8572 14.8574 14.8572H10.5717V8.00002Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path d="M24.2851 30C24.0316 30 23.9047 29.6935 24.0839 29.5143L29.5143 24.0839C29.6935 23.9047 30 24.0316 30 24.2851V29.6C30 29.8209 29.8209 30 29.6 30H24.2851Z" fill="#0A1C38" fill-opacity="0.9"/>
+</g>
+<defs>
+<clipPath id="clip0_11529_155503">
+<rect width="32" height="32" fill="white"/>
+</clipPath>
+</defs>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/editor/param_popup_disable.svg

@@ -0,0 +1,12 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_11570_135274)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.2857 3.71428H3.71431L3.71428 24.2857L24.2857 24.2857V3.71428ZM3.71431 2C2.76754 2 2.00003 2.76751 2.00003 3.71428L2 24.2857C2 25.2325 2.76751 26 3.71429 26H24.2857C25.2325 26 26 25.2325 26 24.2857V3.71431C26 2.76754 25.2325 2.00002 24.2857 2.00002L3.71431 2Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.85742 7.14288C8.85742 6.66949 9.24118 6.28574 9.71456 6.28574H14.8574C17.6977 6.28574 20.0003 8.58827 20.0003 11.4286C20.0003 14.2689 17.6977 16.5715 14.8574 16.5715H10.5717V20.8572C10.5717 21.3306 10.188 21.7143 9.71456 21.7143C9.24118 21.7143 8.85742 21.3306 8.85742 20.8572V7.14288ZM10.5717 8.00002H14.8574C16.751 8.00002 18.286 9.53505 18.286 11.4286C18.286 13.3221 16.751 14.8572 14.8574 14.8572H10.5717V8.00002Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path d="M24.2851 30C24.0316 30 23.9047 29.6935 24.0839 29.5143L29.5143 24.0839C29.6935 23.9047 30 24.0316 30 24.2851V29.6C30 29.8209 29.8209 30 29.6 30H24.2851Z" fill="#0A1C38" fill-opacity="0.29"/>
+</g>
+<defs>
+<clipPath id="clip0_11570_135274">
+<rect width="32" height="32" fill="white"/>
+</clipPath>
+</defs>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/editor/type_boolean_popup.svg

@@ -0,0 +1,12 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_11529_155461)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.2857 3.71429H3.71429V24.2857H24.2857V3.71429ZM3.71429 2C2.76751 2 2 2.76751 2 3.71429V24.2857C2 25.2325 2.76751 26 3.71429 26H24.2857C25.2325 26 26 25.2325 26 24.2857V3.71429C26 2.76751 25.2325 2 24.2857 2H3.71429Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.143 7.14284H15.7144V10.5714H12.2857C11.3389 10.5714 10.5714 11.3389 10.5714 12.2857V15.7143H7.143L7.143 7.14284ZM10.5714 17.4286H7.143C6.19622 17.4286 5.42871 16.661 5.42871 15.7143V7.14284C5.42871 6.19607 6.19622 5.42856 7.143 5.42856H15.7144C16.6612 5.42856 17.4287 6.19607 17.4287 7.14284V10.5714H20.8571C21.8039 10.5714 22.5714 11.3389 22.5714 12.2857V20.8571C22.5714 21.8039 21.8039 22.5714 20.8571 22.5714H12.2857C11.3389 22.5714 10.5714 21.8039 10.5714 20.8571V17.4286ZM17.4287 12.2857H20.8571V20.8571H12.2857V17.4286H15.7144C16.6612 17.4286 17.4287 16.661 17.4287 15.7143V12.2857ZM15.7144 12.2857V15.7143H12.2857V12.2857H15.7144Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path d="M24.2851 30C24.0316 30 23.9047 29.6935 24.0839 29.5143L29.5143 24.0839C29.6935 23.9047 30 24.0316 30 24.2851V29.6C30 29.8209 29.8209 30 29.6 30H24.2851Z" fill="#0A1C38" fill-opacity="0.9"/>
+</g>
+<defs>
+<clipPath id="clip0_11529_155461">
+<rect width="32" height="32" fill="white"/>
+</clipPath>
+</defs>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/editor/type_boolean_popup_disable.svg

@@ -0,0 +1,12 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_11570_135287)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.2857 3.71429H3.71429V24.2857H24.2857V3.71429ZM3.71429 2C2.76751 2 2 2.76751 2 3.71429V24.2857C2 25.2325 2.76751 26 3.71429 26H24.2857C25.2325 26 26 25.2325 26 24.2857V3.71429C26 2.76751 25.2325 2 24.2857 2H3.71429Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.143 7.14284H15.7144V10.5714H12.2857C11.3389 10.5714 10.5714 11.3389 10.5714 12.2857V15.7143H7.143L7.143 7.14284ZM10.5714 17.4286H7.143C6.19622 17.4286 5.42871 16.661 5.42871 15.7143V7.14284C5.42871 6.19607 6.19622 5.42856 7.143 5.42856H15.7144C16.6612 5.42856 17.4287 6.19607 17.4287 7.14284V10.5714H20.8571C21.8039 10.5714 22.5714 11.3389 22.5714 12.2857V20.8571C22.5714 21.8039 21.8039 22.5714 20.8571 22.5714H12.2857C11.3389 22.5714 10.5714 21.8039 10.5714 20.8571V17.4286ZM17.4287 12.2857H20.8571V20.8571H12.2857V17.4286H15.7144C16.6612 17.4286 17.4287 16.661 17.4287 15.7143V12.2857ZM15.7144 12.2857V15.7143H12.2857V12.2857H15.7144Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path d="M24.2851 30C24.0316 30 23.9047 29.6935 24.0839 29.5143L29.5143 24.0839C29.6935 23.9047 30 24.0316 30 24.2851V29.6C30 29.8209 29.8209 30 29.6 30H24.2851Z" fill="#0A1C38" fill-opacity="0.29"/>
+</g>
+<defs>
+<clipPath id="clip0_11570_135287">
+<rect width="32" height="32" fill="white"/>
+</clipPath>
+</defs>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/editor/type_double_popup.svg

@@ -0,0 +1,19 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_11529_155409)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.71428 24.2857L24.2857 24.2857L24.2857 3.71428L3.71428 3.71428L3.71428 24.2857ZM24.2857 26C25.2325 26 26 25.2325 26 24.2857L26 3.71428C26 2.76751 25.2325 2 24.2857 2L3.71428 2C2.76751 2 2 2.76751 2 3.71428L2 24.2857C2 25.2325 2.76751 26 3.71428 26L24.2857 26Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path d="M21.1561 12.6608C21.7823 12.6608 22.2814 12.8298 22.663 13.1679C22.9704 13.4422 23.1812 13.8277 23.3002 14.3243C23.3546 14.5513 23.1713 14.7567 22.938 14.7567C22.7461 14.7567 22.5873 14.615 22.5338 14.4307C22.4493 14.1392 22.3162 13.9098 22.1346 13.7426C21.8802 13.5172 21.5573 13.4158 21.1561 13.4158C20.6668 13.4158 20.2754 13.6299 19.9917 14.0581C19.7177 14.475 19.5163 15.0045 19.5163 15.7144C19.5163 16.4243 19.6435 16.9877 19.9175 17.3933C20.1817 17.799 20.5731 18.0131 21.082 18.0131C21.8418 18.0131 22.3197 17.6183 22.5023 16.8364C22.5462 16.6487 22.7049 16.5032 22.8977 16.5032C23.1312 16.5032 23.3113 16.7126 23.254 16.939C23.1186 17.4744 22.9001 17.9 22.5889 18.2046C22.2073 18.5765 21.7082 18.768 21.082 18.768C20.3187 18.768 19.7315 18.4751 19.3108 17.8891C18.9096 17.337 18.7139 16.6158 18.7139 15.7257C18.7139 14.8355 18.974 14.1482 19.3752 13.5848C19.8057 12.9651 20.4026 12.6608 21.1561 12.6608Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M22.8914 12.9112L22.8924 12.912C23.264 13.2437 23.5036 13.6974 23.6347 14.2444C23.7474 14.715 23.3643 15.0995 22.939 15.0995C22.5676 15.0995 22.2935 14.8293 22.2056 14.5262C22.135 14.2826 22.0308 14.113 21.9058 13.9969C21.7297 13.8421 21.496 13.7586 21.1572 13.7586C20.7884 13.7586 20.5021 13.9104 20.2789 14.2469C20.0393 14.6117 19.8602 15.0762 19.8602 15.7144C19.8602 16.3905 19.9826 16.8756 20.2027 17.2014L20.2059 17.2061L20.2058 17.2062C20.4054 17.5126 20.6876 17.6702 21.083 17.6702C21.4022 17.6702 21.6285 17.5884 21.791 17.4538C21.9555 17.3177 22.0902 17.0982 22.1695 16.7584C22.2439 16.44 22.5228 16.1603 22.8988 16.1603C23.3316 16.1603 23.7053 16.5572 23.5875 17.023C23.4416 17.5995 23.1989 18.0884 22.8298 18.4496L22.8293 18.4501C22.3746 18.8931 21.7853 19.1108 21.083 19.1108C20.2164 19.1108 19.5229 18.7702 19.0339 18.0898C18.5785 17.4626 18.3721 16.6641 18.3721 15.7256C18.3721 14.7624 18.6555 14.0065 19.0958 13.3875C19.5919 12.6745 20.2947 12.3179 21.1572 12.3179C21.848 12.3179 22.4341 12.5061 22.8914 12.9112ZM19.3762 13.5848C18.9751 14.1482 18.7149 14.8355 18.7149 15.7256C18.7149 16.6158 18.9107 17.3369 19.3118 17.8891C19.7326 18.475 20.3198 18.768 21.083 18.768C21.7093 18.768 22.2084 18.5764 22.59 18.2046C22.9012 17.9 23.1196 17.4743 23.2551 16.9389C23.3124 16.7125 23.1323 16.5031 22.8988 16.5031C22.706 16.5031 22.5473 16.6487 22.5034 16.8364C22.3208 17.6182 21.8428 18.013 21.083 18.013C20.5742 18.013 20.1828 17.7989 19.9186 17.3933C19.6446 16.9876 19.5173 16.4242 19.5173 15.7144C19.5173 15.0045 19.7187 14.4749 19.9927 14.058C20.2765 13.6298 20.6679 13.4157 21.1572 13.4157C21.5583 13.4157 21.8813 13.5172 22.1357 13.7425C22.3173 13.9098 22.4503 14.1392 22.5349 14.4307C22.5883 14.615 22.7472 14.7566 22.939 14.7566C23.1724 14.7566 23.3556 14.5512 23.3013 14.3243C23.1823 13.8276 22.9714 13.4421 22.6641 13.1678C22.2825 12.8298 21.7834 12.6608 21.1572 12.6608C20.4037 12.6608 19.8068 12.965 19.3762 13.5848Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path d="M16.081 12.6608C16.5564 12.6608 16.9454 12.8194 17.2551 13.1366C17.5576 13.4538 17.7161 13.8796 17.7161 14.3971C17.7161 14.9146 17.5432 15.3821 17.2119 15.7995C17.0318 16.0165 16.6789 16.342 16.1459 16.7594C15.4904 17.2686 15.1159 17.7277 15.0222 18.1284H17.4186C17.5869 18.1284 17.7233 18.2648 17.7233 18.4331C17.7233 18.6013 17.5869 18.7378 17.4186 18.7378H15.1519C14.6785 18.7378 14.2894 18.3437 14.4542 17.9C14.5377 17.675 14.6546 17.4541 14.8061 17.2603C15.0078 16.9931 15.3752 16.6342 15.9226 16.2001C16.3259 15.8662 16.5924 15.6242 16.7293 15.4572C16.9886 15.1317 17.1255 14.7727 17.1255 14.3887C17.1255 14.0215 17.0318 13.746 16.8445 13.5457C16.6573 13.3453 16.3908 13.2451 16.0594 13.2451C15.7065 13.2451 15.4328 13.3787 15.2455 13.6625C15.0831 13.8776 14.9814 14.1794 14.9442 14.5633C14.9285 14.7252 14.7979 14.8562 14.6353 14.8562C14.4711 14.8562 14.3364 14.7228 14.3495 14.5591C14.3922 14.0283 14.5521 13.5942 14.8205 13.2618C15.1375 12.8612 15.5624 12.6608 16.081 12.6608Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17.5034 12.9C17.8762 13.2909 18.0591 13.8061 18.0591 14.3971C18.0591 14.9977 17.8564 15.5392 17.4806 16.0126L17.476 16.0184C17.2717 16.2647 16.8949 16.6085 16.3574 17.0294L16.3564 17.0302C15.987 17.3171 15.7341 17.5697 15.5732 17.7855H17.4188C17.7764 17.7855 18.0663 18.0754 18.0663 18.4331C18.0663 18.7907 17.7764 19.0806 17.4188 19.0806H15.152C14.8232 19.0806 14.5117 18.9444 14.3068 18.7121C14.0951 18.4722 14.0026 18.1316 14.1329 17.7806C14.2267 17.5281 14.3592 17.2762 14.5344 17.0514C14.7617 16.7511 15.1536 16.3727 15.7069 15.9337C16.1096 15.6003 16.3497 15.3791 16.4628 15.2417C16.6793 14.9692 16.7828 14.6845 16.7828 14.3887C16.7828 14.0807 16.7057 13.8989 16.5943 13.7798L16.8447 13.5456C17.032 13.746 17.1256 14.0214 17.1256 14.3887C17.1256 14.7727 16.9888 15.1317 16.7295 15.4572C16.5926 15.6242 16.3261 15.8662 15.9228 16.2001C15.3753 16.6342 15.008 16.9931 14.8063 17.2602C14.6548 17.4541 14.5379 17.675 14.4543 17.9C14.2895 18.3437 14.6787 18.7377 15.152 18.7377H17.4188C17.5871 18.7377 17.7235 18.6013 17.7235 18.4331C17.7235 18.2648 17.5871 18.1284 17.4188 18.1284H15.0224C15.0481 18.0184 15.0949 17.9041 15.1629 17.7855C15.3427 17.472 15.6704 17.1289 16.146 16.7594C16.6791 16.342 17.032 16.0165 17.2121 15.7995C17.5434 15.3821 17.7163 14.9146 17.7163 14.3971C17.7163 13.8795 17.5578 13.4538 17.2553 13.1366C16.9456 12.8194 16.5566 12.6608 16.0812 12.6608C15.5626 12.6608 15.1376 12.8612 14.8207 13.2618C14.5523 13.5941 14.3923 14.0283 14.3497 14.5591C14.3365 14.7228 14.4712 14.8562 14.6355 14.8562C14.7981 14.8562 14.9287 14.7252 14.9444 14.5633C14.9816 14.1794 15.0833 13.8776 15.2457 13.6625C15.433 13.3787 15.7067 13.2451 16.0596 13.2451C16.3909 13.2451 16.6574 13.3453 16.8447 13.5456L16.5943 13.7798C16.4865 13.6645 16.3199 13.588 16.0596 13.588C15.8087 13.588 15.6487 13.6742 15.5319 13.8513L15.5259 13.8604L15.5193 13.8691C15.4076 14.017 15.3191 14.2506 15.2856 14.5964C15.2548 14.9152 14.9929 15.199 14.6355 15.199C14.2904 15.199 13.9773 14.9137 14.0079 14.5317C14.0548 13.9479 14.2331 13.4443 14.5529 13.0478C14.9369 12.563 15.4619 12.318 16.0812 12.318C16.6424 12.318 17.1219 12.5092 17.5006 12.8971L17.5034 12.9Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path d="M12.4643 17.3218C12.6216 17.3218 12.7692 17.3804 12.8872 17.4974C13.0052 17.6145 13.0643 17.7511 13.0643 17.9267C13.0643 18.0926 13.0052 18.2292 12.8872 18.3462C12.7692 18.4633 12.6216 18.5218 12.4643 18.5218C12.2872 18.5218 12.1495 18.4633 12.0413 18.3462C11.9233 18.2292 11.8643 18.0926 11.8643 17.9267C11.8643 17.7511 11.9233 17.6145 12.0413 17.4974C12.1495 17.3804 12.2872 17.3218 12.4643 17.3218Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.4636 17.0647C12.6884 17.0647 12.9011 17.1497 13.0676 17.3149C13.2342 17.4801 13.3207 17.6824 13.3207 17.9267C13.3207 18.1636 13.2325 18.3652 13.0676 18.5288C12.9011 18.694 12.6884 18.779 12.4636 18.779C12.2232 18.779 12.0162 18.6964 11.8556 18.5249C11.6932 18.362 11.6064 18.1617 11.6064 17.9267C11.6064 17.6843 11.6916 17.4833 11.8556 17.3188C12.0162 17.1473 12.2232 17.0647 12.4636 17.0647ZM12.0406 17.4975C11.9226 17.6145 11.8636 17.7511 11.8636 17.9267C11.8636 18.0926 11.9226 18.2292 12.0406 18.3462C12.1488 18.4633 12.2865 18.5218 12.4636 18.5218C12.621 18.5218 12.7685 18.4633 12.8865 18.3462C13.0046 18.2292 13.0636 18.0926 13.0636 17.9267C13.0636 17.7511 13.0046 17.6145 12.8865 17.4975C12.7685 17.3804 12.621 17.3218 12.4636 17.3218C12.2865 17.3218 12.1488 17.3804 12.0406 17.4975Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path d="M8.81357 8.2763C8.92746 8.1038 9.12036 8 9.32707 8C9.66689 8 9.94238 8.27548 9.94238 8.61531V14.8578H10.8944C11.156 14.8578 11.3681 15.0698 11.3681 15.3314C11.3681 15.5931 11.156 15.8051 10.8944 15.8051H9.94238V18.4185C9.94238 18.6832 9.72777 18.8978 9.46303 18.8978C9.1983 18.8978 8.98369 18.6832 8.98369 18.4185V15.8051H5.41947C4.95103 15.8051 4.57129 15.4254 4.57129 14.957C4.57129 14.7908 4.62009 14.6283 4.71163 14.4897L8.81357 8.2763ZM8.98369 9.51295C8.96067 9.51295 8.93919 9.52451 8.92651 9.54372L5.41936 14.8578H8.98369V9.51295Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.92659 9.54369C8.93927 9.52447 8.96076 9.51291 8.98378 9.51291V14.8577H5.41944L8.92659 9.54369ZM8.64092 10.599L6.05651 14.5149H8.64092V10.599ZM9.94246 14.8577V8.61527C9.94246 8.27544 9.66698 7.99996 9.32715 7.99996C9.12044 7.99996 8.92754 8.10376 8.81365 8.27627L4.71171 14.4896C4.62017 14.6283 4.57137 14.7908 4.57137 14.9569C4.57137 15.4254 4.95111 15.8051 5.41955 15.8051H8.98378V18.4184C8.98378 18.6832 9.19838 18.8978 9.46312 18.8978C9.72785 18.8978 9.94246 18.6832 9.94246 18.4184V15.8051H10.8945C11.1561 15.8051 11.3682 15.593 11.3682 15.3314C11.3682 15.0698 11.1561 14.8577 10.8945 14.8577H9.94246ZM10.2853 16.1479V18.4184C10.2853 18.8725 9.91721 19.2406 9.46312 19.2406C9.00903 19.2406 8.64092 18.8725 8.64092 18.4184V16.1479H5.41955C4.76176 16.1479 4.22852 15.6147 4.22852 14.9569C4.22852 14.7236 4.29704 14.4954 4.42558 14.3007L8.52753 8.08737C8.70487 7.81874 9.00526 7.6571 9.32715 7.6571C9.85633 7.6571 10.2853 8.08609 10.2853 8.61527V14.5149H10.8945C11.3455 14.5149 11.7111 14.8804 11.7111 15.3314C11.7111 15.7824 11.3455 16.1479 10.8945 16.1479H10.2853Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path d="M24.2851 30C24.0316 30 23.9047 29.6935 24.0839 29.5143L29.5143 24.0839C29.6935 23.9047 30 24.0316 30 24.2851V29.6C30 29.8209 29.8209 30 29.6 30H24.2851Z" fill="#0A1C38" fill-opacity="0.9"/>
+</g>
+<defs>
+<clipPath id="clip0_11529_155409">
+<rect width="32" height="32" fill="white"/>
+</clipPath>
+</defs>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/editor/type_double_popup_disable.svg

@@ -0,0 +1,19 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_11570_135337)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.71428 24.2857L24.2857 24.2857L24.2857 3.71428L3.71428 3.71428L3.71428 24.2857ZM24.2857 26C25.2325 26 26 25.2325 26 24.2857L26 3.71428C26 2.76751 25.2325 2 24.2857 2L3.71428 2C2.76751 2 2 2.76751 2 3.71428L2 24.2857C2 25.2325 2.76751 26 3.71428 26L24.2857 26Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path d="M21.1561 12.6608C21.7823 12.6608 22.2814 12.8298 22.663 13.1679C22.9704 13.4422 23.1812 13.8277 23.3002 14.3243C23.3546 14.5513 23.1713 14.7567 22.938 14.7567C22.7461 14.7567 22.5873 14.615 22.5338 14.4307C22.4493 14.1392 22.3162 13.9098 22.1346 13.7426C21.8802 13.5172 21.5573 13.4158 21.1561 13.4158C20.6668 13.4158 20.2754 13.6299 19.9917 14.0581C19.7177 14.475 19.5163 15.0045 19.5163 15.7144C19.5163 16.4243 19.6435 16.9877 19.9175 17.3933C20.1817 17.799 20.5731 18.0131 21.082 18.0131C21.8418 18.0131 22.3197 17.6183 22.5023 16.8364C22.5462 16.6487 22.7049 16.5032 22.8977 16.5032C23.1312 16.5032 23.3113 16.7126 23.254 16.939C23.1186 17.4744 22.9001 17.9 22.5889 18.2046C22.2073 18.5765 21.7082 18.768 21.082 18.768C20.3187 18.768 19.7315 18.4751 19.3108 17.8891C18.9096 17.337 18.7139 16.6158 18.7139 15.7257C18.7139 14.8355 18.974 14.1482 19.3752 13.5848C19.8057 12.9651 20.4026 12.6608 21.1561 12.6608Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M22.8914 12.9112L22.8924 12.912C23.264 13.2437 23.5036 13.6974 23.6347 14.2444C23.7474 14.715 23.3643 15.0995 22.939 15.0995C22.5676 15.0995 22.2935 14.8293 22.2056 14.5262C22.135 14.2826 22.0308 14.113 21.9058 13.9969C21.7297 13.8421 21.496 13.7586 21.1572 13.7586C20.7884 13.7586 20.5021 13.9104 20.2789 14.2469C20.0393 14.6117 19.8602 15.0762 19.8602 15.7144C19.8602 16.3905 19.9826 16.8756 20.2027 17.2014L20.2059 17.2061L20.2058 17.2062C20.4054 17.5126 20.6876 17.6702 21.083 17.6702C21.4022 17.6702 21.6285 17.5884 21.791 17.4538C21.9555 17.3177 22.0902 17.0982 22.1695 16.7584C22.2439 16.44 22.5228 16.1603 22.8988 16.1603C23.3316 16.1603 23.7053 16.5572 23.5875 17.023C23.4416 17.5995 23.1989 18.0884 22.8298 18.4496L22.8293 18.4501C22.3746 18.8931 21.7853 19.1108 21.083 19.1108C20.2164 19.1108 19.5229 18.7702 19.0339 18.0898C18.5785 17.4626 18.3721 16.6641 18.3721 15.7256C18.3721 14.7624 18.6555 14.0065 19.0958 13.3875C19.5919 12.6745 20.2947 12.3179 21.1572 12.3179C21.848 12.3179 22.4341 12.5061 22.8914 12.9112ZM19.3762 13.5848C18.9751 14.1482 18.7149 14.8355 18.7149 15.7256C18.7149 16.6158 18.9107 17.3369 19.3118 17.8891C19.7326 18.475 20.3198 18.768 21.083 18.768C21.7093 18.768 22.2084 18.5764 22.59 18.2046C22.9012 17.9 23.1196 17.4743 23.2551 16.9389C23.3124 16.7125 23.1323 16.5031 22.8988 16.5031C22.706 16.5031 22.5473 16.6487 22.5034 16.8364C22.3208 17.6182 21.8428 18.013 21.083 18.013C20.5742 18.013 20.1828 17.7989 19.9186 17.3933C19.6446 16.9876 19.5173 16.4242 19.5173 15.7144C19.5173 15.0045 19.7187 14.4749 19.9927 14.058C20.2765 13.6298 20.6679 13.4157 21.1572 13.4157C21.5583 13.4157 21.8813 13.5172 22.1357 13.7425C22.3173 13.9098 22.4503 14.1392 22.5349 14.4307C22.5883 14.615 22.7472 14.7566 22.939 14.7566C23.1724 14.7566 23.3556 14.5512 23.3013 14.3243C23.1823 13.8276 22.9714 13.4421 22.6641 13.1678C22.2825 12.8298 21.7834 12.6608 21.1572 12.6608C20.4037 12.6608 19.8068 12.965 19.3762 13.5848Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path d="M16.081 12.6608C16.5564 12.6608 16.9454 12.8194 17.2551 13.1366C17.5576 13.4538 17.7161 13.8796 17.7161 14.3971C17.7161 14.9146 17.5432 15.3821 17.2119 15.7995C17.0318 16.0165 16.6789 16.342 16.1459 16.7594C15.4904 17.2686 15.1159 17.7277 15.0222 18.1284H17.4186C17.5869 18.1284 17.7233 18.2648 17.7233 18.4331C17.7233 18.6013 17.5869 18.7378 17.4186 18.7378H15.1519C14.6785 18.7378 14.2894 18.3437 14.4542 17.9C14.5377 17.675 14.6546 17.4541 14.8061 17.2603C15.0078 16.9931 15.3752 16.6342 15.9226 16.2001C16.3259 15.8662 16.5924 15.6242 16.7293 15.4572C16.9886 15.1317 17.1255 14.7727 17.1255 14.3887C17.1255 14.0215 17.0318 13.746 16.8445 13.5457C16.6573 13.3453 16.3908 13.2451 16.0594 13.2451C15.7065 13.2451 15.4328 13.3787 15.2455 13.6625C15.0831 13.8776 14.9814 14.1794 14.9442 14.5633C14.9285 14.7252 14.7979 14.8562 14.6353 14.8562C14.4711 14.8562 14.3364 14.7228 14.3495 14.5591C14.3922 14.0283 14.5521 13.5942 14.8205 13.2618C15.1375 12.8612 15.5624 12.6608 16.081 12.6608Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17.5034 12.9C17.8762 13.2909 18.0591 13.8061 18.0591 14.3971C18.0591 14.9977 17.8564 15.5392 17.4806 16.0126L17.476 16.0184C17.2717 16.2647 16.8949 16.6085 16.3574 17.0294L16.3564 17.0302C15.987 17.3171 15.7341 17.5697 15.5732 17.7855H17.4188C17.7764 17.7855 18.0663 18.0754 18.0663 18.4331C18.0663 18.7907 17.7764 19.0806 17.4188 19.0806H15.152C14.8232 19.0806 14.5117 18.9444 14.3068 18.7121C14.0951 18.4722 14.0026 18.1316 14.1329 17.7806C14.2267 17.5281 14.3592 17.2762 14.5344 17.0514C14.7617 16.7511 15.1536 16.3727 15.7069 15.9337C16.1096 15.6003 16.3497 15.3791 16.4628 15.2417C16.6793 14.9692 16.7828 14.6845 16.7828 14.3887C16.7828 14.0807 16.7057 13.8989 16.5943 13.7798L16.8447 13.5456C17.032 13.746 17.1256 14.0214 17.1256 14.3887C17.1256 14.7727 16.9888 15.1317 16.7295 15.4572C16.5926 15.6242 16.3261 15.8662 15.9228 16.2001C15.3753 16.6342 15.008 16.9931 14.8063 17.2602C14.6548 17.4541 14.5379 17.675 14.4543 17.9C14.2895 18.3437 14.6787 18.7377 15.152 18.7377H17.4188C17.5871 18.7377 17.7235 18.6013 17.7235 18.4331C17.7235 18.2648 17.5871 18.1284 17.4188 18.1284H15.0224C15.0481 18.0184 15.0949 17.9041 15.1629 17.7855C15.3427 17.472 15.6704 17.1289 16.146 16.7594C16.6791 16.342 17.032 16.0165 17.2121 15.7995C17.5434 15.3821 17.7163 14.9146 17.7163 14.3971C17.7163 13.8795 17.5578 13.4538 17.2553 13.1366C16.9456 12.8194 16.5566 12.6608 16.0812 12.6608C15.5626 12.6608 15.1376 12.8612 14.8207 13.2618C14.5523 13.5941 14.3923 14.0283 14.3497 14.5591C14.3365 14.7228 14.4712 14.8562 14.6355 14.8562C14.7981 14.8562 14.9287 14.7252 14.9444 14.5633C14.9816 14.1794 15.0833 13.8776 15.2457 13.6625C15.433 13.3787 15.7067 13.2451 16.0596 13.2451C16.3909 13.2451 16.6574 13.3453 16.8447 13.5456L16.5943 13.7798C16.4865 13.6645 16.3199 13.588 16.0596 13.588C15.8087 13.588 15.6487 13.6742 15.5319 13.8513L15.5259 13.8604L15.5193 13.8691C15.4076 14.017 15.3191 14.2506 15.2856 14.5964C15.2548 14.9152 14.9929 15.199 14.6355 15.199C14.2904 15.199 13.9773 14.9137 14.0079 14.5317C14.0548 13.9479 14.2331 13.4443 14.5529 13.0478C14.9369 12.563 15.4619 12.318 16.0812 12.318C16.6424 12.318 17.1219 12.5092 17.5006 12.8971L17.5034 12.9Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path d="M12.4643 17.3218C12.6216 17.3218 12.7692 17.3804 12.8872 17.4974C13.0052 17.6145 13.0643 17.7511 13.0643 17.9267C13.0643 18.0926 13.0052 18.2292 12.8872 18.3462C12.7692 18.4633 12.6216 18.5218 12.4643 18.5218C12.2872 18.5218 12.1495 18.4633 12.0413 18.3462C11.9233 18.2292 11.8643 18.0926 11.8643 17.9267C11.8643 17.7511 11.9233 17.6145 12.0413 17.4974C12.1495 17.3804 12.2872 17.3218 12.4643 17.3218Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.4636 17.0647C12.6884 17.0647 12.9011 17.1497 13.0676 17.3149C13.2342 17.4801 13.3207 17.6824 13.3207 17.9267C13.3207 18.1636 13.2325 18.3652 13.0676 18.5288C12.9011 18.694 12.6884 18.779 12.4636 18.779C12.2232 18.779 12.0162 18.6964 11.8556 18.5249C11.6932 18.362 11.6064 18.1617 11.6064 17.9267C11.6064 17.6843 11.6916 17.4833 11.8556 17.3188C12.0162 17.1473 12.2232 17.0647 12.4636 17.0647ZM12.0406 17.4975C11.9226 17.6145 11.8636 17.7511 11.8636 17.9267C11.8636 18.0926 11.9226 18.2292 12.0406 18.3462C12.1488 18.4633 12.2865 18.5218 12.4636 18.5218C12.621 18.5218 12.7685 18.4633 12.8865 18.3462C13.0046 18.2292 13.0636 18.0926 13.0636 17.9267C13.0636 17.7511 13.0046 17.6145 12.8865 17.4975C12.7685 17.3804 12.621 17.3218 12.4636 17.3218C12.2865 17.3218 12.1488 17.3804 12.0406 17.4975Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path d="M8.81357 8.2763C8.92746 8.1038 9.12036 8 9.32707 8C9.66689 8 9.94238 8.27548 9.94238 8.61531V14.8578H10.8944C11.156 14.8578 11.3681 15.0698 11.3681 15.3314C11.3681 15.5931 11.156 15.8051 10.8944 15.8051H9.94238V18.4185C9.94238 18.6832 9.72777 18.8978 9.46303 18.8978C9.1983 18.8978 8.98369 18.6832 8.98369 18.4185V15.8051H5.41947C4.95103 15.8051 4.57129 15.4254 4.57129 14.957C4.57129 14.7908 4.62009 14.6283 4.71163 14.4897L8.81357 8.2763ZM8.98369 9.51295C8.96067 9.51295 8.93919 9.52451 8.92651 9.54372L5.41936 14.8578H8.98369V9.51295Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.92659 9.54369C8.93927 9.52447 8.96076 9.51291 8.98378 9.51291V14.8577H5.41944L8.92659 9.54369ZM8.64092 10.599L6.05651 14.5149H8.64092V10.599ZM9.94246 14.8577V8.61527C9.94246 8.27544 9.66698 7.99996 9.32715 7.99996C9.12044 7.99996 8.92754 8.10376 8.81365 8.27627L4.71171 14.4896C4.62017 14.6283 4.57137 14.7908 4.57137 14.9569C4.57137 15.4254 4.95111 15.8051 5.41955 15.8051H8.98378V18.4184C8.98378 18.6832 9.19838 18.8978 9.46312 18.8978C9.72785 18.8978 9.94246 18.6832 9.94246 18.4184V15.8051H10.8945C11.1561 15.8051 11.3682 15.593 11.3682 15.3314C11.3682 15.0698 11.1561 14.8577 10.8945 14.8577H9.94246ZM10.2853 16.1479V18.4184C10.2853 18.8725 9.91721 19.2406 9.46312 19.2406C9.00903 19.2406 8.64092 18.8725 8.64092 18.4184V16.1479H5.41955C4.76176 16.1479 4.22852 15.6147 4.22852 14.9569C4.22852 14.7236 4.29704 14.4954 4.42558 14.3007L8.52753 8.08737C8.70487 7.81874 9.00526 7.6571 9.32715 7.6571C9.85633 7.6571 10.2853 8.08609 10.2853 8.61527V14.5149H10.8945C11.3455 14.5149 11.7111 14.8804 11.7111 15.3314C11.7111 15.7824 11.3455 16.1479 10.8945 16.1479H10.2853Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path d="M24.2851 30C24.0316 30 23.9047 29.6935 24.0839 29.5143L29.5143 24.0839C29.6935 23.9047 30 24.0316 30 24.2851V29.6C30 29.8209 29.8209 30 29.6 30H24.2851Z" fill="#0A1C38" fill-opacity="0.29"/>
+</g>
+<defs>
+<clipPath id="clip0_11570_135337">
+<rect width="32" height="32" fill="white"/>
+</clipPath>
+</defs>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/svgFile.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="M7 28V4H23L29 10.5V28H7Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M29 28V10.7515L23.0925 4H7L7 28H29ZM7 2C5.89543 2 5 2.89543 5 4V28C5 29.1046 5.89543 30 7 30H29C30.1046 30 31 29.1046 31 28V10.7515C31 10.267 30.8242 9.79904 30.5052 9.43446L24.5976 2.68299C24.2178 2.24896 23.6692 2 23.0925 2H7Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path d="M2 11C2 9.89543 2.93436 9 4.08696 9H23.913C25.0656 9 26 9.89543 26 11V20C26 21.1046 25.0656 22 23.913 22H4.08696C2.93436 22 2 21.1046 2 20V11Z" fill="#F45D5B"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24 10.6H3C2.77909 10.6 2.6 10.7791 2.6 11V20C2.6 20.2209 2.77909 20.4 3 20.4H24C24.2209 20.4 24.4 20.2209 24.4 20V11C24.4 10.7791 24.2209 10.6 24 10.6ZM3 9C1.89543 9 1 9.89543 1 11V20C1 21.1046 1.89543 22 3 22H24C25.1046 22 26 21.1046 26 20V11C26 9.89543 25.1046 9 24 9H3Z" fill="#C8232C"/>
+<path d="M22.6436 14.269C22.3535 14.269 22.1099 14.0708 21.9528 13.8268C21.9441 13.8133 21.9352 13.7998 21.926 13.7866C21.8307 13.6424 21.7153 13.5193 21.58 13.4173C21.447 13.3153 21.2939 13.2388 21.1209 13.1877C20.9479 13.1345 20.7594 13.1079 20.5553 13.1079C20.1894 13.1079 19.8633 13.1999 19.5772 13.384C19.2911 13.5681 19.0659 13.8387 18.9018 14.1958C18.7399 14.5507 18.6589 14.9832 18.6589 15.4933C18.6589 16.0079 18.7399 16.4438 18.9018 16.8009C19.0637 17.158 19.2889 17.4297 19.5772 17.616C19.8655 17.8001 20.2004 17.8921 20.5819 17.8921C20.928 17.8921 21.2274 17.8256 21.4802 17.6925C21.7353 17.5594 21.9316 17.3709 22.0691 17.1269C22.2066 16.8807 22.2754 16.5924 22.2754 16.2619L22.5549 16.3051H21.1875C20.921 16.3051 20.705 16.0891 20.705 15.8227C20.705 15.5563 20.921 15.3403 21.1875 15.3403H22.6513C23.1033 15.3403 23.4698 15.7067 23.4698 16.1587C23.4698 16.7421 23.3456 17.2467 23.0972 17.6725C22.8487 18.0984 22.5072 18.4266 22.0724 18.6573C21.6377 18.8858 21.1387 19 20.5753 19C19.9476 19 19.3964 18.8592 18.9218 18.5775C18.4493 18.2936 18.08 17.891 17.8139 17.3698C17.5499 16.8463 17.418 16.2253 17.418 15.5067C17.418 14.9566 17.4956 14.4653 17.6509 14.0328C17.8083 13.6003 18.0279 13.2332 18.3096 12.9316C18.5913 12.6277 18.9218 12.397 19.301 12.2395C19.6803 12.0798 20.0929 12 20.5387 12C20.9158 12 21.2673 12.0555 21.5933 12.1663C21.9194 12.275 22.2088 12.4303 22.4617 12.6321C22.7168 12.834 22.9264 13.0735 23.0905 13.3508C23.1262 13.411 23.1592 13.4726 23.1895 13.5356C23.3652 13.9004 23.0485 14.269 22.6436 14.269Z" fill="white"/>
+<path d="M11.2049 12C11.486 12 11.7354 12.1802 11.8236 12.4471L13.4976 17.5098H13.5693L15.2397 12.4483C15.328 12.1807 15.578 12 15.8598 12C16.3101 12 16.6253 12.4452 16.4755 12.87L14.5746 18.262C14.4187 18.7042 14.0008 19 13.5319 19C13.0628 19 12.6448 18.704 12.489 18.2615L10.5903 12.868C10.441 12.4441 10.7555 12 11.2049 12Z" fill="white"/>
+<path d="M8.49982 13.9635C8.18346 13.9635 7.94038 13.6984 7.73773 13.4555C7.68532 13.3927 7.62324 13.3361 7.55149 13.2857C7.32337 13.124 7.02658 13.0432 6.66113 13.0432C6.40421 13.0432 6.18383 13.0819 6 13.1595C5.81617 13.237 5.67553 13.3422 5.57807 13.4751C5.48062 13.608 5.43079 13.7597 5.42857 13.9302C5.42857 14.072 5.46069 14.1949 5.52492 14.299C5.59136 14.4031 5.68106 14.4917 5.79402 14.5648C5.90698 14.6357 6.03211 14.6955 6.16944 14.7442C6.30676 14.7929 6.44518 14.8339 6.58472 14.8671L7.22259 15.0266C7.47951 15.0864 7.72647 15.1672 7.96345 15.2691C8.20266 15.371 8.41639 15.4994 8.60465 15.6545C8.79513 15.8095 8.94574 15.9967 9.05648 16.2159C9.16722 16.4352 9.22259 16.6921 9.22259 16.9867C9.22259 17.3854 9.12071 17.7364 8.91694 18.0399C8.71318 18.3411 8.4186 18.577 8.03322 18.7475C7.65005 18.9158 7.18605 19 6.6412 19C6.11185 19 5.65227 18.9181 5.26246 18.7542C4.87486 18.5903 4.57143 18.3511 4.35216 18.0365C4.24448 17.8805 4.16132 17.7076 4.1027 17.5177C3.9995 17.1836 4.29103 16.887 4.64081 16.887C4.96328 16.887 5.20592 17.1587 5.39028 17.4233C5.40344 17.4422 5.41731 17.4606 5.43189 17.4784C5.56035 17.6357 5.72757 17.753 5.93355 17.8306C6.14175 17.9081 6.37431 17.9468 6.63123 17.9468C6.89922 17.9468 7.134 17.907 7.33555 17.8272C7.53931 17.7453 7.69878 17.6323 7.81395 17.4884C7.92912 17.3422 7.98782 17.1716 7.99003 16.9767C7.98782 16.7996 7.93577 16.6534 7.83389 16.5382C7.732 16.4208 7.58915 16.3234 7.40532 16.2458C7.2237 16.1661 7.01107 16.0952 6.76744 16.0332L5.99336 15.8339C5.433 15.6899 4.99003 15.4718 4.66445 15.1794C4.34109 14.8848 4.1794 14.4939 4.1794 14.0066C4.1794 13.6058 4.28793 13.2547 4.50498 12.9535C4.72425 12.6523 5.02215 12.4186 5.39867 12.2525C5.77519 12.0842 6.20155 12 6.67774 12C7.16058 12 7.58361 12.0842 7.94684 12.2525C8.31229 12.4186 8.59911 12.6501 8.80731 12.9468C8.89584 13.0721 8.96614 13.2054 9.01823 13.3466C9.13792 13.6713 8.84584 13.9635 8.49982 13.9635Z" fill="white"/>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/filetree/filetype/svgFile_disable.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="M7 28V4H23L29 10.5V28H7Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.00645 11.0941H24.0064C24.2274 11.0941 24.4064 11.2732 24.4064 11.4941V20.4941C24.4064 20.715 24.2274 20.8941 24.0064 20.8941H3.00644C2.78553 20.8941 2.60645 20.715 2.60645 20.4941V11.4941C2.60645 11.2732 2.78553 11.0941 3.00645 11.0941Z" fill="#0A1C38" fill-opacity="0.2"/>
+<path d="M22.6436 14.769C22.3535 14.769 22.1099 14.5708 21.9528 14.3268C21.9441 14.3133 21.9352 14.2998 21.926 14.2866C21.8307 14.1424 21.7153 14.0193 21.58 13.9173C21.447 13.8153 21.2939 13.7388 21.1209 13.6877C20.9479 13.6345 20.7594 13.6079 20.5553 13.6079C20.1894 13.6079 19.8633 13.6999 19.5772 13.884C19.2911 14.0681 19.0659 14.3387 18.9018 14.6958C18.7399 15.0507 18.6589 15.4832 18.6589 15.9933C18.6589 16.5079 18.7399 16.9438 18.9018 17.3009C19.0637 17.658 19.2889 17.9297 19.5772 18.116C19.8655 18.3001 20.2004 18.3921 20.5819 18.3921C20.928 18.3921 21.2274 18.3256 21.4802 18.1925C21.7353 18.0594 21.9316 17.8709 22.0691 17.6269C22.2066 17.3807 22.2754 17.0924 22.2754 16.7619L22.5549 16.8051H21.1875C20.921 16.8051 20.705 16.5891 20.705 16.3227C20.705 16.0563 20.921 15.8403 21.1875 15.8403H22.6513C23.1033 15.8403 23.4698 16.2067 23.4698 16.6587C23.4698 17.2421 23.3456 17.7467 23.0972 18.1725C22.8487 18.5984 22.5072 18.9266 22.0724 19.1573C21.6377 19.3858 21.1387 19.5 20.5753 19.5C19.9476 19.5 19.3964 19.3592 18.9218 19.0775C18.4493 18.7936 18.08 18.391 17.8139 17.8698C17.5499 17.3463 17.418 16.7253 17.418 16.0067C17.418 15.4566 17.4956 14.9653 17.6509 14.5328C17.8083 14.1003 18.0279 13.7332 18.3096 13.4316C18.5913 13.1277 18.9218 12.897 19.301 12.7395C19.6803 12.5798 20.0929 12.5 20.5387 12.5C20.9158 12.5 21.2673 12.5555 21.5933 12.6663C21.9194 12.775 22.2088 12.9303 22.4617 13.1321C22.7168 13.334 22.9264 13.5735 23.0905 13.8508C23.1262 13.911 23.1592 13.9726 23.1895 14.0356C23.3652 14.4004 23.0485 14.769 22.6436 14.769Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path d="M11.2049 12.5C11.486 12.5 11.7354 12.6802 11.8236 12.9471L13.4976 18.0098H13.5693L15.2397 12.9483C15.328 12.6807 15.578 12.5 15.8598 12.5C16.3101 12.5 16.6253 12.9452 16.4755 13.37L14.5746 18.762C14.4187 19.2042 14.0008 19.5 13.5319 19.5C13.0628 19.5 12.6448 19.204 12.489 18.7615L10.5903 13.368C10.441 12.9441 10.7555 12.5 11.2049 12.5Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path d="M8.49982 14.4635C8.18346 14.4635 7.94038 14.1984 7.73773 13.9555C7.68532 13.8927 7.62324 13.8361 7.55149 13.7857C7.32337 13.624 7.02658 13.5432 6.66113 13.5432C6.40421 13.5432 6.18383 13.5819 6 13.6595C5.81617 13.737 5.67553 13.8422 5.57807 13.9751C5.48062 14.108 5.43079 14.2597 5.42857 14.4302C5.42857 14.572 5.46069 14.6949 5.52492 14.799C5.59136 14.9031 5.68106 14.9917 5.79402 15.0648C5.90698 15.1357 6.03211 15.1955 6.16944 15.2442C6.30676 15.2929 6.44518 15.3339 6.58472 15.3671L7.22259 15.5266C7.47951 15.5864 7.72647 15.6672 7.96345 15.7691C8.20266 15.871 8.41639 15.9994 8.60465 16.1545C8.79513 16.3095 8.94574 16.4967 9.05648 16.7159C9.16722 16.9352 9.22259 17.1921 9.22259 17.4867C9.22259 17.8854 9.12071 18.2364 8.91694 18.5399C8.71318 18.8411 8.4186 19.077 8.03322 19.2475C7.65005 19.4158 7.18605 19.5 6.6412 19.5C6.11185 19.5 5.65227 19.4181 5.26246 19.2542C4.87486 19.0903 4.57143 18.8511 4.35216 18.5365C4.24448 18.3805 4.16132 18.2076 4.1027 18.0177C3.9995 17.6836 4.29103 17.387 4.64081 17.387C4.96328 17.387 5.20592 17.6587 5.39028 17.9233C5.40344 17.9422 5.41731 17.9606 5.43189 17.9784C5.56035 18.1357 5.72757 18.253 5.93355 18.3306C6.14175 18.4081 6.37431 18.4468 6.63123 18.4468C6.89922 18.4468 7.134 18.407 7.33555 18.3272C7.53931 18.2453 7.69878 18.1323 7.81395 17.9884C7.92912 17.8422 7.98782 17.6716 7.99003 17.4767C7.98782 17.2996 7.93577 17.1534 7.83389 17.0382C7.732 16.9208 7.58915 16.8234 7.40532 16.7458C7.2237 16.6661 7.01107 16.5952 6.76744 16.5332L5.99336 16.3339C5.433 16.1899 4.99003 15.9718 4.66445 15.6794C4.34109 15.3848 4.1794 14.9939 4.1794 14.5066C4.1794 14.1058 4.28793 13.7547 4.50498 13.4535C4.72425 13.1523 5.02215 12.9186 5.39867 12.7525C5.77519 12.5842 6.20155 12.5 6.67774 12.5C7.16058 12.5 7.58361 12.5842 7.94684 12.7525C8.31229 12.9186 8.59911 13.1501 8.80731 13.4468C8.89584 13.5721 8.96614 13.7054 9.01823 13.8466C9.13792 14.1713 8.84584 14.4635 8.49982 14.4635Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M29 10.7515V28H7V22.5H5V28C5 29.1046 5.89543 30 7 30H29C30.1046 30 31 29.1046 31 28V10.7515C31 10.267 30.8242 9.79904 30.5052 9.43446L24.5976 2.68299C24.2178 2.24896 23.6692 2 23.0925 2H7C5.89543 2 5 2.89543 5 4V9.5H7V4H23.0925L29 10.7515Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24 11.1H3C2.77909 11.1 2.6 11.2791 2.6 11.5V20.5C2.6 20.7209 2.77909 20.9 3 20.9H24C24.2209 20.9 24.4 20.7209 24.4 20.5V11.5C24.4 11.2791 24.2209 11.1 24 11.1ZM3 9.5C1.89543 9.5 1 10.3954 1 11.5V20.5C1 21.6046 1.89543 22.5 3 22.5H24C25.1046 22.5 26 21.6046 26 20.5V11.5C26 10.3954 25.1046 9.5 24 9.5H3Z" fill="#0A1C38" fill-opacity="0.29"/>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/insert/formula_popup.svg

@@ -0,0 +1,12 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_11529_155502)">
+<path d="M14.2399 3.0127C11.3828 1.79847 8.15486 3.64164 7.7485 6.71934L7.28309 10.2442H2.83375C2.27445 10.2442 1.82104 10.6976 1.82104 11.2569C1.82104 11.8162 2.27445 12.2696 2.83375 12.2696H7.01566L5.78648 21.579C5.5299 23.5222 3.87319 24.9746 1.9131 24.9746C1.3538 24.9746 0.900391 25.428 0.900391 25.9873C0.900391 26.5466 1.3538 27 1.9131 27C4.88932 27 7.40489 24.7948 7.79448 21.8441L9.05866 12.2696H13.4212C13.9805 12.2696 14.4339 11.8162 14.4339 11.2569C14.4339 10.6976 13.9805 10.2442 13.4212 10.2442H9.32609L9.7565 6.98447C9.98757 5.2344 11.8231 4.18632 13.4477 4.87677L14.4061 5.28408C14.9208 5.50284 15.5155 5.2629 15.7342 4.74815C15.953 4.2334 15.713 3.63877 15.1983 3.42001L14.2399 3.0127Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path d="M14.7101 14.0189C14.7101 13.4595 15.1635 13.0061 15.7228 13.0061C17.2209 13.0061 18.6091 13.7921 19.3799 15.0767L20.3056 16.6196L22.0242 14.71C23.0003 13.6254 24.3908 13.0061 25.85 13.0061C26.4093 13.0061 26.8627 13.4595 26.8627 14.0189C26.8627 14.5782 26.4093 15.0316 25.85 15.0316C24.965 15.0316 24.1217 15.4072 23.5297 16.0649L21.3955 18.4362L23.0091 21.1254C23.4138 21.7999 24.1427 22.2126 24.9293 22.2126C25.4886 22.2126 25.942 22.666 25.942 23.2253C25.942 23.7846 25.4886 24.2381 24.9293 24.2381C23.4313 24.2381 22.043 23.4521 21.2723 22.1675L19.9783 20.0109L17.7073 22.5342C16.7312 23.6187 15.3407 24.2381 13.8815 24.2381C13.3222 24.2381 12.8688 23.7846 12.8688 23.2253C12.8688 22.666 13.3222 22.2126 13.8815 22.2126C14.7665 22.2126 15.6099 21.837 16.2019 21.1792L18.8883 18.1942L17.6431 16.1188C17.2384 15.4443 16.5094 15.0316 15.7228 15.0316C15.1635 15.0316 14.7101 14.5782 14.7101 14.0189Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path d="M24.2851 30C24.0316 30 23.9047 29.6935 24.0839 29.5143L29.5143 24.0839C29.6935 23.9047 30 24.0316 30 24.2851V29.6C30 29.8209 29.8209 30 29.6 30H24.2851Z" fill="#0A1C38" fill-opacity="0.9"/>
+</g>
+<defs>
+<clipPath id="clip0_11529_155502">
+<rect width="32" height="32" fill="white"/>
+</clipPath>
+</defs>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/insert/formula_popup_disable.svg

@@ -0,0 +1,12 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_11570_135279)">
+<path d="M14.2399 3.0127C11.3828 1.79847 8.15486 3.64164 7.7485 6.71934L7.28309 10.2442H2.83375C2.27445 10.2442 1.82104 10.6976 1.82104 11.2569C1.82104 11.8162 2.27445 12.2696 2.83375 12.2696H7.01566L5.78648 21.579C5.5299 23.5222 3.87319 24.9746 1.9131 24.9746C1.3538 24.9746 0.900391 25.428 0.900391 25.9873C0.900391 26.5466 1.3538 27 1.9131 27C4.88932 27 7.40489 24.7948 7.79448 21.8441L9.05866 12.2696H13.4212C13.9805 12.2696 14.4339 11.8162 14.4339 11.2569C14.4339 10.6976 13.9805 10.2442 13.4212 10.2442H9.32609L9.7565 6.98447C9.98757 5.2344 11.8231 4.18632 13.4477 4.87677L14.4061 5.28408C14.9208 5.50284 15.5155 5.2629 15.7342 4.74815C15.953 4.2334 15.713 3.63877 15.1983 3.42001L14.2399 3.0127Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path d="M14.7101 14.0189C14.7101 13.4595 15.1635 13.0061 15.7228 13.0061C17.2209 13.0061 18.6091 13.7921 19.3799 15.0767L20.3056 16.6196L22.0242 14.71C23.0003 13.6254 24.3908 13.0061 25.85 13.0061C26.4093 13.0061 26.8627 13.4595 26.8627 14.0189C26.8627 14.5782 26.4093 15.0316 25.85 15.0316C24.965 15.0316 24.1217 15.4072 23.5297 16.0649L21.3955 18.4362L23.0091 21.1254C23.4138 21.7999 24.1427 22.2126 24.9293 22.2126C25.4886 22.2126 25.942 22.666 25.942 23.2253C25.942 23.7846 25.4886 24.2381 24.9293 24.2381C23.4313 24.2381 22.043 23.4521 21.2723 22.1675L19.9783 20.0109L17.7073 22.5342C16.7312 23.6187 15.3407 24.2381 13.8815 24.2381C13.3222 24.2381 12.8688 23.7846 12.8688 23.2253C12.8688 22.666 13.3222 22.2126 13.8815 22.2126C14.7665 22.2126 15.6099 21.837 16.2019 21.1792L18.8883 18.1942L17.6431 16.1188C17.2384 15.4443 16.5094 15.0316 15.7228 15.0316C15.1635 15.0316 14.7101 14.5782 14.7101 14.0189Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path d="M24.2851 30C24.0316 30 23.9047 29.6935 24.0839 29.5143L29.5143 24.0839C29.6935 23.9047 30 24.0316 30 24.2851V29.6C30 29.8209 29.8209 30 29.6 30H24.2851Z" fill="#0A1C38" fill-opacity="0.29"/>
+</g>
+<defs>
+<clipPath id="clip0_11570_135279">
+<rect width="32" height="32" fill="white"/>
+</clipPath>
+</defs>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/propertiestab/floatelement_popup.svg

@@ -0,0 +1,18 @@
+<svg width="48" height="32" viewBox="0 0 48 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_11570_134818)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3 3V8H8V3H3ZM3 1C1.89543 1 1 1.89543 1 3V8C1 9.10457 1.89543 10 3 10H8C9.10457 10 10 9.10457 10 8V3C10 1.89543 9.10457 1 8 1H3Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M22 3V8H27V3H22ZM22 1C20.8954 1 20 1.89543 20 3V8C20 9.10457 20.8954 10 22 10H27C28.1046 10 29 9.10457 29 8V3C29 1.89543 28.1046 1 27 1H22Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3 22V27H8V22H3ZM3 20C1.89543 20 1 20.8954 1 22V27C1 28.1046 1.89543 29 3 29H8C9.10457 29 10 28.1046 10 27V22C10 20.8954 9.10457 20 8 20H3Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M22 22V27H27V22H22ZM22 20C20.8954 20 20 20.8954 20 22V27C20 28.1046 20.8954 29 22 29H27C28.1046 29 29 28.1046 29 27V22C29 20.8954 28.1046 20 27 20H22Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path d="M10 4.5H20V6.5H10V4.5Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path d="M4.5 10H6.5V20H4.5V10Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path d="M23.5 10H25.5V20H23.5V10Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path d="M10 23.5H20V25.5H10V23.5Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path d="M37.3912 13.3055L44.6077 13.3055C44.9198 13.3055 45.0953 13.6644 44.9037 13.9107L41.2955 18.5499C41.1453 18.7429 40.8536 18.7429 40.7034 18.5499L37.0952 13.9107C36.9036 13.6644 37.0791 13.3055 37.3912 13.3055Z" fill="#0A1C38" fill-opacity="0.66"/>
+</g>
+<defs>
+<clipPath id="clip0_11570_134818">
+<rect width="48" height="32" fill="white"/>
+</clipPath>
+</defs>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/propertiestab/floatelement_popup_disable.svg

@@ -0,0 +1,18 @@
+<svg width="48" height="32" viewBox="0 0 48 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_11570_135407)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3 3V8H8V3H3ZM3 1C1.89543 1 1 1.89543 1 3V8C1 9.10457 1.89543 10 3 10H8C9.10457 10 10 9.10457 10 8V3C10 1.89543 9.10457 1 8 1H3Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M22 3V8H27V3H22ZM22 1C20.8954 1 20 1.89543 20 3V8C20 9.10457 20.8954 10 22 10H27C28.1046 10 29 9.10457 29 8V3C29 1.89543 28.1046 1 27 1H22Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3 22V27H8V22H3ZM3 20C1.89543 20 1 20.8954 1 22V27C1 28.1046 1.89543 29 3 29H8C9.10457 29 10 28.1046 10 27V22C10 20.8954 9.10457 20 8 20H3Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M22 22V27H27V22H22ZM22 20C20.8954 20 20 20.8954 20 22V27C20 28.1046 20.8954 29 22 29H27C28.1046 29 29 28.1046 29 27V22C29 20.8954 28.1046 20 27 20H22Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path d="M10 4.5H20V6.5H10V4.5Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path d="M4.5 10H6.5V20H4.5V10Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path d="M23.5 10H25.5V20H23.5V10Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path d="M10 23.5H20V25.5H10V23.5Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path d="M37.3912 13.3055L44.6077 13.3055C44.9198 13.3055 45.0953 13.6644 44.9037 13.9107L41.2955 18.5499C41.1453 18.7429 40.8536 18.7429 40.7034 18.5499L37.0952 13.9107C36.9036 13.6644 37.0791 13.3055 37.3912 13.3055Z" fill="#0A1C38" fill-opacity="0.29"/>
+</g>
+<defs>
+<clipPath id="clip0_11570_135407">
+<rect width="48" height="32" fill="white"/>
+</clipPath>
+</defs>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/saveFile.svg

@@ -0,0 +1,3 @@
+<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="M28.5 28V9.46837C28.5 9.34773 28.4564 9.23115 28.3772 9.14014L23.6185 3.67177C23.5236 3.56265 23.386 3.5 23.2414 3.5H20V10.6C20 11.3732 19.3732 12 18.6 12H9.4C8.6268 12 8 11.3732 8 10.6V3.5H4C3.72386 3.5 3.5 3.72386 3.5 4V28C3.5 28.2761 3.72386 28.5 4 28.5H8V19.4C8 18.6268 8.6268 18 9.4 18H22.6C23.3732 18 24 18.6268 24 19.4V28.5H28C28.2761 28.5 28.5 28.2761 28.5 28ZM24 30H8H4C2.89543 30 2 29.1046 2 28V4C2 2.89543 2.89543 2 4 2H8H20H23.2414C23.82 2 24.3702 2.2506 24.7501 2.68709L29.5087 8.15546C29.8255 8.51949 30 8.9858 30 9.46837V28C30 29.1046 29.1046 30 28 30H24ZM22.5 28.5V19.5H9.5V28.5H22.5ZM9.5 3.5H18.5V10.5H9.5V3.5Z" fill="#0A1C38" fill-opacity="0.9"/>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/saveFile_disable.svg

@@ -0,0 +1,3 @@
+<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="M28.5 28V9.46837C28.5 9.34773 28.4564 9.23115 28.3772 9.14014L23.6185 3.67177C23.5236 3.56265 23.386 3.5 23.2414 3.5H20V10.6C20 11.3732 19.3732 12 18.6 12H9.4C8.6268 12 8 11.3732 8 10.6V3.5H4C3.72386 3.5 3.5 3.72386 3.5 4V28C3.5 28.2761 3.72386 28.5 4 28.5H8V19.4C8 18.6268 8.6268 18 9.4 18H22.6C23.3732 18 24 18.6268 24 19.4V28.5H28C28.2761 28.5 28.5 28.2761 28.5 28ZM24 30H8H4C2.89543 30 2 29.1046 2 28V4C2 2.89543 2.89543 2 4 2H8H20H23.2414C23.82 2 24.3702 2.2506 24.7501 2.68709L29.5087 8.15546C29.8255 8.51949 30 8.9858 30 9.46837V28C30 29.1046 29.1046 30 28 30H24ZM22.5 28.5V19.5H9.5V28.5H22.5ZM9.5 3.5H18.5V10.5H9.5V3.5Z" fill="#0A1C38" fill-opacity="0.29"/>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/toolbar/filter_popup.svg

@@ -1,4 +1,11 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12.261 10.6184L12 10.9047V11.2921V17.9604L10 16.7297V11.3208V10.9333L9.73896 10.647L5.50197 6L16.4719 6L12.261 10.6184ZM13 17.9604V11.2921L17.2109 6.67375C17.7963 6.03172 17.3408 5 16.4719 5H5.50197C4.63313 5 4.17763 6.03172 4.76301 6.67375L9 11.3208V16.7297C9 17.0769 9.18016 17.3993 9.4759 17.5813L11.4759 18.8121C12.1422 19.2221 13 18.7428 13 17.9604ZM15.5 12C15.2239 12 15 12.2239 15 12.5C15 12.7761 15.2239 13 15.5 13H18.5C18.7761 13 19 12.7761 19 12.5C19 12.2239 18.7761 12 18.5 12H15.5ZM15 15C15 14.7239 15.2239 14.5 15.5 14.5H18.5C18.7761 14.5 19 14.7239 19 15C19 15.2761 18.7761 15.5 18.5 15.5H15.5C15.2239 15.5 15 15.2761 15 15ZM15.5 17C15.2239 17 15 17.2239 15 17.5C15 17.7761 15.2239 18 15.5 18H18.5C18.7761 18 19 17.7761 19 17.5C19 17.2239 18.7761 17 18.5 17H15.5Z" fill="#0A1C38" fill-opacity="0.9"/>
-<path d="M18.1425 21C18.0158 21 17.9523 20.8468 18.042 20.7571L20.7571 18.042C20.8468 17.9523 21 18.0158 21 18.1425V20.6C21 20.8209 20.8209 21 20.6 21H18.1425Z" fill="#0A1C38" fill-opacity="0.9"/>
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_11564_110367)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M14.9405 12.1685L14.5 12.6517V13.3055V24.5582L11.125 22.4813V13.3538V12.7L10.6845 12.2168L3.53458 4.375L22.0464 4.375L14.9405 12.1685ZM16.1875 24.5582V13.3055L23.2934 5.51196C24.2812 4.42853 23.5125 2.6875 22.0464 2.6875H3.53458C2.06841 2.6875 1.29975 4.42853 2.28759 5.51196L9.4375 13.3538V22.4813C9.4375 23.0673 9.74151 23.6114 10.2406 23.9185L13.6156 25.9954C14.7399 26.6873 16.1875 25.8784 16.1875 24.5582ZM20.4062 14.5C19.9403 14.5 19.5625 14.8778 19.5625 15.3438C19.5625 15.8097 19.9403 16.1875 20.4062 16.1875H25.4688C25.9347 16.1875 26.3125 15.8097 26.3125 15.3438C26.3125 14.8778 25.9347 14.5 25.4688 14.5H20.4062ZM19.5625 19.5625C19.5625 19.0965 19.9403 18.7188 20.4062 18.7188H25.4688C25.9347 18.7188 26.3125 19.0965 26.3125 19.5625C26.3125 20.0285 25.9347 20.4062 25.4688 20.4062H20.4062C19.9403 20.4062 19.5625 20.0285 19.5625 19.5625ZM20.4062 22.9375C19.9403 22.9375 19.5625 23.3153 19.5625 23.7812C19.5625 24.2472 19.9403 24.625 20.4062 24.625H25.4688C25.9347 24.625 26.3125 24.2472 26.3125 23.7812C26.3125 23.3153 25.9347 22.9375 25.4688 22.9375H20.4062Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path d="M24.2851 30C24.0316 30 23.9047 29.6935 24.0839 29.5143L29.5143 24.0839C29.6935 23.9047 30 24.0316 30 24.2851V29.6C30 29.8209 29.8209 30 29.6 30H24.2851Z" fill="#0A1C38" fill-opacity="0.9"/>
+</g>
+<defs>
+<clipPath id="clip0_11564_110367">
+<rect width="32" height="32" fill="white"/>
+</clipPath>
+</defs>
 </svg>

designer-base/src/main/resources/com/fine/theme/icon/toolbar/filter_popup_disable.svg

@@ -0,0 +1,11 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_11570_135401)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M14.9405 12.1685L14.5 12.6517V13.3055V24.5582L11.125 22.4813V13.3538V12.7L10.6845 12.2168L3.53458 4.375L22.0464 4.375L14.9405 12.1685ZM16.1875 24.5582V13.3055L23.2934 5.51196C24.2812 4.42853 23.5125 2.6875 22.0464 2.6875H3.53458C2.06841 2.6875 1.29975 4.42853 2.28759 5.51196L9.4375 13.3538V22.4813C9.4375 23.0673 9.74151 23.6114 10.2406 23.9185L13.6156 25.9954C14.7399 26.6873 16.1875 25.8784 16.1875 24.5582ZM20.4062 14.5C19.9403 14.5 19.5625 14.8778 19.5625 15.3438C19.5625 15.8097 19.9403 16.1875 20.4062 16.1875H25.4688C25.9347 16.1875 26.3125 15.8097 26.3125 15.3438C26.3125 14.8778 25.9347 14.5 25.4688 14.5H20.4062ZM19.5625 19.5625C19.5625 19.0965 19.9403 18.7188 20.4062 18.7188H25.4688C25.9347 18.7188 26.3125 19.0965 26.3125 19.5625C26.3125 20.0285 25.9347 20.4062 25.4688 20.4062H20.4062C19.9403 20.4062 19.5625 20.0285 19.5625 19.5625ZM20.4062 22.9375C19.9403 22.9375 19.5625 23.3153 19.5625 23.7812C19.5625 24.2472 19.9403 24.625 20.4062 24.625H25.4688C25.9347 24.625 26.3125 24.2472 26.3125 23.7812C26.3125 23.3153 25.9347 22.9375 25.4688 22.9375H20.4062Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path d="M24.2851 30C24.0316 30 23.9047 29.6935 24.0839 29.5143L29.5143 24.0839C29.6935 23.9047 30 24.0316 30 24.2851V29.6C30 29.8209 29.8209 30 29.6 30H24.2851Z" fill="#0A1C38" fill-opacity="0.29"/>
+</g>
+<defs>
+<clipPath id="clip0_11570_135401">
+<rect width="32" height="32" fill="white"/>
+</clipPath>
+</defs>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/toolbar/saveAs.svg

@@ -1,5 +1,5 @@
 <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="M22.5936 7.16984C22.9696 7.69113 23.5731 8 24.2158 8H26.0769V12H28V8C28 6.89543 27.139 6 26.0769 6H24.1538L21.8679 2.83016C21.492 2.30887 20.8884 2 20.2457 2H19H17H9H7H4.92308C3.86099 2 3 2.89543 3 4V28C3 29.1046 3.86099 30 4.92308 30H26.0769C27.139 30 28 29.1046 28 28V26H26.0769V28H4.92308L4.92308 4H7V8C7 9.10457 7.89543 10 9 10H17C18.1046 10 19 9.10457 19 8V4H20.3077L22.5936 7.16984ZM17 4H9V8H17V4ZM24.1219 13.7069L28.6135 18.1984C28.6316 18.2141 28.6493 18.2306 28.6666 18.2479C29.0571 18.6384 29.0571 19.2716 28.6666 19.6621L24.2571 24.0716C23.8665 24.4621 23.2334 24.4621 22.8428 24.0716C22.4523 23.6811 22.4523 23.0479 22.8428 22.6574L25.5002 20H9C8.44771 20 8 19.5523 8 19C8 18.4477 8.44772 18 9 18H25.5866L22.7077 15.1211C22.3172 14.7306 22.3172 14.0974 22.7077 13.7069C23.0982 13.3163 23.7314 13.3163 24.1219 13.7069Z"
-          fill="#0A1C38" fill-opacity="0.9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M27.5947 25.4094V9.79335C27.5947 9.26606 27.404 8.75655 27.0579 8.35877L23.0479 3.75076C22.6329 3.27382 22.0316 3 21.3994 3H5.18533C3.97841 3 3 3.97841 3 5.18534V25.4094C3 26.6163 3.97841 27.5947 5.18534 27.5947H25.4094C26.6163 27.5947 27.5947 26.6163 27.5947 25.4094ZM8.05583 4.764H5.18533C4.95264 4.764 4.764 4.95264 4.764 5.18534V25.4094C4.764 25.642 4.95264 25.8307 5.18534 25.8307H8.05629V18.1624C8.05629 17.2347 8.80833 16.4827 9.73602 16.4827H20.8592C21.7869 16.4827 22.539 17.2347 22.539 18.1624V25.8307H25.4094C25.642 25.8307 25.8307 25.642 25.8307 25.4094V9.79335C25.8307 9.69169 25.7939 9.59345 25.7272 9.51676L21.7172 4.90875C21.6372 4.81679 21.5213 4.764 21.3994 4.764H19.1678V10.747C19.1678 11.6747 18.4158 12.4267 17.4881 12.4267H9.73556C8.80787 12.4267 8.05583 11.6747 8.05583 10.747V4.764ZM8.90134 11.5812C9.11484 11.7947 9.40978 11.9267 9.73556 11.9267H17.4881C18.1396 11.9267 18.6678 11.3985 18.6678 10.747V4.764H18.6678V10.747C18.6678 11.3985 18.1396 11.9267 17.4881 11.9267H9.73553C9.40976 11.9267 9.11483 11.7947 8.90134 11.5812ZM22.039 25.8307V18.1624C22.039 17.5109 21.5108 16.9827 20.8592 16.9827H9.73602C9.26963 16.9827 8.86645 17.2533 8.67496 17.6461C8.86647 17.2534 9.26963 16.9828 9.73599 16.9828H20.8592C21.5107 16.9828 22.0389 17.5109 22.0389 18.1625V25.8307H22.039ZM20.7749 18.2468V25.8307H9.82025V18.2468H20.7749ZM9.81979 4.76402V10.6627H17.4038V4.76402H9.81979Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M18.6679 10.7469C18.6679 10.7469 18.6679 10.7469 18.6679 10.7469C18.6679 11.3985 18.1397 11.9267 17.4882 11.9267C17.4882 11.9267 17.4882 11.9267 17.4882 11.9267H9.73566C9.73565 11.9267 9.73567 11.9267 9.73566 11.9267H17.4882C18.1397 11.9267 18.6679 11.3985 18.6679 10.7469ZM27.7448 9.79333V25.4093C27.7448 26.6991 26.6992 27.7447 25.4095 27.7447H5.18543C3.89566 27.7447 2.8501 26.6991 2.8501 25.4093V5.18531C2.8501 3.89554 3.89566 2.84998 5.18543 2.84998H21.3995C22.0751 2.84998 22.7177 3.14259 23.1612 3.65226L27.1711 8.26028C27.541 8.68536 27.7448 9.22984 27.7448 9.79333ZM7.90592 4.91398H5.18543C5.03558 4.91398 4.9141 5.03546 4.9141 5.18531V25.4093C4.9141 25.5592 5.03558 25.6807 5.18543 25.6807H7.90639V18.1624C7.90639 17.1518 8.72558 16.3326 9.73612 16.3326H20.8593C21.8699 16.3326 22.6891 17.1518 22.6891 18.1624V25.6807H25.4095C25.5593 25.6807 25.6808 25.5592 25.6808 25.4093V9.79333C25.6808 9.72786 25.6571 9.6646 25.6141 9.61521L21.6042 5.00719C21.5527 4.94797 21.478 4.91398 21.3995 4.91398H19.3179V10.747C19.3179 11.7575 18.4987 12.5767 17.4882 12.5767H9.73566C8.72512 12.5767 7.90592 11.7575 7.90592 10.747V4.91398ZM5.18543 4.76398C4.95274 4.76398 4.7641 4.95261 4.7641 5.18531V25.4093C4.7641 25.642 4.95274 25.8307 5.18543 25.8307H8.05639V18.1624C8.05639 17.2347 8.80843 16.4826 9.73612 16.4826H20.8593C21.787 16.4826 22.5391 17.2347 22.5391 18.1624V25.8307H25.4095C25.6421 25.8307 25.8308 25.642 25.8308 25.4093V9.79333C25.8308 9.69167 25.794 9.59343 25.7273 9.51674L21.7173 4.90872C21.6373 4.81677 21.5214 4.76398 21.3995 4.76398H19.1679V10.747C19.1679 11.6747 18.4159 12.4267 17.4882 12.4267H9.73566C8.80797 12.4267 8.05592 11.6747 8.05592 10.747V4.76398H5.18543ZM9.73608 16.9827H20.8593C20.8593 16.9827 20.8593 16.9827 20.8593 16.9827C21.5108 16.9827 22.039 17.5109 22.039 18.1624C22.039 18.1624 22.039 18.1624 22.039 18.1624C22.039 17.5109 21.5108 16.9827 20.8593 16.9827H9.73608C9.7361 16.9827 9.73607 16.9827 9.73608 16.9827ZM20.775 18.2467V25.8307H9.82035V18.2467H20.775ZM9.97035 18.3967V25.6807H20.625V18.3967H9.97035ZM9.96989 4.914V10.5127H17.2539V4.914H9.96989ZM27.5948 9.79333V25.4093C27.5948 26.6163 26.6164 27.5947 25.4095 27.5947H5.18543C3.97851 27.5947 3.0001 26.6163 3.0001 25.4093V5.18531C3.0001 3.97838 3.97851 2.99998 5.18543 2.99998H21.3995C22.0317 2.99998 22.633 3.27379 23.048 3.75073L27.058 8.35875C27.4041 8.75652 27.5948 9.26603 27.5948 9.79333ZM9.81989 4.764H17.4039V10.6627H9.81989V4.764Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path d="M30 13C29.4477 13 29 13.4477 29 14V29H12C11.4477 29 11 29.4477 11 30C11 30.5523 11.4477 31 12 31H29C30.1046 31 31 30.1046 31 29V14C31 13.4477 30.5523 13 30 13Z" fill="#0A1C38" fill-opacity="0.9"/>
 </svg>

designer-base/src/main/resources/com/fine/theme/icon/toolbar/saveAs_disable.svg

@@ -1,5 +1,5 @@
 <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="M22.5936 7.16984C22.9696 7.69113 23.5731 8 24.2158 8H26.0769V12H28V8C28 6.89543 27.139 6 26.0769 6H24.1538L21.8679 2.83016C21.492 2.30887 20.8884 2 20.2457 2H19H17H9H7H4.92308C3.86099 2 3 2.89543 3 4V28C3 29.1046 3.86099 30 4.92308 30H26.0769C27.139 30 28 29.1046 28 28V26H26.0769V28H4.92308L4.92308 4H7V8C7 9.10457 7.89543 10 9 10H17C18.1046 10 19 9.10457 19 8V4H20.3077L22.5936 7.16984ZM17 4H9V8H17V4ZM24.1219 13.7069L28.6135 18.1984C28.6316 18.2141 28.6493 18.2306 28.6666 18.2479C29.0571 18.6384 29.0571 19.2716 28.6666 19.6621L24.2571 24.0716C23.8665 24.4621 23.2334 24.4621 22.8428 24.0716C22.4523 23.6811 22.4523 23.0479 22.8428 22.6574L25.5002 20H9C8.44771 20 8 19.5523 8 19C8 18.4477 8.44772 18 9 18H25.5866L22.7077 15.1211C22.3172 14.7306 22.3172 14.0974 22.7077 13.7069C23.0982 13.3163 23.7314 13.3163 24.1219 13.7069Z"
-          fill="#0A1C38" fill-opacity="0.29"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M27.5947 25.4094V9.79335C27.5947 9.26606 27.404 8.75655 27.0579 8.35877L23.0479 3.75076C22.6329 3.27382 22.0316 3 21.3994 3H5.18533C3.97841 3 3 3.97841 3 5.18534V25.4094C3 26.6163 3.97841 27.5947 5.18534 27.5947H25.4094C26.6163 27.5947 27.5947 26.6163 27.5947 25.4094ZM8.05583 4.764H5.18533C4.95264 4.764 4.764 4.95264 4.764 5.18534V25.4094C4.764 25.642 4.95264 25.8307 5.18534 25.8307H8.05629V18.1624C8.05629 17.2347 8.80833 16.4827 9.73602 16.4827H20.8592C21.7869 16.4827 22.539 17.2347 22.539 18.1624V25.8307H25.4094C25.642 25.8307 25.8307 25.642 25.8307 25.4094V9.79335C25.8307 9.69169 25.7939 9.59345 25.7272 9.51676L21.7172 4.90875C21.6372 4.81679 21.5213 4.764 21.3994 4.764H19.1678V10.747C19.1678 11.6747 18.4158 12.4267 17.4881 12.4267H9.73556C8.80787 12.4267 8.05583 11.6747 8.05583 10.747V4.764ZM8.90134 11.5812C9.11484 11.7947 9.40978 11.9267 9.73556 11.9267H17.4881C18.1396 11.9267 18.6678 11.3985 18.6678 10.747V4.764H18.6678V10.747C18.6678 11.3985 18.1396 11.9267 17.4881 11.9267H9.73553C9.40976 11.9267 9.11483 11.7947 8.90134 11.5812ZM22.039 25.8307V18.1624C22.039 17.5109 21.5108 16.9827 20.8592 16.9827H9.73602C9.26963 16.9827 8.86645 17.2533 8.67496 17.6461C8.86647 17.2534 9.26963 16.9828 9.73599 16.9828H20.8592C21.5107 16.9828 22.0389 17.5109 22.0389 18.1625V25.8307H22.039ZM20.7749 18.2468V25.8307H9.82025V18.2468H20.7749ZM9.81979 4.76402V10.6627H17.4038V4.76402H9.81979Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M18.6679 10.7469C18.6679 10.7469 18.6679 10.7469 18.6679 10.7469C18.6679 11.3985 18.1397 11.9267 17.4882 11.9267C17.4882 11.9267 17.4882 11.9267 17.4882 11.9267H9.73566C9.73565 11.9267 9.73567 11.9267 9.73566 11.9267H17.4882C18.1397 11.9267 18.6679 11.3985 18.6679 10.7469ZM27.7448 9.79333V25.4093C27.7448 26.6991 26.6992 27.7447 25.4095 27.7447H5.18543C3.89566 27.7447 2.8501 26.6991 2.8501 25.4093V5.18531C2.8501 3.89554 3.89566 2.84998 5.18543 2.84998H21.3995C22.0751 2.84998 22.7177 3.14259 23.1612 3.65226L27.1711 8.26028C27.541 8.68536 27.7448 9.22984 27.7448 9.79333ZM7.90592 4.91398H5.18543C5.03558 4.91398 4.9141 5.03546 4.9141 5.18531V25.4093C4.9141 25.5592 5.03558 25.6807 5.18543 25.6807H7.90639V18.1624C7.90639 17.1518 8.72558 16.3326 9.73612 16.3326H20.8593C21.8699 16.3326 22.6891 17.1518 22.6891 18.1624V25.6807H25.4095C25.5593 25.6807 25.6808 25.5592 25.6808 25.4093V9.79333C25.6808 9.72786 25.6571 9.6646 25.6141 9.61521L21.6042 5.00719C21.5527 4.94797 21.478 4.91398 21.3995 4.91398H19.3179V10.747C19.3179 11.7575 18.4987 12.5767 17.4882 12.5767H9.73566C8.72512 12.5767 7.90592 11.7575 7.90592 10.747V4.91398ZM5.18543 4.76398C4.95274 4.76398 4.7641 4.95261 4.7641 5.18531V25.4093C4.7641 25.642 4.95274 25.8307 5.18543 25.8307H8.05639V18.1624C8.05639 17.2347 8.80843 16.4826 9.73612 16.4826H20.8593C21.787 16.4826 22.5391 17.2347 22.5391 18.1624V25.8307H25.4095C25.6421 25.8307 25.8308 25.642 25.8308 25.4093V9.79333C25.8308 9.69167 25.794 9.59343 25.7273 9.51674L21.7173 4.90872C21.6373 4.81677 21.5214 4.76398 21.3995 4.76398H19.1679V10.747C19.1679 11.6747 18.4159 12.4267 17.4882 12.4267H9.73566C8.80797 12.4267 8.05592 11.6747 8.05592 10.747V4.76398H5.18543ZM9.73608 16.9827H20.8593C20.8593 16.9827 20.8593 16.9827 20.8593 16.9827C21.5108 16.9827 22.039 17.5109 22.039 18.1624C22.039 18.1624 22.039 18.1624 22.039 18.1624C22.039 17.5109 21.5108 16.9827 20.8593 16.9827H9.73608C9.7361 16.9827 9.73607 16.9827 9.73608 16.9827ZM20.775 18.2467V25.8307H9.82035V18.2467H20.775ZM9.97035 18.3967V25.6807H20.625V18.3967H9.97035ZM9.96989 4.914V10.5127H17.2539V4.914H9.96989ZM27.5948 9.79333V25.4093C27.5948 26.6163 26.6164 27.5947 25.4095 27.5947H5.18543C3.97851 27.5947 3.0001 26.6163 3.0001 25.4093V5.18531C3.0001 3.97838 3.97851 2.99998 5.18543 2.99998H21.3995C22.0317 2.99998 22.633 3.27379 23.048 3.75073L27.058 8.35875C27.4041 8.75652 27.5948 9.26603 27.5948 9.79333ZM9.81989 4.764H17.4039V10.6627H9.81989V4.764Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path d="M30 13C29.4477 13 29 13.4477 29 14V29H12C11.4477 29 11 29.4477 11 30C11 30.5523 11.4477 31 12 31H29C30.1046 31 31 30.1046 31 29V14C31 13.4477 30.5523 13 30 13Z" fill="#0A1C38" fill-opacity="0.29"/>
 </svg>

designer-base/src/main/resources/com/fine/theme/icon/widget/prewidget_popup.svg

@@ -0,0 +1,16 @@
+<svg width="48" height="32" viewBox="0 0 48 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_11564_134744)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.5 29.8492C13.2239 29.8492 13 29.6254 13 29.3492V27.0208L24.5836 15.4372L27.412 18.2657L15.8284 29.8492H13.5ZM28.8262 16.8514L29.2635 16.4142C30.0445 15.6332 30.0445 14.3668 29.2635 13.5858C28.4824 12.8047 27.2161 12.8047 26.435 13.5858L25.9978 14.023L28.8262 16.8514Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3 4H25V12.1165C25.5752 11.5843 26.2705 11.2423 27 11.0907V4C27 2.89543 26.1046 2 25 2H3C1.89543 2 1 2.89543 1 4V25C1 26.1046 1.89543 27 3 27H10.449C10.391 26.7925 10.3601 26.5743 10.3601 26.3492V25H3L3 4ZM23.08 25L21 27H25C26.1046 27 27 26.1046 27 25V21.5061L25 23.4292V25H23.08Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path d="M5 9.6255C5 8.7968 5.6718 8.125 6.5005 8.125C7.32921 8.125 8.00101 8.7968 8.00101 9.6255V9.7245C8.00101 10.5532 7.32921 11.225 6.5005 11.225C5.6718 11.225 5 10.5532 5 9.7245V9.6255Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10.6286 6C10.0763 6 9.62857 6.44772 9.62857 7V12.4375C9.62857 12.9898 10.0763 13.4375 10.6286 13.4375H22C22.5523 13.4375 23 12.9898 23 12.4375V7C23 6.44772 22.5523 6 22 6H10.6286ZM20.943 8.125H11.6859V11.3125H20.943V8.125Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path d="M5 19.188C5 18.3593 5.6718 17.6875 6.5005 17.6875C7.32921 17.6875 8.00101 18.3593 8.00101 19.188V19.287C8.00101 20.1157 7.32921 20.7875 6.5005 20.7875C5.6718 20.7875 5 20.1157 5 19.287V19.188Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path d="M22.3744 15.635C22.2588 15.5882 22.1324 15.5625 22 15.5625H10.6286C10.0763 15.5625 9.62857 16.0102 9.62857 16.5625V22C9.62857 22.5523 10.0763 23 10.6286 23H15.2446L17.3017 20.875H11.6859V17.6875H20.3874L22.3744 15.635Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path d="M37.3912 13.3055L44.6077 13.3055C44.9198 13.3055 45.0953 13.6644 44.9037 13.9107L41.2955 18.5499C41.1453 18.7429 40.8536 18.7429 40.7034 18.5499L37.0952 13.9107C36.9036 13.6644 37.0791 13.3055 37.3912 13.3055Z" fill="#0A1C38" fill-opacity="0.66"/>
+</g>
+<defs>
+<clipPath id="clip0_11564_134744">
+<rect width="48" height="32" fill="white"/>
+</clipPath>
+</defs>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/widget/prewidget_popup_disable.svg

@@ -0,0 +1,16 @@
+<svg width="48" height="32" viewBox="0 0 48 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_11570_135404)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.5 29.8492C13.2239 29.8492 13 29.6254 13 29.3492V27.0208L24.5836 15.4372L27.412 18.2657L15.8284 29.8492H13.5ZM28.8262 16.8514L29.2635 16.4142C30.0445 15.6332 30.0445 14.3668 29.2635 13.5858C28.4824 12.8047 27.2161 12.8047 26.435 13.5858L25.9978 14.023L28.8262 16.8514Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3 4H25V12.1165C25.5752 11.5843 26.2705 11.2423 27 11.0907V4C27 2.89543 26.1046 2 25 2H3C1.89543 2 1 2.89543 1 4V25C1 26.1046 1.89543 27 3 27H10.449C10.391 26.7925 10.3601 26.5743 10.3601 26.3492V25H3L3 4ZM23.08 25L21 27H25C26.1046 27 27 26.1046 27 25V21.5061L25 23.4292V25H23.08Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path d="M5 9.6255C5 8.7968 5.6718 8.125 6.5005 8.125C7.32921 8.125 8.00101 8.7968 8.00101 9.6255V9.7245C8.00101 10.5532 7.32921 11.225 6.5005 11.225C5.6718 11.225 5 10.5532 5 9.7245V9.6255Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10.6286 6C10.0763 6 9.62857 6.44772 9.62857 7V12.4375C9.62857 12.9898 10.0763 13.4375 10.6286 13.4375H22C22.5523 13.4375 23 12.9898 23 12.4375V7C23 6.44772 22.5523 6 22 6H10.6286ZM20.943 8.125H11.6859V11.3125H20.943V8.125Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path d="M5 19.188C5 18.3593 5.6718 17.6875 6.5005 17.6875C7.32921 17.6875 8.00101 18.3593 8.00101 19.188V19.287C8.00101 20.1157 7.32921 20.7875 6.5005 20.7875C5.6718 20.7875 5 20.1157 5 19.287V19.188Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path d="M22.3744 15.635C22.2588 15.5882 22.1324 15.5625 22 15.5625H10.6286C10.0763 15.5625 9.62857 16.0102 9.62857 16.5625V22C9.62857 22.5523 10.0763 23 10.6286 23H15.2446L17.3017 20.875H11.6859V17.6875H20.3874L22.3744 15.635Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path d="M37.3912 13.3055L44.6077 13.3055C44.9198 13.3055 45.0953 13.6644 44.9037 13.9107L41.2955 18.5499C41.1453 18.7429 40.8536 18.7429 40.7034 18.5499L37.0952 13.9107C36.9036 13.6644 37.0791 13.3055 37.3912 13.3055Z" fill="#0A1C38" fill-opacity="0.29"/>
+</g>
+<defs>
+<clipPath id="clip0_11570_135404">
+<rect width="48" height="32" fill="white"/>
+</clipPath>
+</defs>
+</svg>

designer-base/src/main/resources/com/fine/theme/light/ui/fine_light.icon.json

@@ -6,6 +6,7 @@
   "icons": {
     "cut": "cut.svg",
     "save": "save.svg",
+    "saveFile": "saveFile.svg",
     "copy": "copy.svg",
     "formatBrush": "formatBrush.svg",
     "paste": "paste.svg",
@@ -90,6 +91,8 @@
     "wordFile": "filetree/filetype/wordFile.svg",
     "xlsFile": "filetree/filetype/xlsFile.svg",
     "xmlFile": "filetree/filetype/xmlFile.svg",
+    "csvFile": "filetree/filetype/csvFile.svg",
+    "svgFile": "filetree/filetype/svgFile.svg",
     "cellattr": "propertiestab/cellattr.svg",
     "cellattr_disabled": "propertiestab/cellattr_disabled.svg",
     "cellattr_selected": "propertiestab/cellattr_selected.svg",
@@ -100,7 +103,7 @@
     "conditionattr_disabled": "propertiestab/conditionattr_disabled.svg",
     "conditionattr_selected": "propertiestab/conditionattr_selected.svg",
     "floatelement": "propertiestab/floatelement.svg",
-    "floatelement_disabled": "propertiestab/floatelement_disabled.svg",
+    "floatelement_popup": "propertiestab/floatelement_popup.svg",
     "floatelement_selected": "propertiestab/floatelement_selected.svg",
     "hyperlink": "propertiestab/hyperlink.svg",
     "hyperlink_disabled": "propertiestab/hyperlink_disabled.svg",
@@ -145,6 +148,7 @@
     "text": "insert/text.svg",
     "richtext": "insert/richtext.svg",
     "formula": "insert/formula.svg",
+    "formula_popup": "insert/formula_popup.svg",
     "chart": "insert/chart.svg",
     "image": "insert/image.svg",
     "bias": "insert/bias.svg",
@@ -313,15 +317,24 @@
     "widget_preview": "widget/preview.svg",
     "apply_components": "widget/apply_components.svg",
     "prewidget": "widget/prewidget.svg",
+    "prewidget_popup": "widget/prewidget_popup.svg",
     "tab": "widget/tab.svg",
     "text_area": "widget/text_area.svg",
     "text_field": "widget/text_field.svg",
     "widget_tree": "widget/tree.svg",
-    "ds_column_name": "editor/ds_column_name.svg",
-    "ds_column_index": "editor/ds_column_index.svg",
+    "dsColumnName": "editor/dsColumnName.svg",
+    "dsColumnName_popup": "editor/dsColumnName_popup.svg",
+    "dsColumnIndex": "editor/dsColumnIndex.svg",
+    "dsColumnIndex_popup": "editor/dsColumnIndex_popup.svg",
     "ds_column": "editor/ds_column.svg",
     "type_double": "editor/type_double.svg",
+    "type_double_popup": "editor/type_double_popup.svg",
     "type_boolean": "editor/type_boolean.svg",
+    "type_boolean_popup": "editor/type_boolean_popup.svg",
+    "date_popup": "editor/date_popup.svg",
+    "param_popup": "editor/param_popup.svg",
+    "cellelement_popup": "editor/cellelement_popup.svg",
+    "bind_column_popup": "editor/bind_column_popup.svg",
     "preview_mobile": "preview/preview_mobile.svg",
     "preview_paging": "preview/preview_paging.svg",
     "preview_write": "preview/preview_write.svg",

designer-form/src/main/java/com/fr/design/designer/creator/XButton.java

@@ -298,6 +298,11 @@ public class XButton extends XWidgetCreator {
         return "button_16.png";
     }
 
+    @Override
+    public String getIconId() {
+        return "button";
+    }
+
     /**
      * data属性改变触发其他操作
      */

designer-form/src/main/java/com/fr/design/designer/creator/XCheckBox.java

@@ -81,6 +81,11 @@ public class XCheckBox extends XWidgetCreator {
         return "check_box_16.png";
     }
 
+    @Override
+    public String getIconId() {
+        return "check_box";
+    }
+
     public void firePropertyChange() {
         ((UICheckBox) editor).setText(((CheckBox) data).getText());
         ValueInitializer value = ((CheckBox) data).getWidgetValue();

designer-form/src/main/java/com/fr/design/designer/creator/XCheckBoxGroup.java

@@ -90,6 +90,11 @@ public class XCheckBoxGroup extends XFieldEditor {
         return "checkbox_group_16.png";
     }
 
+	@Override
+	public String getIconId() {
+		return "checkbox_group";
+	}
+
 	@Override
 	public WidgetPropertyUIProvider[] getWidgetPropertyUIProviders() {
 		return new WidgetPropertyUIProvider[] {new ButtonGroupPropertyUI(this)};

designer-form/src/main/java/com/fr/design/designer/creator/XComboBox.java

@@ -53,7 +53,7 @@ public class XComboBox extends XCustomWriteAbleRepeatEditor {
             UITextField textField = new UITextField(5);
             textField.setOpaque(false);
             editor.add(textField, BorderLayout.CENTER);
-			btn = new LimpidButton("", this.getIconPath(), toData().isVisible() ? FULL_OPACITY : HALF_OPACITY);
+			btn = new LimpidButton("", this.getIconPath(), this.getIconId(), toData().isVisible() ? FULL_OPACITY : HALF_OPACITY);
             btn.setPreferredSize(new Dimension(21, 21));
             btn.setOpaque(true);
             editor.add(btn, BorderLayout.EAST);
@@ -67,6 +67,11 @@ public class XComboBox extends XCustomWriteAbleRepeatEditor {
         return "combo_box_16.png";
     }
 
+	@Override
+	public String getIconId() {
+		return "combo_box";
+	}
+
 	protected void makeVisible(boolean visible) {
 		btn.makeVisible(visible);
 	}

designer-form/src/main/java/com/fr/design/designer/creator/XComboCheckBox.java

@@ -52,4 +52,9 @@ public class XComboCheckBox extends XComboBox {
     protected String getIconName() {
         return "combo_check_16.png";
     }
+
+	@Override
+	public String getIconId() {
+		return "combo_check";
+	}
 }

designer-form/src/main/java/com/fr/design/designer/creator/XCreator.java

@@ -281,6 +281,10 @@ public abstract class XCreator extends JPanel implements XComponent, XCreatorToo
 		return "/com/fr/web/images/form/resources/" + getIconName();
 	}
 
+	public String getIconId() {
+		return StringUtils.EMPTY;
+	}
+
 	/**
 	 * 返回组件默认名
 	 * @return 组件类名(小写)

designer-form/src/main/java/com/fr/design/designer/creator/XCreatorUtils.java

@@ -3,6 +3,7 @@
  */
 package com.fr.design.designer.creator;
 
+import com.fine.theme.icon.LazyIcon;
 import com.fr.base.chart.BaseChartCollection;
 import com.fr.base.svg.IconUtils;
 import com.fr.base.theme.FineColorSynchronizer;
@@ -381,6 +382,9 @@ public class XCreatorUtils {
      * @return 组件icon
      */
     public static Icon getCreatorIcon(XCreator creator) {
+        if (StringUtils.isNotEmpty(creator.getIconId())) {
+            return new LazyIcon(creator.getIconId());
+        }
         String iconPath = creator.getIconPath();
         if (StringUtils.isEmpty(iconPath)) {
             return null;

designer-form/src/main/java/com/fr/design/designer/creator/XDateEditor.java

@@ -116,7 +116,7 @@ public class XDateEditor extends XDirectWriteEditor {
         if (editor == null) {
             editor = FRGUIPaneFactory.createBorderLayout_S_Pane();
             editor.add(textField = new UITextField(5), BorderLayout.CENTER);
-            btn = new LimpidButton(StringUtils.EMPTY, this.getIconPath(), toData().isVisible() ? FULL_OPACITY : HALF_OPACITY);
+            btn = new LimpidButton(StringUtils.EMPTY, this.getIconPath(), this.getIconId(), toData().isVisible() ? FULL_OPACITY : HALF_OPACITY);
             btn.setPreferredSize(new Dimension(21, 21));
             editor.add(btn, BorderLayout.EAST);
             textField.setOpaque(false);
@@ -130,6 +130,11 @@ public class XDateEditor extends XDirectWriteEditor {
         return "date_16.png";
     }
 
+    @Override
+    public String getIconId() {
+        return "date";
+    }
+
     protected void makeVisible(boolean visible) {
         btn.makeVisible(visible);
     }

designer-form/src/main/java/com/fr/design/designer/creator/XLabel.java

@@ -146,4 +146,9 @@ public class XLabel extends XWidgetCreator {
         return "label_16.png";
     }
 
+    @Override
+    public String getIconId() {
+        return "label";
+    }
+
 }

designer-form/src/main/java/com/fr/design/designer/creator/XNameWidget.java

@@ -13,8 +13,13 @@ import com.fr.form.ui.WidgetInfoConfig;
 import com.fr.general.FRFont;
 import com.fr.stable.core.PropertyChangeAdapter;
 
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.SwingConstants;
+import javax.swing.JComponent;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Color;
+import java.awt.BorderLayout;
 import java.beans.IntrospectionException;
 
 public class XNameWidget extends XWidgetCreator {
@@ -81,6 +86,11 @@ public class XNameWidget extends XWidgetCreator {
 		return "user_widget.png";
 	}
 
+	@Override
+	public String getIconId() {
+		return "customButton";
+	}
+
 	/**
 	 * 属性改变后，重新构建控件
 	 */

designer-form/src/main/java/com/fr/design/designer/creator/XNumberEditor.java

@@ -104,6 +104,11 @@ public class XNumberEditor extends XWrapperedFieldEditor {
 		return "number_field_16.png";
 	}
 
+	@Override
+	public String getIconId() {
+		return "number_field";
+	}
+
 	@Override
 	public WidgetPropertyUIProvider[] getWidgetPropertyUIProviders() {
 		return new WidgetPropertyUIProvider[]{new NumberEditorMobilePropertyUI(this)};

designer-form/src/main/java/com/fr/design/designer/creator/XPassword.java

@@ -40,6 +40,11 @@ public class XPassword extends XWrapperedFieldEditor {
         return "password_field_16.png";
     }
 
+    @Override
+    public String getIconId() {
+        return "password_field";
+    }
+
     /**
      * 控件的属性列表
      *

designer-form/src/main/java/com/fr/design/designer/creator/XRadioGroup.java

@@ -86,6 +86,11 @@ public class XRadioGroup extends XFieldEditor {
 		return "button_group_16.png";
 	}
 
+	@Override
+	public String getIconId() {
+		return "button_group";
+	}
+
 	@Override
 	public WidgetPropertyUIProvider[] getWidgetPropertyUIProviders() {
 		return new WidgetPropertyUIProvider[] {new ButtonGroupPropertyUI(this)};

designer-form/src/main/java/com/fr/design/designer/creator/XTextArea.java

@@ -85,6 +85,11 @@ public class XTextArea extends XWrapperedFieldEditor {
         return "text_area_16.png";
     }
 
+    @Override
+    public String getIconId() {
+        return "text_area";
+    }
+
     @Override
     public WidgetPropertyUIProvider[] getWidgetPropertyUIProviders() {
         return new WidgetPropertyUIProvider[]{new TextAreaMobilePropertyUI(this)};

designer-form/src/main/java/com/fr/design/designer/creator/XTextEditor.java

@@ -84,6 +84,11 @@ public class XTextEditor extends XWrapperedFieldEditor {
         return "text_field_16.png";
     }
 
+    @Override
+    public String getIconId() {
+        return "text_field";
+    }
+
     @Override
     public WidgetPropertyUIProvider[] getWidgetPropertyUIProviders() {
         return new WidgetPropertyUIProvider[]{new TextEditorMobilePropertyUI(this)};

designer-form/src/main/java/com/fr/design/designer/creator/XTreeComboBoxEditor.java

@@ -33,7 +33,7 @@ public class XTreeComboBoxEditor extends XTreeEditor {
             UITextField textField = new UITextField(5);
             textField.setOpaque(false);
             editor.add(textField, BorderLayout.CENTER);
-			btn = new LimpidButton("", this.getIconPath(), toData().isVisible() ? FULL_OPACITY : HALF_OPACITY);
+			btn = new LimpidButton("", this.getIconPath(), this.getIconId(), toData().isVisible() ? FULL_OPACITY : HALF_OPACITY);
             btn.setPreferredSize(new Dimension(21, 21));
             btn.setOpaque(true);
             editor.add(btn, BorderLayout.EAST);
@@ -65,6 +65,11 @@ public class XTreeComboBoxEditor extends XTreeEditor {
         return "comboboxtree.png";
     }
 
+	@Override
+	public String getIconId() {
+		return "comboboxtree";
+	}
+
 	protected void makeVisible(boolean visible) {
 		btn.makeVisible(visible);
 	}

designer-form/src/main/java/com/fr/design/designer/creator/XTreeEditor.java

@@ -124,4 +124,8 @@ public class XTreeEditor extends XWidgetCreator {
         return "tree_16.png";
     }
 
+    @Override
+    public String getIconId() {
+        return "widget_tree";
+    }
 }

designer-form/src/main/java/com/fr/design/designer/creator/XWidgetCreator.java

@@ -3,6 +3,7 @@
  */
 package com.fr.design.designer.creator;
 
+import com.fine.theme.icon.LazyIcon;
 import com.fr.base.BaseUtils;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.form.util.XCreatorConstants;
@@ -10,12 +11,14 @@ import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.FormDesigner;
 import com.fr.form.ui.Widget;
 import com.fr.log.FineLoggerFactory;
+import com.fr.stable.StringUtils;
 import com.fr.stable.core.PropertyChangeAdapter;
 
 import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JFrame;
-import javax.swing.JOptionPane;
+import javax.swing.Icon;
+import java.awt.image.BufferedImage;
 import java.awt.AlphaComposite;
 import java.awt.Color;
 import java.awt.Composite;
@@ -105,6 +108,7 @@ public abstract class XWidgetCreator extends XCreator {
         private String name;
         private String imagePath;
         private float opacity = 0.4f;
+        private String iconId;
 
         public LimpidButton(String name, String imagePath, float opacity) {
             this.name = name;
@@ -113,48 +117,71 @@ public abstract class XWidgetCreator extends XCreator {
             this.draw();
         }
 
+        public LimpidButton(String name, String imagePath, String iconId, float opacity) {
+            this.name = name;
+            this.imagePath = imagePath;
+            this.opacity = opacity;
+            this.iconId = iconId;
+            this.draw();
+        }
+
         public void draw() {
             try {
-                ImageIcon imageIcon = (ImageIcon) BaseUtils.readIcon(imagePath);
-                Image img = imageIcon.getImage();
-                MediaTracker mt = new MediaTracker(this);
-                int w = 21;
-                int h = 21;
-                mt.addImage(img, 0);
-                mt.waitForAll();
-
                 GraphicsConfiguration gc = new JFrame().getGraphicsConfiguration(); // 本地图形设备
-                Image image = gc.createCompatibleImage(w, h, Transparency.TRANSLUCENT);//建立透明画布
-                Graphics2D g = (Graphics2D) image.getGraphics(); //在画布上创建画笔
-
-                Composite alpha = AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1.0f); //指定透明度为半透明90%
-                g.setComposite(alpha);
-                g.drawImage(img, 0, 0, this); //注意是,将image画到g画笔所在的画布上
-                g.setColor(Color.black);//设置颜色为黑色
-                g.drawString(name, 25, 20);//写字
-                g.dispose(); //释放内存
-
-                Composite alpha2 = AlphaComposite.getInstance(AlphaComposite.SRC_OVER, opacity);
-                Image image1 = gc.createCompatibleImage(w, h, Transparency.TRANSLUCENT);
-                g = (Graphics2D) image1.getGraphics();
-                g.setComposite(alpha2);
-                g.drawImage(img, 2, 2, this); //改变图像起始位置,产生动态效果
-                g.setColor(Color.black);
-                g.drawString(name, 25, 20);
-                g.dispose();
-
                 this.setIgnoreRepaint(true);
                 this.setFocusable(false);//设置没有焦点
                 this.setBorder(null);//设置不画按钮边框
                 this.setContentAreaFilled(false);//设置不画按钮背景
-                this.setIcon(new ImageIcon(image1)); //把刚才生成的半透明image变成ImageIcon,贴到按钮上去
-                this.setRolloverIcon(new ImageIcon(image1));
-                this.setPressedIcon(new ImageIcon(image));//按下去的图标
+
+                if (StringUtils.isEmpty(iconId)){
+                    ImageIcon imageIcon = (ImageIcon) BaseUtils.readIcon(imagePath);
+                    Image img = imageIcon.getImage();
+                    MediaTracker mt = new MediaTracker(this);
+                    mt.addImage(img, 0);
+                    mt.waitForAll();
+                    Image originalImage = createImageWithTransparency(gc, img, 1.0f, 0, 0);
+                    this.setPressedIcon(new ImageIcon(originalImage));//按下去的图标
+                    // 半透明图像
+                    Image transparentImage = createImageWithTransparency(gc, img, opacity, 2, 2);
+                    this.setIcon(new ImageIcon(transparentImage)); //把刚才生成的半透明image变成ImageIcon,贴到按钮上去
+                    this.setRolloverIcon(new ImageIcon(transparentImage));
+                } else {
+                    Icon originalIcon = createIconWithTransparency(gc, 1.0f, 0, 0);
+                    Icon transparentIcon = createIconWithTransparency(gc, opacity, 2, 2);
+                    this.setIcon(transparentIcon);
+                    this.setRolloverIcon(transparentIcon);
+                    this.setPressedIcon(originalIcon);
+                }
             } catch (Exception e) {
                 FineLoggerFactory.getLogger().error(e.getMessage(), e);
             }
         }
 
+        private Image createImageWithTransparency(GraphicsConfiguration gc, Image img, float alphaValue, int x, int y) {
+            BufferedImage image = gc.createCompatibleImage(21, 21, Transparency.TRANSLUCENT);
+            Graphics2D g2d = image.createGraphics(); //在画布上创建画笔
+            Composite alpha = AlphaComposite.getInstance(AlphaComposite.SRC_OVER, alphaValue);
+            g2d.setComposite(alpha);
+            g2d.drawImage(img, x, y, this); //改变图像起始位置,产生动态效果
+            g2d.setColor(Color.black); //设置颜色为黑色
+            g2d.drawString(name, 25, 20);//写字
+            g2d.dispose();//释放内存
+            return image;
+        }
+
+        private Icon createIconWithTransparency(GraphicsConfiguration gc, float alphaValue, int x, int y) {
+            BufferedImage image = gc.createCompatibleImage(21, 21, Transparency.TRANSLUCENT);
+            Graphics2D g2d = image.createGraphics();
+            Composite alpha = AlphaComposite.getInstance(AlphaComposite.SRC_OVER, alphaValue);
+            g2d.setComposite(alpha);
+            g2d.setColor(Color.black);
+            g2d.drawString(name, 25, 20);
+            Icon icon = new LazyIcon(iconId);
+            icon.paintIcon(this, g2d, x, y);
+            g2d.dispose();
+            return icon;
+        }
+
         /**
          * 待说明
          *

designer-form/src/main/java/com/fr/design/form/parameter/XFormSubmit.java

@@ -1 +1 @@
-package com.fr.design.form.parameter;


import com.fr.design.designer.creator.XButton;
import com.fr.design.designer.creator.XCreator;
import com.fr.form.parameter.FormSubmitButton;

import java.awt.*;

/**
 * 提交按钮
 * @editor zhou
 * @since 2012-3-23下午3:36:00
 */
public class XFormSubmit extends XButton {

    public XFormSubmit(FormSubmitButton widget, Dimension initSize) {
        super(widget, initSize);
    }

    /**
     * 是否有查询按钮
     * @param xCreator  控件或容器
     * @return  有无查询按钮
     */
    public boolean SearchQueryCreators(XCreator xCreator) {
        return true;
    }

    /**
     * 该组件是否可以拖入表单主体
     * @return 是则返回true
     */
    public boolean canEnterIntoAdaptPane(){
        return false;
    }

    /**
     * 该组件是否可以拖入绝对布局
     *
     * @return 是则返回true
     */
    @Override
    public boolean canEnterIntoAbsolutePane() {
        return false;
    }

    @Override
    protected String getIconName() {
        return "preview_16.png";
    }
}
+package com.fr.design.form.parameter;


import com.fr.design.designer.creator.XButton;
import com.fr.design.designer.creator.XCreator;
import com.fr.form.parameter.FormSubmitButton;

import java.awt.*;

/**
 * 提交按钮
 * @editor zhou
 * @since 2012-3-23下午3:36:00
 */
public class XFormSubmit extends XButton {

    public XFormSubmit(FormSubmitButton widget, Dimension initSize) {
        super(widget, initSize);
    }

    /**
     * 是否有查询按钮
     * @param xCreator  控件或容器
     * @return  有无查询按钮
     */
    public boolean SearchQueryCreators(XCreator xCreator) {
        return true;
    }

    /**
     * 该组件是否可以拖入表单主体
     * @return 是则返回true
     */
    public boolean canEnterIntoAdaptPane(){
        return false;
    }

    /**
     * 该组件是否可以拖入绝对布局
     *
     * @return 是则返回true
     */
    @Override
    public boolean canEnterIntoAbsolutePane() {
        return false;
    }

    @Override
    protected String getIconName() {
        return "preview_16.png";
    }

    @Override
    public String getIconId() {
        return "preview";
    }
}

designer-form/src/main/java/com/fr/design/mainframe/FormParaPane.java

@@ -1,5 +1,6 @@
 package com.fr.design.mainframe;
 
+import com.fine.theme.icon.LazyIcon;
 import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.designer.creator.XCreatorUtils;
@@ -19,6 +20,7 @@ import com.fr.plugin.observer.PluginEvent;
 import com.fr.plugin.observer.PluginEventListener;
 import com.fr.stable.ArrayUtils;
 
+import java.awt.*;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.util.ArrayList;
@@ -70,7 +72,7 @@ public class FormParaPane extends UIToolbar {
     }
 
     public FormParaPane() {
-        predefineButton = new UIButton(UIConstants.PRE_WIDGET_NORMAL_ICON);
+        predefineButton = new UIButton(new LazyIcon("prewidget_popup", new Dimension(25, 21)));
         predefineButton.set4ToolbarButton();
         predefineButton.setToolTipText(Toolkit.i18nText("Fine-Design_Basic_Widget_User_Defined_Widget_Config"));
         predefineButton.addMouseListener(new MouseAdapter() {

designer-realize/src/main/java/com/fr/design/actions/file/export/CSVExportAction.java

@@ -3,7 +3,7 @@
  */
 package com.fr.design.actions.file.export;
 
-import com.fr.base.BaseUtils;
+import com.fine.theme.icon.LazyIcon;
 import com.fr.base.extension.FileExtension;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.JWorkBook;
@@ -25,7 +25,7 @@ public class CSVExportAction extends AbstractWorkBookExportAction {
         this.setMenuKeySet(KeySetUtils.CSV_EXPORT);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_file/csv.png"));
+        this.setSmallIcon(new LazyIcon("csvFile"));
     }
 
     @Override

designer-realize/src/main/java/com/fr/design/actions/file/export/EmbeddedExportExportAction.java

@@ -1,6 +1,6 @@
 package com.fr.design.actions.file.export;
 
-import com.fr.base.BaseUtils;
+import com.fine.theme.icon.LazyIcon;
 import com.fr.base.extension.FileExtension;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.JWorkBook;
@@ -22,7 +22,7 @@ public class EmbeddedExportExportAction extends AbstractWorkBookExportAction {
         this.setMenuKeySet(KeySetUtils.EMBEDDED_EXPORT);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(BaseUtils.readIcon("/com/fr/base/images/oem/logo.png"));
+        this.setSmallIcon(new LazyIcon("logo"));
     }
 
     @Override

designer-realize/src/main/java/com/fr/design/actions/file/export/SVGExportAction.java

@@ -3,7 +3,7 @@
  */
 package com.fr.design.actions.file.export;
 
-import com.fr.base.BaseUtils;
+import com.fine.theme.icon.LazyIcon;
 import com.fr.base.extension.FileExtension;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.JWorkBook;
@@ -24,7 +24,7 @@ public class SVGExportAction extends AbstractWorkBookExportAction {
         this.setMenuKeySet(KeySetUtils.SVG_EXPORT);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_file/svg.png"));
+        this.setSmallIcon(new LazyIcon("svgFile"));
     }
 
     @Override

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

@@ -3,6 +3,7 @@
  */
 package com.fr.design.mainframe;
 
+import com.fine.theme.icon.LazyIcon;
 import com.formdev.flatlaf.ui.FlatUIUtils;
 import com.fr.base.BaseFormula;
 import com.fr.base.DynamicUnitList;
@@ -1345,7 +1346,7 @@ public abstract class ElementCasePane<T extends TemplateElementCase> extends Tar
         MenuDef insertFloatMenu = new MenuDef();
         insertFloatMenu.setName(KeySetUtils.INSERT_FLOAT.getMenuKeySetName());
         insertFloatMenu.setTooltip(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_T_Insert_Float"));
-        insertFloatMenu.setIconPath("/com/fr/design/standard/floatpop");
+        insertFloatMenu.setIcon(new LazyIcon("floatelement_popup", new Dimension(25, 21)));
 
         UpdateAction[] actions = ActionFactory.createFloatInsertAction(ElementCasePane.class, this);
         for (int i = 0; i < actions.length; i++) {

designer-realize/src/main/java/com/fr/design/sort/celldscolumn/CellDSColumnSortGroupPane.java

@@ -27,6 +27,7 @@ public class CellDSColumnSortGroupPane extends AbstractSortGroupPane {
         java.util.Map<String, TableDataWrapper> tableDataWrapperMap =
                 DesignTableDataManager.getAllEditingDataSet(HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getTarget());
         Map<String, TableDataWrapper> allDataSetIncludingProcedure = DesignTableDataManager.getAllDataSetIncludingProcedure(tableDataWrapperMap);
+        if (dsColumn != null) {
             TableDataWrapper tableDataWrapper = allDataSetIncludingProcedure.get(dsColumn.getDSName());
             if (tableDataWrapper != null) {
                 java.util.List<String> columnNameList = tableDataWrapper.calculateColumnNameList();
@@ -37,6 +38,8 @@ public class CellDSColumnSortGroupPane extends AbstractSortGroupPane {
                     cellDSColumnSortItemPane.sortAreaUiComboBox.addItem(columnName);
                 }
             }
+        }
+
         cellDSColumnSortItemPane.populateBean(sortExpression);
         return cellDSColumnSortItemPane;
     }

designer-realize/src/main/java/com/fr/design/webattr/EditToolBar.java

@@ -47,6 +47,8 @@ import com.fr.stable.StringUtils;
 import com.fr.widgettheme.util.WidgetThemeDesignerUtils;
 import com.fr.write.JavaScriptResourceInfo;
 
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
 import javax.swing.DefaultListModel;
 import javax.swing.Icon;
 import javax.swing.ImageIcon;
@@ -136,6 +138,12 @@ public class EditToolBar extends BasicPane {
                     }
                 }
             });
+            dialog.addWindowFocusListener(new WindowAdapter() {
+                @Override
+                public void windowGainedFocus(WindowEvent e) {
+                    dialog.toFront();
+                }
+            });
             dialog.setVisible(true);
         }
     };

designer-realize/src/main/java/com/fr/design/webattr/SettingToolBar.java

@@ -12,6 +12,8 @@ import javax.swing.AbstractAction;
 import javax.swing.Action;
 import javax.swing.Icon;
 import javax.swing.JPanel;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
 import java.awt.BorderLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -73,6 +75,12 @@ public  class SettingToolBar extends JPanel {
 					toolBarPane.setFToolBar(tb.update());
 				}
 			});
+			dialog.addWindowFocusListener(new WindowAdapter() {
+				@Override
+				public void windowGainedFocus(WindowEvent e) {
+					dialog.toFront();
+				}
+			});
 			dialog.setVisible(true);
 		}
 	}