From 057b99da9133e4b050b11bafe040ac6282b060ea Mon Sep 17 00:00:00 2001 From: "Joe.Jiang" Date: Tue, 22 Oct 2019 19:37:35 +0800 Subject: [PATCH 1/3] =?UTF-8?q?REPORT-19102=20=E3=80=90=E6=96=87=E6=9C=AC?= =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E3=80=91=E7=94=B5=E8=AF=9D-=E8=87=AA?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E8=A7=84=E5=88=99=E8=AE=BE=E7=BD=AE=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E8=A7=84=E5=88=99=E6=9C=AA=E4=BF=9D=E5=AD=98=E6=88=90?= =?UTF-8?q?=E5=8A=9F=EF=BC=8C=E4=B8=94=E4=B8=8B=E6=8B=89=E6=A1=86=E5=87=BA?= =?UTF-8?q?=E7=8E=B0=E7=A9=BA=E7=99=BD=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/mainframe/CellWidgetPropertyPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/CellWidgetPropertyPane.java b/designer-realize/src/main/java/com/fr/design/mainframe/CellWidgetPropertyPane.java index f7c1f7825..59a58231a 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/CellWidgetPropertyPane.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/CellWidgetPropertyPane.java @@ -109,7 +109,7 @@ public class CellWidgetPropertyPane extends BasicPane { if (finalCS.isSelectedOneCell(ePane)) { if (tplEC.getTemplateCellElement(cellElement.getColumn(), cellElement.getRow()) == null) {//cellElement未加入到report中时要添加进去 tplEC.addCellElement(cellElement); - } else { + } else if (tplEC.getTemplateCellElement(finalCS.getColumn(), finalCS.getRow()) != null) { cellElement = tplEC.getTemplateCellElement(finalCS.getColumn(), finalCS.getRow()); } setCellWidget(cellWidget, cellElement); From d8375487c27064bec966cce3fe8c04d0a491a6c0 Mon Sep 17 00:00:00 2001 From: "Joe.Jiang" Date: Wed, 23 Oct 2019 09:27:08 +0800 Subject: [PATCH 2/3] =?UTF-8?q?REPORT-23090=20=E6=A8=A1=E6=9D=BF-=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E4=B8=8E=E5=86=BB=E7=BB=93=E8=AE=BE=E7=BD=AE=EF=BC=8C?= =?UTF-8?q?=E7=BC=BA=E5=B0=91=E4=B8=80=E5=88=97=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/report/freeze/RepeatAndFreezeSettingPane.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/designer-realize/src/main/java/com/fr/design/report/freeze/RepeatAndFreezeSettingPane.java b/designer-realize/src/main/java/com/fr/design/report/freeze/RepeatAndFreezeSettingPane.java index 349735ac0..1dd75e163 100644 --- a/designer-realize/src/main/java/com/fr/design/report/freeze/RepeatAndFreezeSettingPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/freeze/RepeatAndFreezeSettingPane.java @@ -69,6 +69,7 @@ public class RepeatAndFreezeSettingPane extends BasicPane { soverlapRowStartPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Title_Start_Row_Form"))); repeatTitleRowPane = new RepeatRowPane(); soverlapRowStartPane.add(repeatTitleRowPane); + soverlapRowStartPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Row"))); return soverlapRowStartPane; } @@ -85,6 +86,7 @@ public class RepeatAndFreezeSettingPane extends BasicPane { // 重复打印标题的结束列 repeatTitleColPane = new RepeatColPane(); soverlapColStartPane.add(repeatTitleColPane); + soverlapColStartPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Column"))); return soverlapColStartPane; } @@ -100,6 +102,7 @@ public class RepeatAndFreezeSettingPane extends BasicPane { foverlapRowStartPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Finis_Start_Row_Form"))); repeatFinisRowPane = new RepeatRowPane(); foverlapRowStartPane.add(repeatFinisRowPane); + foverlapRowStartPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Row"))); return foverlapRowStartPane; } @@ -115,6 +118,7 @@ public class RepeatAndFreezeSettingPane extends BasicPane { foverlapColStartPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Finis_Start_Column_Form"))); repeatFinisColPane = new RepeatColPane(); foverlapColStartPane.add(repeatFinisColPane); + foverlapColStartPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Column"))); return foverlapColStartPane; } From 04e4b2459767a82f877139f253cb90a44a7d28a0 Mon Sep 17 00:00:00 2001 From: "Joe.Jiang" Date: Thu, 24 Oct 2019 09:23:36 +0800 Subject: [PATCH 3/3] =?UTF-8?q?REPORT-19102=20=E3=80=90=E6=96=87=E6=9C=AC?= =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E3=80=91=E7=94=B5=E8=AF=9D-=E8=87=AA?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E8=A7=84=E5=88=99=E8=AE=BE=E7=BD=AE=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E8=A7=84=E5=88=99=E6=9C=AA=E4=BF=9D=E5=AD=98=E6=88=90?= =?UTF-8?q?=E5=8A=9F=EF=BC=8C=E4=B8=94=E4=B8=8B=E6=8B=89=E6=A1=86=E5=87=BA?= =?UTF-8?q?=E7=8E=B0=E7=A9=BA=E7=99=BD=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/mainframe/CellWidgetPropertyPane.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/CellWidgetPropertyPane.java b/designer-realize/src/main/java/com/fr/design/mainframe/CellWidgetPropertyPane.java index 59a58231a..246bb72aa 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/CellWidgetPropertyPane.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/CellWidgetPropertyPane.java @@ -109,8 +109,11 @@ public class CellWidgetPropertyPane extends BasicPane { if (finalCS.isSelectedOneCell(ePane)) { if (tplEC.getTemplateCellElement(cellElement.getColumn(), cellElement.getRow()) == null) {//cellElement未加入到report中时要添加进去 tplEC.addCellElement(cellElement); - } else if (tplEC.getTemplateCellElement(finalCS.getColumn(), finalCS.getRow()) != null) { - cellElement = tplEC.getTemplateCellElement(finalCS.getColumn(), finalCS.getRow()); + } else { + TemplateCellElement newCellElement = tplEC.getTemplateCellElement(finalCS.getColumn(), finalCS.getRow()); + if (newCellElement != null) { + cellElement = newCellElement; + } } setCellWidget(cellWidget, cellElement); } else {