From a374cf2fdbc26af50c66d79fe167e9af3211b71d Mon Sep 17 00:00:00 2001
From: "Henry.Wang" <Henry.Wang@fanruan.com>
Date: Thu, 14 Oct 2021 09:51:00 +0800
Subject: [PATCH 1/6] =?UTF-8?q?REPORT-60535=20=E8=A1=A8=E5=8D=95=E6=96=B0?=
 =?UTF-8?q?=E8=87=AA=E9=80=82=E5=BA=94=E5=8D=95=E5=85=83=E6=A0=BC=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E2=80=9C=E7=94=A8=E4=B8=8B=E8=BD=BD=E9=93=BE=E6=8E=A5?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BA=8C=E8=BF=9B=E5=88=B6=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E2=80=9D=E8=AE=BE=E8=AE=A1=E5=99=A8=E5=92=8CPC=E6=89=93?=
 =?UTF-8?q?=E5=BC=80=E9=A2=9C=E8=89=B2=E4=B8=8D=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mainframe/cell/settingpane/CellOtherSetPane.java   | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java
index bcf1244d31..0ea7713ca9 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java
@@ -1,5 +1,6 @@
 package com.fr.design.mainframe.cell.settingpane;
 
+import com.fr.base.Style;
 import com.fr.design.constants.LayoutConstants;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.editor.ValueEditorPane;
@@ -21,11 +22,13 @@ import com.fr.design.mainframe.theme.utils.DefaultThemedTemplateCellElementCase;
 import com.fr.design.utils.gui.UIComponentUtils;
 import com.fr.design.widget.FRWidgetFactory;
 import com.fr.general.ComparatorUtils;
+import com.fr.general.FRFont;
 import com.fr.report.cell.TemplateCellElement;
 import com.fr.report.cell.cellattr.CellGUIAttr;
 import com.fr.report.cell.cellattr.CellInsertPolicyAttr;
 import com.fr.report.cell.cellattr.CellPageAttr;
 import com.fr.report.elementcase.TemplateElementCase;
+import com.fr.stable.Constants;
 import com.fr.stable.StringUtils;
 import com.fr.design.i18n.Toolkit;
 import java.awt.Color;
@@ -327,13 +330,20 @@ public class CellOtherSetPane extends AbstractCellAttrPane {
 
             @Override
             public void itemStateChanged(ItemEvent e) {
+                Style elementStyle = cellElement.getStyle();
+                FRFont frFont = elementStyle.getFRFont();
                 if (showContent.getSelectedIndex() == 3) {
                     fileNamePane.setPreferredSize(new Dimension(100, 20));
                     fileNameLayout.show(fileNamePane, "content");
+                    frFont = frFont.applyForeground(Color.blue);
+                    frFont = frFont.applyUnderline(Constants.LINE_THIN);
                 } else {
                     fileNameLayout.show(fileNamePane, "none");
                     fileNamePane.setPreferredSize(new Dimension(0, 0));
+                    frFont = frFont.applyForeground(Color.black);
+                    frFont = frFont.applyUnderline(Constants.LINE_NONE);
                 }
+                cellElement.setStyle(elementStyle.deriveFRFont(frFont));
             }
         });
         return fileNamePane;

From a64885d6eb8ecc74dd2c908870195dd55534b7ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=B9=E7=A3=8A?= <294531121@qq.com>
Date: Thu, 14 Oct 2021 16:42:30 +0800
Subject: [PATCH 2/6] =?UTF-8?q?REPORT-59545=20=E8=AE=BE=E8=AE=A1=E5=99=A8?=
 =?UTF-8?q?=E5=BE=88=E5=A4=9A=E6=8A=A5=E9=94=99=E6=8F=90=E7=A4=BA=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E7=9A=84=E4=BA=A4=E4=BA=92=E6=9C=89=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/formula/FormulaChecker.java | 17 +++---
 .../formula/FormulaCheckerException.java      | 11 ++++
 .../com/fr/design/formula/FormulaPane.java    | 60 ++++++++++++-------
 3 files changed, 61 insertions(+), 27 deletions(-)
 create mode 100644 designer-base/src/main/java/com/fr/design/formula/FormulaCheckerException.java

