Pull request #8561: REPORT-69575 设计器在线组件刷不出来

Merge in DESIGN/design from ~STARRYI/design:final/11.0 to final/11.0

* commit '73df50d5254ea3ec81d97595de66f4bc41312f8e':
  REPORT-69575 设计器在线组件刷不出来

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

@@ -23,7 +23,6 @@ import javax.swing.JPopupMenu;
 import java.awt.Dimension;
 import java.awt.Image;
 import java.awt.event.MouseEvent;
-import java.io.IOException;
 import java.net.URL;
 
 /**
@@ -75,7 +74,8 @@ public abstract class AbstractOnlineWidgetBlock extends PreviewWidgetBlock<Onlin
     public Image getPreviewImage() {
         try {
             return ImageIO.read(new URL(UriUtils.encodePath(widget.getPicPath(), EncodeConstants.ENCODING_UTF_8)));
-        } catch (IOException e) {
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().error(widget.getName());
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
             return getDefaultDisplayImage();
         }
@@ -88,7 +88,8 @@ public abstract class AbstractOnlineWidgetBlock extends PreviewWidgetBlock<Onlin
             String previewURI = UriUtils.encodePath(widget.getPicPath(), EncodeConstants.ENCODING_UTF_8) + "?x-oss-process=image/resize,m_fixed," + "w_" + coverDimension.width +
                     ",h_" + coverDimension.height;
             image = ImageIO.read(new URL(previewURI));
-        } catch (IOException e) {
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().error(widget.getName());
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
             image = getDefaultDisplayImage();
         }

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

@@ -43,6 +43,7 @@ public class OnlineWidgetTabPane extends JPanel {
     private CardLayout cardLayout;
     private JPanel centerPane;
     private boolean packagePaneCreated = false;
+    private boolean componentPaneCreated = false;
     private final List<TabChangeListener> tabChangeListeners;
     private OnlineEmbedFilterShowPane embedFilterShowPane;
     private OnlineWidgetPackagesShowPane widgetPackagesShowPane;
@@ -57,8 +58,6 @@ public class OnlineWidgetTabPane extends JPanel {
         this.cardLayout = new CardLayout();
         this.centerPane = new JPanel(cardLayout);
 
-        this.centerPane.add(new OnlineWidgetShowPane(sharableWidgets), COMPONENT);
-        this.centerPane.add( embedFilterShowPane = new OnlineEmbedFilterShowPane(new OnlineWidgetShowPane(sharableWidgets, OnlineWidgetSortType.SALES)), COMPONENT_EMBED);
         //延迟组件包面板的初始化，防止组件面板里组件的缩略图和组件包面板里组件的缩略图一起加载
         this.headGroup = new UITabGroup(new String[]{COMPONENT_PACKAGE, COMPONENT}) {
             public void tabChanged(int newSelectedIndex) {
@@ -66,6 +65,12 @@ public class OnlineWidgetTabPane extends JPanel {
                     changeListener.tabChange(newSelectedIndex);
                 }
                 if (newSelectedIndex == COMPONENT_TAB_INDEX) {
+                    //延迟组件包面板的初始化，防止组件面板里组件和缩略图和组件包面板里组件的缩略图一起加载
+                    if (!componentPaneCreated) {
+                        centerPane.add(new OnlineWidgetShowPane(sharableWidgets), COMPONENT);
+                        centerPane.add( embedFilterShowPane = new OnlineEmbedFilterShowPane(new OnlineWidgetShowPane(sharableWidgets, OnlineWidgetSortType.SALES)), COMPONENT_EMBED);
+                        componentPaneCreated = true;
+                    }
                     cardLayout.show(centerPane, ComponentShareUtil.needShowEmbedFilterPane() ? COMPONENT_EMBED : COMPONENT);
                 } else {
                     ComponentShareUtil.completeEmbedFilter();