From f807064850eb4bc1d7960d7e0edd2513a4674b93 Mon Sep 17 00:00:00 2001
From: Starryi <starryi@foxmail.com>
Date: Tue, 12 Apr 2022 10:42:56 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-69575=20=E8=AE=BE=E8=AE=A1=E5=99=A8?=
 =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=BB=84=E4=BB=B6=E5=88=B7=E4=B8=8D=E5=87=BA?=
 =?UTF-8?q?=E6=9D=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

【问题原因】
oss服务器上缺少部分组件的封面图且读取文件时因为异常类型不匹配，
导致没有捕获到对应的异常，进而影响到组件面板的初始化，最终导致
子进程运行失败，没有切出加载界面。

【改动思路】

1. 组件面板延迟加载，不要影响组件包面板，以及整个在线组件库面板的展示
2. 使用Exception捕获封面图的读取异常

【review建议】
---
 .../share/ui/block/AbstractOnlineWidgetBlock.java        | 7 ++++---
 .../mainframe/share/ui/online/OnlineWidgetTabPane.java   | 9 +++++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/designer-form/src/main/java/com/fr/design/mainframe/share/ui/block/AbstractOnlineWidgetBlock.java b/designer-form/src/main/java/com/fr/design/mainframe/share/ui/block/AbstractOnlineWidgetBlock.java
index 5c1620ab4..e4a978d52 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/share/ui/block/AbstractOnlineWidgetBlock.java
+++ b/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();
         }
diff --git a/designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/OnlineWidgetTabPane.java b/designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/OnlineWidgetTabPane.java
index ca0e8aa6a..385cc9e3a 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/OnlineWidgetTabPane.java
+++ b/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();