diff --git a/designer-base/src/main/java/com/fr/design/formula/FormulaChecker.java b/designer-base/src/main/java/com/fr/design/formula/FormulaChecker.java
index 093f26edf8..59446169d3 100644
--- a/designer-base/src/main/java/com/fr/design/formula/FormulaChecker.java
+++ b/designer-base/src/main/java/com/fr/design/formula/FormulaChecker.java
@@ -25,7 +25,7 @@ public class FormulaChecker {
     private static final String INVALID_FORMULA = Toolkit.i18nText("Fine-Design_Basic_FormulaD_Invalid_Formula");
     public static final String COLON = ":";
 
-    public static String check(String formulaText) {
+    public static String check(String formulaText) throws FormulaCheckerException {
         StringReader in = new StringReader(formulaText);
 
         FRLexer lexer = new FRLexer(in);
@@ -34,12 +34,15 @@ public class FormulaChecker {
         try {
             Expression expression = parser.parse();
             Node node = expression.getConditionalExpression();
-            return FunctionCheckerDispatcher.getInstance()
-                    .getFunctionChecker(node)
-                    .checkFunction(node) ? VALID_FORMULA : INVALID_FORMULA;
+            boolean valid = FunctionCheckerDispatcher.getInstance().getFunctionChecker(node).checkFunction(node);
+            if (valid) {
+                return VALID_FORMULA;
+            } else {
+                throw new FormulaCheckerException(INVALID_FORMULA);
+            }
         } catch (ConditionCheckWrongException cce) {
             String functionName = cce.getFunctionName();
-            return functionName + Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Condition_Tips") + COLON;
+            throw new FormulaCheckerException(functionName + Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Condition_Tips") + COLON);
         } catch (FunctionCheckWrongException ce) {
             List<FunctionRule> rules = ce.getRules();
             String functionName = ce.getFunctionName();
@@ -60,10 +63,10 @@ public class FormulaChecker {
                     errorMsg.append(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Or"));
                 }
             }
-            return errorMsg.toString();
+            throw new FormulaCheckerException(errorMsg.toString());
         } catch (Exception e) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
-            return INVALID_FORMULA;
+            throw new FormulaCheckerException(INVALID_FORMULA);
             // alex:继续往下面走,expression为null时告知不合法公式
         }
     }
diff --git a/designer-base/src/main/java/com/fr/design/formula/FormulaCheckerException.java b/designer-base/src/main/java/com/fr/design/formula/FormulaCheckerException.java
new file mode 100644
index 0000000000..42fc585cbb
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/formula/FormulaCheckerException.java
@@ -0,0 +1,11 @@
+package com.fr.design.formula;
+
+public class FormulaCheckerException extends Exception {
+    public FormulaCheckerException() {
+
+    }
+
+    public FormulaCheckerException(String message) {
+        super(message);
+    }
+}
diff --git a/designer-base/src/main/java/com/fr/design/formula/FormulaPane.java b/designer-base/src/main/java/com/fr/design/formula/FormulaPane.java
index 447421a415..6012bba195 100644
--- a/designer-base/src/main/java/com/fr/design/formula/FormulaPane.java
+++ b/designer-base/src/main/java/com/fr/design/formula/FormulaPane.java
@@ -650,12 +650,14 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
         public void actionPerformed(ActionEvent evt) {
             // Execute Formula default cell element.
             String formulaText = formulaTextArea.getText().trim();
-            String formulaValidMessage = FormulaChecker.check(formulaText);
-            FineJOptionPane.showMessageDialog(
-                    FormulaPane.this,
-                    formulaValidMessage + ".",
-                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
-                    JOptionPane.WARNING_MESSAGE);
+            String formulaValidMessage;
+            try {
+                formulaValidMessage = FormulaChecker.check(formulaText);
+                showMessageDialog(formulaValidMessage + ".");
+            } catch (FormulaCheckerException e) {
+                formulaValidMessage = e.getMessage();
+                showMessageDialog(formulaValidMessage + ".", false);
+            }
         }
     };
 
@@ -663,22 +665,26 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
         @Override
         public void actionPerformed(ActionEvent e) {
             String formulaText = formulaTextArea.getText().trim();
-            String formulaValidMessage = FormulaChecker.check(formulaText);
-            ;
             String unSupportFormula = containsUnsupportedSimulationFormulas(formulaText);
             if (unSupportFormula != null) {
-                FineJOptionPane.showMessageDialog(
-                        FormulaPane.this,
-                        com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula_Unsupported_Formulas") + ":" + unSupportFormula,
-                        com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
-                        JOptionPane.INFORMATION_MESSAGE);
+                showMessageDialog(Toolkit.i18nText("Fine-Design_Basic_Formula_Unsupported_Formulas") + ":" + unSupportFormula, false);
                 return;
             }
+
+            String formulaValidMessage;
+            boolean formulaValid;
+            try {
+                formulaValidMessage = FormulaChecker.check(formulaText);
+                formulaValid = true;
+            } catch (FormulaCheckerException formulaCheckerException) {
+                formulaValidMessage = formulaCheckerException.getMessage();
+                formulaValid = false;
+            }
             String messageTips;
-            if (formulaValidMessage.equals(INVALID_FORMULA)) {
+            if (ComparatorUtils.equals(formulaValidMessage, INVALID_FORMULA)) {
                 messageTips = INVALID_FORMULA;
             } else {
-                messageTips = formulaValidMessage.equals(VALID_FORMULA) ? "" : formulaValidMessage + "\n";
+                messageTips = ComparatorUtils.equals(formulaValidMessage, VALID_FORMULA) ? "" : formulaValidMessage + "\n";
                 Map<String, Object> paramsMap = setParamsIfExist(formulaText);
                 Calculator calculator = Calculator.createCalculator();
                 ParameterMapNameSpace parameterMapNameSpace = ParameterMapNameSpace.create(paramsMap);
@@ -699,19 +705,33 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
                     String result = objectToString.length() > DEFUAL_FOMULA_LENGTH ?
                             objectToString.substring(0, DEFUAL_FOMULA_LENGTH - ELLIPSIS.length()) + ELLIPSIS : objectToString;
                     messageTips = messageTips +
-                            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula_Cal_Result") + ":" + result;
+                            Toolkit.i18nText("Fine-Design_Basic_Formula_Cal_Result") + ":" + result;
                     FineLoggerFactory.getLogger().info("value:{}", value);
                 } catch (UtilEvalError utilEvalError) {
                     FineLoggerFactory.getLogger().error("", utilEvalError);
                 }
             }
+            showMessageDialog(messageTips, formulaValid);
+        }
+    };
+
+    private void showMessageDialog(String message) {
+        showMessageDialog(message, true);
+    }
+
+    private void showMessageDialog(String message, boolean formulaValid) {
+        if (formulaValid) {
+            FineJOptionPane.showMessageDialog(
+                    FormulaPane.this,
+                    message);
+        } else {
             FineJOptionPane.showMessageDialog(
                     FormulaPane.this,
-                    messageTips,
-                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
-                    JOptionPane.INFORMATION_MESSAGE);
+                    message,
+                    Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
+                    JOptionPane.WARNING_MESSAGE);
         }
-    };
+    }
 
     private String containsUnsupportedSimulationFormulas(String formulaText) {
         try {

From 10a55919ae344a8f8ee7dada36d0f0d892785160 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=B9=E7=A3=8A?= <294531121@qq.com>
Date: Thu, 14 Oct 2021 17:45:53 +0800
Subject: [PATCH 3/6] =?UTF-8?q?REPORT-60900=20=E8=A7=86=E8=A7=89=E5=88=87?=
 =?UTF-8?q?=E5=9B=BE=E6=8F=90=E4=BE=9B=E7=9A=84=E6=9C=89=E7=82=B9=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=8C=E6=89=BE=E8=A7=86=E8=A7=89=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E4=BA=86=E5=88=87=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../form/layouts/images/simple_style_18.png   | Bin 10548 -> 9640 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_18.png

diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_18.png b/designer-form/src/main/resources/com/fr/design/form/layouts/images/simple_style_18.png
old mode 100644
new mode 100755
index 656494c55a8c9cbae8796d4f67ebf7e428ad1339..362a57cf5ebc72a58cdc6b4c664ad6416fa2f13c
GIT binary patch
literal 9640
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
WLuIq7D%|K59#~yhtzOkW>i+;ptqi>Y

literal 10548
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


From 25b2b65066dca667207f2bdd62c0b7464721aee1 Mon Sep 17 00:00:00 2001
From: pengda <pengda@fanruan.com>
Date: Fri, 15 Oct 2021 17:24:43 +0800
Subject: [PATCH 4/6] =?UTF-8?q?REPORT-60992=20=E5=AF=BC=E5=87=BA-=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E4=BA=8B=E4=BB=B6-=E5=85=B6=E4=BB=96=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF-=E7=82=B9=E5=87=BB=E6=A8=A1=E6=9D=BF=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=90=8E=E6=95=88=E6=9E=9C=E9=94=99=E4=B9=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/javascript/ExportJavaScriptPane.java    | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/javascript/ExportJavaScriptPane.java b/designer-base/src/main/java/com/fr/design/javascript/ExportJavaScriptPane.java
index a0a8e6b11d..4060eb13e2 100644
--- a/designer-base/src/main/java/com/fr/design/javascript/ExportJavaScriptPane.java
+++ b/designer-base/src/main/java/com/fr/design/javascript/ExportJavaScriptPane.java
@@ -326,16 +326,19 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane<ExportJavaScript
             private UIButton browserButton;
 
             public ExportTemplateChooser() {
-                reportletNamePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
                 // 路径输入框
-                reportPathTextField = new UITextField(7);
+                reportPathTextField = new UITextField(8);
                 reportPathTextField.setEnabled(false);
-                reportletNamePane.add(reportPathTextField, BorderLayout.WEST);
 
                 // 选择路径按钮
                 browserButton = new UIButton("...");
                 browserButton.setVisible(true);
-                reportletNamePane.add(browserButton, BorderLayout.EAST);
+
+                Component[][] templateChooserComponent = {{reportPathTextField, browserButton}};
+                double[] rowSize = {TableLayout.PREFERRED};
+                double[] columnSize = {TableLayout.FILL, 22};
+                reportletNamePane = TableLayoutHelper.createCommonTableLayoutPane(templateChooserComponent, rowSize, columnSize, 0);
+
                 browserButton.addActionListener(new ActionListener() {
                     @Override
                     public void actionPerformed(ActionEvent evt) {

From 364b073c285e15745345e89b4790e016c8c4f5f1 Mon Sep 17 00:00:00 2001
From: kuangshuai <kuangshuai_ios@icloud.com>
Date: Fri, 15 Oct 2021 19:52:45 +0800
Subject: [PATCH 5/6] =?UTF-8?q?REPORT-60919=20&&=20REPORT-60899=20?=
 =?UTF-8?q?=E5=BC=95=E5=AF=BC=E9=A1=B5=E4=BC=98=E5=8C=96=E8=A7=A3=E5=86=B3?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E7=B1=BB=E7=9A=84=E5=BC=95=E5=AF=BC=E5=BF=AB?=
 =?UTF-8?q?=E9=80=9F=E7=82=B9=E5=87=BB=E5=8F=91=E7=94=9F=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../guide/scene/AbstractGuideScene.java       | 17 ++---
 .../mainframe/guide/scene/ClickScene.java     | 73 +++++++++++--------
 .../guide/creator/GuideSceneHelper.java       |  2 -
 .../layout/ChangeLayoutComponentGuide.java    | 23 +++---
 .../layout/UseLayoutAndComponentGuide.java    | 24 +++---
 .../theme/DownloadComponentPackageGuide.java  |  2 +-
 .../guide/creator/theme/ThemeToggleGuide.java |  5 +-
 7 files changed, 74 insertions(+), 72 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/mainframe/guide/scene/AbstractGuideScene.java b/designer-base/src/main/java/com/fr/design/mainframe/guide/scene/AbstractGuideScene.java
index f0d74789d2..240244fff2 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/guide/scene/AbstractGuideScene.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/guide/scene/AbstractGuideScene.java
@@ -307,9 +307,6 @@ public abstract class AbstractGuideScene extends JPanel implements GuideScene {
                 nextButton.setBounds((getSceneWidth() - 60) / 2, getSceneHeight() - 100, 60, 30);
                 add(nextButton);
             }
-
-            container.revalidate();
-            container.repaint();
         }
         showContainer();
         if (lifecycle != null) {
@@ -319,9 +316,7 @@ public abstract class AbstractGuideScene extends JPanel implements GuideScene {
 
     @Override
     public void complete() {
-        container.getLayeredPane().remove(this);
-        container.repaint();
-
+        clear();
         if (lifecycle != null && !lifecycle.onComplete()) {
             return;
         }
@@ -386,13 +381,15 @@ public abstract class AbstractGuideScene extends JPanel implements GuideScene {
         return container.getLayeredPane().getHeight();
     }
 
-    private void clear() {
+    public void clear() {
         targetList = new ArrayList<>();
         highlightList = new ArrayList<>();
         this.nextButton = null;
-        this.removeAll();
-        invalidate();
-        repaint();
+        if (this.getComponentCount() > 0) {
+            this.removeAll();
+            invalidate();
+            repaint();
+        }
     }
 
     @Override
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/guide/scene/ClickScene.java b/designer-base/src/main/java/com/fr/design/mainframe/guide/scene/ClickScene.java
index 6217f41e7b..0d8b5711b0 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/guide/scene/ClickScene.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/guide/scene/ClickScene.java
@@ -1,13 +1,15 @@
 package com.fr.design.mainframe.guide.scene;
 
+import com.fr.design.gui.ibutton.UIButtonGroup;
 import com.fr.design.mainframe.guide.base.GuideManager;
 
 import javax.swing.AbstractButton;
-import javax.swing.ButtonModel;
 import javax.swing.SwingUtilities;
 import java.awt.Component;
 import java.awt.Point;
 import java.awt.Rectangle;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 
@@ -58,49 +60,60 @@ public class ClickScene extends AbstractGuideScene{
             public void mouseClicked(MouseEvent e) {
                 if (e.getButton() == MouseEvent.BUTTON1) {
                     if ((e.getClickCount() == 1 && clickType == ClickType.LEFT) || (e.getClickCount() == 2 && clickType == ClickType.LEFT_DOUBLE)) {
-                        if (isDispatch) {
-                            redispatchMouseEvent(e, target);
-                        }
-                        complete();
+                        dealWithDispatchLeftClick(target, e, isDispatch);
                     }
                 } else if (e.getButton() == MouseEvent.BUTTON3 && clickType == ClickType.RIGHT) {
-                    if (isDispatch) {
-                        redispatchMouseEvent(e, target);
-                    }
-                    complete();
+                    clear();
+                    SwingUtilities.invokeLater(new Runnable() {
+                        @Override
+                        public void run() {
+                            if (isDispatch) {
+                                redispatchMouseEvent(e, target);
+                            }
+                            complete();
+                        }
+                    });
                 }
+
             }
 
+
             @Override
             public void mousePressed(MouseEvent e) {
-                if (isDispatch) {
-                    if (target instanceof AbstractButton) {
-                        AbstractButton b = (AbstractButton) target;
-                        b.setFocusable(false);
+                if ((target instanceof AbstractButton) && (target.getParent() instanceof UIButtonGroup)) {
+                    if (isDispatch) {
+                        redispatchMouseEvent(e, target);
                     }
-                    redispatchMouseEvent(e, target);
-                }
-            }
-
-            @Override
-            public void mouseReleased(MouseEvent e) {
-                if (isDispatch) {
-                    redispatchMouseEvent(e, target);
                 }
-            }
 
-            @Override
-            public void mouseEntered(MouseEvent e) {
-                if (isDispatch) {
-                    redispatchMouseEvent(e, target);
-                }
             }
+        });
+    }
 
+    private void dealWithDispatchLeftClick(Component target, MouseEvent e, boolean isDispatch) {
+        clear();
+        SwingUtilities.invokeLater(new Runnable() {
             @Override
-            public void mouseExited(MouseEvent e) {
+            public void run() {
                 if (isDispatch) {
-                    redispatchMouseEvent(e, target);
+                    if (target instanceof AbstractButton) {
+                        AbstractButton button = (AbstractButton) target;
+                        ActionListener[] actionListeners= button.getActionListeners();
+                        for(int i = 0; i < actionListeners.length; i++) {
+                            ActionListener actionListener = actionListeners[i];
+                            actionListener.actionPerformed(new ActionEvent(
+                                    button,
+                                    ActionEvent.ACTION_PERFORMED,
+                                    button.getActionCommand(),
+                                    e.getWhen(),
+                                    e.getModifiers()
+                            ));
+                        }
+                    } else {
+                        redispatchMouseEvent(e, target);
+                    }
                 }
+                complete();
             }
         });
     }
@@ -114,7 +127,7 @@ public class ClickScene extends AbstractGuideScene{
     @Override
     public void showScene() {
         // 交互类的 scene 如果没有高亮内容块载，需要及时终止Guide，否则就没法去掉模态框影响到设计器主功能的使用了
-        if (this.getComponentCount() == 0) {
+        if (this.getComponentCount() == 0 && getHighlightList().isEmpty()) {
             GuideManager.getInstance().getCurrentGuide().terminate();
         } else {
             super.showScene();
diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/GuideSceneHelper.java b/designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/GuideSceneHelper.java
index ff80efcf9c..2131fda07d 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/GuideSceneHelper.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/GuideSceneHelper.java
@@ -19,8 +19,6 @@ import com.fr.design.utils.ComponentUtils;
 import com.fr.design.worker.save.CallbackSaveWorker;
 import com.fr.design.worker.save.EmptyCallBackSaveWorker;
 
-import java.awt.Window;
-
 public class GuideSceneHelper {
     public static GuideScene createFormDesignerBodyDisplayScene() {
         DisplayScene scene = new DisplayScene();
diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/layout/ChangeLayoutComponentGuide.java b/designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/layout/ChangeLayoutComponentGuide.java
index 335837196a..a9b7f56c8d 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/layout/ChangeLayoutComponentGuide.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/layout/ChangeLayoutComponentGuide.java
@@ -98,20 +98,15 @@ public class ChangeLayoutComponentGuide {
             @Override
             public boolean prepared() {
                 switchButton.getComponentPopupMenu().setVisible(true);
-                SwingUtilities.invokeLater(new Runnable() {
-                    @Override
-                    public void run() {
-                        scene.addCustomTarget(
-                                GuideCreateUtils.createModalTarget(switchButton.getComponentPopupMenu()),
-                                GuideCreateUtils.getRelativeBounds(switchButton.getComponentPopupMenu(), switchButton,0, -switchButton.getComponentPopupMenu().getHeight())
-                        );
-                        scene.addClickTarget(switchButton.getComponentPopupMenu().getComponent(1), ClickScene.ClickType.LEFT, true);
-                        scene.addBubbleTip(Toolkit.i18nText("Fine-Design_Guide_Scene_F001002_Tip_Select_Fix_layout"), null, GuideTip.Direction.RIGHT, 0.5f, 0.8f);
-                        switchButton.getComponentPopupMenu().setVisible(false);
-                        scene.showScene();
-                    }
-                });
-                return false;
+                scene.addCustomTarget(
+                        GuideCreateUtils.createModalTarget(switchButton.getComponentPopupMenu()),
+                        GuideCreateUtils.getRelativeBounds(switchButton.getComponentPopupMenu(), switchButton,0, -switchButton.getComponentPopupMenu().getHeight())
+                );
+                scene.addClickTarget(switchButton.getComponentPopupMenu().getComponent(1), ClickScene.ClickType.LEFT, true);
+                scene.addBubbleTip(Toolkit.i18nText("Fine-Design_Guide_Scene_F001002_Tip_Select_Fix_layout"), null, GuideTip.Direction.RIGHT, 0.5f, 0.8f);
+                switchButton.getComponentPopupMenu().setVisible(false);
+                scene.showScene();
+                return true;
             }
         });
         return scene;
diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/layout/UseLayoutAndComponentGuide.java b/designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/layout/UseLayoutAndComponentGuide.java
index 6234ea7902..54fc5577bd 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/layout/UseLayoutAndComponentGuide.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/layout/UseLayoutAndComponentGuide.java
@@ -32,6 +32,7 @@ import com.fr.form.share.group.DefaultShareGroup;
 import com.fr.form.share.group.DefaultShareGroupManager;
 import com.fr.stable.StringUtils;
 
+import javax.swing.JComponent;
 import java.awt.Component;
 import java.util.ArrayList;
 import java.util.List;
@@ -72,15 +73,11 @@ public class UseLayoutAndComponentGuide {
                         preloadShareComponent();
                         Component component = ComponentUtils.findComponentByName(NorthRegionContainerPane.getInstance(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_File"));
                         fileHeadMenu = ((UIHeadMenu) component);
-                        fileHeadMenu.setSelected(true);
-                        fileHeadMenu.getPopupMenu().show(fileHeadMenu, 0, fileHeadMenu.getHeight());
                         return true;
                     }
 
                     @Override
                     public void onEnd() {
-                        fileHeadMenu.setSelected(false);
-                        fileHeadMenu.getPopupMenu().setVisible(false);
                         if (newFormPane != null) {
                             newFormPane.getWindow().dispose();
                         }
@@ -101,18 +98,18 @@ public class UseLayoutAndComponentGuide {
                         GuideCreateUtils.createModalTarget(fileHeadMenu.getPopupMenu()),
                         GuideCreateUtils.getRelativeBounds(fileHeadMenu.getPopupMenu(), fileHeadMenu, 0 , fileHeadMenu.getHeight())
                 );
-                scene.addClickTarget(fileHeadMenu.getMenuComponent(2), ClickScene.ClickType.LEFT);
 
-                scene.addBubbleTip(Toolkit.i18nText("Fine-Design_Guide_Scene_F001001_Tip_New_Form"), GuideTip.Direction.BOTTOM);
+                scene.addCustomClickTarget(
+                        GuideCreateUtils.createTarget((JComponent) fileHeadMenu.getMenuComponent(2)),
+                        GuideCreateUtils.getRelativeBounds(fileHeadMenu.getMenuComponent(2), fileHeadMenu, 0,fileHeadMenu.getHeight() + fileHeadMenu.getMenuComponent(2).getY()),
+                        ClickScene.ClickType.LEFT
+                );
+
+                scene.addBubbleTip(Toolkit.i18nText("Fine-Design_Guide_Scene_F001001_Tip_New_Form") + "测试文本测试文本测试文本测试文本测试文本", GuideTip.Direction.BOTTOM);
                 scene.showScene();
                 return true;
             }
-
-            @Override
-            public void onShow() {
-                fileHeadMenu.setSelected(false);
-                fileHeadMenu.getPopupMenu().setVisible(false);
-            }
+            
 
             @Override
             public boolean onComplete() {
@@ -124,6 +121,7 @@ public class UseLayoutAndComponentGuide {
         return scene;
     }
 
+
     public static GuideScene createScene2() {
         DisplayScene scene = new DisplayScene();
         scene.registerLifecycle(new GuideSceneLifecycleAdaptor() {
@@ -136,7 +134,7 @@ public class UseLayoutAndComponentGuide {
                         scene.showScene();
                         GuideCreateUtils.TIMER.purge();
                     }
-                }, 300);
+                }, 100);
                 return false;
             }
         });
diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/theme/DownloadComponentPackageGuide.java b/designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/theme/DownloadComponentPackageGuide.java
index d36506c94c..349857a3b2 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/theme/DownloadComponentPackageGuide.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/theme/DownloadComponentPackageGuide.java
@@ -247,7 +247,7 @@ public class DownloadComponentPackageGuide {
                         scene.showScene();
                         GuideCreateUtils.TIMER.purge();
                     }
-                }, 300);
+                }, 100);
                 return false;
             }
         });
diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/theme/ThemeToggleGuide.java b/designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/theme/ThemeToggleGuide.java
index 2387a470c5..5b7024778c 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/theme/ThemeToggleGuide.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/theme/ThemeToggleGuide.java
@@ -105,7 +105,7 @@ public class ThemeToggleGuide {
                         scene.showScene();
                         GuideCreateUtils.TIMER.purge();
                     }
-                },300);
+                },100);
                 return false;
             }
         });
