From 3b166bf8ad135de39be90818e72f41fce63390fd Mon Sep 17 00:00:00 2001 From: Carlson Date: Fri, 4 Nov 2022 11:41:58 +0800 Subject: [PATCH 1/2] =?UTF-8?q?REPORT-83462=20fix:fvs-=E5=9B=BE=E8=A1=A8-?= =?UTF-8?q?=E8=B6=85=E9=93=BE-=E7=BD=91=E7=BB=9C=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E7=BC=BA=E5=B0=91=E4=B8=80=E4=BA=9B=E5=8F=82=E6=95=B0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=20&&=20KERNEL-12559=20feat:fvs=E5=85=88=E4=B8=8D?= =?UTF-8?q?=E5=81=9A=E7=89=88=E6=9C=AC=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/hyperlink/ReportletHyperlinkPane.java | 8 ++++++++ .../com/fr/design/mainframe/vcs/common/VcsHelper.java | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperlinkPane.java b/designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperlinkPane.java index 7147ef90e2..48affb7dc3 100644 --- a/designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperlinkPane.java +++ b/designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperlinkPane.java @@ -158,6 +158,14 @@ public class ReportletHyperlinkPane extends AbstractHyperLinkPane Date: Mon, 7 Nov 2022 11:51:59 +0800 Subject: [PATCH 2/2] =?UTF-8?q?REPORT-80695=20=E6=A8=A1=E6=9D=BF=E5=85=A8?= =?UTF-8?q?=E5=B1=80=E7=BA=A7=E5=88=AB=E6=9F=A5=E6=89=BE=E6=9B=BF=E6=8D=A2?= =?UTF-8?q?=E4=BA=8C=E6=9C=9F=20=E9=87=8D=E5=A4=8D=E6=9B=BF=E6=8D=A2?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/actions/replace/ui/ITReplaceMainDialog.java | 2 +- 1 file changed, 1 insertion(+), 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 ba7b4bf445..dd01157a75 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 @@ -258,7 +258,7 @@ public class ITReplaceMainDialog extends UIDialog { */ public void replace(String searchStr, String replaceStr) { for (Info info : searchContentResultList) { - if (!info.getContent().isWrongful() && info.getContent().isSelected()) { + if (!info.getContent().isWrongful() && isSupportReplace(info)) { info.setValue(info, searchStr, replaceStr, info.getContent().getOperatorArray()); } if (info.getContent().isSelected()) {