Merge pull request #10592 in DESIGN/design from bugfix/11.0 to feature/x

* commit '9ffd9f9b971083892b02d888cc5909b896f8efe3':
  REPORT-80695 模板全局级别查找替换二期 重复替换问题修复
  REPORT-83462 fix:fvs-图表-超链-网络报表缺少一些参数字段 && KERNEL-12559 feat:fvs先不做版本控制

designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperlinkPane.java

@@ -158,6 +158,14 @@ public class ReportletHyperlinkPane extends AbstractHyperLinkPane<ReportletHyper
         protected boolean needRenamePane() {
             return false;
         }
+
+        public ChartNoRename(HashMap hyperLinkEditorMap, boolean needRenamePace) {
+            super(hyperLinkEditorMap, needRenamePace);
+        }
+
+        public ChartNoRename() {
+            super();
+        }
     }
 
     public ReportletHyperNorthPane getNorthPane() {

designer-base/src/main/java/com/fr/design/mainframe/vcs/common/VcsHelper.java

@@ -1,6 +1,7 @@
 package com.fr.design.mainframe.vcs.common;
 
 
+import com.fr.base.extension.FileExtension;
 import com.fr.concurrent.NamedThreadFactory;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.file.HistoryTemplateListCache;
@@ -135,6 +136,9 @@ public class VcsHelper implements JTemplateActionListener {
             public void run() {
 
                 String fileName = getEditingFilename();
+                if (FileExtension.VIS.matchExtension(fileName)) { // fvs文件先不做版本控制
+                    return;
+                }
                 VcsOperator operator = WorkContext.getCurrent().get(VcsOperator.class);
                 VcsEntity entity = operator.getFileVersionByIndex(fileName, 0);
                 int latestFileVersion = 0;

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()) {