diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptBooleanComponent.java b/liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptBooleanComponent.java index 2f27ae0ab..97b7e9122 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptBooleanComponent.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptBooleanComponent.java @@ -1,5 +1,6 @@ package com.yomahub.liteflow.core; +import com.yomahub.liteflow.enums.ScriptTypeEnum; import com.yomahub.liteflow.log.LFLog; import com.yomahub.liteflow.log.LFLoggerManager; import com.yomahub.liteflow.script.ScriptExecuteWrap; @@ -45,6 +46,9 @@ public class ScriptBooleanComponent extends NodeBooleanComponent implements Scri @Override public boolean isEnd() { + if (!ScriptTypeEnum.JAVA.getDisplayName().equals(this.getRefNode().getLanguage())){ + return super.isEnd(); + } ScriptExecuteWrap wrap = this.buildWrap(this); return scriptExecutor.executeIsEnd(wrap); } diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptForComponent.java b/liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptForComponent.java index 036fe25cb..bb78f91bd 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptForComponent.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptForComponent.java @@ -1,5 +1,6 @@ package com.yomahub.liteflow.core; +import com.yomahub.liteflow.enums.ScriptTypeEnum; import com.yomahub.liteflow.log.LFLog; import com.yomahub.liteflow.log.LFLoggerManager; import com.yomahub.liteflow.script.ScriptExecuteWrap; @@ -47,6 +48,9 @@ public class ScriptForComponent extends NodeForComponent implements ScriptCompon @Override public boolean isEnd() { + if (!ScriptTypeEnum.JAVA.getDisplayName().equals(this.getRefNode().getLanguage())){ + return super.isEnd(); + } ScriptExecuteWrap wrap = this.buildWrap(this); return scriptExecutor.executeIsEnd(wrap); } diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptSwitchComponent.java b/liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptSwitchComponent.java index d318e9ad7..27bb012eb 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptSwitchComponent.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptSwitchComponent.java @@ -1,5 +1,6 @@ package com.yomahub.liteflow.core; +import com.yomahub.liteflow.enums.ScriptTypeEnum; import com.yomahub.liteflow.log.LFLog; import com.yomahub.liteflow.log.LFLoggerManager; import com.yomahub.liteflow.script.ScriptExecuteWrap; @@ -47,6 +48,9 @@ public class ScriptSwitchComponent extends NodeSwitchComponent implements Script @Override public boolean isEnd() { + if (!ScriptTypeEnum.JAVA.getDisplayName().equals(this.getRefNode().getLanguage())){ + return super.isEnd(); + } ScriptExecuteWrap wrap = this.buildWrap(this); return scriptExecutor.executeIsEnd(wrap); }