From 9069765d30f8e96cf38e1ae3f6ff096f80b28c94 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Fri, 20 Jun 2025 18:51:33 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E5=BA=94=E7=94=A8=E9=85=8D=E7=BD=AE=E6=B5=81=E6=B0=B4=E7=BA=BF?= =?UTF-8?q?=E9=98=B6=E6=AE=B5=E7=BB=84=E3=80=81=E9=98=B6=E6=AE=B5=E3=80=81?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=E7=9A=84=E6=8B=96=E6=8B=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1447015538458624]发布应用配置流水线阶段组、阶段、工具的拖拽优化 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1447015538458624 --- .../module/deploy/util/DeployPipelineConfigManager.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/neatlogic/module/deploy/util/DeployPipelineConfigManager.java b/src/main/java/neatlogic/module/deploy/util/DeployPipelineConfigManager.java index 2a28a0fc..d0f3648d 100644 --- a/src/main/java/neatlogic/module/deploy/util/DeployPipelineConfigManager.java +++ b/src/main/java/neatlogic/module/deploy/util/DeployPipelineConfigManager.java @@ -899,6 +899,8 @@ public class DeployPipelineConfigManager { disabledPhaseIdList.remove(overridePhaseVo.getId()); } overridePhaseVo.setGroupSort(pipelinePhaseVo.getGroupSort()); + // 模块层或环境层被重载后，修改应用层阶段顺序，回显模块层或环境层阶段时还是用应用层的顺序 + overridePhaseVo.setSort(pipelinePhaseVo.getSort()); pipelinePhaseList.set(index, overridePhaseVo); break; } @@ -924,6 +926,8 @@ public class DeployPipelineConfigManager { int index = 0; for (DeployPipelineGroupVo pipelineGroupVo : pipelineGroupList) { if (Objects.equals(overrideGroupVo.getUuid(), pipelineGroupVo.getUuid())) { + // 模块层或环境层被重载后，修改应用层阶段顺序，回显模块层或环境层阶段时还是用应用层的顺序 + overrideGroupVo.setSort(pipelineGroupVo.getSort()); pipelineGroupList.set(index, overrideGroupVo); break; } -- Gitee From bd2c85b69e0c807b0fd02187d67ab4fe3d78c5b7 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Fri, 20 Jun 2025 18:53:07 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E5=BA=94=E7=94=A8=E9=85=8D=E7=BD=AE=E6=B5=81=E6=B0=B4=E7=BA=BF?= =?UTF-8?q?=E9=98=B6=E6=AE=B5=E7=BB=84=E3=80=81=E9=98=B6=E6=AE=B5=E3=80=81?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=E7=9A=84=E6=8B=96=E6=8B=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1447015538458624]发布应用配置流水线阶段组、阶段、工具的拖拽优化 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1447015538458624 --- .../module/deploy/util/DeployPipelineConfigManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/neatlogic/module/deploy/util/DeployPipelineConfigManager.java b/src/main/java/neatlogic/module/deploy/util/DeployPipelineConfigManager.java index d0f3648d..478ae113 100644 --- a/src/main/java/neatlogic/module/deploy/util/DeployPipelineConfigManager.java +++ b/src/main/java/neatlogic/module/deploy/util/DeployPipelineConfigManager.java @@ -926,7 +926,7 @@ public class DeployPipelineConfigManager { int index = 0; for (DeployPipelineGroupVo pipelineGroupVo : pipelineGroupList) { if (Objects.equals(overrideGroupVo.getUuid(), pipelineGroupVo.getUuid())) { - // 模块层或环境层被重载后，修改应用层阶段顺序，回显模块层或环境层阶段时还是用应用层的顺序 + // 模块层或环境层被重载后，修改应用层阶段组顺序，回显模块层或环境层阶段组时还是用应用层的顺序 overrideGroupVo.setSort(pipelineGroupVo.getSort()); pipelineGroupList.set(index, overrideGroupVo); break; -- Gitee