@@ -163,7 +163,7 @@ public class ThemeToggleGuide {
                         if (target2 != null) {
                             uiButtonGroup[0] = (UIButtonGroup) target2;
                             target2 = ((UIButtonGroup) target2).getButton(0);
-                            scene.addClickTarget(target2, ClickScene.ClickType.LEFT, true);
+                            scene.addClickTarget(target2, ClickScene.ClickType.LEFT,true);
                             scene.addBubbleTip(
                                     Toolkit.i18nText("Fine-Design_Guide_Scene_F002001_Tip_Toggle_Follow_Theme"),
                                     Toolkit.i18nText("Fine-Design_Guide_Scene_F002001_Tip_Toggle_Follow_Theme_Description"),
@@ -183,6 +183,7 @@ public class ThemeToggleGuide {
                 if (uiButtonGroup[0] != null) {
                     uiButtonGroup[0].setSelectedIndex(0);
                 }
+                GuideCreateUtils.getFormDesigner().repaint();
                 return true;
             }
         });

From 41ac183f99eed00a79d918790c3db43bc8a1c6a4 Mon Sep 17 00:00:00 2001
From: pengda <pengda@fanruan.com>
Date: Sun, 17 Oct 2021 23:00:01 +0800
Subject: [PATCH 6/6] =?UTF-8?q?REPORT-60995=20=E5=AF=BC=E5=87=BA-=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E4=BA=8B=E4=BB=B6-=E5=8F=82=E6=95=B0=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE-=E5=8F=96=E6=B6=88=E5=8B=BE=E9=80=89=E7=BB=A7?=
 =?UTF-8?q?=E6=89=BF=E6=8A=A5=E8=A1=A8=E5=90=8E=E5=BC=B9=E7=AA=97=E5=85=B3?=
 =?UTF-8?q?=E4=B8=8D=E6=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/javascript/ExportJavaScriptPane.java   | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/javascript/ExportJavaScriptPane.java b/designer-base/src/main/java/com/fr/design/javascript/ExportJavaScriptPane.java
index 4060eb13e2..ba64b4d4d7 100644
--- a/designer-base/src/main/java/com/fr/design/javascript/ExportJavaScriptPane.java
+++ b/designer-base/src/main/java/com/fr/design/javascript/ExportJavaScriptPane.java
@@ -780,11 +780,13 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane<ExportJavaScript
             if (currentTemplatePane.extendParametersCheckBox.isSelected()) {
                 exportJavaScript.setParameters(null);
             } else {
-                List<ParameterProvider> parameterList = parameterViewPane.update();
-                if (!parameterList.isEmpty()) {
-                    Parameter[] parameters = new Parameter[parameterList.size()];
-                    parameterList.toArray(parameters);
-                    js.setParameters(parameters);
+                if (parameterViewPane != null) {
+                    List<ParameterProvider> parameterList = parameterViewPane.update();
+                    if (!parameterList.isEmpty()) {
+                        Parameter[] parameters = new Parameter[parameterList.size()];
+                        parameterList.toArray(parameters);
+                        js.setParameters(parameters);
+                    }
                 }
             }
             exportJavaScript.addJS(js);