Browse Source

Pull request #12972: REPORT-102182 【版本管理三期】版本详情,批量删除,部分失败的场景,页面不会实时刷新 & REPORT-101549 【版本管理二期】迁移失败直接进入版本管理没有更新提示,二次进入就有了

Merge in DESIGN/design from ~DESTINY.LIN/design:release/11.0 to release/11.0

* commit '3ca14e3df8e4cdf4065d19c5b130344e6e590de4':
  REPORT-101549 【版本管理二期】迁移失败直接进入版本管理没有更新提示,二次进入就有了
  REPORT-102182 【版本管理三期】版本详情,批量删除,部分失败的场景,页面不会实时刷新
release/11.0
parent
commit
4976cc5d64
  1. 14
      designer-base/src/main/java/com/fr/design/mainframe/vcs/VcsProcessFailedWrapper.java
  2. 2
      designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/RecyclePane.java
  3. 2
      designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsMovePanel.java

14
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;
}
/**
* 处理是否全部成功
*/

2
designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/RecyclePane.java

@ -232,7 +232,7 @@ public class RecyclePane extends AbstractSupportSelectTablePane<VcsTableEntity>
}
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());

2
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);
}

Loading…
Cancel
Save