Browse Source

REPORT-83876 单元格替换了3次但撤回变成了2次

release/11.0
Destiny.Lin 2 years ago
parent
commit
aa1322dcf0
  1. 5
      designer-realize/src/main/java/com/fr/design/actions/replace/ui/ITReplaceMainDialog.java

5
designer-realize/src/main/java/com/fr/design/actions/replace/ui/ITReplaceMainDialog.java

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

Loading…
Cancel
Save