From e022b26efb5f9fc7e2704ac661d1d2a97f76116f Mon Sep 17 00:00:00 2001 From: gaibu <1016771049@qq.com> Date: Fri, 20 Jan 2023 13:48:32 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat=20#I69VAR=20=E4=BC=98=E5=8C=96=20node?= =?UTF-8?q?=20chain=20=E4=B8=8D=E5=AD=98=E5=9C=A8=E6=97=B6=E5=80=99?= =?UTF-8?q?=E7=9A=84=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../liteflow/builder/el/LiteFlowChainELBuilder.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/LiteFlowChainELBuilder.java b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/LiteFlowChainELBuilder.java index 6d1740dfb..83ced38fc 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/LiteFlowChainELBuilder.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/LiteFlowChainELBuilder.java @@ -20,6 +20,7 @@ import com.yomahub.liteflow.builder.el.operator.ForOperator; import com.yomahub.liteflow.builder.el.operator.IdOperator; import com.yomahub.liteflow.builder.el.operator.IfOperator; import com.yomahub.liteflow.builder.el.operator.IgnoreErrorOperator; +import com.yomahub.liteflow.builder.el.operator.IteratorOperator; import com.yomahub.liteflow.builder.el.operator.NodeOperator; import com.yomahub.liteflow.builder.el.operator.PreOperator; import com.yomahub.liteflow.builder.el.operator.SwitchOperator; @@ -257,18 +258,18 @@ public class LiteFlowChainELBuilder { int commaRightIndex = sourceEl.indexOf(attrName + StrUtil.COMMA); if (commaRightIndex != -1) { // 需要加上 "EL: " 的长度 4，再加上 "^" 的长度 1，indexOf 从 0 开始，所以还需要加 1 - msg = msg + sourceEl + "\n" + StrUtil.fill("^", CharUtil.SPACE, commaRightIndex + 6, true); + return msg + sourceEl + "\n" + StrUtil.fill("^", CharUtil.SPACE, commaRightIndex + 6, true); } int commaLeftIndex = sourceEl.indexOf(StrUtil.COMMA + attrName); if (commaLeftIndex != -1) { // 需要加上 "EL: " 的长度 4，再加上 "^" 的长度 1，再加上 "," 的长度 1，indexOf 从 0 开始，所以还需要加 1 - msg = msg + sourceEl + "\n" + StrUtil.fill("^", CharUtil.SPACE, commaLeftIndex + 7, true); + return msg + sourceEl + "\n" + StrUtil.fill("^", CharUtil.SPACE, commaLeftIndex + 7, true); } // 还有一种特殊情况，就是 EL 表达式中的节点使用 node("a") int nodeIndex = sourceEl.indexOf(String.format("node(\"%s\")", attrName)); if (nodeIndex != -1) { // 需要加上 "EL: " 的长度 4，再加上 “node("” 长度 6，再加上 "^" 的长度 1，indexOf 从 0 开始，所以还需要加 1 - msg = msg + sourceEl + "\n" + StrUtil.fill("^", CharUtil.SPACE, commaLeftIndex + 12, true); + return msg + sourceEl + "\n" + StrUtil.fill("^", CharUtil.SPACE, commaLeftIndex + 12, true); } break; } From cc3c9fc8728c02bd89b3c90d2c54c912e7a0c7f8 Mon Sep 17 00:00:00 2001 From: gaibu <1016771049@qq.com> Date: Fri, 20 Jan 2023 13:49:51 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat=20#I69VAR=20=E4=BC=98=E5=8C=96=20node?= =?UTF-8?q?=20chain=20=E4=B8=8D=E5=AD=98=E5=9C=A8=E6=97=B6=E5=80=99?= =?UTF-8?q?=E7=9A=84=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yomahub/liteflow/builder/el/LiteFlowChainELBuilder.java | 1 - 1 file changed, 1 deletion(-) diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/LiteFlowChainELBuilder.java b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/LiteFlowChainELBuilder.java index 83ced38fc..a685ce890 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/LiteFlowChainELBuilder.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/builder/el/LiteFlowChainELBuilder.java @@ -271,7 +271,6 @@ public class LiteFlowChainELBuilder { // 需要加上 "EL: " 的长度 4，再加上 “node("” 长度 6，再加上 "^" 的长度 1，indexOf 从 0 开始，所以还需要加 1 return msg + sourceEl + "\n" + StrUtil.fill("^", CharUtil.SPACE, commaLeftIndex + 12, true); } - break; } } } catch (Exception ex) {