REPORT-138249 cpt支持数据集替换 调整接口

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

@@ -1,14 +1,12 @@
 package com.fr.design.actions.replace.ui;
 
 
-import com.fr.data.TableReplacementEntity;
 import com.fr.design.actions.replace.action.ITChecker;
 import com.fr.design.actions.replace.action.ShowSearchResultAction;
 
 import com.fr.design.actions.replace.action.setting.SettingController;
 import com.fr.design.actions.replace.info.Info;
 
-import com.fr.design.actions.replace.utils.ReplaceUtils;
 import com.fr.design.actions.replace.utils.ShowValueUtils;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.dialog.UIDialog;
@@ -37,11 +35,9 @@ import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.util.ArrayList;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.regex.Pattern;
 
-import static com.fr.design.actions.replace.ui.ITTableEditorPane.editTable;
 import static com.fr.design.actions.replace.ui.ITTableEditorPane.getEditTable;
 
 /**

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

@@ -1,26 +1,21 @@
 package com.fr.design.actions.replace.utils;
 
 import com.fr.base.Formula;
-import com.fr.base.chart.chartdata.TopDefinitionProvider;
-import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.ChartCollection;
-import com.fr.chart.chartdata.TableDataDefinition;
-import com.fr.chartx.attr.ChartProvider;
 import com.fr.data.TableReplacementEntity;
 import com.fr.design.actions.replace.action.content.cell.SearchCellAction;
 import com.fr.design.actions.replace.action.content.formula.SearchFormulaManager;
 import com.fr.design.actions.replace.action.content.formula.cell.SearchCellFormulaAction;
 import com.fr.design.actions.replace.action.content.formula.chart.SearchChartCollectionFormulaAction;
 import com.fr.design.actions.replace.action.content.formula.widget.SearchWidgetFormulaAction;
-import com.fr.design.actions.replace.action.content.tabledata.TableDataFormulaUtils;
 import com.fr.design.actions.replace.action.content.tabledata.TableDataFormulaType;
+import com.fr.design.actions.replace.action.content.tabledata.TableDataFormulaUtils;
 import com.fr.design.actions.replace.action.content.widget.SearchWidgetAction;
 import com.fr.design.actions.replace.info.CellInfo;
 import com.fr.design.actions.replace.info.FormulaInfo;
 import com.fr.design.actions.replace.info.WidgetInfo;
 import com.fr.design.actions.replace.info.base.ITContent;
 import com.fr.design.mainframe.JTemplate;
-import com.fr.extended.chart.ChartTableDataDefinitionReplacer;
 import com.fr.form.FormElementCaseProvider;
 import com.fr.form.ui.ElementCaseEditor;
 import com.fr.main.impl.WorkBook;
@@ -30,7 +25,6 @@ import com.fr.report.utils.ElementCaseHelper;
 import com.fr.stable.StringUtils;
 
 import java.util.ArrayList;
-
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
@@ -181,7 +175,7 @@ public class ReplaceUtils {
      */
     public static void replaceChart(ChartCollection chartCollection, List<TableReplacementEntity> entities) {
         // 非公式部分
-        chartCollection.replaceTableData(entities);
+        chartCollection.replace(entities);
         // 公式部分
         List<FormulaInfo> formulaInfos = new ArrayList<>();
         SearchChartCollectionFormulaAction.getInstance().searchChartCollectionFormula(formulaInfos, new ITContent(), chartCollection);