Merge pull request #632 in DESIGN/design from ~MATA.LI/design:feature/10.0 to feature/10.0

* commit '3d61cbadb7224789d40c02769af12490c8aa6e22':
  REPORT-12635
  REPORT-12635
  REPORT-12635
  REPORT-12635
  REPORT-12635
  REPORT-12635
  REPORT-12635
  REPORT-10536

designer-base/src/main/java/com/fr/design/web/CustomIconPane.java

@@ -24,6 +24,8 @@ import com.fr.stable.Constants;
 import com.fr.stable.CoreGraphHelper;
 import com.fr.stable.ListMap;
 import com.fr.stable.StringUtils;
+import com.fr.transaction.Configurations;
+import com.fr.transaction.WorkerFacade;
 
 import javax.swing.*;
 import javax.swing.event.ChangeEvent;
@@ -39,9 +41,7 @@ import java.awt.geom.Rectangle2D;
 import java.awt.image.BufferedImage;
 
 /**
- * 
  * carl：自定义Icon编辑
- *
  */
 public class CustomIconPane extends BasicPane {
     private String selectedIconName = null;
@@ -55,7 +55,6 @@ public class CustomIconPane extends BasicPane {
     private UIButton editButton;
 
 
-
     private static final int THE_WIDTH = 180;
     private static final int HORIZONTAL_COUNT = 6;
     private static final int HEIGHT_PER = 29;
@@ -283,6 +282,14 @@ public class CustomIconPane extends BasicPane {
     }
 
     public String update() {
+        //把图标信息入库
+        Configurations.update(new WorkerFacade(WidgetInfoConfig.class) {
+            @Override
+            public void run() {
+                WidgetInfoConfig.getInstance().setIconManager(IconManager.getIconManager());
+            }
+        });
+
         return selectedIconName;
     }
 
@@ -309,6 +316,7 @@ public class CustomIconPane extends BasicPane {
         private static final int ICON_BUTTON_SIZE = 24;
         private static final int ICON_X = 4;
         private static final int ICON_Y = 4;
+
         public IconButton(String name) {
             this.iconName = name;
             this.addActionListener(this);
@@ -403,6 +411,7 @@ public class CustomIconPane extends BasicPane {
                 public void focusGained(FocusEvent e) {
                     // do nothing
                 }
+
                 public void focusLost(FocusEvent e) {
                     if (oldName != null && ComparatorUtils.equals(oldName, nameTextField.getText())) {
                         return;