瀏覽代碼

bug #IBVGGT 13版本groovy脚本中使用_meta.cmp.setIsEnd(true)结束流程不生效

everywhere.z 1 月之前
父節點
當前提交
c95fa2f678

+ 4 - 0
liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptBooleanComponent.java

@@ -1,5 +1,6 @@
 package com.yomahub.liteflow.core;
 package com.yomahub.liteflow.core;
 
 
+import com.yomahub.liteflow.enums.ScriptTypeEnum;
 import com.yomahub.liteflow.log.LFLog;
 import com.yomahub.liteflow.log.LFLog;
 import com.yomahub.liteflow.log.LFLoggerManager;
 import com.yomahub.liteflow.log.LFLoggerManager;
 import com.yomahub.liteflow.script.ScriptExecuteWrap;
 import com.yomahub.liteflow.script.ScriptExecuteWrap;
@@ -45,6 +46,9 @@ public class ScriptBooleanComponent extends NodeBooleanComponent implements Scri
 
 
 	@Override
 	@Override
 	public boolean isEnd() {
 	public boolean isEnd() {
+		if (!ScriptTypeEnum.JAVA.getDisplayName().equals(this.getRefNode().getLanguage())){
+			return super.isEnd();
+		}
 		ScriptExecuteWrap wrap = this.buildWrap(this);
 		ScriptExecuteWrap wrap = this.buildWrap(this);
 		return scriptExecutor.executeIsEnd(wrap);
 		return scriptExecutor.executeIsEnd(wrap);
 	}
 	}

+ 4 - 0
liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptForComponent.java

@@ -1,5 +1,6 @@
 package com.yomahub.liteflow.core;
 package com.yomahub.liteflow.core;
 
 
+import com.yomahub.liteflow.enums.ScriptTypeEnum;
 import com.yomahub.liteflow.log.LFLog;
 import com.yomahub.liteflow.log.LFLog;
 import com.yomahub.liteflow.log.LFLoggerManager;
 import com.yomahub.liteflow.log.LFLoggerManager;
 import com.yomahub.liteflow.script.ScriptExecuteWrap;
 import com.yomahub.liteflow.script.ScriptExecuteWrap;
@@ -47,6 +48,9 @@ public class ScriptForComponent extends NodeForComponent implements ScriptCompon
 
 
 	@Override
 	@Override
 	public boolean isEnd() {
 	public boolean isEnd() {
+		if (!ScriptTypeEnum.JAVA.getDisplayName().equals(this.getRefNode().getLanguage())){
+			return super.isEnd();
+		}
 		ScriptExecuteWrap wrap = this.buildWrap(this);
 		ScriptExecuteWrap wrap = this.buildWrap(this);
 		return scriptExecutor.executeIsEnd(wrap);
 		return scriptExecutor.executeIsEnd(wrap);
 	}
 	}

+ 4 - 0
liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptSwitchComponent.java

@@ -1,5 +1,6 @@
 package com.yomahub.liteflow.core;
 package com.yomahub.liteflow.core;
 
 
+import com.yomahub.liteflow.enums.ScriptTypeEnum;
 import com.yomahub.liteflow.log.LFLog;
 import com.yomahub.liteflow.log.LFLog;
 import com.yomahub.liteflow.log.LFLoggerManager;
 import com.yomahub.liteflow.log.LFLoggerManager;
 import com.yomahub.liteflow.script.ScriptExecuteWrap;
 import com.yomahub.liteflow.script.ScriptExecuteWrap;
@@ -47,6 +48,9 @@ public class ScriptSwitchComponent extends NodeSwitchComponent implements Script
 
 
 	@Override
 	@Override
 	public boolean isEnd() {
 	public boolean isEnd() {
+		if (!ScriptTypeEnum.JAVA.getDisplayName().equals(this.getRefNode().getLanguage())){
+			return super.isEnd();
+		}
 		ScriptExecuteWrap wrap = this.buildWrap(this);
 		ScriptExecuteWrap wrap = this.buildWrap(this);
 		return scriptExecutor.executeIsEnd(wrap);
 		return scriptExecutor.executeIsEnd(wrap);
 	}
 	}