From ba0dc1cde4704e4b606bb5acc5f3b193ae334f36 Mon Sep 17 00:00:00 2001 From: warm <290631660@qq.com> Date: Tue, 31 Dec 2024 16:27:10 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=20=E4=BF=AE=E5=A4=8D=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E5=99=A8=E9=A9=B3=E5=9B=9E=E6=8C=87=E5=AE=9A=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98=20[fix]?= =?UTF-8?q?=20=E6=B5=81=E7=A8=8B=E5=AE=9E=E4=BE=8B=E6=9F=A5=E8=AF=A2SQL=20?= =?UTF-8?q?BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 +-- pom.xml | 2 +- sql/mysql/v1-upgrade/warm-flow_1.3.7.sql | 1 + .../v1-upgrade/oracle-warm-flow_1.3.4.sql | 8 ++--- .../v1-upgrade/oracle-warm-flow_1.3.5.sql | 34 +++++++++---------- .../v1-upgrade/oracle-warm-flow_1.3.7.sql | 1 + .../v1-upgrade/postgresql-warm-flow_1.3.7.sql | 1 + warm-flow-core/pom.xml | 2 +- .../core/service/impl/TaskServiceImpl.java | 3 +- warm-flow-orm/pom.xml | 2 +- warm-flow-orm/warm-flow-easy-query/pom.xml | 2 +- .../warm-flow-easy-query-core/pom.xml | 2 +- .../warm-flow-easy-query-sb-starter/pom.xml | 4 +-- .../warm-flow-easy-query-solon-plugin/pom.xml | 2 +- warm-flow-orm/warm-flow-jpa/pom.xml | 2 +- .../warm-flow-jpa/warm-flow-jpa-core/pom.xml | 2 +- .../warm-flow-jpa-sb-starter/pom.xml | 2 +- .../warm-flow-jpa-solon-plugin/pom.xml | 2 +- warm-flow-orm/warm-flow-mybatis-flex/pom.xml | 2 +- .../warm-flow-mybatis-flex-core/pom.xml | 2 +- .../warm-flow-mybatis-flex-sb-starter/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- warm-flow-orm/warm-flow-mybatis-plus/pom.xml | 2 +- .../warm-flow-mybatis-plus-core/pom.xml | 2 +- .../warm-flow-mybatis-plus-sb-starter/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- warm-flow-orm/warm-flow-mybatis/pom.xml | 2 +- .../warm-flow-mybatis-core/pom.xml | 2 +- .../warm-flow-mybatis-sb-starter/pom.xml | 2 +- .../warm-flow-mybatis-sb3-starter/pom.xml | 2 +- .../warm-flow-mybatis-solon-plugin/pom.xml | 2 +- warm-flow-plugin/pom.xml | 2 +- .../warm-flow-plugin-json/pom.xml | 2 +- .../warm-flow-plugin-modes/pom.xml | 2 +- .../warm-flow-plugin-modes-sb/pom.xml | 2 +- .../warm-flow-plugin-modes-solon/pom.xml | 2 +- warm-flow-plugin/warm-flow-plugin-ui/pom.xml | 2 +- .../warm-flow-plugin-ui-core/pom.xml | 2 +- .../warm-flow-plugin-ui-sb-web/pom.xml | 2 +- .../warm-flow-plugin-ui-solon-web/pom.xml | 2 +- .../warm-flow-plugin-vue3-ui/pom.xml | 2 +- .../WarmFlow/PropertySetting/between.vue | 2 +- .../WarmFlow/PropertySetting/index.vue | 2 +- 45 files changed, 67 insertions(+), 63 deletions(-) create mode 100644 sql/mysql/v1-upgrade/warm-flow_1.3.7.sql create mode 100644 sql/oracle/v1-upgrade/oracle-warm-flow_1.3.7.sql create mode 100644 sql/postgresql/v1-upgrade/postgresql-warm-flow_1.3.7.sql diff --git a/README.md b/README.md index 987fa486..9955a833 100644 --- a/README.md +++ b/README.md @@ -12,8 +12,8 @@

