Browse Source

Pull request #10097: REPORT-75998 模板级全局查找替换(添加部分校验和不可跳转)

Merge in DESIGN/design from ~DESTINY.LIN/design:feature/x to feature/x

* commit 'd13623f45829e492ee864b455771b12cd5554887':
  REPORT-75998 优化判断
  REPORT-75998 添加不可跳转判断
  REPORT-75998 添加一部分校验
feature/x
Destiny.Lin-林锦龙 2 years ago
parent
commit
42fe7f26fc
  1. 2
      designer-realize/src/main/java/com/fr/design/actions/replace/action/ShowSearchResultAction.java
  2. 15
      designer-realize/src/main/java/com/fr/design/actions/replace/action/content/component/ComponentType.java
  3. 141
      designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/FormulaReplaceObject.java
  4. 2
      designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/data/SearchDataFormulaAction.java
  5. 5
      designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/template/SearchTemplateFormulaAction.java
  6. 2
      designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/widget/SearchDateEditorFormulaAction.java
  7. 2
      designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/widget/SearchTreeEditorFormulaAction.java
  8. 23
      designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/widget/SearchWidgetFormulaAction.java
  9. 2
      designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/widget/SearchWidgetFormulaManager.java
  10. 1
      designer-realize/src/main/java/com/fr/design/actions/replace/action/content/js/SearchWebJSAction.java
  11. 1
      designer-realize/src/main/java/com/fr/design/actions/replace/action/content/sql/SearchSQLAction.java
  12. 14
      designer-realize/src/main/java/com/fr/design/actions/replace/info/ComponentInfo.java
  13. 25
      designer-realize/src/main/java/com/fr/design/actions/replace/info/FloatInfo.java
  14. 9
      designer-realize/src/main/java/com/fr/design/actions/replace/info/FormulaInfo.java
  15. 9
      designer-realize/src/main/java/com/fr/design/actions/replace/info/JSInfo.java
  16. 45
      designer-realize/src/main/java/com/fr/design/actions/replace/info/ReplaceObject.java
  17. 45
      designer-realize/src/main/java/com/fr/design/actions/replace/ui/ITReplaceMainDialog.java
  18. 8
      designer-realize/src/main/java/com/fr/design/actions/replace/ui/ITReplaceNorthPanel.java
  19. 10
      designer-realize/src/main/java/com/fr/design/actions/replace/utils/ShowValueUtils.java

2
designer-realize/src/main/java/com/fr/design/actions/replace/action/ShowSearchResultAction.java

