!83 增加getTagAction方法返回null值实现

Merge pull request !83 from dialYun/N/A
entropy-cloud · Aug 22, 2024 · cfd2daa · cfd2daa
2 parents 08d9b8a + a3a59b2
commit cfd2daa
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/nop-xlang/src/main/java/io/nop/xlang/api/XLang.java b/nop-xlang/src/main/java/io/nop/xlang/api/XLang.java
@@ -79,16 +79,24 @@ public static XplModel loadTpl(String path) {
         return (XplModel) ResourceComponentManager.instance().loadComponentModel(path);
     }
 
-    public static AbstractEvalAction getTagAction(String libPath, String tagName) {
+    public static AbstractEvalAction getTagAction(String libPath, String tagName, boolean isException) {
         IXplTagLib lib = (IXplTagLib) ResourceComponentManager.instance().loadComponentModel(libPath);
         IXplTag tag = lib.getTag(tagName);
-        if (tag == null)
-            throw new NopException(ERR_XLIB_UNKNOWN_TAG).param(ARG_LIB_PATH, libPath).param(ARG_TAG_NAME, tagName);
+        if (tag == null) {
+            if (isException) {
+                throw new NopException(ERR_XLIB_UNKNOWN_TAG).param(ARG_LIB_PATH, libPath).param(ARG_TAG_NAME, tagName);
+            }
+            return null;
+        }
 
         IFunctionModel func = tag.getFunctionModel();
         return new ExecutableFunctionEvalAction(func);
     }
 
+    public static AbstractEvalAction getTagAction(String libPath, String tagName) {
+        return getTagAction(libPath, tagName, true);
+    }
+
     public static IXplTag getTag(String libPath, String tagName) {
         IXplTagLib lib = (IXplTagLib) ResourceComponentManager.instance().loadComponentModel(libPath);
         IXplTag tag = lib.getTag(tagName);