From aa1322dcf050087ac3cc29cc6acc9785e74a8354 Mon Sep 17 00:00:00 2001
From: "Destiny.Lin" <Destiny.Lin@fanruan.com>
Date: Fri, 4 Nov 2022 15:12:11 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-83876=20=E5=8D=95=E5=85=83=E6=A0=BC?=
 =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E4=BA=863=E6=AC=A1=E4=BD=86=E6=92=A4?=
 =?UTF-8?q?=E5=9B=9E=E5=8F=98=E6=88=90=E4=BA=862=E6=AC=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/actions/replace/ui/ITReplaceMainDialog.java    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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 1990062967..ba7b4bf445 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
@@ -257,7 +257,6 @@ public class ITReplaceMainDialog extends UIDialog {
      * @param replaceStr
      */
     public void replace(String searchStr, String replaceStr) {
-        HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().fireTargetModified(true);
         for (Info info : searchContentResultList) {
             if (!info.getContent().isWrongful() && info.getContent().isSelected()) {
                 info.setValue(info, searchStr, replaceStr, info.getContent().getOperatorArray());
@@ -266,6 +265,7 @@ public class ITReplaceMainDialog extends UIDialog {
                 info.getContent().setReplaced(true);
             }
         }
+        HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().fireTargetModified(true);
         northPane.getResultLabel().setText(ShowValueUtils.getResultTip(searchContentResultList.size(), contentReplaceCount, contentReplaceFailedCount));
         southPanel.getTableEditorPane().update();
         northPane.refreshReplaceInputComboBoxItems();
@@ -529,7 +529,6 @@ public class ITReplaceMainDialog extends UIDialog {
             if (isInputStrValid(inputStr, extraStr)) {
                 String secondStr = GeneralUtils.objectToString(northPane.getReplaceSettingInputComboBox().getSelectedItem());
                 String thirdStr = GeneralUtils.objectToString(northPane.getReplaceExtraSettingComboBox().getSelectedItem());
-                HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().fireTargetModified(true);
                 for (Info info : searchSettingResultList) {
                     if (isSupportReplace(info)) {
                         SettingController controller = SettingController.match(firstStr);
@@ -540,10 +539,10 @@ public class ITReplaceMainDialog extends UIDialog {
                         }
                     }
                 }
+                HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().fireTargetModified(true);
                 northPane.getSettingResultLabel().setText(ShowValueUtils.getResultTip(searchSettingResultList.size(), settingReplaceCount, settingReplaceFailedCount));
                 southPanel.getTableEditorPane().update();
                 ITTableEditorPane.getEditTable().repaint();
-                HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().fireTargetModified();
             } else {
                 search4Setting();
             }