From c4fc5636ef5a0ad700f534659493150e0f597251 Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Sat, 17 Sep 2022 15:04:06 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-75998=20=E5=88=A0=E9=99=A4=E4=B8=8D?= =?UTF-8?q?=E5=90=88=E7=90=86=E7=9A=84import?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../actions/replace/action/SearchManagerCenter.java | 7 ++----- .../com/fr/design/actions/replace/action/ShowValue.java | 1 - .../action/content/component/SearchComponentAction.java | 2 +- .../action/content/floatelement/SearchFloatAction.java | 2 +- .../replace/action/content/formula/SearchFormula.java | 1 - .../action/content/formula/SearchFormulaManager.java | 1 - .../content/formula/cell/SearchCellFormulaAction.java | 2 +- .../content/formula/cell/SearchDSColumnFormulaAction.java | 7 ++----- .../content/formula/cell/SearchRichFormulaAction.java | 1 - .../replace/action/content/formula/data/DataType.java | 6 ++++-- .../content/formula/data/SearchDataFormulaAction.java | 5 ----- .../content/formula/floatelement/SearchFloatFormula.java | 3 --- .../content/formula/highlight/SearchHighlightFormula.java | 1 - .../formula/highlight/SearchHighlightFormulaAction.java | 4 +--- .../formula/highlight/SearchHighlightFormulaManager.java | 2 -- .../highlight/condition/SearchConditionFormula.java | 1 - .../highlight/condition/SearchFormulaConditionAction.java | 1 - .../highlight/javascript/SearchExportJSFormulaAction.java | 2 +- .../formula/highlight/javascript/SearchJSFormula.java | 2 +- .../highlight/javascript/SearchJSFormulaManager.java | 4 +--- .../formula/template/SearchTemplateFormulaAction.java | 3 +-- .../formula/widget/SearchDateEditorFormulaAction.java | 3 +-- .../content/formula/widget/SearchDictFormulaAction.java | 3 +-- .../formula/widget/SearchTreeEditorFormulaAction.java | 1 - .../content/formula/widget/SearchWidgetFormula.java | 1 - .../content/formula/widget/SearchWidgetFormulaAction.java | 3 +-- .../formula/widget/SearchWidgetFormulaManager.java | 2 -- .../replace/action/content/js/SearchCellJSAction.java | 7 +++---- .../replace/action/content/js/SearchChartJSAction.java | 2 +- .../replace/action/content/js/SearchFloatJSAction.java | 8 +++----- .../replace/action/content/sql/SearchSQLAction.java | 1 - .../fr/design/actions/replace/info/DealWithInfoValue.java | 5 ++--- .../java/com/fr/design/actions/replace/info/JSInfo.java | 1 - .../fr/design/actions/replace/info/base/ITContent.java | 1 - .../fr/design/actions/replace/ui/ITReplaceMainDialog.java | 1 - 35 files changed, 28 insertions(+), 69 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/design/actions/replace/action/SearchManagerCenter.java b/designer-realize/src/main/java/com/fr/design/actions/replace/action/SearchManagerCenter.java index d1c7054b5b..211ab41d66 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/replace/action/SearchManagerCenter.java +++ b/designer-realize/src/main/java/com/fr/design/actions/replace/action/SearchManagerCenter.java @@ -5,12 +5,9 @@ import com.fr.design.actions.replace.action.content.formula.highlight.SearchHigh import com.fr.design.actions.replace.action.content.formula.highlight.condition.SearchConditionManager; import com.fr.design.actions.replace.action.content.formula.highlight.javascript.SearchJSFormulaManager; import com.fr.design.actions.replace.action.content.formula.widget.SearchWidgetFormulaManager; -import com.fr.design.actions.replace.action.content.js.SearchCellJSAction; -import com.fr.design.actions.replace.action.content.js.SearchJS; + import com.fr.design.actions.replace.action.content.js.SearchJSManager; -import com.fr.design.actions.replace.action.content.js.SearchWebJSAction; -import com.fr.design.actions.replace.action.content.js.SearchWidgetJSAction; -import com.fr.third.v2.org.apache.poi.ss.formula.functions.T; + import org.jetbrains.annotations.Nullable; /** diff --git a/designer-realize/src/main/java/com/fr/design/actions/replace/action/ShowValue.java b/designer-realize/src/main/java/com/fr/design/actions/replace/action/ShowValue.java index c65cee63fb..02ded341eb 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/replace/action/ShowValue.java +++ b/designer-realize/src/main/java/com/fr/design/actions/replace/action/ShowValue.java @@ -3,7 +3,6 @@ package com.fr.design.actions.replace.action; import com.fr.design.actions.replace.info.Info; import com.fr.design.mainframe.JTemplate; -import java.util.ArrayList; import java.util.List; /** diff --git a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/component/SearchComponentAction.java b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/component/SearchComponentAction.java index 775d03f5c2..4326f62287 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/component/SearchComponentAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/component/SearchComponentAction.java @@ -1,7 +1,7 @@ package com.fr.design.actions.replace.action.content.component; import com.fr.design.actions.replace.action.SearchAction; -import com.fr.design.actions.replace.action.content.cell.SearchCellAction; + import com.fr.design.actions.replace.info.ComponentInfo; import com.fr.design.actions.replace.info.base.ITContent; import com.fr.design.mainframe.JTemplate; diff --git a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/floatelement/SearchFloatAction.java b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/floatelement/SearchFloatAction.java index 4d89c51361..6f0a338b90 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/floatelement/SearchFloatAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/floatelement/SearchFloatAction.java @@ -2,7 +2,7 @@ package com.fr.design.actions.replace.action.content.floatelement; import com.fr.chart.chartattr.ChartCollection; import com.fr.design.actions.replace.action.SearchAction; -import com.fr.design.actions.replace.action.content.cell.SearchCellAction; + import com.fr.design.actions.replace.info.FloatInfo; import com.fr.design.actions.replace.info.base.ITContent; import com.fr.design.i18n.Toolkit; diff --git a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/SearchFormula.java b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/SearchFormula.java index 82a2db3275..67bc2e4b1f 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/SearchFormula.java +++ b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/SearchFormula.java @@ -6,7 +6,6 @@ import com.fr.design.actions.replace.info.base.ITContent; import com.fr.design.mainframe.JTemplate; -import java.util.ArrayList; import java.util.List; /** diff --git a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/SearchFormulaManager.java b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/SearchFormulaManager.java index 51c61ef6ae..296123405e 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/SearchFormulaManager.java +++ b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/SearchFormulaManager.java @@ -1,7 +1,6 @@ package com.fr.design.actions.replace.action.content.formula; import com.fr.design.actions.replace.action.SearchAction; -import com.fr.design.actions.replace.action.SearchManager; import com.fr.design.actions.replace.action.content.formula.cell.SearchCellFormulaAction; import com.fr.design.actions.replace.action.content.formula.data.SearchDataFormulaAction; import com.fr.design.actions.replace.action.content.formula.floatelement.SearchFloatFormulaAction; diff --git a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/cell/SearchCellFormulaAction.java b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/cell/SearchCellFormulaAction.java index 3882d7721e..9cfdd43433 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/cell/SearchCellFormulaAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/cell/SearchCellFormulaAction.java @@ -27,7 +27,7 @@ import com.fr.report.core.sort.common.CellSortAttr; import com.fr.report.core.sort.sortexpression.FormulaSortExpression; import com.fr.report.core.sort.sortexpression.SortExpression; -import java.util.HashMap; + import java.util.List; import java.util.Map; diff --git a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/cell/SearchDSColumnFormulaAction.java b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/cell/SearchDSColumnFormulaAction.java index 0048c84563..cc2c1988e4 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/cell/SearchDSColumnFormulaAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/cell/SearchDSColumnFormulaAction.java @@ -2,11 +2,9 @@ package com.fr.design.actions.replace.action.content.formula.cell; import com.fr.base.Formula; import com.fr.base.Parameter; -import com.fr.design.actions.replace.action.content.formula.highlight.condition.SearchCommonConditionAction; import com.fr.design.actions.replace.action.content.formula.highlight.condition.SearchConditionFormula; import com.fr.design.actions.replace.action.content.formula.highlight.condition.SearchConditionManager; -import com.fr.design.actions.replace.action.content.formula.highlight.condition.SearchFormulaConditionAction; -import com.fr.design.actions.replace.action.content.formula.highlight.condition.SearchListConditionAction; + import com.fr.design.actions.replace.info.FormulaInfo; import com.fr.design.actions.replace.info.base.ITContent; import com.fr.design.i18n.Toolkit; @@ -16,8 +14,7 @@ import com.fr.report.cell.cellattr.core.group.DSColumn; import com.fr.report.core.sort.sortexpression.FormulaSortExpression; import com.fr.report.core.sort.sortexpression.SortExpression; -import java.util.ArrayList; -import java.util.HashMap; + import java.util.List; import java.util.Map; diff --git a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/cell/SearchRichFormulaAction.java b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/cell/SearchRichFormulaAction.java index c6a63e9bdc..5e60e17fff 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/cell/SearchRichFormulaAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/cell/SearchRichFormulaAction.java @@ -2,7 +2,6 @@ package com.fr.design.actions.replace.action.content.formula.cell; import com.fr.design.actions.replace.info.FormulaInfo; import com.fr.design.actions.replace.info.base.ITContent; -import com.fr.design.actions.replace.utils.ShowValueUtils; import com.fr.design.i18n.Toolkit; import com.fr.report.cell.CellElement; import com.fr.report.cell.cellattr.core.RichChar; diff --git a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/data/DataType.java b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/data/DataType.java index bece3ef101..2c8fd93165 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/data/DataType.java +++ b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/data/DataType.java @@ -2,7 +2,9 @@ package com.fr.design.actions.replace.action.content.formula.data; import com.fr.base.Formula; import com.fr.base.TableData; -import com.fr.data.impl.*; +import com.fr.data.impl.ConditionTableData; +import com.fr.data.impl.DBTableData; +import com.fr.data.impl.RecursionTableData; import com.fr.data.impl.storeproc.StoreProcedure; import com.fr.design.actions.replace.info.FormulaInfo; import com.fr.design.actions.replace.info.base.ITContent; @@ -11,7 +13,7 @@ import com.fr.stable.ParameterProvider; import com.fr.stable.StringUtils; import org.jetbrains.annotations.Nullable; -import java.util.ArrayList; + import java.util.List; /** diff --git a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/data/SearchDataFormulaAction.java b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/data/SearchDataFormulaAction.java index 5cc7acc229..472819d6ad 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/data/SearchDataFormulaAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/data/SearchDataFormulaAction.java @@ -1,19 +1,14 @@ package com.fr.design.actions.replace.action.content.formula.data; import com.fr.data.TableDataSource; -import com.fr.data.impl.DBTableData; import com.fr.design.actions.replace.action.content.formula.SearchFormula; -import com.fr.design.actions.replace.action.content.formula.widget.SearchWidgetFormulaAction; import com.fr.design.actions.replace.info.FormulaInfo; -import com.fr.design.actions.replace.info.SQLInfo; import com.fr.design.actions.replace.info.base.ITContent; import com.fr.design.data.tabledata.wrapper.TableDataFactory; import com.fr.design.i18n.Toolkit; import com.fr.design.mainframe.JTemplate; import com.fr.file.TableDataConfig; -import com.fr.main.impl.WorkBook; -import java.util.ArrayList; import java.util.Iterator; import java.util.List; diff --git a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/floatelement/SearchFloatFormula.java b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/floatelement/SearchFloatFormula.java index f9f31d5a4d..4a74e46b8f 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/floatelement/SearchFloatFormula.java +++ b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/floatelement/SearchFloatFormula.java @@ -3,10 +3,7 @@ package com.fr.design.actions.replace.action.content.formula.floatelement; import com.fr.design.actions.replace.action.content.formula.SearchFormula; import com.fr.design.actions.replace.info.FloatInfo; import com.fr.design.actions.replace.info.FormulaInfo; -import com.fr.design.actions.replace.info.base.ITContent; -import com.fr.design.mainframe.JTemplate; -import java.util.ArrayList; import java.util.List; /** diff --git a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/highlight/SearchHighlightFormula.java b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/highlight/SearchHighlightFormula.java index 2758a42685..d9dc0b5e31 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/highlight/SearchHighlightFormula.java +++ b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/highlight/SearchHighlightFormula.java @@ -5,7 +5,6 @@ import com.fr.design.actions.replace.info.FormulaInfo; import com.fr.design.actions.replace.info.base.ITContent; import com.fr.report.cell.cellattr.highlight.HighlightAction; -import java.util.ArrayList; import java.util.List; /** diff --git a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/highlight/SearchHighlightFormulaAction.java b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/highlight/SearchHighlightFormulaAction.java index 0ce61c0a9d..28e6cacb8b 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/highlight/SearchHighlightFormulaAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/highlight/SearchHighlightFormulaAction.java @@ -1,12 +1,10 @@ package com.fr.design.actions.replace.action.content.formula.highlight; -import com.fr.design.actions.replace.action.content.formula.highlight.javascript.SearchJSHighlightAction; import com.fr.design.actions.replace.info.FormulaInfo; import com.fr.design.actions.replace.info.base.ITContent; import com.fr.report.cell.cellattr.highlight.HighlightAction; -import java.util.ArrayList; -import java.util.HashMap; + import java.util.List; import java.util.Map; diff --git a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/highlight/SearchHighlightFormulaManager.java b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/highlight/SearchHighlightFormulaManager.java index bf05d46066..28a5b752a9 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/highlight/SearchHighlightFormulaManager.java +++ b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/highlight/SearchHighlightFormulaManager.java @@ -2,8 +2,6 @@ package com.fr.design.actions.replace.action.content.formula.highlight; import com.fr.design.actions.replace.action.SearchAction; import com.fr.design.actions.replace.action.SearchManager; -import com.fr.design.actions.replace.action.content.formula.cell.SearchCellFormula; -import com.fr.design.actions.replace.action.content.formula.cell.SearchCellFormulaManager; import com.fr.design.actions.replace.action.content.formula.highlight.javascript.SearchJSHighlightAction; import java.util.HashMap; diff --git a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/highlight/condition/SearchConditionFormula.java b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/highlight/condition/SearchConditionFormula.java index 2cc7c595f4..85f5a67dbb 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/highlight/condition/SearchConditionFormula.java +++ b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/highlight/condition/SearchConditionFormula.java @@ -5,7 +5,6 @@ import com.fr.design.actions.replace.info.base.ITContent; import com.fr.general.data.Condition; -import java.util.ArrayList; import java.util.List; /** diff --git a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/highlight/condition/SearchFormulaConditionAction.java b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/highlight/condition/SearchFormulaConditionAction.java index c668ea7679..c6b8533219 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/highlight/condition/SearchFormulaConditionAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/highlight/condition/SearchFormulaConditionAction.java @@ -1,7 +1,6 @@ package com.fr.design.actions.replace.action.content.formula.highlight.condition; import com.fr.data.condition.FormulaCondition; -import com.fr.design.actions.replace.action.content.formula.cell.SearchCellFormulaTypeAction; import com.fr.design.actions.replace.info.FormulaInfo; import com.fr.design.actions.replace.info.base.ITContent; diff --git a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/highlight/javascript/SearchExportJSFormulaAction.java b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/highlight/javascript/SearchExportJSFormulaAction.java index 44750feec9..716c2d908f 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/highlight/javascript/SearchExportJSFormulaAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/highlight/javascript/SearchExportJSFormulaAction.java @@ -7,7 +7,7 @@ import com.fr.js.ExportJavaScript; import com.fr.js.JavaScript; import com.fr.js.SingleJavaScript; -import java.util.ArrayList; + import java.util.List; /** diff --git a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/highlight/javascript/SearchJSFormula.java b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/highlight/javascript/SearchJSFormula.java index 780a982bb7..553c55ba5c 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/highlight/javascript/SearchJSFormula.java +++ b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/highlight/javascript/SearchJSFormula.java @@ -5,7 +5,7 @@ import com.fr.design.actions.replace.info.FormulaInfo; import com.fr.design.actions.replace.info.base.ITContent; import com.fr.js.JavaScript; -import java.util.ArrayList; + import java.util.List; /** diff --git a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/highlight/javascript/SearchJSFormulaManager.java b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/highlight/javascript/SearchJSFormulaManager.java index 413f3c24f8..dafc79d586 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/highlight/javascript/SearchJSFormulaManager.java +++ b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/highlight/javascript/SearchJSFormulaManager.java @@ -2,9 +2,7 @@ package com.fr.design.actions.replace.action.content.formula.highlight.javascrip import com.fr.design.actions.replace.action.SearchAction; import com.fr.design.actions.replace.action.SearchManager; -import com.fr.design.actions.replace.action.content.formula.highlight.condition.SearchCommonConditionAction; -import com.fr.design.actions.replace.action.content.formula.highlight.condition.SearchConditionFormula; -import com.fr.design.actions.replace.action.content.formula.highlight.condition.SearchConditionManager; + import java.util.HashMap; import java.util.Map; diff --git a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/template/SearchTemplateFormulaAction.java b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/template/SearchTemplateFormulaAction.java index a500bdb7fb..977de5a333 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/template/SearchTemplateFormulaAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/template/SearchTemplateFormulaAction.java @@ -5,14 +5,13 @@ import com.fr.base.Parameter; import com.fr.base.ParameterConfig; import com.fr.base.io.AttrMark; import com.fr.base.iofile.attr.WatermarkAttr; -import com.fr.design.actions.replace.action.content.formula.data.SearchDataFormulaAction; import com.fr.design.actions.replace.info.FormulaInfo; import com.fr.design.actions.replace.info.base.ITContent; import com.fr.design.i18n.Toolkit; import com.fr.design.mainframe.JTemplate; import com.fr.report.core.ReportUtils; -import java.util.ArrayList; + import java.util.List; /** diff --git a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/widget/SearchDateEditorFormulaAction.java b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/widget/SearchDateEditorFormulaAction.java index a4221c1b92..d7e81a1d6e 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/widget/SearchDateEditorFormulaAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/widget/SearchDateEditorFormulaAction.java @@ -1,13 +1,12 @@ package com.fr.design.actions.replace.action.content.formula.widget; 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.i18n.Toolkit; import com.fr.form.ui.DateEditor; import org.gradle.internal.impldep.org.apache.commons.lang.StringUtils; -import java.util.ArrayList; + import java.util.List; /** diff --git a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/widget/SearchDictFormulaAction.java b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/widget/SearchDictFormulaAction.java index 2f9072751e..a89e5118e1 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/widget/SearchDictFormulaAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/widget/SearchDictFormulaAction.java @@ -2,10 +2,9 @@ package com.fr.design.actions.replace.action.content.formula.widget; import com.fr.design.actions.replace.info.FormulaInfo; import com.fr.design.actions.replace.info.base.ITContent; -import com.fr.form.ui.ComboCheckBox; import com.fr.form.ui.DictionaryContainer; -import java.util.ArrayList; + import java.util.List; /** diff --git a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/widget/SearchTreeEditorFormulaAction.java b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/widget/SearchTreeEditorFormulaAction.java index 88722fc8f2..81987a1db4 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/widget/SearchTreeEditorFormulaAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/widget/SearchTreeEditorFormulaAction.java @@ -10,7 +10,6 @@ import com.fr.form.ui.TreeEditor; import com.fr.form.ui.tree.LayerConfig; import com.fr.stable.StringUtils; -import java.util.ArrayList; import java.util.List; /** diff --git a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/widget/SearchWidgetFormula.java b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/widget/SearchWidgetFormula.java index 355cb0080e..166fd215ef 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/widget/SearchWidgetFormula.java +++ b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/widget/SearchWidgetFormula.java @@ -3,7 +3,6 @@ package com.fr.design.actions.replace.action.content.formula.widget; import com.fr.design.actions.replace.action.content.formula.SearchFormula; import com.fr.design.actions.replace.info.FormulaInfo; import com.fr.design.actions.replace.info.Info; -import com.fr.design.actions.replace.info.WidgetInfo; import com.fr.design.actions.replace.info.base.ITContent; import java.util.List; diff --git a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/widget/SearchWidgetFormulaAction.java b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/widget/SearchWidgetFormulaAction.java index 61b139f053..f1f214f648 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/widget/SearchWidgetFormulaAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/widget/SearchWidgetFormulaAction.java @@ -13,7 +13,7 @@ import com.fr.design.actions.replace.utils.ShowValueUtils; import com.fr.design.mainframe.JTemplate; import com.fr.form.main.Form; import com.fr.form.ui.ChartEditor; -import com.fr.form.ui.ComboCheckBox; + import com.fr.form.ui.Widget; import com.fr.form.ui.container.WScaleLayout; import com.fr.form.ui.container.WTitleLayout; @@ -21,7 +21,6 @@ import com.fr.form.ui.widget.CRBoundsWidget; import com.fr.main.impl.WorkBook; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/widget/SearchWidgetFormulaManager.java b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/widget/SearchWidgetFormulaManager.java index 08e0ea3942..6ddb7eae72 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/widget/SearchWidgetFormulaManager.java +++ b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/widget/SearchWidgetFormulaManager.java @@ -2,8 +2,6 @@ package com.fr.design.actions.replace.action.content.formula.widget; import com.fr.design.actions.replace.action.SearchAction; import com.fr.design.actions.replace.action.SearchManager; -import com.fr.design.actions.replace.action.content.formula.highlight.SearchHighlightFormula; -import com.fr.design.actions.replace.action.content.formula.highlight.SearchHighlightFormulaManager; import java.util.HashMap; import java.util.Map; diff --git a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/js/SearchCellJSAction.java b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/js/SearchCellJSAction.java index bbce689967..d0a00644eb 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/js/SearchCellJSAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/js/SearchCellJSAction.java @@ -1,7 +1,7 @@ package com.fr.design.actions.replace.action.content.js; import com.fr.chart.chartattr.ChartCollection; -import com.fr.design.actions.replace.action.SearchAction; + import com.fr.design.actions.replace.action.content.cell.SearchCellAction; import com.fr.design.actions.replace.info.CellInfo; import com.fr.design.actions.replace.info.JSInfo; @@ -10,15 +10,14 @@ import com.fr.design.actions.replace.utils.SearchJSUtils; import com.fr.design.i18n.Toolkit; import com.fr.design.mainframe.JTemplate; import com.fr.js.JavaScriptImpl; -import com.fr.js.NameJavaScript; + import com.fr.js.NameJavaScriptGroup; -import com.fr.plugin.chart.base.VanChartHtmlLabel; + import com.fr.report.cell.CellElement; import com.fr.report.cell.TemplateCellElement; import com.fr.report.cell.cellattr.highlight.DefaultHighlight; import com.fr.report.cell.cellattr.highlight.HighlightAction; import com.fr.report.cell.cellattr.highlight.HyperlinkHighlightAction; -import com.fr.stable.collections.combination.Pair; import java.util.ArrayList; import java.util.List; diff --git a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/js/SearchChartJSAction.java b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/js/SearchChartJSAction.java index fa2f716f0e..768972c679 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/js/SearchChartJSAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/js/SearchChartJSAction.java @@ -8,7 +8,7 @@ import com.fr.design.actions.replace.info.base.ITContent; import com.fr.design.actions.replace.utils.SearchJSUtils; import com.fr.design.i18n.Toolkit; import com.fr.js.NameJavaScript; -import com.fr.plugin.chart.attr.axis.VanChartAlertValue; + import com.fr.plugin.chart.attr.axis.VanChartAxis; import com.fr.plugin.chart.base.VanChartHtmlLabel; import com.fr.stable.collections.combination.Pair; diff --git a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/js/SearchFloatJSAction.java b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/js/SearchFloatJSAction.java index b64a934243..4270d5bbca 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/js/SearchFloatJSAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/js/SearchFloatJSAction.java @@ -1,20 +1,18 @@ package com.fr.design.actions.replace.action.content.js; import com.fr.chart.chartattr.ChartCollection; -import com.fr.design.actions.replace.action.SearchAction; + import com.fr.design.actions.replace.action.content.floatelement.SearchFloatAction; import com.fr.design.actions.replace.info.FloatInfo; import com.fr.design.actions.replace.info.JSInfo; import com.fr.design.actions.replace.info.base.ITContent; import com.fr.design.actions.replace.utils.SearchJSUtils; -import com.fr.design.i18n.Toolkit; + import com.fr.design.mainframe.JTemplate; -import com.fr.js.NameJavaScript; -import com.fr.plugin.chart.base.VanChartHtmlLabel; import com.fr.report.cell.FloatElement; -import com.fr.stable.collections.combination.Pair; + import java.util.*; diff --git a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/sql/SearchSQLAction.java b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/sql/SearchSQLAction.java index 10fdd28659..10ae238056 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/sql/SearchSQLAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/replace/action/content/sql/SearchSQLAction.java @@ -3,7 +3,6 @@ package com.fr.design.actions.replace.action.content.sql; import com.fr.data.TableDataSource; import com.fr.data.impl.DBTableData; import com.fr.design.actions.replace.action.SearchAction; -import com.fr.design.actions.replace.action.content.floatelement.SearchFloatAction; import com.fr.design.actions.replace.info.SQLInfo; import com.fr.design.actions.replace.info.base.ITContent; diff --git a/designer-realize/src/main/java/com/fr/design/actions/replace/info/DealWithInfoValue.java b/designer-realize/src/main/java/com/fr/design/actions/replace/info/DealWithInfoValue.java index 14a3ff4d1b..feb5cc1a78 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/replace/info/DealWithInfoValue.java +++ b/designer-realize/src/main/java/com/fr/design/actions/replace/info/DealWithInfoValue.java @@ -1,11 +1,10 @@ package com.fr.design.actions.replace.info; -import com.fr.design.actions.replace.info.base.ITContent; + import com.fr.stable.collections.combination.Pair; -import java.util.ArrayList; -import java.util.HashMap; + import java.util.List; import java.util.Map; diff --git a/designer-realize/src/main/java/com/fr/design/actions/replace/info/JSInfo.java b/designer-realize/src/main/java/com/fr/design/actions/replace/info/JSInfo.java index b1123c4eb9..4cf9de1fd8 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/replace/info/JSInfo.java +++ b/designer-realize/src/main/java/com/fr/design/actions/replace/info/JSInfo.java @@ -7,7 +7,6 @@ import com.fr.stable.AssistUtils; import com.fr.stable.collections.combination.Pair; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/designer-realize/src/main/java/com/fr/design/actions/replace/info/base/ITContent.java b/designer-realize/src/main/java/com/fr/design/actions/replace/info/base/ITContent.java index 239f4a92fc..de736cb27f 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/replace/info/base/ITContent.java +++ b/designer-realize/src/main/java/com/fr/design/actions/replace/info/base/ITContent.java @@ -7,7 +7,6 @@ import com.fr.stable.collections.combination.Pair; import java.util.ArrayList; import java.util.List; -import java.util.Map; /** * 主要的存储信息的数据结构 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 0c01a2ec87..b59499c7d5 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 @@ -3,7 +3,6 @@ package com.fr.design.actions.replace.ui; import com.fr.design.actions.replace.action.ShowSearchResultAction; -import com.fr.design.actions.replace.action.content.formula.SearchFormulaManager; import com.fr.design.actions.replace.info.Info; import com.fr.design.actions.replace.utils.ShowValueUtils;