REPORT-63190【接触点优化】轮播过程中切换组件包，再回来发现显示有问题

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

@@ -95,6 +95,10 @@ public abstract class AbstractOnlineWidgetBlock extends PreviewWidgetBlock<Onlin
         resetCover(image);
     }
 
+    public boolean checkValid(Object key) {
+        return this.parentPane == key;
+    }
+
     private Image getDefaultDisplayImage(){
         return ShareComponentConstants.DEFAULT_COVER;
     }

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

@@ -41,6 +41,9 @@ public class OnlineWidgetPackageBlock extends AbstractOnlineWidgetBlock {
         southPane.add(detailLabel, BorderLayout.EAST);
         return southPane;
     }
+    protected boolean supportFirstDragAnimate(){
+        return false;
+    }
 
     protected Dimension getCoverDimension() {
         return new Dimension(ShareComponentConstants.SHARE_PACKAGE_BLOCK_WIDTH, IMAGE_HEIGHT);

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

@@ -148,7 +148,8 @@ public abstract class PreviewWidgetBlock<T> extends JPanel implements MouseListe
     @Override
     public void mouseEntered(MouseEvent e) {
         hover = true;
-        if (ComponentShareUtil.needShowFirstDragAnimate() && !FormWidgetDetailPane.getInstance().hasTouched() && checkWidget()) {
+        if (ComponentShareUtil.needShowFirstDragAnimate() && supportFirstDragAnimate() &&
+                !FormWidgetDetailPane.getInstance().hasTouched() && checkWidget()) {
             schedule(ANIMATE_START_TIME);
             awtEventListener = event -> {
                 if (!this.isShowing()) {
@@ -169,6 +170,10 @@ public abstract class PreviewWidgetBlock<T> extends JPanel implements MouseListe
         }
     }
 
+    protected boolean supportFirstDragAnimate(){
+        return true;
+    }
+
     protected boolean checkWidget() {
         return true;
     }

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

@@ -14,4 +14,9 @@ public class SimpleWidgetBlock extends OnlineWidgetBlock {
         this.removeListener();
         this.setFocusable(false);
     }
+
+    protected boolean supportFirstDragAnimate(){
+        return false;
+    }
+
 }

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

@@ -170,7 +170,7 @@ public abstract class AbstractOnlineWidgetSelectPane  extends AbstractWidgetSele
         if (!OnlineShopUtils.testConnection()) {
             return OnlineWidgetSelectPane.PaneStatue.DISCONNECTED;
         }
-        OnlineResourceManager.getInstance().cancelLoad();
+        OnlineResourceManager.getInstance().cancelLoad(this);
 
         contentPane.removeAll();
         scrollPane = createScrollPane();

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

@@ -3,6 +3,7 @@ package com.fr.design.mainframe.share.ui.online.resource;
 import javax.swing.SwingWorker;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
+import java.util.function.Predicate;
 
 /**
  * Created by kerry on 2020-12-10
@@ -25,11 +26,16 @@ public class OnlineResourceManager {
 
     private final BlockingQueue<ResourceLoader> loaderBlockingQueue = new ArrayBlockingQueue<ResourceLoader>(100);
 
-    public void cancelLoad() {
+    public void cancelLoad(Object key) {
         if (swingWorker != null) {
             swingWorker.cancel(true);
         }
-        this.loaderBlockingQueue.clear();
+        loaderBlockingQueue.removeIf(new Predicate<ResourceLoader>() {
+            @Override
+            public boolean test(ResourceLoader resourceLoader) {
+                return resourceLoader.checkValid(key);
+            }
+        });
     }
 
     public void addLoader(ResourceLoader loader) {

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

@@ -10,4 +10,11 @@ public interface ResourceLoader {
      */
     void load();
 
+    /**
+     * 检查resource是否属于某分类
+     * @param key 分类标识
+     * @return boolean
+     */
+    boolean checkValid(Object key);
+
 }