diff --git a/designer-base/src/main/java/com/fr/design/mainframe/vcs/VcsProcessFailedWrapper.java b/designer-base/src/main/java/com/fr/design/mainframe/vcs/VcsProcessFailedWrapper.java index 0a257ce2e4..93d7d93479 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/vcs/VcsProcessFailedWrapper.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/vcs/VcsProcessFailedWrapper.java @@ -1,6 +1,7 @@ package com.fr.design.mainframe.vcs; import com.fr.report.entity.VcsEntity; +import com.fr.stable.StringUtils; import java.util.ArrayList; import java.util.List; @@ -51,6 +52,19 @@ public class VcsProcessFailedWrapper { return detailList; } + /** + * 是否失败 + */ + public boolean isFalse(VcsTableEntity entity) { + for (VcsEntity vcsEntity : failedList) { + if (StringUtils.equals(vcsEntity.getFilename(), entity.getFilename()) + && vcsEntity.getVersion() == entity.getEntity().getVersion()) { + return true; + } + } + return false; + } + /** * 处理是否全部成功 */ diff --git a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/RecyclePane.java b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/RecyclePane.java index 9f19008ee4..1aacaa9d7b 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/RecyclePane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/RecyclePane.java @@ -232,7 +232,7 @@ public class RecyclePane extends AbstractSupportSelectTablePane } private void updateVcsUI(VcsProcessFailedWrapper wrapper) { - tableEntities = model.getList().stream().filter(tableEntity -> !tableEntity.isSelect() || wrapper.getFailedNameList().contains(tableEntity.getFilename())).collect(Collectors.toList()); + tableEntities = model.getList().stream().filter(tableEntity -> !tableEntity.isSelect() || wrapper.isFalse(tableEntity)).collect(Collectors.toList()); model.setList(new ArrayList<>(tableEntities)); model.fireTableDataChanged(); fireVcsListener(model.getList()); diff --git a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsMovePanel.java b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsMovePanel.java index 28cb3f2447..2c8401c94c 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsMovePanel.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsMovePanel.java @@ -371,7 +371,7 @@ public class VcsMovePanel extends BasicPane { private void doAfterMove() { visible = !VcsHelper.getInstance().isLegacyMode(); initVcsLabel(updatePane); - updatePane.setVisible(visible); + updatePane.setVisible(!visible); callBack.doCallBack(visible); parentCard.show(parentPane, SETTING); }