REPORT-60489 主题面板引导长按滑动时候会有异常

designer-base/src/main/java/com/fr/design/mainframe/guide/scene/ClickScene.java

@@ -88,6 +88,20 @@ public class ClickScene extends AbstractGuideScene{
                     redispatchMouseEvent(e, target);
                 }
             }
+
+            @Override
+            public void mouseEntered(MouseEvent e) {
+                if (isDispatch) {
+                    redispatchMouseEvent(e, target);
+                }
+            }
+
+            @Override
+            public void mouseExited(MouseEvent e) {
+                if (isDispatch) {
+                    redispatchMouseEvent(e, target);
+                }
+            }
         });
     }
 
@@ -99,10 +113,11 @@ public class ClickScene extends AbstractGuideScene{
 
     @Override
     public void showScene() {
-        super.showScene();
         // 交互类的 scene 如果没有高亮内容块载，需要及时终止Guide，否则就没法去掉模态框影响到设计器主功能的使用了
         if (this.getComponentCount() == 0) {
             GuideManager.getInstance().getCurrentGuide().terminate();
+        } else {
+            super.showScene();
         }
     }
 }

designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeGridPagesPane.java

@@ -51,6 +51,7 @@ import java.util.Set;
  * Created by Starryi on 2021/10/9
  */
 public class TemplateThemeGridPagesPane extends JPanel {
+    public static final String COMPLETE_BUTTON = "theme_button_complete";
     private BreadcrumbBar breadcrumbBar;
     private JPanel contentPane;
     private CardLayout cardLayout;
@@ -176,6 +177,7 @@ public class TemplateThemeGridPagesPane extends JPanel {
 
     private UIButton createCompleteButton() {
         UIButton button = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Manager_Dialog_Complete"));
+        button.setName(COMPLETE_BUTTON);
         button.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {

designer-base/src/main/java/com/fr/design/mainframe/theme/dialog/TemplateThemeGridPagesDialog.java

@@ -16,7 +16,6 @@ import javax.swing.JPanel;
  * Created by Starryi on 2021/8/13
  */
 public class TemplateThemeGridPagesDialog extends TemplateThemeDialog implements TemplateThemeGridPagesPane.PageChangeListener {
-    public static final String COMPLETE_BUTTON = "theme_button_complete";
     public static final int CONTENT_WIDTH = TemplateThemeGridPane.CONTENT_WIDTH + 40;
     public static final int CONTENT_HEIGHT = TemplateThemeGridPane.CONTENT_HEIGHT + 37;
 

designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/theme/ThemeToggleGuide.java

@@ -1,6 +1,5 @@
 package com.fr.design.mainframe.guide.creator.theme;
 
-import com.fr.base.theme.FormTheme;
 import com.fr.base.theme.FormThemeConfig;
 import com.fr.base.theme.TemplateTheme;
 import com.fr.design.file.HistoryTemplateListCache;
@@ -8,8 +7,6 @@ import com.fr.design.gui.ibutton.UIButtonGroup;
 import com.fr.design.gui.style.FollowingThemePane;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.CenterRegionContainerPane;
-import com.fr.design.mainframe.DesignerContext;
-import com.fr.design.mainframe.DesignerFrame;
 import com.fr.design.mainframe.EastRegionContainerPane;
 import com.fr.design.mainframe.guide.GuideIds;
 import com.fr.design.mainframe.guide.base.Guide;
@@ -24,6 +21,7 @@ import com.fr.design.mainframe.guide.scene.GuideSceneLifecycleAdaptor;
 import com.fr.design.mainframe.guide.tip.BubbleTip;
 import com.fr.design.mainframe.guide.tip.GuideTip;
 import com.fr.design.mainframe.theme.TemplateThemeBlock;
+import com.fr.design.mainframe.theme.TemplateThemeGridPagesPane;
 import com.fr.design.mainframe.theme.dialog.TemplateThemeUsingDialog;
 import com.fr.design.utils.ComponentUtils;
 
@@ -137,7 +135,7 @@ public class ThemeToggleGuide {
         scene.registerLifecycle(new GuideSceneLifecycleAdaptor() {
             @Override
             public boolean prepared() {
-                scene.addClickTarget(ComponentUtils.findComponentByName(themeDialog, TemplateThemeUsingDialog.COMPLETE_BUTTON), ClickScene.ClickType.LEFT, true);
+                scene.addClickTarget(ComponentUtils.findComponentByName(themeDialog, TemplateThemeGridPagesPane.COMPLETE_BUTTON), ClickScene.ClickType.LEFT, true);
                 scene.addBubbleTip(Toolkit.i18nText("Fine-Design_Guide_Scene_Base_Tip_Click_Complete"), BubbleTip.Direction.TOP);
                 return true;
             }