Merge pull request #722 in DESIGN/design from ~NEIL/design:release/10.0 to release/10.0

* commit '1ec6b56501b6075a7b2969255946bfb1864167b2':
  REPORT-13999 公式增强编辑插件兼容.

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

@@ -12,7 +12,6 @@ import com.fr.function.RANGE;
 import com.fr.function.SUM;
 import com.fr.function.TIME;
 import com.fr.general.ComparatorUtils;
-
 import com.fr.general.GeneralUtils;
 import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.ExtraClassManager;
@@ -25,23 +24,28 @@ import com.fr.stable.fun.mark.Mutable;
 import com.fr.stable.script.Function;
 import com.fr.stable.script.FunctionDef;
 
+import javax.swing.DefaultListModel;
 import java.io.File;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URL;
 import java.net.URLDecoder;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.Set;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
-import javax.swing.DefaultListModel;
-
 public final class FunctionConstants {
 
 	public static FunctionGroup PLUGIN = getPluginFunctionGroup();
 	public static FunctionGroup CUSTOM = getCustomFunctionGroup();
-	static NameAndFunctionList COMMON = getCommonFunctionList();
-	static NameAndTypeAndFunctionList[] EMBFUNCTIONS = getEmbededFunctionListArray();
+	public static NameAndFunctionList COMMON = getCommonFunctionList();
+	public static NameAndTypeAndFunctionList[] EMBFUNCTIONS = getEmbededFunctionListArray();
 	public static FunctionGroup ALL = getAllFunctionGroup();
 
 	static {
@@ -117,7 +121,7 @@ public final class FunctionConstants {
 	 * 将函数分组插件中的函数添加到对应的列表中
 	 * @param listModel
 	 */
-	static void addFunctionGroupFromPlugins(DefaultListModel listModel){
+	public static void addFunctionGroupFromPlugins(DefaultListModel listModel){
 		//hugh:自定义函数分组
         Set<Mutable> containers = ExtraClassManager.getInstance().getArray(FunctionDefContainer.MARK_STRING);
         if(!containers.isEmpty()){