Merge remote-tracking branch 'origin/feature/x' into feature/x

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

@@ -376,4 +376,5 @@ public class XChartEditor extends XBorderStyleWidgetCreator {
     public boolean isComponent() {
         return true;
     }
+
 }

designer-form/src/main/java/com/fr/design/mainframe/share/ui/block/OnlineWidgetBlock.java

@@ -357,6 +357,9 @@ public class OnlineWidgetBlock extends AbstractOnlineWidgetBlock {
         if (isUnusable) {
             paintUnusableMask((Graphics2D) g);
         }
+        if (this.parentPane != null) {
+            this.parentPane.refreshShowPaneUI();
+        }
     }
 
     protected void paintUnusableMask(Graphics2D g2d) {
@@ -393,14 +396,12 @@ public class OnlineWidgetBlock extends AbstractOnlineWidgetBlock {
 
         g2d.setColor(oldColor);
         g2d.setFont(oldFont);
+
     }
 
     @Override
     public void repaint() {
         super.repaint();
-        if (this.parentPane != null) {
-            this.parentPane.refreshUI();
-        }
     }
 
     class WidgetDownloadProcess implements com.fr.design.extra.Process<Double> {

designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/AbstractOnlineWidgetSelectPane.java

@@ -242,7 +242,7 @@ public abstract class AbstractOnlineWidgetSelectPane  extends AbstractWidgetSele
         return this.getParent();
     }
 
-    public void refreshUI() {
+    public void refreshShowPaneUI() {
-      OnlineWidgetRepoPane.getInstance().repaint();
+      OnlineWidgetRepoPane.getInstance().refreshShowPaneUI();
     }
 }

designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/OnlineWidgetRepoPane.java

@@ -228,6 +228,12 @@ public class OnlineWidgetRepoPane extends BasicPane {
         }
     }
 
+    public void refreshShowPaneUI(){
+        if (componentTabPane != null) {
+            this.componentTabPane.refreshShowPaneUI();
+        }
+    }
+
 
     public void completeEmbedFilter(){
         if (componentTabPane != null) {

designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/OnlineWidgetTabPane.java

@@ -87,6 +87,13 @@ public class OnlineWidgetTabPane extends JPanel {
         this.cardLayout.show(centerPane, ComponentShareUtil.needShowEmbedFilterPane() ? COMPONENT_EMBED : COMPONENT);
     }
 
+    public void refreshShowPaneUI(){
+        if (embedFilterShowPane != null) {
+            this.embedFilterShowPane.refreshUI();
+        }
+    }
+
+
     public void removeTabChangeListener(TabChangeListener listener) {
         tabChangeListeners.remove(listener);
     }

designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/embed/EmbedPane.java

@@ -86,7 +86,7 @@ public class EmbedPane extends JPanel {
             protected void paintBorder(Graphics g, UIButton b) {
                 Color oldColor = g.getColor();
                 g.setColor(SEARCH_BUTTON_COLOR);
-                g.drawRoundRect(0, 0, b.getWidth(), b.getHeight(), 2, 2);
+                g.drawRoundRect(0, 0, b.getWidth() - 4, b.getHeight() - 4, 2, 2);
                 g.setColor(oldColor);
             }
         });

designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/embed/OnlineEmbedFilterShowPane.java

@@ -36,6 +36,12 @@ public class OnlineEmbedFilterShowPane extends JPanel {
         selectPane.animate();
     }
 
+    public void refreshUI(){
+        if (embedPane != null) {
+            this.repaint();
+        }
+    }
+
     public void completeEmbedFilter(){
         if (embedPane!= null && embedPane.isShowing()){
             this.remove(embedPane);

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

@@ -128,6 +128,7 @@ public class DesignerSocketIO {
             } else {
                 //表示所有的uri都连接不成功
                 FineLoggerFactory.getLogger().warn("All uris failed to connect");
+                showSocketDisconnectToast();
             }
         } catch (Exception e) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
@@ -206,7 +207,6 @@ public class DesignerSocketIO {
     private static final Emitter.Listener failRetry = new Emitter.Listener() {
         @Override
         public void call(Object... args) {
-            showSocketDisconnectToast();
             printLog(args, PrintEventLogImpl.WARN, "failed args: {}");
             status = Status.Disconnecting;
             socket.close();