From 16e871420934e59c796dc6a26678f179fca066e4 Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Tue, 1 Nov 2022 16:52:01 +0800 Subject: [PATCH 1/3] =?UTF-8?q?REPORT-83339=20=E8=AE=BE=E7=BD=AE=E9=A1=B9-?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E6=A8=A1=E6=9D=BF=E5=90=8E=EF=BC=8C=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=9B=86=E7=9A=84=E6=9F=A5=E6=89=BE=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=E8=BF=98=E6=98=AF=E4=B8=8A=E4=B8=80=E4=B8=AA=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../replace/action/setting/action/SearchDSColumnAction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-realize/src/main/java/com/fr/design/actions/replace/action/setting/action/SearchDSColumnAction.java b/designer-realize/src/main/java/com/fr/design/actions/replace/action/setting/action/SearchDSColumnAction.java index 9493cbfa7..5e17f2e9a 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/replace/action/setting/action/SearchDSColumnAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/replace/action/setting/action/SearchDSColumnAction.java @@ -39,8 +39,8 @@ public class SearchDSColumnAction implements SearchAction { content.setShowStr(dataName); content.setTemplateName(jTemplate.getTemplateName()); dsColumnInfos.add(new DataSourceInfo(content)); - setDsColumnInfos(dsColumnInfos); } + setDsColumnInfos(dsColumnInfos); } public List getDsColumnInfos() { From c558887d0380d26c976929943940e45e8acf28ea Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Tue, 1 Nov 2022 16:54:44 +0800 Subject: [PATCH 2/3] =?UTF-8?q?REPORT-83501=20=E5=A4=9A=E6=AC=A1=E6=9B=BF?= =?UTF-8?q?=E6=8D=A2=E6=97=B6=EF=BC=8C=E4=B8=8B=E4=B8=80=E6=AC=A1=E4=BC=9A?= =?UTF-8?q?=E8=A6=86=E7=9B=96=E4=B8=8A=E4=B8=80=E6=AC=A1=E6=9B=BF=E6=8D=A2?= =?UTF-8?q?=E7=9A=84=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/actions/replace/ui/ITReplaceMainDialog.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/designer-realize/src/main/java/com/fr/design/actions/replace/ui/ITReplaceMainDialog.java b/designer-realize/src/main/java/com/fr/design/actions/replace/ui/ITReplaceMainDialog.java index b2ae3cae0..9d28ff31b 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/replace/ui/ITReplaceMainDialog.java +++ b/designer-realize/src/main/java/com/fr/design/actions/replace/ui/ITReplaceMainDialog.java @@ -514,7 +514,7 @@ public class ITReplaceMainDialog extends UIDialog { String thirdStr = GeneralUtils.objectToString(northPane.getReplaceExtraSettingComboBox().getSelectedItem()); HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().fireTargetModified(true); for (Info info : searchSettingResultList) { - if (info.getContent().isSelected()) { + if (isSupportReplace(info)) { SettingController controller = SettingController.match(firstStr); if (controller != null) { controller.replace(info, secondStr, thirdStr); @@ -549,6 +549,10 @@ public class ITReplaceMainDialog extends UIDialog { } } } + + private boolean isSupportReplace(Info info) { + return info.getContent().isSelected() && !info.getContent().isReplaced(); + } private boolean isSelectSearch(int optionSelected) { return optionSelected == NONE; From d217d2a03597da020b6b5802bdcffc67a22cc2a6 Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Tue, 1 Nov 2022 16:55:38 +0800 Subject: [PATCH 3/3] =?UTF-8?q?REPORT-83498=20=E5=8D=95=E5=85=83=E6=A0=BC-?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F-=E5=B8=B8=E8=A7=84=E9=80=89=E4=B8=AD?= =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E4=BC=9A=E6=8F=90=E7=A4=BA=E6=9F=A5=E6=89=BE?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E4=B8=8D=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/actions/replace/action/setting/CellFormatType.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-realize/src/main/java/com/fr/design/actions/replace/action/setting/CellFormatType.java b/designer-realize/src/main/java/com/fr/design/actions/replace/action/setting/CellFormatType.java index a468dc995..b22434a45 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/replace/action/setting/CellFormatType.java +++ b/designer-realize/src/main/java/com/fr/design/actions/replace/action/setting/CellFormatType.java @@ -61,7 +61,7 @@ public enum CellFormatType { @Override public boolean isEverChanged(Info info, String inputStr, String extraStr) { CellElement cellElement = (CellElement) info.getContent().getReplaceObject(); - return (cellElement.getStyle() != null && cellElement.getStyle().getFormat() == null); + return !(cellElement.getStyle() != null && cellElement.getStyle().getFormat() == null); } }, /**