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

* commit '8b6b9ad55d32f27d534f6e5ad4d65db6601cd7b4':
  REPORT-138249 cpt支持数据集替换 优化按钮禁用逻辑，去除多余提交
  REPORT-138249 cpt支持数据集替换 适配FVS部分

designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java

@@ -729,10 +729,16 @@ public class TableDataTreePane extends BasicTableDataTreePane {
         pasteAction.setEnabled(false);
         removeAction.setEnabled(false);
         previewTableDataAction.setEnabled(false);
+        for (AbstractExtraAction action : extraActions) {
+            action.setEnabled(false);
+        }
         if (op == null || op.interceptButtonEnabled()) {
             // 保持false状态
             return;
         }
+        if(getDataTree() != null) {
+            checkExtraActionEnable(op.getDataMode(), getDataTree().getSelectedTableDataCounts(), getDataTree().hasSelectedIndependentColumns());
+        }
         // 获取选中的数据集数量
         int selectioncount = getDataTree().getSelectedTableDataCounts();
         if (op.getDataMode() == SERVER_TABLE_DATA) {
@@ -756,7 +762,7 @@ public class TableDataTreePane extends BasicTableDataTreePane {
         }
         removeAction.setEnabled(true);
         copyAction.setEnabled(true);
-        checkExtraActionEnable(op.getDataMode(), selectioncount, getDataTree().hasSelectedIndependentColumns());
+
     }
 
     private void checkExtraActionEnable(int dataMode, int selectioncount, boolean hasSelectedIndependentColumns) {

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

@@ -126,7 +126,7 @@ public class ITReplaceMainDialog extends UIDialog {
 
         northPane.fitScreen(0, 0, width);
 
- }
+    }
 
 
     /**
@@ -566,7 +566,7 @@ public class ITReplaceMainDialog extends UIDialog {
             }
         }
     }
-    
+
     private boolean isSupportReplace(Info info) {
         return info.getContent().isSelected() && !info.getContent().isReplaced();
     }

designer-realize/src/main/java/com/fr/design/actions/replace/utils/ReplaceUtils.java

@@ -175,7 +175,7 @@ public class ReplaceUtils {
      */
     public static void replaceChart(ChartCollection chartCollection, List<TableReplacementEntity> entities) {
         // 非公式部分
-        chartCollection.replace(entities);
+        chartCollection.replaceTableData(entities);
         // 公式部分
         List<FormulaInfo> formulaInfos = new ArrayList<>();
         SearchChartCollectionFormulaAction.getInstance().searchChartCollectionFormula(formulaInfos, new ITContent(), chartCollection);