Browse Source

Pull request #14866: REPORT-133840 【fr-fbp回归】关闭起始页,先进会失败的工作目录,再进会成功的工作目录会失败

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

* commit '18346ef7ce67d9e4ad0fd0a2ca232151e2804425':
  REPORT-133840 【fr-fbp回归】关闭起始页,先进会失败的工作目录,再进会成功的工作目录会失败
fbp/release
Destiny.Lin-林锦龙 2 months ago
parent
commit
4905bb46c8
  1. 4
      designer-base/src/main/java/com/fr/design/gui/ibutton/UILockButton.java

4
designer-base/src/main/java/com/fr/design/gui/ibutton/UILockButton.java

@ -4,6 +4,7 @@ import com.fr.design.editlock.EditLockChangeEvent;
import com.fr.design.editlock.EditLockChangeListener;
import com.fr.design.editlock.EditLockUtils;
import com.fr.report.LockItem;
import com.fr.start.common.DesignerStartupContext;
import javax.swing.Icon;
@ -41,7 +42,8 @@ public class UILockButton extends UIButton implements EditLockChangeListener {
}
private void init() {
boolean locked = EditLockUtils.isLocked(LockItem.CONNECTION);
// 设计器如果还在启动中就不需要判断上锁情况,界面都还没出现呢,直接短路掉
boolean locked = !DesignerStartupContext.getInstance().isOnStartup() && EditLockUtils.isLocked(LockItem.CONNECTION);
this.setIcon(locked ? lockedIcon : normalIcon);
this.setToolTipText(locked ? lockedTooltips : normalTooltips);
}

Loading…
Cancel
Save