@ -135,7 +135,7 @@ public enum ShowSearchResultAction implements ShowValue {
} }
private void searchMap4JS(Map<String, String> map, List<JSInfo> jsInfos, JSInfo info, String str) { private void searchMap4JS(Map<String, String> map, List<JSInfo> jsInfos, JSInfo info, String str) {
if (map.containsKey(objectNameKey) && !StringUtils.isEmpty(map.get(objectNameKey))) { if (map.containsKey(objectNameKey) && StringUtils.isNotEmpty(map.get(objectNameKey))) {
String name = map.get(objectNameKey); String name = map.get(objectNameKey);
if (name.contains(str)) { if (name.contains(str)) {
JSInfo nameJSInfo = info.copy(); JSInfo nameJSInfo = info.copy();

15
designer-realize/src/main/java/com/fr/design/actions/replace/action/content/component/ComponentType.java

@ -347,4 +347,19 @@ public enum ComponentType implements DealWithInfoValue {
} }
/**
* 校验是否被修改
*
* @param info
* @return
*/
public boolean check(Info info) {
if (info.getContent().getReplaceObject() instanceof Widget) {
Widget widget = (Widget) info.getContent().getReplaceObject();
return StringUtils.equals(widget.getWidgetName(), info.getContent().getOldShowStr());
}
return false;
}
} }

141
designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/FormulaReplaceObject.java

@ -4,14 +4,19 @@ import com.fr.base.BaseFormula;
import com.fr.base.Formula; import com.fr.base.Formula;
import com.fr.base.Parameter; import com.fr.base.Parameter;
import com.fr.base.StoreProcedureParameter; import com.fr.base.StoreProcedureParameter;
import com.fr.base.core.KV;
import com.fr.base.iofile.attr.WatermarkAttr; import com.fr.base.iofile.attr.WatermarkAttr;
import com.fr.base.present.FormulaPresent; import com.fr.base.present.FormulaPresent;
import com.fr.base.present.Present;
import com.fr.data.condition.FormulaCondition; import com.fr.data.condition.FormulaCondition;
import com.fr.data.core.Compare; import com.fr.data.core.Compare;
import com.fr.design.actions.replace.info.DealWithInfoValue; import com.fr.design.actions.replace.info.DealWithInfoValue;
import com.fr.design.actions.replace.info.Info; import com.fr.design.actions.replace.info.Info;
import com.fr.design.actions.replace.utils.ShowValueUtils; import com.fr.design.actions.replace.utils.ShowValueUtils;
import com.fr.design.file.HistoryTemplateListCache; import com.fr.design.file.HistoryTemplateListCache;
import com.fr.form.main.Form;
import com.fr.function.IF;
import com.fr.general.GeneralUtils;
import com.fr.js.SingleJavaScript; import com.fr.js.SingleJavaScript;
import com.fr.main.impl.WorkBook; import com.fr.main.impl.WorkBook;
import com.fr.report.cell.cellattr.CellInsertPolicyAttr; import com.fr.report.cell.cellattr.CellInsertPolicyAttr;
@ -54,6 +59,15 @@ public enum FormulaReplaceObject implements DealWithInfoValue {
info.updateOldStr(((Formula) replaceObject).getContent(), findStr); info.updateOldStr(((Formula) replaceObject).getContent(), findStr);
((Formula) replaceObject).setContent(ShowValueUtils.replaceAll(((Formula) replaceObject).getContent(), findStr, replaceStr)); ((Formula) replaceObject).setContent(ShowValueUtils.replaceAll(((Formula) replaceObject).getContent(), findStr, replaceStr));
} }
@Override
public boolean check(Info info) {
if (info.getContent().getReplaceObject() instanceof Formula){
Formula formula = (Formula) info.getContent().getReplaceObject();
return StringUtils.equals(formula.getContent(), info.getContent().getOldShowStr());
}
return false;
}
}, },
/** /**
* FormulaCondition * FormulaCondition
@ -77,6 +91,14 @@ public enum FormulaReplaceObject implements DealWithInfoValue {
((FormulaCondition) replaceObject).setFormula(ShowValueUtils.replaceAll(((FormulaCondition) replaceObject).getFormula(), findStr, replaceStr)); ((FormulaCondition) replaceObject).setFormula(ShowValueUtils.replaceAll(((FormulaCondition) replaceObject).getFormula(), findStr, replaceStr));
} }
@Override
public boolean check(Info info) {
if (info.getContent().getReplaceObject() instanceof FormulaCondition){
FormulaCondition condition = (FormulaCondition) info.getContent().getReplaceObject();
return StringUtils.equals(condition.getFormula(), info.getContent().getOldShowStr());
}
return false;
}
}, },
/** /**
* Compare * Compare
@ -102,6 +124,14 @@ public enum FormulaReplaceObject implements DealWithInfoValue {
} }
} }
@Override
public boolean check(Info info) {
if (info.getContent().getReplaceObject() instanceof Compare){
Compare compare = (Compare) info.getContent().getReplaceObject();
return StringUtils.equals(GeneralUtils.objectToString(compare.getValue()), info.getContent().getOldShowStr());
}
return false;
}
}, },
/** /**
* 富文本 * 富文本
@ -128,6 +158,14 @@ public enum FormulaReplaceObject implements DealWithInfoValue {
} }
} }
@Override
public boolean check(Info info) {
if (info.getContent().getReplaceObject() instanceof RichChar){
RichChar richChar = (RichChar) info.getContent().getReplaceObject();
return StringUtils.equals(richChar.getText(), info.getContent().getOldShowStr());
}
return false;
}
}, },
/** /**
* KV * KV
@ -150,6 +188,14 @@ public enum FormulaReplaceObject implements DealWithInfoValue {
((Formula) ((com.fr.base.core.KV) replaceObject).getValue()).setContent(ShowValueUtils.replaceAll(((Formula) ((com.fr.base.core.KV) replaceObject).getValue()).getContent(), findStr, replaceStr)); ((Formula) ((com.fr.base.core.KV) replaceObject).getValue()).setContent(ShowValueUtils.replaceAll(((Formula) ((com.fr.base.core.KV) replaceObject).getValue()).getContent(), findStr, replaceStr));
} }
@Override
public boolean check(Info info) {
if (info.getContent().getReplaceObject() instanceof com.fr.base.core.KV){
com.fr.base.core.KV kv = (com.fr.base.core.KV) info.getContent().getReplaceObject();
return StringUtils.equals(GeneralUtils.objectToString(kv.getValue()), info.getContent().getOldShowStr());
}
return false;
}
}, },
/** /**
* 插入策略 * 插入策略
@ -171,6 +217,14 @@ public enum FormulaReplaceObject implements DealWithInfoValue {
((Formula) (((CellInsertPolicyAttr) replaceObject).getDefaultInsertValue())).setContent(ShowValueUtils.replaceAll(((Formula) (((CellInsertPolicyAttr) replaceObject).getDefaultInsertValue())).getContent(), findStr, replaceStr)); ((Formula) (((CellInsertPolicyAttr) replaceObject).getDefaultInsertValue())).setContent(ShowValueUtils.replaceAll(((Formula) (((CellInsertPolicyAttr) replaceObject).getDefaultInsertValue())).getContent(), findStr, replaceStr));
} }
@Override
public boolean check(Info info) {
if (info.getContent().getReplaceObject() instanceof CellInsertPolicyAttr){
CellInsertPolicyAttr policyAttr = (CellInsertPolicyAttr) info.getContent().getReplaceObject();
return StringUtils.equals(GeneralUtils.objectToString(policyAttr.getDefaultInsertValue()), info.getContent().getOldShowStr());
}
return false;
}
}, },
/** /**
* present * present
@ -193,6 +247,14 @@ public enum FormulaReplaceObject implements DealWithInfoValue {
((FormulaPresent) replaceObject).setFormulaContent(ShowValueUtils.replaceAll(((FormulaPresent) replaceObject).getFormulaContent(), findStr, replaceStr)); ((FormulaPresent) replaceObject).setFormulaContent(ShowValueUtils.replaceAll(((FormulaPresent) replaceObject).getFormulaContent(), findStr, replaceStr));
} }
@Override
public boolean check(Info info) {
if (info.getContent().getReplaceObject() instanceof FormulaPresent){
FormulaPresent present = (FormulaPresent) info.getContent().getReplaceObject();
return StringUtils.equals(present.getFormulaContent(), info.getContent().getOldShowStr());
}
return false;
}
}, },
/** /**
* SingleJavaScript * SingleJavaScript
@ -211,10 +273,17 @@ public enum FormulaReplaceObject implements DealWithInfoValue {
public void setValue(Info info, String findStr, String replaceStr, List<Pair<Integer, Integer>> operatorArray) { public void setValue(Info info, String findStr, String replaceStr, List<Pair<Integer, Integer>> operatorArray) {
Object replaceObject = info.getContent().getReplaceObject(); Object replaceObject = info.getContent().getReplaceObject();
info.updateOldStr(((SingleJavaScript) replaceObject).getFileName(), findStr); info.updateOldStr(((SingleJavaScript) replaceObject).getFileName(), findStr);
((SingleJavaScript) replaceObject).setFileName(ShowValueUtils.replaceAll(((SingleJavaScript) replaceObject).getFileName(), findStr, replaceStr)); ((SingleJavaScript) replaceObject).setFileName(ShowValueUtils.replaceAll(((SingleJavaScript) replaceObject).getFileName(), findStr, replaceStr));
} }
@Override
public boolean check(Info info) {
if (info.getContent().getReplaceObject() instanceof SingleJavaScript){
SingleJavaScript javaScript = (SingleJavaScript) info.getContent().getReplaceObject();
return StringUtils.equals(javaScript.getFileName(), info.getContent().getOldShowStr());
}
return false;
}
}, },
/** /**
* 参数 * 参数
@ -237,6 +306,16 @@ public enum FormulaReplaceObject implements DealWithInfoValue {
((Formula) (((ParameterProvider) replaceObject).getValue())).setContent(ShowValueUtils.replaceAll(((Formula) (((ParameterProvider) replaceObject).getValue())).getContent(), findStr, replaceStr)); ((Formula) (((ParameterProvider) replaceObject).getValue())).setContent(ShowValueUtils.replaceAll(((Formula) (((ParameterProvider) replaceObject).getValue())).getContent(), findStr, replaceStr));
} }
@Override
public boolean check(Info info) {
if (info.getContent().getReplaceObject() instanceof ParameterProvider){
ParameterProvider provider = (ParameterProvider) info.getContent().getReplaceObject();
if (provider.getValue() instanceof Formula){
return StringUtils.equals(GeneralUtils.objectToString(provider.getValue()), info.getContent().getOldShowStr());
}
}
return false;
}
}, },
/** /**
* FormulaProvider * FormulaProvider
@ -259,6 +338,14 @@ public enum FormulaReplaceObject implements DealWithInfoValue {
((FormulaProvider) replaceObject).setContent(ShowValueUtils.replaceAll(((FormulaProvider) replaceObject).getContent(), findStr, replaceStr)); ((FormulaProvider) replaceObject).setContent(ShowValueUtils.replaceAll(((FormulaProvider) replaceObject).getContent(), findStr, replaceStr));
} }
@Override
public boolean check(Info info) {
if (info.getContent().getReplaceObject() instanceof FormulaProvider){
FormulaProvider provider = (FormulaProvider) info.getContent().getReplaceObject();
return StringUtils.equals(provider.getContent(), info.getContent().getOldShowStr());
}
return false;
}
}, },
/** /**
* 参数 * 参数
@ -281,6 +368,16 @@ public enum FormulaReplaceObject implements DealWithInfoValue {
((Formula) (((Parameter) replaceObject).getValue())).setContent(ShowValueUtils.replaceAll(((Formula) (((Parameter) replaceObject).getValue())).getContent(), findStr, replaceStr)); ((Formula) (((Parameter) replaceObject).getValue())).setContent(ShowValueUtils.replaceAll(((Formula) (((Parameter) replaceObject).getValue())).getContent(), findStr, replaceStr));
} }
@Override
public boolean check(Info info) {
if (info.getContent().getReplaceObject() instanceof Parameter){
Parameter parameter = (Parameter) info.getContent().getReplaceObject();
if (parameter.getValue() instanceof Formula){
return StringUtils.equals(((Formula) parameter.getValue()).getContent(), info.getContent().getOldShowStr());
}
}
return false;
}
}, },
/** /**
* 数据列 * 数据列
@ -303,6 +400,14 @@ public enum FormulaReplaceObject implements DealWithInfoValue {
((DSColumn) replaceObject).setResult(ShowValueUtils.replaceAll(((DSColumn) replaceObject).getResult(), findStr, replaceStr)); ((DSColumn) replaceObject).setResult(ShowValueUtils.replaceAll(((DSColumn) replaceObject).getResult(), findStr, replaceStr));
} }
@Override
public boolean check(Info info) {
if (info.getContent().getReplaceObject() instanceof DSColumn){
DSColumn column = (DSColumn) info.getContent().getReplaceObject();
return StringUtils.equals(column.getResult(), info.getContent().getOldShowStr());
}
return false;
}
}, },
/** /**
* 公式类型 * 公式类型
@ -325,6 +430,14 @@ public enum FormulaReplaceObject implements DealWithInfoValue {
((BaseFormula) replaceObject).setContent(ShowValueUtils.replaceAll(((BaseFormula) replaceObject).getContent(), findStr, replaceStr)); ((BaseFormula) replaceObject).setContent(ShowValueUtils.replaceAll(((BaseFormula) replaceObject).getContent(), findStr, replaceStr));
} }
@Override
public boolean check(Info info) {
if (info.getContent().getReplaceObject() instanceof BaseFormula){
BaseFormula formula = (BaseFormula) info.getContent().getReplaceObject();
return StringUtils.equals(formula.getContent(), info.getContent().getOldShowStr());
}
return false;
}
}, },
/** /**
* 存储过程的参数 * 存储过程的参数
@ -347,6 +460,17 @@ public enum FormulaReplaceObject implements DealWithInfoValue {
((Formula) ((StoreProcedureParameter) replaceObject).getValue()).setContent(ShowValueUtils.replaceAll(((Formula) ((StoreProcedureParameter) replaceObject).getValue()).getContent(), findStr, replaceStr)); ((Formula) ((StoreProcedureParameter) replaceObject).getValue()).setContent(ShowValueUtils.replaceAll(((Formula) ((StoreProcedureParameter) replaceObject).getValue()).getContent(), findStr, replaceStr));
} }
@Override
public boolean check(Info info) {
if (info.getContent().getReplaceObject() instanceof StoreProcedureParameter){
StoreProcedureParameter procedureParameter = (StoreProcedureParameter) info.getContent().getReplaceObject();
if (procedureParameter.getValue() instanceof Formula){
return StringUtils.equals(GeneralUtils.objectToString(procedureParameter.getValue()), info.getContent().getOldShowStr());
}
}
return false;
}
}, },
/** /**
* WatermarkAttr水印 * WatermarkAttr水印
@ -369,6 +493,15 @@ public enum FormulaReplaceObject implements DealWithInfoValue {
watermarkAttr.setText(ShowValueUtils.replaceAll(watermarkAttr.getText(), findStr, replaceStr)); watermarkAttr.setText(ShowValueUtils.replaceAll(watermarkAttr.getText(), findStr, replaceStr));
workBook.addAttrMark(watermarkAttr); workBook.addAttrMark(watermarkAttr);
} }
@Override
public boolean check(Info info) {
if (info.getContent().getReplaceObject() instanceof WatermarkAttr){
WatermarkAttr watermarkAttr = ((WatermarkAttr) info.getContent().getReplaceObject());
return StringUtils.equals(watermarkAttr.getText(), info.getContent().getOldShowStr());
}
return false;
}
}; };
@ -395,6 +528,12 @@ public enum FormulaReplaceObject implements DealWithInfoValue {
return null; return null;
} }
/**
* 校验内容
* @param info
* @return
*/
abstract public boolean check(Info info);
@Override @Override
public String getInfoShowStr(Info info) { public String getInfoShowStr(Info info) {

2
designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/data/SearchDataFormulaAction.java

@ -44,6 +44,7 @@ public class SearchDataFormulaAction implements SearchFormula {
Toolkit.i18nText("Fine-Design_Basic_DS_Server_TableData"), Toolkit.i18nText("Fine-Design_Basic_DS_Server_TableData"),
dataName dataName
); );
content.setJumpAble(false);
content.setShowObject(Toolkit.i18nText("Fine-Design_Basic_DS_Server_TableData")); content.setShowObject(Toolkit.i18nText("Fine-Design_Basic_DS_Server_TableData"));
DataType dataType = DataType.match(tableDataConfig.getTableData(dataName).getClass().getSimpleName()); DataType dataType = DataType.match(tableDataConfig.getTableData(dataName).getClass().getSimpleName());
if (dataType != null) { if (dataType != null) {
@ -60,6 +61,7 @@ public class SearchDataFormulaAction implements SearchFormula {
String dataName = (String) dataIterator.next(); String dataName = (String) dataIterator.next();
ITContent content = new ITContent(); ITContent content = new ITContent();
content.setTemplateName(jTemplate.getTemplateName()); content.setTemplateName(jTemplate.getTemplateName());
content.setJumpAble(false);
content.addOtherPos( content.addOtherPos(
Toolkit.i18nText("Fine-Design_Basic_DS_Report_TableData"), Toolkit.i18nText("Fine-Design_Basic_DS_Report_TableData"),
dataName dataName

5
designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/template/SearchTemplateFormulaAction.java

@ -32,6 +32,7 @@ public class SearchTemplateFormulaAction implements SearchTemplateFormula {
public void searchFormulaFromObject(JTemplate jTemplate, List<FormulaInfo> formulaInfos) { public void searchFormulaFromObject(JTemplate jTemplate, List<FormulaInfo> formulaInfos) {
ITContent content = new ITContent(); ITContent content = new ITContent();
content.setTemplateName(jTemplate.getTemplateName()); content.setTemplateName(jTemplate.getTemplateName());
content.setJumpAble(false);
searchTemplateParaFormula(jTemplate, formulaInfos, content); searchTemplateParaFormula(jTemplate, formulaInfos, content);
searchTemplateWaterMarkFormula(jTemplate, formulaInfos, content); searchTemplateWaterMarkFormula(jTemplate, formulaInfos, content);
} }
@ -54,7 +55,7 @@ public class SearchTemplateFormulaAction implements SearchTemplateFormula {
if (parameter.getValue() instanceof Formula) { if (parameter.getValue() instanceof Formula) {
ITContent paraContent = ITContent.copy(content); ITContent paraContent = ITContent.copy(content);
paraContent.addOtherPos(Toolkit.i18nText("Fine-Design_Basic_Template_Parameter")); paraContent.addOtherPos(Toolkit.i18nText("Fine-Design_Basic_Template_Parameter"));
paraContent.setReplaceObject(parameter.getValue()); paraContent.setReplaceObject(parameter);
formulaInfos.add(new FormulaInfo(paraContent)); formulaInfos.add(new FormulaInfo(paraContent));
} }
} }
@ -64,7 +65,7 @@ public class SearchTemplateFormulaAction implements SearchTemplateFormula {
if (parameter.getValue() instanceof Formula) { if (parameter.getValue() instanceof Formula) {
ITContent paraContent = ITContent.copy(content); ITContent paraContent = ITContent.copy(content);
paraContent.addOtherPos(Toolkit.i18nText("Fine-Design_Basic_Parameter_Source_Type_Server")); paraContent.addOtherPos(Toolkit.i18nText("Fine-Design_Basic_Parameter_Source_Type_Server"));
paraContent.setReplaceObject(parameter.getValue()); paraContent.setReplaceObject(parameter);
formulaInfos.add(new FormulaInfo(paraContent)); formulaInfos.add(new FormulaInfo(paraContent));
} }
} }

2
designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/widget/SearchDateEditorFormulaAction.java

@ -4,7 +4,7 @@ import com.fr.design.actions.replace.info.FormulaInfo;
import com.fr.design.actions.replace.info.base.ITContent; import com.fr.design.actions.replace.info.base.ITContent;
import com.fr.design.i18n.Toolkit; import com.fr.design.i18n.Toolkit;
import com.fr.form.ui.DateEditor; import com.fr.form.ui.DateEditor;
import org.gradle.internal.impldep.org.apache.commons.lang.StringUtils; import com.fr.stable.StringUtils;
import java.util.List; import java.util.List;

2
designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/widget/SearchTreeEditorFormulaAction.java

@ -33,6 +33,7 @@ public class SearchTreeEditorFormulaAction extends AbstractSearchWidgetFormulaAc
} }
private void SearchFormulaFromModelConfig(ITContent content, List<FormulaInfo> formulaInfos) { private void SearchFormulaFromModelConfig(ITContent content, List<FormulaInfo> formulaInfos) {
if (content.getReplaceObject() instanceof TreeEditor) {
if (((TreeEditor) content.getReplaceObject()).getBuildModelConfig() != null) { if (((TreeEditor) content.getReplaceObject()).getBuildModelConfig() != null) {
//LayerConfig[] 急速分层构建 //LayerConfig[] 急速分层构建
//TreeNodeWrapper 普通分层构建 //TreeNodeWrapper 普通分层构建
@ -45,6 +46,7 @@ public class SearchTreeEditorFormulaAction extends AbstractSearchWidgetFormulaAc
} }
} }
} }
}
private void dealWithTreeNodeWrapper(TreeNodeWrapper wrapper, ITContent content, List<FormulaInfo> formulaInfos) { private void dealWithTreeNodeWrapper(TreeNodeWrapper wrapper, ITContent content, List<FormulaInfo> formulaInfos) {
for (TreeNodeAttr attr : wrapper.getTreeNodeAttrs()) { for (TreeNodeAttr attr : wrapper.getTreeNodeAttrs()) {

23
designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/widget/SearchWidgetFormulaAction.java

@ -1,5 +1,6 @@
package com.fr.design.actions.replace.action.content.formula.widget; package com.fr.design.actions.replace.action.content.formula.widget;
import com.fr.chart.chartattr.ChartCollection; import com.fr.chart.chartattr.ChartCollection;
import com.fr.design.actions.replace.action.content.component.SearchComponentAction; import com.fr.design.actions.replace.action.content.component.SearchComponentAction;
import com.fr.design.actions.replace.action.content.formula.chart.SearchChartCollectionFormulaAction; import com.fr.design.actions.replace.action.content.formula.chart.SearchChartCollectionFormulaAction;
@ -11,15 +12,20 @@ import com.fr.design.actions.replace.info.WidgetInfo;
import com.fr.design.actions.replace.info.base.ITContent; import com.fr.design.actions.replace.info.base.ITContent;
import com.fr.design.actions.replace.utils.ShowValueUtils; import com.fr.design.actions.replace.utils.ShowValueUtils;
import com.fr.design.mainframe.JTemplate; import com.fr.design.mainframe.JTemplate;
import com.fr.form.main.Form; import com.fr.form.main.Form;
import com.fr.form.ui.ChartEditor; import com.fr.form.ui.ChartEditor;
import com.fr.form.ui.Label;
import com.fr.form.ui.Widget; import com.fr.form.ui.Widget;
import com.fr.form.ui.container.WScaleLayout; import com.fr.form.ui.container.WScaleLayout;
import com.fr.form.ui.container.WTitleLayout; import com.fr.form.ui.container.WTitleLayout;
import com.fr.form.ui.widget.CRBoundsWidget; import com.fr.form.ui.widget.CRBoundsWidget;
import com.fr.main.impl.WorkBook; import com.fr.main.impl.WorkBook;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -59,7 +65,6 @@ public class SearchWidgetFormulaAction extends AbstractSearchWidgetFormulaAction
formulaInfos.addAll(result); formulaInfos.addAll(result);
} }
@Override @Override
public void searchFormulaFromWidgetInfos(Info info, List<FormulaInfo> formulaInfos) { public void searchFormulaFromWidgetInfos(Info info, List<FormulaInfo> formulaInfos) {
if (isReplaceObjectExist(info)) { if (isReplaceObjectExist(info)) {
@ -69,13 +74,23 @@ public class SearchWidgetFormulaAction extends AbstractSearchWidgetFormulaAction
private void searchFormulaFromWidgetValue(Info info, List<FormulaInfo> formulaInfos) { private void searchFormulaFromWidgetValue(Info info, List<FormulaInfo> formulaInfos) {
Widget widget = (Widget) info.getContent().getReplaceObject(); Widget widget = (Widget) info.getContent().getReplaceObject();
if (widget instanceof WScaleLayout) { if (widget instanceof WScaleLayout) {
widget = ((CRBoundsWidget) ((WScaleLayout) widget).getWidget(0)).getWidget(); widget = ((CRBoundsWidget) ((WScaleLayout) widget).getWidget(0)).getWidget();
info.getContent().setReplaceObject(widget);
} }
if (widget instanceof WTitleLayout) { if (widget instanceof WTitleLayout) {
widget = ((CRBoundsWidget) ((WTitleLayout) widget).getWidget(0)).getWidget(); if (((WTitleLayout) widget).getTitleBoundsWidget() != null){
if (widget instanceof ChartEditor && ((ChartEditor) widget).getChartCollection() instanceof ChartCollection) { CRBoundsWidget boundsWidget = ((WTitleLayout) widget).getTitleBoundsWidget();
SearchChartCollectionFormulaAction.getInstance().searchChartCollectionFormula(formulaInfos, info.getContent(), (ChartCollection) ((ChartEditor) widget).getChartCollection()); if (boundsWidget.getWidget() instanceof Label){
ITContent titleContent = ITContent.copy(info.getContent());
titleContent.setReplaceObject(((Label) boundsWidget.getWidget()).getWidgetValue().getValue());
formulaInfos.add(new FormulaInfo(titleContent));
}
}
Widget tempWidget = (((WTitleLayout) widget).getBodyBoundsWidget()).getWidget();
if (tempWidget instanceof ChartEditor && ((ChartEditor) tempWidget).getChartCollection() instanceof ChartCollection) {
SearchChartCollectionFormulaAction.getInstance().searchChartCollectionFormula(formulaInfos, info.getContent(), (ChartCollection) ((ChartEditor) tempWidget).getChartCollection());
} }
} }
Map<String, SearchWidgetFormula> widgetType = SearchWidgetFormulaManager.getInstance().getWidgetType(); Map<String, SearchWidgetFormula> widgetType = SearchWidgetFormulaManager.getInstance().getWidgetType();

2
designer-realize/src/main/java/com/fr/design/actions/replace/action/content/formula/widget/SearchWidgetFormulaManager.java

@ -32,6 +32,7 @@ public class SearchWidgetFormulaManager implements SearchManager {
private static final String PAGE_FIXED_ROW_COMBOBOX = "PageFixedRowComboBox"; private static final String PAGE_FIXED_ROW_COMBOBOX = "PageFixedRowComboBox";
private static final String TREE_COMBO_BOX_EDITOR = "TreeComboBoxEditor"; private static final String TREE_COMBO_BOX_EDITOR = "TreeComboBoxEditor";
private static final String TREE_EDITOR = "TreeEditor"; private static final String TREE_EDITOR = "TreeEditor";
private static final String W_TITLE_LAYOUT = "WTitleLayout";
private SearchWidgetFormulaManager() { private SearchWidgetFormulaManager() {
/** /**
@ -46,6 +47,7 @@ public class SearchWidgetFormulaManager implements SearchManager {
register(FREE_BUTTON, SearchCommonWidgetFormulaAction.getInstance()); register(FREE_BUTTON, SearchCommonWidgetFormulaAction.getInstance());
register(NUMBER_EDITOR, SearchCommonWidgetFormulaAction.getInstance()); register(NUMBER_EDITOR, SearchCommonWidgetFormulaAction.getInstance());
register(TEXT_EDITOR, SearchCommonWidgetFormulaAction.getInstance()); register(TEXT_EDITOR, SearchCommonWidgetFormulaAction.getInstance());
register(W_TITLE_LAYOUT, SearchCommonWidgetFormulaAction.getInstance());
/** /**
* 日期类型 * 日期类型

1
designer-realize/src/main/java/com/fr/design/actions/replace/action/content/js/SearchWebJSAction.java

@ -59,6 +59,7 @@ public class SearchWebJSAction implements SearchJS {
ReportWebAttr webAttr = workBook.getReportWebAttr(); ReportWebAttr webAttr = workBook.getReportWebAttr();
ITContent content = new ITContent(); ITContent content = new ITContent();
content.setTemplateName(jTemplate.getTemplateName()); content.setTemplateName(jTemplate.getTemplateName());
content.setJumpAble(false);
addWebContent2Array(webAttr); addWebContent2Array(webAttr);
for (int i = 0; i < arrayList.size(); i++) { for (int i = 0; i < arrayList.size(); i++) {
addJSInfos2ListFromArray(content, jsInfos, arrayList.get(i)); addJSInfos2ListFromArray(content, jsInfos, arrayList.get(i));

1
designer-realize/src/main/java/com/fr/design/actions/replace/action/content/sql/SearchSQLAction.java

@ -34,6 +34,7 @@ public class SearchSQLAction implements SearchAction {
List<SQLInfo> sqlInfos = new ArrayList<>(); List<SQLInfo> sqlInfos = new ArrayList<>();
ITContent content = new ITContent(); ITContent content = new ITContent();
content.setTemplateName(jTemplate.getTemplateName()); content.setTemplateName(jTemplate.getTemplateName());
content.setJumpAble(false);
addModelDataInfos2Array(jTemplate, content, sqlInfos); addModelDataInfos2Array(jTemplate, content, sqlInfos);
addServerDataInfos2Array(content, sqlInfos); addServerDataInfos2Array(content, sqlInfos);
setSqlInfos(sqlInfos); setSqlInfos(sqlInfos);

14
designer-realize/src/main/java/com/fr/design/actions/replace/info/ComponentInfo.java

@ -44,6 +44,15 @@ public class ComponentInfo implements Info {
} }
@Override
public Boolean checkValid() {
ComponentType componentType = ComponentType.match(this.content.getReplaceObject().getClass().getSimpleName());
if (componentType != null) {
return componentType.check(this);
}
return false;
}
/** /**
* 这边设置值其实就是修改组件的名称要注意的就是如果是layout的情况下有些需要对其外面封装的对象也进行名称的修改 * 这边设置值其实就是修改组件的名称要注意的就是如果是layout的情况下有些需要对其外面封装的对象也进行名称的修改
* *
@ -68,9 +77,6 @@ public class ComponentInfo implements Info {
*/ */
@Override @Override
public String getInfoShowStr(Info info) { public String getInfoShowStr(Info info) {
if (this.content.getReplaceObject() != null && this.content.getReplaceObject() instanceof Widget) { return this.getContent().getOldShowStr();
return ((Widget) this.content.getReplaceObject()).getWidgetName();
}
return StringUtils.EMPTY;
} }
} }

25
designer-realize/src/main/java/com/fr/design/actions/replace/info/FloatInfo.java

@ -7,8 +7,10 @@ import com.fr.design.actions.replace.info.base.ITContent;
import com.fr.design.actions.replace.utils.ShowValueUtils; import com.fr.design.actions.replace.utils.ShowValueUtils;
import com.fr.general.GeneralUtils; import com.fr.general.GeneralUtils;
import com.fr.report.cell.CellElement;
import com.fr.report.cell.FloatElement; import com.fr.report.cell.FloatElement;
import com.fr.stable.AssistUtils; import com.fr.stable.AssistUtils;
import com.fr.stable.StringUtils;
import com.fr.stable.collections.combination.Pair; import com.fr.stable.collections.combination.Pair;
@ -108,6 +110,29 @@ public class FloatInfo implements Info {
} }
} }
@Override
public Boolean checkValid() {
FloatElement floatElement = (((FloatElement) (this.getContent().getReplaceObject())));
String newValue;
if (this.isChartExist() && this.getFloatChartIndex() != -1) {
newValue = getChartCheckValue();
} else {
newValue = GeneralUtils.objectToString(floatElement.getValue());
}
return StringUtils.equals(newValue, this.getContent().getOldShowStr());
}
private String getChartCheckValue() {
ChartCollection chartCollection = (ChartCollection) ((FloatElement) this.getContent().getReplaceObject()).getValue();
Title title = chartCollection.getChart(this.getFloatChartIndex()).getTitle();
if (title.getTextObject() instanceof Formula) {
Formula formula = (Formula) title.getTextObject();
return formula.getContent();
} else {
return GeneralUtils.objectToString(title.getTextObject());
}
}
@Override @Override
public String getInfoShowStr(Info info) { public String getInfoShowStr(Info info) {
return this.getContent().getOldShowStr(); return this.getContent().getOldShowStr();

9
designer-realize/src/main/java/com/fr/design/actions/replace/info/FormulaInfo.java

@ -68,6 +68,15 @@ public class FormulaInfo implements Info {
return StringUtils.EMPTY; return StringUtils.EMPTY;
} }
@Override
public Boolean checkValid() {
FormulaReplaceObject formulaReplaceObject = FormulaReplaceObject.match(this.content.getReplaceObject().getClass().getSimpleName());
if (formulaReplaceObject != null) {
return formulaReplaceObject.check(this);
}
return false;
}
private Map<String, String> getCommonValue() { private Map<String, String> getCommonValue() {
Map<String, String> map = new HashMap(); Map<String, String> map = new HashMap();
FormulaReplaceObject o = FormulaReplaceObject.match(this.content.getReplaceObject().getClass().getSimpleName()); FormulaReplaceObject o = FormulaReplaceObject.match(this.content.getReplaceObject().getClass().getSimpleName());

9
designer-realize/src/main/java/com/fr/design/actions/replace/info/JSInfo.java

@ -60,6 +60,15 @@ public class JSInfo implements Info {
} }
@Override
public Boolean checkValid() {
ReplaceObject o = ReplaceObject.match(this.content.getReplaceObject().getClass().getSimpleName());
if (o != null) {
return o.check(this);
}
return false;
}
/** /**
* toString * toString
* *

45
designer-realize/src/main/java/com/fr/design/actions/replace/info/ReplaceObject.java

@ -59,6 +59,17 @@ public enum ReplaceObject implements DealWithInfoValue {
return javaScript.getName(); return javaScript.getName();
} }
} }
@Override
boolean check(Info info) {
if (((JSInfo) info).isContent()) {
JavaScriptImpl javaScript = (JavaScriptImpl) ((NameJavaScript) (info.getContent().getReplaceObject())).getJavaScript();
return StringUtils.equals(javaScript.getContent(), info.getContent().getOldShowStr());
} else {
NameJavaScript javaScript = ((NameJavaScript) (info.getContent().getReplaceObject()));
return StringUtils.equals(javaScript.getName(), info.getContent().getOldShowStr());
}
}
}, },
/** /**
* ListenerJS * ListenerJS
@ -79,7 +90,6 @@ public enum ReplaceObject implements DealWithInfoValue {
JavaScriptImpl javaScript = (JavaScriptImpl) ((Listener) (info.getContent().getReplaceObject())).getAction(); JavaScriptImpl javaScript = (JavaScriptImpl) ((Listener) (info.getContent().getReplaceObject())).getAction();
info.updateOldStr(javaScript.getContent(), findStr); info.updateOldStr(javaScript.getContent(), findStr);
javaScript.setContent(ShowValueUtils.replaceAll(javaScript.getContent(), findStr, replaceStr)); javaScript.setContent(ShowValueUtils.replaceAll(javaScript.getContent(), findStr, replaceStr));
} }
} else { } else {
Listener listener = ((Listener) ((info.getContent().getReplaceObject()))); Listener listener = ((Listener) ((info.getContent().getReplaceObject())));
@ -97,6 +107,17 @@ public enum ReplaceObject implements DealWithInfoValue {
return listener.getName(); return listener.getName();
} }
} }
@Override
boolean check(Info info) {
if (((JSInfo) info).isContent()) {
JavaScriptImpl javaScript = (JavaScriptImpl) ((Listener) (info.getContent().getReplaceObject())).getAction();
return StringUtils.equals(javaScript.getContent(), info.getContent().getOldShowStr());
} else {
Listener listener = ((Listener) (info.getContent().getReplaceObject()));
return StringUtils.equals(listener.getName(), info.getContent().getOldShowStr());
}
}
}, },
/** /**
* VanChartHtmlLabelJS * VanChartHtmlLabelJS
@ -126,6 +147,15 @@ public enum ReplaceObject implements DealWithInfoValue {
VanChartHtmlLabel htmlLabel = ((VanChartHtmlLabel) (info.getContent().getReplaceObject())); VanChartHtmlLabel htmlLabel = ((VanChartHtmlLabel) (info.getContent().getReplaceObject()));
return htmlLabel.getCustomText(); return htmlLabel.getCustomText();
} }
@Override
boolean check(Info info) {
if (((JSInfo) info).isContent()) {
VanChartHtmlLabel htmlLabel = ((VanChartHtmlLabel) (info.getContent().getReplaceObject()));
return StringUtils.equals(htmlLabel.getCustomText(), info.getContent().getOldShowStr());
}
return false;
}
}, },
/** /**
* JavaScriptImplJS * JavaScriptImplJS
@ -150,11 +180,23 @@ public enum ReplaceObject implements DealWithInfoValue {
JavaScriptImpl javaScript = (JavaScriptImpl) (info.getContent().getReplaceObject()); JavaScriptImpl javaScript = (JavaScriptImpl) (info.getContent().getReplaceObject());
return javaScript.getContent(); return javaScript.getContent();
} }
@Override
boolean check(Info info) {
JavaScriptImpl javaScript = (JavaScriptImpl) (info.getContent().getReplaceObject());
return StringUtils.equals(javaScript.getContent(), info.getContent().getOldShowStr());
}
}, },
/** /**
* DBTableDataSQL * DBTableDataSQL
*/ */
DB_TABLE_DATA("DBTableData") { DB_TABLE_DATA("DBTableData") {
@Override
boolean check(Info info) {
DBTableData dbTableData = (DBTableData) info.getContent().getReplaceObject();
return StringUtils.equals(dbTableData.getQuery(), info.getContent().getOldShowStr());
}
@Override @Override
public Map<String, String> getValue(Object... o) { public Map<String, String> getValue(Object... o) {
HashMap<String, String> map = new HashMap<>(); HashMap<String, String> map = new HashMap<>();
@ -215,4 +257,5 @@ public enum ReplaceObject implements DealWithInfoValue {
} }
abstract boolean check(Info info);
} }

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

@ -41,6 +41,7 @@ import java.util.List;
public class ITReplaceMainDialog extends UIDialog { public class ITReplaceMainDialog extends UIDialog {
List<? extends Info> searchResultList = new ArrayList<>(); List<? extends Info> searchResultList = new ArrayList<>();
private static boolean ITReplaceFlag = false; private static boolean ITReplaceFlag = false;
private static boolean matched = false;
private static volatile ITReplaceMainDialog instance = null; private static volatile ITReplaceMainDialog instance = null;
private static String templateID; private static String templateID;
private ITReplaceNorthPanel northPane; private ITReplaceNorthPanel northPane;
@ -116,21 +117,12 @@ public class ITReplaceMainDialog extends UIDialog {
northPane.getFindInputCombobox().setEditable(true); northPane.getFindInputCombobox().setEditable(true);
northPane.getReplaceInputCombobox().setEditable(false); northPane.getReplaceInputCombobox().setEditable(false);
((UITextField) (northPane.getFindInputCombobox().getEditor().getEditorComponent())).setPlaceholder(Toolkit.i18nText("Fine-Design_Replace_Search_Input")); ((UITextField) (northPane.getFindInputCombobox().getEditor().getEditorComponent())).setPlaceholder(Toolkit.i18nText("Fine-Design_Replace_Search_Input"));
((UITextField) (northPane.getReplaceInputCombobox().getEditor().getEditorComponent())).setPlaceholder(Toolkit.i18nText("Fine-Design_Replace_Input")); ((UITextField) (northPane.getReplaceInputCombobox().getEditor().getEditorComponent())).setPlaceholder(Toolkit.i18nText("Fine-Design_Replace_Input"));
((UITextField) (northPane.getFindInputCombobox().getEditor().getEditorComponent())).addActionListener(new ActionListener() { ((UITextField) (northPane.getFindInputCombobox().getEditor().getEditorComponent())).addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
search(); search();
String searchStr = ((UITextField) (northPane.getFindInputCombobox().getEditor().getEditorComponent())).getText();
if (StringUtils.isNotEmpty(searchStr)) {
((UITextField) (northPane.getReplaceInputCombobox().getEditor().getEditorComponent())).setEditable(true);
northPane.getReplaceInputCombobox().setEditable(true);
} else {
((UITextField) (northPane.getReplaceInputCombobox().getEditor().getEditorComponent())).setEditable(false);
northPane.getReplaceInputCombobox().setEditable(false);
}
} }
}); });
@ -138,14 +130,7 @@ public class ITReplaceMainDialog extends UIDialog {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
search(); search();
String searchStr = ((UITextField) (northPane.getFindInputCombobox().getEditor().getEditorComponent())).getText();
if (StringUtils.isNotEmpty(searchStr)) {
((UITextField) (northPane.getReplaceInputCombobox().getEditor().getEditorComponent())).setEditable(true);
northPane.getReplaceInputCombobox().setEditable(true);
} else {
((UITextField) (northPane.getReplaceInputCombobox().getEditor().getEditorComponent())).setEditable(false);
northPane.getReplaceInputCombobox().setEditable(false);
}
} }
}); });
@ -169,6 +154,7 @@ public class ITReplaceMainDialog extends UIDialog {
* 替换 * 替换
*/ */
private void replace() { private void replace() {
if (isITReplaceValid() && checkTemplateChanged(searchResultList)) { if (isITReplaceValid() && checkTemplateChanged(searchResultList)) {
String searchStr = ((UITextField) (northPane.getFindInputCombobox().getEditor().getEditorComponent())).getText(); String searchStr = ((UITextField) (northPane.getFindInputCombobox().getEditor().getEditorComponent())).getText();
String replaceStr = ((UITextField) (northPane.getReplaceInputCombobox().getEditor().getEditorComponent())).getText(); String replaceStr = ((UITextField) (northPane.getReplaceInputCombobox().getEditor().getEditorComponent())).getText();
@ -183,6 +169,7 @@ public class ITReplaceMainDialog extends UIDialog {
southPanel.getTableEditorPane().update(); southPanel.getTableEditorPane().update();
northPane.refreshReplaceInputComboBoxItems(); northPane.refreshReplaceInputComboBoxItems();
ITTableEditorPane.getEditTable().repaint(); ITTableEditorPane.getEditTable().repaint();
HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().fireTabChange();
HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().fireTargetModified(true); HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().fireTargetModified(true);
setSearchFlag(false); setSearchFlag(false);
@ -204,6 +191,8 @@ public class ITReplaceMainDialog extends UIDialog {
search(); search();
} }
} }
} }
private Boolean checkTemplateChanged(List<? extends Info> searchResultList) { private Boolean checkTemplateChanged(List<? extends Info> searchResultList) {
@ -252,6 +241,19 @@ public class ITReplaceMainDialog extends UIDialog {
this.searchStr = searchStr; this.searchStr = searchStr;
} }
/**
* 是否使用通配符
*
* @return
*/
public static boolean isMatched() {
return matched;
}
public static void setMatched(boolean matched) {
ITReplaceMainDialog.matched = matched;
}
/** /**
* 设置标签 * 设置标签
* *
@ -288,6 +290,15 @@ public class ITReplaceMainDialog extends UIDialog {
itTableEditor.fireTableDataChanged(); itTableEditor.fireTableDataChanged();
northPane.refreshFindInputComboBoxItems(); northPane.refreshFindInputComboBoxItems();
setSearchFlag(true); setSearchFlag(true);
String searchStr = ((UITextField) (northPane.getFindInputCombobox().getEditor().getEditorComponent())).getText();
if (StringUtils.isNotEmpty(searchStr)) {
((UITextField) (northPane.getReplaceInputCombobox().getEditor().getEditorComponent())).setEditable(true);
northPane.getReplaceInputCombobox().setEditable(true);
} else {
((UITextField) (northPane.getReplaceInputCombobox().getEditor().getEditorComponent())).setEditable(false);
northPane.getReplaceInputCombobox().setEditable(false);
}
} else { } else {
//todo //todo
} }

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

@ -13,6 +13,8 @@ import javax.swing.ComboBoxEditor;
import javax.swing.JCheckBox; import javax.swing.JCheckBox;
import javax.swing.JPanel; import javax.swing.JPanel;
import java.awt.Dimension; import java.awt.Dimension;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
@ -92,6 +94,12 @@ public class ITReplaceNorthPanel {
} }
}; };
matchRadioButton = new JCheckBox(Toolkit.i18nText("Fine-Design_Replace_WildCard")); matchRadioButton = new JCheckBox(Toolkit.i18nText("Fine-Design_Replace_WildCard"));
matchRadioButton.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
ITReplaceMainDialog.setMatched(matchRadioButton.isSelected());
}
});
replaceButton = new UIButton(Toolkit.i18nText("Fine-Design_Replace_Button")); replaceButton = new UIButton(Toolkit.i18nText("Fine-Design_Replace_Button"));
searchButton = new UIButton(Toolkit.i18nText("Fine-Design_Search_Button")); searchButton = new UIButton(Toolkit.i18nText("Fine-Design_Search_Button"));

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

@ -3,9 +3,10 @@ package com.fr.design.actions.replace.utils;
import com.fr.design.actions.replace.info.Info; import com.fr.design.actions.replace.info.Info;
import com.fr.design.actions.replace.ui.ITReplaceMainDialog;
import com.fr.stable.StringUtils;
import com.fr.stable.collections.combination.Pair; import com.fr.stable.collections.combination.Pair;
import org.gradle.internal.impldep.org.apache.commons.lang.StringUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
@ -39,7 +40,7 @@ public class ShowValueUtils {
} }
/** /**
* 可以替换括号的replaceAll * 替换策略
* *
* @param str 原字符串 * @param str 原字符串
* @param regex 要被替换的内容 * @param regex 要被替换的内容
@ -47,7 +48,12 @@ public class ShowValueUtils {
* @return 替换后的字符串 * @return 替换后的字符串
*/ */
public static String replaceAll(String str, String regex, String replacement) { public static String replaceAll(String str, String regex, String replacement) {
if (ITReplaceMainDialog.isMatched()){
return str.replaceAll(Pattern.quote(regex), replacement); return str.replaceAll(Pattern.quote(regex), replacement);
}else {
return str.replace(regex, replacement);
}
} }

Loading…
Cancel
Save