Browse Source

Merge remote-tracking branch 'origin/final/11.0' into final/11.0

final/11.0
Yvan 3 years ago
parent
commit
ff3ebbbc47
  1. 3
      designer-base/src/main/java/com/fr/design/formula/FunctionConstants.java

3
designer-base/src/main/java/com/fr/design/formula/FunctionConstants.java

@ -58,6 +58,7 @@ public final class FunctionConstants {
public static FunctionGroup ALL = getAllFunctionGroup();
public static List<String> abandonFormulas = Arrays.asList("CIRCULAR", "CROSSLAYERTOTAL", "HIERARCHY", "LAYERTOTAL");
public static NameAndFunctionList NEW = getNewFunctionList();
private static List<String> shieldedFormulas = Arrays.asList("ENBYSTRNUM","TEXTGETNUM" ,"GETCHARNUM","GCD", "LCM");
static {
loadEmbededFunctions();
@ -102,7 +103,7 @@ public final class FunctionConstants {
if (StableUtils.classInstanceOf(cls, iface)) {
Function inst;
inst = (Function) cls.newInstance();
if (abandonFormulas.contains(inst.getClass().getSimpleName())) {
if (abandonFormulas.contains(inst.getClass().getSimpleName()) || shieldedFormulas.contains(inst.getClass().getSimpleName())) {
continue;
}
for (NameAndTypeAndFunctionList EMBFUNCTION : EMBFUNCTIONS) {

Loading…
Cancel
Save