From 80ab13972c31dbc2fa6fe1317313299db94299f6 Mon Sep 17 00:00:00 2001 From: Yvan Date: Mon, 12 Oct 2020 15:15:49 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-40822=20=E5=AD=98=E5=82=A8=E8=BF=87?= =?UTF-8?q?=E7=A8=8B=E6=95=B0=E6=8D=AE=E9=9B=86=E3=80=8B=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E7=82=B9=E5=87=BB=E9=A2=84=E8=A7=88=EF=BC=8C?= =?UTF-8?q?=E9=A2=84=E8=A7=88=E6=A1=86=E5=87=BA=E7=8E=B0=E5=9C=A8=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E7=95=8C=E9=9D=A2=E8=83=8C=E9=9D=A2=20=E3=80=90?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=8E=9F=E5=9B=A0=E3=80=91=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E5=99=A8=E4=B8=AD=EF=BC=8C=E5=9C=A8=E5=BC=B9=E7=AA=97=E7=9A=84?= =?UTF-8?q?=E5=BC=B9=E7=AA=97=E5=9C=BA=E6=99=AF=E9=87=8C=EF=BC=8C=E5=A6=82?= =?UTF-8?q?=E6=9E=9C=E6=98=AF=E4=BD=BF=E7=94=A8DesignerContext.getDesigner?= =?UTF-8?q?Frame()=E8=8E=B7=E5=8F=96=E7=88=B6=E5=BC=B9=E7=AA=97=E7=9A=84?= =?UTF-8?q?=E8=AF=9D=E6=9C=89=E7=82=B9=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BC=9A?= =?UTF-8?q?=E9=80=A0=E6=88=90=E7=AC=AC=E4=BA=8C=E7=BA=A7=E7=9A=84=E5=BC=B9?= =?UTF-8?q?=E7=AA=97=E4=BD=8D=E4=BA=8E=E7=AC=AC=E4=B8=80=E7=BA=A7=E5=BC=B9?= =?UTF-8?q?=E7=AA=97=E8=83=8C=E5=90=8E=E3=80=82=E5=8F=A6=E5=A4=96=E8=BF=99?= =?UTF-8?q?=E9=87=8C=E7=9A=84=E9=A2=84=E8=A7=88=E4=BC=9A=E6=9C=89=E9=97=AA?= =?UTF-8?q?=E5=B1=8F=E7=8E=B0=E8=B1=A1=EF=BC=8C=E5=8E=9F=E5=9B=A0=E6=98=AF?= =?UTF-8?q?=E5=9C=A8StoreProcedureDataWrapper=E4=B8=AD=E4=BC=9A=E5=9C=A8?= =?UTF-8?q?=E4=B8=80=E4=B8=AASwingWorker=E4=B8=AD=E5=B0=86dialog(=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E7=9A=84=E6=97=B6=E5=80=99=E5=8F=91=E7=8E=B0=E8=BF=99?= =?UTF-8?q?=E4=B8=AAdialog=E4=B8=80=E7=9B=B4=E6=B2=A1=E6=9C=89=E9=A2=84?= =?UTF-8?q?=E8=A7=88=E6=95=B0=E6=8D=AE)=E7=BD=AE=E4=B8=BA=E5=8F=AF?= =?UTF-8?q?=E8=A7=81=EF=BC=8C=E4=BD=86=E6=98=AF=E5=9C=A8=E5=8F=A6=E4=B8=80?= =?UTF-8?q?=E4=B8=AASwingWorker=E4=B8=AD=E5=8F=88=E4=BC=9A=E5=B0=86?= =?UTF-8?q?=E5=85=B6=E7=BD=AE=E4=B8=BA=E4=B8=8D=E5=8F=AF=E8=A7=81=EF=BC=8C?= =?UTF-8?q?=E7=84=B6=E5=90=8E=E5=9C=A8=E5=90=8E=E7=BB=AD=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=B8=AD=E9=87=8D=E6=96=B0=E6=9E=84=E5=BB=BA=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E5=8C=85=E5=90=AB=E9=A2=84=E8=A7=88=E6=95=B0=E6=8D=AE=E7=9A=84?= =?UTF-8?q?=E5=BC=B9=E7=AA=97=E5=BC=B9=E5=87=BA=EF=BC=8C=E8=BF=99=E6=A0=B7?= =?UTF-8?q?=E4=BC=9A=E9=80=A0=E6=88=90=E5=BC=B9=E7=AA=97=E5=8F=88=E5=BC=80?= =?UTF-8?q?=E5=8F=88=E5=85=B3=E5=8F=88=E5=BC=80=EF=BC=8C=E9=97=AA=E5=B1=8F?= =?UTF-8?q?=20=E3=80=90=E6=94=B9=E5=8A=A8=E6=80=9D=E8=B7=AF=E3=80=91?= =?UTF-8?q?=E4=BC=A0=E5=85=A5new=20JFrame()=E4=BD=9C=E4=B8=BA=E7=88=B6?= =?UTF-8?q?=E5=BC=B9=E7=AA=97=EF=BC=8C=E5=B0=B1=E5=8F=AF=E4=BB=A5=E4=BF=9D?= =?UTF-8?q?=E8=AF=81=E9=A2=84=E8=A7=88=E7=9A=84=E5=BC=B9=E7=AA=97=E5=9C=A8?= =?UTF-8?q?=E6=9C=80=E4=B8=8A=E5=B1=82=E4=BA=86=EF=BC=9B=E5=85=B3=E4=BA=8E?= =?UTF-8?q?=E9=97=AA=E5=B1=8F=EF=BC=8C=E8=BF=99=E8=BE=B9=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E7=AC=AC=E4=B8=80=E4=B8=AA=E7=A9=BA=E7=99=BD=E7=9A=84dialog?= =?UTF-8?q?=E7=BD=AE=E4=B8=BA=E5=8F=AF=E8=A7=81=E9=82=A3=E8=A1=8C=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=B3=A8=E9=87=8A=E6=8E=89=EF=BC=8C=E7=84=B6=E5=90=8E?= =?UTF-8?q?=E8=87=AA=E5=B7=B1=E6=B5=8B=E8=AF=95=EF=BC=8C=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=89=8D=E5=90=8E=E9=A2=84=E8=A7=88=E5=A4=B1=E8=B4=A5=E7=9A=84?= =?UTF-8?q?=E8=A1=A8=E7=8E=B0=E5=9F=BA=E6=9C=AC=E4=B8=80=E8=87=B4(?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8E=E6=97=A0=E9=97=AA=E5=B1=8F)?= =?UTF-8?q?=EF=BC=9B=E5=8F=A6=E5=A4=96=E8=BF=98=E4=BF=AE=E6=94=B9=E4=BA=86?= =?UTF-8?q?=E4=B8=80=E4=BA=9B=E5=AF=BC=E5=8C=85=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datapane/preview/PreviewTablePane.java | 4 +- .../wrapper/StoreProcedureDataWrapper.java | 37 ++++++++++--------- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTablePane.java b/designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTablePane.java index 8d8e3a48c..8749153fd 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTablePane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTablePane.java @@ -442,7 +442,7 @@ public class PreviewTablePane extends BasicPane { FineLoggerFactory.getLogger().error(e.getMessage(), e); } previewTablePane.fireLoadedListener(); - previewTablePane.showWindow(DesignerContext.getDesignerFrame()).setVisible(true); + previewTablePane.showWindow(new JFrame()).setVisible(true); } /** @@ -475,7 +475,7 @@ public class PreviewTablePane extends BasicPane { }; prieviewPane.setLayout(FRGUIPaneFactory.createBorderLayout()); prieviewPane.add(tabPreviewpane, BorderLayout.CENTER); - prieviewPane.showWindow(DesignerContext.getDesignerFrame()).setVisible(true); + prieviewPane.showWindow(new JFrame()).setVisible(true); } private void populateStoreDataSQL() throws Exception { diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/StoreProcedureDataWrapper.java b/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/StoreProcedureDataWrapper.java index cefc0e112..495a814be 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/StoreProcedureDataWrapper.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/StoreProcedureDataWrapper.java @@ -12,12 +12,12 @@ import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.dialog.FineJOptionPane; import com.fr.design.gui.iprogressbar.AutoProgressBar; import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode; +import com.fr.design.i18n.Toolkit; import com.fr.design.mainframe.DesignerContext; import com.fr.general.ComparatorUtils; import com.fr.log.FineLoggerFactory; import javax.swing.Icon; -import javax.swing.JOptionPane; import javax.swing.SwingWorker; import java.util.ArrayList; import java.util.Arrays; @@ -81,7 +81,7 @@ public final class StoreProcedureDataWrapper implements TableDataWrapper { getWorker().cancel(true); } }); - loadingBar = new AutoProgressBar(dialog, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Loading_Data"), "", 0, 100) { + loadingBar = new AutoProgressBar(dialog, Toolkit.i18nText("Fine-Design_Basic_Loading_Data"), "", 0, 100) { public void doMonitorCanceled() { getDialog().setVisible(false); getWorker().cancel(true); @@ -93,17 +93,17 @@ public final class StoreProcedureDataWrapper implements TableDataWrapper { * 数据集执行结果返回的所有字段 * * @return 数据集执行结果返回的所有字段 - * + * * * @date 2014-12-3-下午7:43:17 - * + * */ public List calculateColumnNameList() { if (columnNameList != null) { return columnNameList; } if (!createStore(false)) { - FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Engine_No_TableData")); + FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText("Fine-Design_Basic_Engine_No_TableData")); return new ArrayList(); } columnNameList = Arrays.asList(procedureDataModel.getColumnName()); @@ -114,10 +114,10 @@ public final class StoreProcedureDataWrapper implements TableDataWrapper { * 生成子节点 * * @return 节点数组 - * + * * * @date 2014-12-3-下午7:06:47 - * + * */ public ExpandMutableTreeNode[] load() { List namelist; @@ -160,12 +160,12 @@ public final class StoreProcedureDataWrapper implements TableDataWrapper { /** * 预览数据 - * + * * @param previewModel 预览模式, 全部还是一个 - * + * * * @date 2014-12-3-下午7:05:50 - * + * */ public void previewData(final int previewModel) { this.previewModel = previewModel; @@ -174,11 +174,12 @@ public final class StoreProcedureDataWrapper implements TableDataWrapper { protected Object doInBackground() throws Exception { loadingBar.close(); PreviewTablePane.resetPreviewTable(); - dialog.setVisible(true); + // REPORT-40822 这里的dialog是个空界面，这里设置成可见之后，后面又会设置成不可见，造成闪屏 + //dialog.setVisible(true); return null; } }.execute(); - connectionBar = new AutoProgressBar(dialog, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Now_Create_Connection"), "", 0, 100) { + connectionBar = new AutoProgressBar(dialog, Toolkit.i18nText("Fine-Design_Basic_Utils_Now_Create_Connection"), "", 0, 100) { public void doMonitorCanceled() { connectionBar.close(); worker.cancel(true); @@ -196,7 +197,7 @@ public final class StoreProcedureDataWrapper implements TableDataWrapper { connectionBar.close(); // bug 61345 预览失败时，关闭窗口 dialog.setVisible(false); - throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed")); + throw new Exception(Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed")); } connectionBar.close(); storeProcedure.resetDataModelList(); @@ -240,10 +241,10 @@ public final class StoreProcedureDataWrapper implements TableDataWrapper { /** * 预览返回的一个数据集 - * + * * * @date 2014-12-3-下午7:42:53 - * + * */ public void previewData() { previewData(-1, -1); @@ -253,13 +254,13 @@ public final class StoreProcedureDataWrapper implements TableDataWrapper { /** * 预览返回的一个数据集，带有显示值和实际值的标记结果 - * + * * @param keyIndex 实际值 * @param valueIndex 显示值 - * + * * * @date 2014-12-3-下午7:42:27 - * + * */ public void previewData(final int keyIndex, final int valueIndex) { PreviewTablePane.previewStoreData(procedureDataModel, keyIndex, valueIndex);