-**项目代码、文档 均开源免费可商用 遵循开源协议即可** - +**项目代码、文档 均开源免费可商用 遵循开源协议即可** +**开发完成请务必登记使用项目列表，[登记地址](https://gitee.com/dromara/warm-flow/issues/I7Y57D)** ## 介绍 diff --git a/pom.xml b/pom.xml index 72e41158..41eb4d56 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.dromara.warm warm-flow - 1.3.6 + 1.3.7 pom warm-flow diff --git a/sql/mysql/v1-upgrade/warm-flow_1.3.7.sql b/sql/mysql/v1-upgrade/warm-flow_1.3.7.sql new file mode 100644 index 00000000..47a20f51 --- /dev/null +++ b/sql/mysql/v1-upgrade/warm-flow_1.3.7.sql @@ -0,0 +1 @@ +update flow_node set permission_flag = REPLACE(permission_flag,',','@@'); diff --git a/sql/oracle/v1-upgrade/oracle-warm-flow_1.3.4.sql b/sql/oracle/v1-upgrade/oracle-warm-flow_1.3.4.sql index 6acee868..5948126d 100644 --- a/sql/oracle/v1-upgrade/oracle-warm-flow_1.3.4.sql +++ b/sql/oracle/v1-upgrade/oracle-warm-flow_1.3.4.sql @@ -1,5 +1,5 @@ -update flow_node set permission_flag = REPLACE(permission_flag,'@@default@@|',''); -update flow_node set permission_flag = REPLACE(permission_flag,'@@spel@@|',''); +update FLOW_NODE set PERMISSION_FLAG = REPLACE(PERMISSION_FLAG,'@@default@@|',''); +update FLOW_NODE set PERMISSION_FLAG = REPLACE(PERMISSION_FLAG,'@@spel@@|',''); -UPDATE flow_node SET permission_flag = REPLACE(permission_flag, '@@default@@|', ''); -UPDATE flow_node SET permission_flag = REPLACE(permission_flag, '@@spel@@|', ''); +UPDATE FLOW_NODE SET PERMISSION_FLAG = REPLACE(PERMISSION_FLAG, '@@default@@|', ''); +UPDATE FLOW_NODE SET PERMISSION_FLAG = REPLACE(PERMISSION_FLAG, '@@spel@@|', ''); diff --git a/sql/oracle/v1-upgrade/oracle-warm-flow_1.3.5.sql b/sql/oracle/v1-upgrade/oracle-warm-flow_1.3.5.sql index d7f42d15..1846f23a 100644 --- a/sql/oracle/v1-upgrade/oracle-warm-flow_1.3.5.sql +++ b/sql/oracle/v1-upgrade/oracle-warm-flow_1.3.5.sql @@ -1,28 +1,28 @@ -UPDATE flow_skip SET skip_condition = REPLACE(skip_condition, '@@eq@@|', 'eq|'); -UPDATE flow_skip SET skip_condition = REPLACE(skip_condition, '@@eq@@', '|'); +UPDATE FLOW_SKIP SET SKIP_CONDITION = REPLACE(SKIP_CONDITION, '@@eq@@|', 'eq|'); +UPDATE FLOW_SKIP SET SKIP_CONDITION = REPLACE(SKIP_CONDITION, '@@eq@@', '|'); -UPDATE flow_skip SET skip_condition = REPLACE(skip_condition, '@@ge@@|', 'ge|'); -UPDATE flow_skip SET skip_condition = REPLACE(skip_condition, '@@ge@@', '|'); +UPDATE FLOW_SKIP SET SKIP_CONDITION = REPLACE(SKIP_CONDITION, '@@ge@@|', 'ge|'); +UPDATE FLOW_SKIP SET SKIP_CONDITION = REPLACE(SKIP_CONDITION, '@@ge@@', '|'); -UPDATE flow_skip SET skip_condition = REPLACE(skip_condition, '@@gt@@|', 'gt|'); -UPDATE flow_skip SET skip_condition = REPLACE(skip_condition, '@@gt@@', '|'); +UPDATE FLOW_SKIP SET SKIP_CONDITION = REPLACE(SKIP_CONDITION, '@@gt@@|', 'gt|'); +UPDATE FLOW_SKIP SET SKIP_CONDITION = REPLACE(SKIP_CONDITION, '@@gt@@', '|'); -UPDATE flow_skip SET skip_condition = REPLACE(skip_condition, '@@le@@|', 'le|'); -UPDATE flow_skip SET skip_condition = REPLACE(skip_condition, '@@le@@', '|'); +UPDATE FLOW_SKIP SET SKIP_CONDITION = REPLACE(SKIP_CONDITION, '@@le@@|', 'le|'); +UPDATE FLOW_SKIP SET SKIP_CONDITION = REPLACE(SKIP_CONDITION, '@@le@@', '|'); -UPDATE flow_skip SET skip_condition = REPLACE(skip_condition, '@@like@@|', 'like|'); -UPDATE flow_skip SET skip_condition = REPLACE(skip_condition, '@@like@@', '|'); +UPDATE FLOW_SKIP SET SKIP_CONDITION = REPLACE(SKIP_CONDITION, '@@like@@|', 'like|'); +UPDATE FLOW_SKIP SET SKIP_CONDITION = REPLACE(SKIP_CONDITION, '@@like@@', '|'); -UPDATE flow_skip SET skip_condition = REPLACE(skip_condition, '@@lt@@|', 'lt|'); -UPDATE flow_skip SET skip_condition = REPLACE(skip_condition, '@@lt@@', '|'); +UPDATE FLOW_SKIP SET SKIP_CONDITION = REPLACE(SKIP_CONDITION, '@@lt@@|', 'lt|'); +UPDATE FLOW_SKIP SET SKIP_CONDITION = REPLACE(SKIP_CONDITION, '@@lt@@', '|'); -UPDATE flow_skip SET skip_condition = REPLACE(skip_condition, '@@ne@@|', 'ne|'); -UPDATE flow_skip SET skip_condition = REPLACE(skip_condition, '@@ne@@', '|'); +UPDATE FLOW_SKIP SET SKIP_CONDITION = REPLACE(SKIP_CONDITION, '@@ne@@|', 'ne|'); +UPDATE FLOW_SKIP SET SKIP_CONDITION = REPLACE(SKIP_CONDITION, '@@ne@@', '|'); -UPDATE flow_skip SET skip_condition = REPLACE(skip_condition, '@@notNike@@|', 'notNike|'); -UPDATE flow_skip SET skip_condition = REPLACE(skip_condition, '@@notNike@@', '|'); +UPDATE FLOW_SKIP SET SKIP_CONDITION = REPLACE(SKIP_CONDITION, '@@notNike@@|', 'notNike|'); +UPDATE FLOW_SKIP SET SKIP_CONDITION = REPLACE(SKIP_CONDITION, '@@notNike@@', '|'); -UPDATE flow_skip SET skip_condition = REPLACE(skip_condition, '@@spel@@|', 'spel|'); +UPDATE FLOW_SKIP SET SKIP_CONDITION = REPLACE(SKIP_CONDITION, '@@spel@@|', 'spel|'); ALTER TABLE flow_node ADD any_node_skip VARCHAR2(100) DEFAULT NULL; diff --git a/sql/oracle/v1-upgrade/oracle-warm-flow_1.3.7.sql b/sql/oracle/v1-upgrade/oracle-warm-flow_1.3.7.sql new file mode 100644 index 00000000..73e9bfbd --- /dev/null +++ b/sql/oracle/v1-upgrade/oracle-warm-flow_1.3.7.sql @@ -0,0 +1 @@ +UPDATE FLOW_NODE SET PERMISSION_FLAG = REPLACE(PERMISSION_FLAG,',','@@'); diff --git a/sql/postgresql/v1-upgrade/postgresql-warm-flow_1.3.7.sql b/sql/postgresql/v1-upgrade/postgresql-warm-flow_1.3.7.sql new file mode 100644 index 00000000..dbd89c20 --- /dev/null +++ b/sql/postgresql/v1-upgrade/postgresql-warm-flow_1.3.7.sql @@ -0,0 +1 @@ +UPDATE flow_node SET permission_flag = REPLACE(permission_flag,',','@@'); diff --git a/warm-flow-core/pom.xml b/warm-flow-core/pom.xml index 1c7c171c..eb6f02f4 100644 --- a/warm-flow-core/pom.xml +++ b/warm-flow-core/pom.xml @@ -6,7 +6,7 @@ org.dromara.warm warm-flow - 1.3.6 + 1.3.7 warm-flow-core diff --git a/warm-flow-core/src/main/java/org/dromara/warm/flow/core/service/impl/TaskServiceImpl.java b/warm-flow-core/src/main/java/org/dromara/warm/flow/core/service/impl/TaskServiceImpl.java index 1430ca7c..9d1540e3 100644 --- a/warm-flow-core/src/main/java/org/dromara/warm/flow/core/service/impl/TaskServiceImpl.java +++ b/warm-flow-core/src/main/java/org/dromara/warm/flow/core/service/impl/TaskServiceImpl.java @@ -17,6 +17,7 @@ import org.dromara.warm.flow.core.FlowFactory; import org.dromara.warm.flow.core.constant.ExceptionCons; +import org.dromara.warm.flow.core.constant.FlowCons; import org.dromara.warm.flow.core.dao.FlowTaskDao; import org.dromara.warm.flow.core.dto.FlowParams; import org.dromara.warm.flow.core.entity.*; @@ -346,7 +347,7 @@ public Task addTask(Node node, Instance instance, Definition definition, FlowPar .setNodeName(node.getNodeName()) .setNodeType(node.getNodeType()) .setCreateTime(new Date()) - .setPermissionList(StringUtils.str2List(node.getPermissionFlag(), ",")); + .setPermissionList(StringUtils.str2List(node.getPermissionFlag(), FlowCons.splitAt)); if (StringUtils.isNotEmpty(node.getFormCustom()) && StringUtils.isNotEmpty(node.getFormPath())) { // 节点有自定义表单则使用 diff --git a/warm-flow-orm/pom.xml b/warm-flow-orm/pom.xml index 28c3ae88..4804556a 100644 --- a/warm-flow-orm/pom.xml +++ b/warm-flow-orm/pom.xml @@ -6,7 +6,7 @@ org.dromara.warm warm-flow - 1.3.6 + 1.3.7 warm-flow-orm diff --git a/warm-flow-orm/warm-flow-easy-query/pom.xml b/warm-flow-orm/warm-flow-easy-query/pom.xml index b09b5b3b..11d3dadc 100644 --- a/warm-flow-orm/warm-flow-easy-query/pom.xml +++ b/warm-flow-orm/warm-flow-easy-query/pom.xml @@ -6,7 +6,7 @@ org.dromara.warm warm-flow-orm - 1.3.6 + 1.3.7 warm-flow-easy-query diff --git a/warm-flow-orm/warm-flow-easy-query/warm-flow-easy-query-core/pom.xml b/warm-flow-orm/warm-flow-easy-query/warm-flow-easy-query-core/pom.xml index 490900c9..87d1c053 100644 --- a/warm-flow-orm/warm-flow-easy-query/warm-flow-easy-query-core/pom.xml +++ b/warm-flow-orm/warm-flow-easy-query/warm-flow-easy-query-core/pom.xml @@ -6,7 +6,7 @@ org.dromara.warm warm-flow-easy-query - 1.3.6 + 1.3.7 warm-flow-easy-query-core diff --git a/warm-flow-orm/warm-flow-easy-query/warm-flow-easy-query-sb-starter/pom.xml b/warm-flow-orm/warm-flow-easy-query/warm-flow-easy-query-sb-starter/pom.xml index ea9b82a9..42a2f20d 100644 --- a/warm-flow-orm/warm-flow-easy-query/warm-flow-easy-query-sb-starter/pom.xml +++ b/warm-flow-orm/warm-flow-easy-query/warm-flow-easy-query-sb-starter/pom.xml @@ -6,7 +6,7 @@ org.dromara.warm warm-flow-easy-query - 1.3.6 + 1.3.7 warm-flow-easy-query-sb-starter @@ -20,7 +20,7 @@ org.dromara.warm warm-flow-easy-query-core - 1.3.6 + 1.3.7 diff --git a/warm-flow-orm/warm-flow-easy-query/warm-flow-easy-query-solon-plugin/pom.xml b/warm-flow-orm/warm-flow-easy-query/warm-flow-easy-query-solon-plugin/pom.xml index d75a00c9..3ceb1b4d 100644 --- a/warm-flow-orm/warm-flow-easy-query/warm-flow-easy-query-solon-plugin/pom.xml +++ b/warm-flow-orm/warm-flow-easy-query/warm-flow-easy-query-solon-plugin/pom.xml @@ -6,7 +6,7 @@ org.dromara.warm warm-flow-easy-query - 1.3.6 + 1.3.7 warm-flow-easy-query-solon-plugin diff --git a/warm-flow-orm/warm-flow-jpa/pom.xml b/warm-flow-orm/warm-flow-jpa/pom.xml index d8901c27..8f7e8c0d 100644 --- a/warm-flow-orm/warm-flow-jpa/pom.xml +++ b/warm-flow-orm/warm-flow-jpa/pom.xml @@ -6,7 +6,7 @@ org.dromara.warm warm-flow-orm - 1.3.6 + 1.3.7 warm-flow-jpa diff --git a/warm-flow-orm/warm-flow-jpa/warm-flow-jpa-core/pom.xml b/warm-flow-orm/warm-flow-jpa/warm-flow-jpa-core/pom.xml index fe0cf30a..36390a09 100644 --- a/warm-flow-orm/warm-flow-jpa/warm-flow-jpa-core/pom.xml +++ b/warm-flow-orm/warm-flow-jpa/warm-flow-jpa-core/pom.xml @@ -6,7 +6,7 @@ org.dromara.warm warm-flow-jpa - 1.3.6 + 1.3.7 warm-flow-jpa-core diff --git a/warm-flow-orm/warm-flow-jpa/warm-flow-jpa-sb-starter/pom.xml b/warm-flow-orm/warm-flow-jpa/warm-flow-jpa-sb-starter/pom.xml index a1548986..231e84db 100644 --- a/warm-flow-orm/warm-flow-jpa/warm-flow-jpa-sb-starter/pom.xml +++ b/warm-flow-orm/warm-flow-jpa/warm-flow-jpa-sb-starter/pom.xml @@ -6,7 +6,7 @@ org.dromara.warm warm-flow-jpa - 1.3.6 + 1.3.7 warm-flow-jpa-sb-starter diff --git a/warm-flow-orm/warm-flow-jpa/warm-flow-jpa-solon-plugin/pom.xml b/warm-flow-orm/warm-flow-jpa/warm-flow-jpa-solon-plugin/pom.xml index 662c0d9d..bc18a84d 100644 --- a/warm-flow-orm/warm-flow-jpa/warm-flow-jpa-solon-plugin/pom.xml +++ b/warm-flow-orm/warm-flow-jpa/warm-flow-jpa-solon-plugin/pom.xml @@ -6,7 +6,7 @@ org.dromara.warm warm-flow-jpa - 1.3.6 + 1.3.7 warm-flow-jpa-solon-plugin diff --git a/warm-flow-orm/warm-flow-mybatis-flex/pom.xml b/warm-flow-orm/warm-flow-mybatis-flex/pom.xml index 28272703..69a00ad2 100644 --- a/warm-flow-orm/warm-flow-mybatis-flex/pom.xml +++ b/warm-flow-orm/warm-flow-mybatis-flex/pom.xml @@ -6,7 +6,7 @@ org.dromara.warm warm-flow-orm - 1.3.6 + 1.3.7 warm-flow-mybatis-flex diff --git a/warm-flow-orm/warm-flow-mybatis-flex/warm-flow-mybatis-flex-core/pom.xml b/warm-flow-orm/warm-flow-mybatis-flex/warm-flow-mybatis-flex-core/pom.xml index 2530f8b5..b049e1ee 100644 --- a/warm-flow-orm/warm-flow-mybatis-flex/warm-flow-mybatis-flex-core/pom.xml +++ b/warm-flow-orm/warm-flow-mybatis-flex/warm-flow-mybatis-flex-core/pom.xml @@ -6,7 +6,7 @@ org.dromara.warm warm-flow-mybatis-flex - 1.3.6 + 1.3.7 warm-flow-mybatis-flex-core diff --git a/warm-flow-orm/warm-flow-mybatis-flex/warm-flow-mybatis-flex-sb-starter/pom.xml b/warm-flow-orm/warm-flow-mybatis-flex/warm-flow-mybatis-flex-sb-starter/pom.xml index 00115383..4cf93158 100644 --- a/warm-flow-orm/warm-flow-mybatis-flex/warm-flow-mybatis-flex-sb-starter/pom.xml +++ b/warm-flow-orm/warm-flow-mybatis-flex/warm-flow-mybatis-flex-sb-starter/pom.xml @@ -6,7 +6,7 @@ org.dromara.warm warm-flow-mybatis-flex - 1.3.6 + 1.3.7 warm-flow-mybatis-flex-sb-starter diff --git a/warm-flow-orm/warm-flow-mybatis-flex/warm-flow-mybatis-flex-sb3-starter/pom.xml b/warm-flow-orm/warm-flow-mybatis-flex/warm-flow-mybatis-flex-sb3-starter/pom.xml index b2aef166..091cdef5 100644 --- a/warm-flow-orm/warm-flow-mybatis-flex/warm-flow-mybatis-flex-sb3-starter/pom.xml +++ b/warm-flow-orm/warm-flow-mybatis-flex/warm-flow-mybatis-flex-sb3-starter/pom.xml @@ -6,7 +6,7 @@ org.dromara.warm warm-flow-mybatis-flex - 1.3.6 + 1.3.7 warm-flow-mybatis-flex-sb3-starter diff --git a/warm-flow-orm/warm-flow-mybatis-flex/warm-flow-mybatis-flex-solon-plugin/pom.xml b/warm-flow-orm/warm-flow-mybatis-flex/warm-flow-mybatis-flex-solon-plugin/pom.xml index a7ae8115..7902e150 100644 --- a/warm-flow-orm/warm-flow-mybatis-flex/warm-flow-mybatis-flex-solon-plugin/pom.xml +++ b/warm-flow-orm/warm-flow-mybatis-flex/warm-flow-mybatis-flex-solon-plugin/pom.xml @@ -6,7 +6,7 @@ org.dromara.warm warm-flow-mybatis-flex - 1.3.6 + 1.3.7 warm-flow-mybatis-flex-solon-plugin diff --git a/warm-flow-orm/warm-flow-mybatis-plus/pom.xml b/warm-flow-orm/warm-flow-mybatis-plus/pom.xml index c9f4830b..2f47b338 100644 --- a/warm-flow-orm/warm-flow-mybatis-plus/pom.xml +++ b/warm-flow-orm/warm-flow-mybatis-plus/pom.xml @@ -6,7 +6,7 @@ org.dromara.warm warm-flow-orm - 1.3.6 + 1.3.7 warm-flow-mybatis-plus diff --git a/warm-flow-orm/warm-flow-mybatis-plus/warm-flow-mybatis-plus-core/pom.xml b/warm-flow-orm/warm-flow-mybatis-plus/warm-flow-mybatis-plus-core/pom.xml index efe63746..0227300b 100644 --- a/warm-flow-orm/warm-flow-mybatis-plus/warm-flow-mybatis-plus-core/pom.xml +++ b/warm-flow-orm/warm-flow-mybatis-plus/warm-flow-mybatis-plus-core/pom.xml @@ -6,7 +6,7 @@ org.dromara.warm warm-flow-mybatis-plus - 1.3.6 + 1.3.7 warm-flow-mybatis-plus-core diff --git a/warm-flow-orm/warm-flow-mybatis-plus/warm-flow-mybatis-plus-sb-starter/pom.xml b/warm-flow-orm/warm-flow-mybatis-plus/warm-flow-mybatis-plus-sb-starter/pom.xml index cd871254..9c4ac45b 100644 --- a/warm-flow-orm/warm-flow-mybatis-plus/warm-flow-mybatis-plus-sb-starter/pom.xml +++ b/warm-flow-orm/warm-flow-mybatis-plus/warm-flow-mybatis-plus-sb-starter/pom.xml @@ -6,7 +6,7 @@ org.dromara.warm warm-flow-mybatis-plus - 1.3.6 + 1.3.7 warm-flow-mybatis-plus-sb-starter diff --git a/warm-flow-orm/warm-flow-mybatis-plus/warm-flow-mybatis-plus-sb3-starter/pom.xml b/warm-flow-orm/warm-flow-mybatis-plus/warm-flow-mybatis-plus-sb3-starter/pom.xml index 736441d1..43abb67c 100644 --- a/warm-flow-orm/warm-flow-mybatis-plus/warm-flow-mybatis-plus-sb3-starter/pom.xml +++ b/warm-flow-orm/warm-flow-mybatis-plus/warm-flow-mybatis-plus-sb3-starter/pom.xml @@ -6,7 +6,7 @@ org.dromara.warm warm-flow-mybatis-plus - 1.3.6 + 1.3.7 warm-flow-mybatis-plus-sb3-starter diff --git a/warm-flow-orm/warm-flow-mybatis-plus/warm-flow-mybatis-plus-solon-plugin/pom.xml b/warm-flow-orm/warm-flow-mybatis-plus/warm-flow-mybatis-plus-solon-plugin/pom.xml index a877d0d5..988656f9 100644 --- a/warm-flow-orm/warm-flow-mybatis-plus/warm-flow-mybatis-plus-solon-plugin/pom.xml +++ b/warm-flow-orm/warm-flow-mybatis-plus/warm-flow-mybatis-plus-solon-plugin/pom.xml @@ -6,7 +6,7 @@ org.dromara.warm warm-flow-mybatis-plus - 1.3.6 + 1.3.7 warm-flow-mybatis-plus-solon-plugin diff --git a/warm-flow-orm/warm-flow-mybatis/pom.xml b/warm-flow-orm/warm-flow-mybatis/pom.xml index ea288a67..872cf310 100644 --- a/warm-flow-orm/warm-flow-mybatis/pom.xml +++ b/warm-flow-orm/warm-flow-mybatis/pom.xml @@ -6,7 +6,7 @@ org.dromara.warm warm-flow-orm - 1.3.6 + 1.3.7 warm-flow-mybatis diff --git a/warm-flow-orm/warm-flow-mybatis/warm-flow-mybatis-core/pom.xml b/warm-flow-orm/warm-flow-mybatis/warm-flow-mybatis-core/pom.xml index c06ace32..a19d8d2a 100644 --- a/warm-flow-orm/warm-flow-mybatis/warm-flow-mybatis-core/pom.xml +++ b/warm-flow-orm/warm-flow-mybatis/warm-flow-mybatis-core/pom.xml @@ -6,7 +6,7 @@ org.dromara.warm warm-flow-mybatis - 1.3.6 + 1.3.7 warm-flow-mybatis-core diff --git a/warm-flow-orm/warm-flow-mybatis/warm-flow-mybatis-sb-starter/pom.xml b/warm-flow-orm/warm-flow-mybatis/warm-flow-mybatis-sb-starter/pom.xml index 5573ada9..72918dad 100644 --- a/warm-flow-orm/warm-flow-mybatis/warm-flow-mybatis-sb-starter/pom.xml +++ b/warm-flow-orm/warm-flow-mybatis/warm-flow-mybatis-sb-starter/pom.xml @@ -6,7 +6,7 @@ org.dromara.warm warm-flow-mybatis - 1.3.6 + 1.3.7 warm-flow-mybatis-sb-starter diff --git a/warm-flow-orm/warm-flow-mybatis/warm-flow-mybatis-sb3-starter/pom.xml b/warm-flow-orm/warm-flow-mybatis/warm-flow-mybatis-sb3-starter/pom.xml index 4454ac73..e6a1149c 100644 --- a/warm-flow-orm/warm-flow-mybatis/warm-flow-mybatis-sb3-starter/pom.xml +++ b/warm-flow-orm/warm-flow-mybatis/warm-flow-mybatis-sb3-starter/pom.xml @@ -6,7 +6,7 @@ org.dromara.warm warm-flow-mybatis - 1.3.6 + 1.3.7 warm-flow-mybatis-sb3-starter diff --git a/warm-flow-orm/warm-flow-mybatis/warm-flow-mybatis-solon-plugin/pom.xml b/warm-flow-orm/warm-flow-mybatis/warm-flow-mybatis-solon-plugin/pom.xml index 93ad2a7a..9fad55d2 100644 --- a/warm-flow-orm/warm-flow-mybatis/warm-flow-mybatis-solon-plugin/pom.xml +++ b/warm-flow-orm/warm-flow-mybatis/warm-flow-mybatis-solon-plugin/pom.xml @@ -6,7 +6,7 @@ org.dromara.warm warm-flow-mybatis - 1.3.6 + 1.3.7 warm-flow-mybatis-solon-plugin diff --git a/warm-flow-plugin/pom.xml b/warm-flow-plugin/pom.xml index 4309c4f8..290274f0 100644 --- a/warm-flow-plugin/pom.xml +++ b/warm-flow-plugin/pom.xml @@ -6,7 +6,7 @@ org.dromara.warm warm-flow - 1.3.6 + 1.3.7 warm-flow-plugin diff --git a/warm-flow-plugin/warm-flow-plugin-json/pom.xml b/warm-flow-plugin/warm-flow-plugin-json/pom.xml index ebf937e1..5e80305b 100644 --- a/warm-flow-plugin/warm-flow-plugin-json/pom.xml +++ b/warm-flow-plugin/warm-flow-plugin-json/pom.xml @@ -6,7 +6,7 @@ org.dromara.warm warm-flow-plugin - 1.3.6 + 1.3.7 warm-flow-plugin-json diff --git a/warm-flow-plugin/warm-flow-plugin-modes/pom.xml b/warm-flow-plugin/warm-flow-plugin-modes/pom.xml index 4ce332e7..dd25b42a 100644 --- a/warm-flow-plugin/warm-flow-plugin-modes/pom.xml +++ b/warm-flow-plugin/warm-flow-plugin-modes/pom.xml @@ -6,7 +6,7 @@ org.dromara.warm warm-flow-plugin - 1.3.6 + 1.3.7 warm-flow-plugin-modes diff --git a/warm-flow-plugin/warm-flow-plugin-modes/warm-flow-plugin-modes-sb/pom.xml b/warm-flow-plugin/warm-flow-plugin-modes/warm-flow-plugin-modes-sb/pom.xml index 30cdf4af..ff3ec60b 100644 --- a/warm-flow-plugin/warm-flow-plugin-modes/warm-flow-plugin-modes-sb/pom.xml +++ b/warm-flow-plugin/warm-flow-plugin-modes/warm-flow-plugin-modes-sb/pom.xml @@ -6,7 +6,7 @@ org.dromara.warm warm-flow-plugin-modes - 1.3.6 + 1.3.7 warm-flow-plugin-modes-sb diff --git a/warm-flow-plugin/warm-flow-plugin-modes/warm-flow-plugin-modes-solon/pom.xml b/warm-flow-plugin/warm-flow-plugin-modes/warm-flow-plugin-modes-solon/pom.xml index b5252137..e97cbce0 100644 --- a/warm-flow-plugin/warm-flow-plugin-modes/warm-flow-plugin-modes-solon/pom.xml +++ b/warm-flow-plugin/warm-flow-plugin-modes/warm-flow-plugin-modes-solon/pom.xml @@ -6,7 +6,7 @@ org.dromara.warm warm-flow-plugin-modes - 1.3.6 + 1.3.7 warm-flow-plugin-modes-solon diff --git a/warm-flow-plugin/warm-flow-plugin-ui/pom.xml b/warm-flow-plugin/warm-flow-plugin-ui/pom.xml index f466ce75..7bc79cff 100644 --- a/warm-flow-plugin/warm-flow-plugin-ui/pom.xml +++ b/warm-flow-plugin/warm-flow-plugin-ui/pom.xml @@ -6,7 +6,7 @@ org.dromara.warm warm-flow-plugin - 1.3.6 + 1.3.7 warm-flow-plugin-ui diff --git a/warm-flow-plugin/warm-flow-plugin-ui/warm-flow-plugin-ui-core/pom.xml b/warm-flow-plugin/warm-flow-plugin-ui/warm-flow-plugin-ui-core/pom.xml index 83b3fd5b..6e27328e 100644 --- a/warm-flow-plugin/warm-flow-plugin-ui/warm-flow-plugin-ui-core/pom.xml +++ b/warm-flow-plugin/warm-flow-plugin-ui/warm-flow-plugin-ui-core/pom.xml @@ -6,7 +6,7 @@ org.dromara.warm warm-flow-plugin-ui - 1.3.6 + 1.3.7 warm-flow-plugin-ui-core diff --git a/warm-flow-plugin/warm-flow-plugin-ui/warm-flow-plugin-ui-sb-web/pom.xml b/warm-flow-plugin/warm-flow-plugin-ui/warm-flow-plugin-ui-sb-web/pom.xml index 6c13f732..dc252eb2 100644 --- a/warm-flow-plugin/warm-flow-plugin-ui/warm-flow-plugin-ui-sb-web/pom.xml +++ b/warm-flow-plugin/warm-flow-plugin-ui/warm-flow-plugin-ui-sb-web/pom.xml @@ -6,7 +6,7 @@ org.dromara.warm warm-flow-plugin-ui - 1.3.6 + 1.3.7 warm-flow-plugin-ui-sb-web diff --git a/warm-flow-plugin/warm-flow-plugin-ui/warm-flow-plugin-ui-solon-web/pom.xml b/warm-flow-plugin/warm-flow-plugin-ui/warm-flow-plugin-ui-solon-web/pom.xml index a53dda98..e829dfb7 100644 --- a/warm-flow-plugin/warm-flow-plugin-ui/warm-flow-plugin-ui-solon-web/pom.xml +++ b/warm-flow-plugin/warm-flow-plugin-ui/warm-flow-plugin-ui-solon-web/pom.xml @@ -6,7 +6,7 @@ org.dromara.warm warm-flow-plugin-ui - 1.3.6 + 1.3.7 warm-flow-plugin-ui-solon-web diff --git a/warm-flow-plugin/warm-flow-plugin-ui/warm-flow-plugin-vue3-ui/pom.xml b/warm-flow-plugin/warm-flow-plugin-ui/warm-flow-plugin-vue3-ui/pom.xml index 6a29e052..ea50f0d7 100644 --- a/warm-flow-plugin/warm-flow-plugin-ui/warm-flow-plugin-vue3-ui/pom.xml +++ b/warm-flow-plugin/warm-flow-plugin-ui/warm-flow-plugin-vue3-ui/pom.xml @@ -6,7 +6,7 @@ org.dromara.warm warm-flow-plugin-ui - 1.3.6 + 1.3.7 warm-flow-plugin-vue3-ui diff --git a/warm-flow-ui/warm-flow-vue3-logic-flow/src/components/WarmFlow/PropertySetting/between.vue b/warm-flow-ui/warm-flow-vue3-logic-flow/src/components/WarmFlow/PropertySetting/between.vue index 798fb604..2eabc7b7 100644 --- a/warm-flow-ui/warm-flow-vue3-logic-flow/src/components/WarmFlow/PropertySetting/between.vue +++ b/warm-flow-ui/warm-flow-vue3-logic-flow/src/components/WarmFlow/PropertySetting/between.vue @@ -202,7 +202,7 @@ function addPermission() { /** 选择角色权限范围触发 */ function getPermissionFlag() { - form.value.permissionFlag = form.value.permissionFlag ? form.value.permissionFlag.split(",") : [""]; + form.value.permissionFlag = form.value.permissionFlag ? form.value.permissionFlag.split("@@") : [""]; if (form.value.listenerType) { const listenerTypes = form.value.listenerType.split(","); const listenerPaths = form.value.listenerPath.split("@@"); diff --git a/warm-flow-ui/warm-flow-vue3-logic-flow/src/components/WarmFlow/PropertySetting/index.vue b/warm-flow-ui/warm-flow-vue3-logic-flow/src/components/WarmFlow/PropertySetting/index.vue index dabf804b..0bb8b7b1 100644 --- a/warm-flow-ui/warm-flow-vue3-logic-flow/src/components/WarmFlow/PropertySetting/index.vue +++ b/warm-flow-ui/warm-flow-vue3-logic-flow/src/components/WarmFlow/PropertySetting/index.vue @@ -191,7 +191,7 @@ watch(() => form.value.nodeRatio, (n) => { watch(() => form.value.permissionFlag, (n) => { // 监听节点属性变化并更新 props.lf.setProperties(objId.value, { - permissionFlag: Array.isArray(n) ? n.filter(e => e).join(',') : n + permissionFlag: Array.isArray(n) ? n.filter(e => e).join('@@') : n }) }, { deep: true });