From 83fce755ea6b5696a717a5bcb61645cf6ecede47 Mon Sep 17 00:00:00 2001 From: "Sky.Luo" Date: Sat, 6 May 2023 09:45:27 +0800 Subject: [PATCH 1/2] =?UTF-8?q?REPORT-95337=20&=20REPORT-95265=20fix:=20?= =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E5=99=A8=E9=A2=84=E8=A7=88=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=9B=86=E7=9A=84=E6=A8=A1=E6=9D=BF=E4=BF=A1=E6=81=AF=E6=90=BA?= =?UTF-8?q?=E5=B8=A6=E4=BF=AE=E6=94=B9=20&=20sql=E6=B3=A8=E9=87=8A?= =?UTF-8?q?=E5=85=88=E5=8D=95=E7=8B=AC=E5=A4=84=E7=90=86=E4=B8=80=E4=B8=8B?= =?UTF-8?q?sqlserver=E7=9A=84=E5=AD=98=E5=82=A8=E8=BF=87=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/data/DesignTableDataManager.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java b/designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java index 712dcbd33b..6ed05fe115 100644 --- a/designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java +++ b/designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java @@ -572,7 +572,7 @@ public abstract class DesignTableDataManager { parameter.setValue(parameterMap.get(parameter.getName())); } } - parameterMap.put(SqlNoteConstants.SQL_NOTE_TEMPLATE, HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getEditingFILE().getPath()); + addTemplateInfo(parameterMap); return DataOperator.getInstance().previewTableData(TableDataSourceTailor.extractTableData(tableDataSource), tabledata, parameterMap, rowCount); } catch (Exception e) { throw new TableDataException(e.getMessage(), e); @@ -592,6 +592,12 @@ public abstract class DesignTableDataManager { } } + private static void addTemplateInfo(Map parameterMap) { + if (JTemplate.isValid(HistoryTemplateListCache.getInstance().getCurrentEditingTemplate())) { + parameterMap.put(SqlNoteConstants.SQL_NOTE_TEMPLATE, HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getEditingFILE().getPath()); + } + } + private static boolean needInputParams(boolean mustInputParameters, ParameterProvider[] parameters) { if (mustInputParameters && ArrayUtils.isNotEmpty(parameters)) { return true; @@ -669,7 +675,7 @@ public abstract class DesignTableDataManager { if (needLoadingBar) { MultiResultTableDataWrapper.loadingBar.start(); } - parameterMap.put(SqlNoteConstants.SQL_NOTE_TEMPLATE, HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getEditingFILE().getPath()); + addTemplateInfo(parameterMap); return DataOperator.getInstance().previewMultiResultTableData(tableData, parameterMap, 0); } From 28b4d2a774b0fa916f0b5878536da6e06b46df40 Mon Sep 17 00:00:00 2001 From: "Sky.Luo" Date: Sat, 6 May 2023 10:04:22 +0800 Subject: [PATCH 2/2] =?UTF-8?q?REPORT-95337=20&=20REPORT-95265=20fix:=20?= =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E5=99=A8=E9=A2=84=E8=A7=88=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=9B=86=E7=9A=84=E6=A8=A1=E6=9D=BF=E4=BF=A1=E6=81=AF=E6=90=BA?= =?UTF-8?q?=E5=B8=A6=E4=BF=AE=E6=94=B9=20&=20sql=E6=B3=A8=E9=87=8A?= =?UTF-8?q?=E5=85=88=E5=8D=95=E7=8B=AC=E5=A4=84=E7=90=86=E4=B8=80=E4=B8=8B?= =?UTF-8?q?sqlserver=E7=9A=84=E5=AD=98=E5=82=A8=E8=BF=87=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/data/DesignTableDataManager.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java b/designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java index 6ed05fe115..2354007e18 100644 --- a/designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java +++ b/designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java @@ -572,7 +572,7 @@ public abstract class DesignTableDataManager { parameter.setValue(parameterMap.get(parameter.getName())); } } - addTemplateInfo(parameterMap); + addTemplateInfoIfNeed(parameterMap); return DataOperator.getInstance().previewTableData(TableDataSourceTailor.extractTableData(tableDataSource), tabledata, parameterMap, rowCount); } catch (Exception e) { throw new TableDataException(e.getMessage(), e); @@ -592,7 +592,7 @@ public abstract class DesignTableDataManager { } } - private static void addTemplateInfo(Map parameterMap) { + private static void addTemplateInfoIfNeed(Map parameterMap) { if (JTemplate.isValid(HistoryTemplateListCache.getInstance().getCurrentEditingTemplate())) { parameterMap.put(SqlNoteConstants.SQL_NOTE_TEMPLATE, HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getEditingFILE().getPath()); } @@ -675,7 +675,7 @@ public abstract class DesignTableDataManager { if (needLoadingBar) { MultiResultTableDataWrapper.loadingBar.start(); } - addTemplateInfo(parameterMap); + addTemplateInfoIfNeed(parameterMap); return DataOperator.getInstance().previewMultiResultTableData(tableData, parameterMap, 0); }