From b5c89e6c6e3ba78e2e5d36ef3e4bb27589ddf0f3 Mon Sep 17 00:00:00 2001 From: "Bruce.Deng" Date: Wed, 9 Jun 2021 16:58:00 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-52526=20=E3=80=90=E6=9D=A5=E6=BA=90?= =?UTF-8?q?=E4=BA=8E=E8=BF=AD=E4=BB=A3=E4=BB=BB=E5=8A=A1=E3=80=91=E3=80=90?= =?UTF-8?q?V2.1.0=E3=80=91=E8=AE=BE=E8=AE=A1=E5=99=A8=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=9B=86=E6=9F=A5=E8=AF=A2=E7=95=8C=E9=9D=A2=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=A4=8D=E5=88=B6=E4=BC=A0=E5=8F=82=E5=90=8Esql=E7=9A=84?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../preview/sql/PreviewPerformedSqlPane.java | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/preview/sql/PreviewPerformedSqlPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/preview/sql/PreviewPerformedSqlPane.java index 462f70b34e..c0239c8fad 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/preview/sql/PreviewPerformedSqlPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/preview/sql/PreviewPerformedSqlPane.java @@ -208,12 +208,22 @@ public class PreviewPerformedSqlPane extends JDialog implements ActionListener { StringSelection selection = new StringSelection(sql); java.awt.Toolkit.getDefaultToolkit().getSystemClipboard().setContents(selection, selection); // 弹窗 - PreviewPerformedSqlPane pane; if (isShowSpecialCharSqlPane(specialCharParamIndex)) { - pane = new PreviewPerformedSqlPane(DesignerContext.getDesignerFrame(), sql, specialCharParamIndex, ConfigService.getInstance().getPSIConfig().getSelectedSpecialChar(), highlight); + showSpecialCharSqlPane(sql, specialCharParamIndex, highlight); } else { - pane = new PreviewPerformedSqlPane(DesignerContext.getDesignerFrame(), sql); + showNormalPreviewPane(sql); } + } + + // 埋点方法 + private static void showNormalPreviewPane(String sql) { + PreviewPerformedSqlPane pane = new PreviewPerformedSqlPane(DesignerContext.getDesignerFrame(), sql); + pane.setVisible(true); + } + + // 埋点方法 + private static void showSpecialCharSqlPane(String sql, List specialCharParamIndex, boolean highlight) { + PreviewPerformedSqlPane pane = new PreviewPerformedSqlPane(DesignerContext.getDesignerFrame(), sql, specialCharParamIndex, ConfigService.getInstance().getPSIConfig().getSelectedSpecialChar(), highlight); pane.setVisible(true); }