Browse Source

Pull request #4475: REPORT-53197 && REPORT-53195 数据集名称替换问题 && REPORT-53216 加速查找 过滤可能的设计器中类

Merge in DESIGN/design from ~HADES/design:feature/10.0 to feature/10.0

* commit 'c7e5f22acfccf44c58dfa246a6aabe15dfbc9da9':
  REPORT-53216 加速查找 过滤可能的设计器中类
  REPORT-53197 && REPORT-53195 数据集名称替换问题
feature/10.0
Hades 3 years ago
parent
commit
07a6d5d0b8
  1. 2
      designer-base/src/main/java/com/fr/design/mod/ContentReplaceUtil.java
  2. 4
      designer-base/src/main/java/com/fr/design/mod/ModClassFilter.java

2
designer-base/src/main/java/com/fr/design/mod/ContentReplaceUtil.java

@ -83,7 +83,7 @@ public class ContentReplaceUtil {
private static String replaceFormulaContent4TableDataName0(String content, String oldName, String newName) {
content = getFormulaPureContent(content);
FRFormulaTransformer frFormulaTransformer = new FRFormulaTransformer();
frFormulaTransformer.addRenamedWidget(oldName, newName);
frFormulaTransformer.addRenamedDataset(oldName, newName);
return EQ_STRING + frFormulaTransformer.transform(content);
}

4
designer-base/src/main/java/com/fr/design/mod/ModClassFilter.java

@ -17,6 +17,8 @@ public class ModClassFilter implements Filter<String> {
private static final Filter<String> INSTANCE = new ModClassFilter();
private static final String DESIGN_PREFIX = "com.fr.design";
public static Filter<String> getInstance() {
return INSTANCE;
}
@ -31,6 +33,6 @@ public class ModClassFilter implements Filter<String> {
@Override
public boolean accept(String s) {
return FILTER_SET.contains(s);
return FILTER_SET.contains(s) || s.startsWith(DESIGN_PREFIX);
}
}

Loading…
Cancel
Save