Browse Source

Pull request #3: REPORT-111337 【设计器性能】设计器卡顿优化 打开模板动画优化

Merge in ~DESTINY.LIN/design from Fix-lag to fix-lag

* commit '8987fa09c1f16211148be8ee37838173612068cf':
  REPORT-111337 【设计器性能】设计器卡顿优化 打开模板动画优化
  REPORT-111337 【设计器性能】设计器卡顿优化 打开模板动画优化
fix-lag
parent
commit
a1ef183761
  1. 8
      designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java
  2. 4
      designer-base/src/main/java/com/fr/design/worker/check/BaseCheckLockWorker.java

8
designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java

@ -20,7 +20,7 @@ import com.fr.design.mainframe.manager.search.TemplateTreeSearchManager;
import com.fr.design.mainframe.manager.search.searcher.control.pane.TemplateSearchRemindPane;
import com.fr.design.mainframe.vcs.common.VcsHelper;
import com.fr.design.worker.check.CheckLockResult;
import com.fr.design.worker.check.CheckLockWorker;
import com.fr.design.worker.check.BaseCheckLockWorker;
import com.fr.file.FILE;
import com.fr.file.FileNodeFILE;
import com.fr.file.filetree.FileNode;
@ -242,16 +242,16 @@ public class TemplateTreePane extends JPanel implements FileOperations {
String reportPath = reportletsTree.getSelectedTemplatePath();
final String selectedFilePath = StableUtils.pathJoin(ProjectConstants.REPORTLETS_NAME, reportPath);
CheckLockWorker checkLockWorker = getCheckLockWorker(node, selectedFilePath);
BaseCheckLockWorker checkLockWorker = getCheckLockWorker(node, selectedFilePath);
checkLockWorker.execute();
CheckLockResult checkLockResult = checkLockWorker.getResult();
processLockResult(checkLockResult, node ,selectedFilePath);
}
@NotNull
private CheckLockWorker getCheckLockWorker(FileNode node, String selectedFilePath) {
private BaseCheckLockWorker getCheckLockWorker(FileNode node, String selectedFilePath) {
String lock = node.getLock();
CheckLockWorker checkLockWorker = new CheckLockWorker(() -> {
BaseCheckLockWorker checkLockWorker = new BaseCheckLockWorker(() -> {
boolean showLockInfo = needShowLockInfo(lock, selectedFilePath, node);
UserInfo userInfo = null;
if (showLockInfo) {

4
designer-base/src/main/java/com/fr/design/worker/check/CheckLockWorker.java → designer-base/src/main/java/com/fr/design/worker/check/BaseCheckLockWorker.java

@ -14,14 +14,14 @@ import java.util.concurrent.TimeoutException;
* @since 11.0
* Created on 2024/1/8
*/
public abstract class CheckLockWorker extends SwingWorker<CheckLockResult, Void> {
public abstract class BaseCheckLockWorker extends SwingWorker<CheckLockResult, Void> {
private static final int TIME_OUT = 50;
private boolean slowly = false;
private final Callable<CheckLockResult> doInBackground;
private CheckLockResult result;
public CheckLockWorker(Callable<CheckLockResult> doInBackground) {
public BaseCheckLockWorker(Callable<CheckLockResult> doInBackground) {
this.doInBackground = doInBackground;
}
@Override
Loading…
Cancel
Save