Browse Source

Merge pull request 'REPORT-47782 数据集-数据连接-数据集界面的数据连接按钮,鼠标悬浮时的提示不对' (#10) from yvan/finekit:master into master

Reviewed-on: #10
pull/12/head
richie 4 years ago
parent
commit
30b5970252
  1. 4
      src/main/java/com/fanruan/api/design/work/ConnectionComboBoxPanel.java

4
src/main/java/com/fanruan/api/design/work/ConnectionComboBoxPanel.java

@ -70,7 +70,7 @@ public class ConnectionComboBoxPanel extends ItemEditableComboBoxPanel {
EditLockUtils.CONNECTION_LOCKED_ICON, EditLockUtils.CONNECTION_LOCKED_ICON,
IconUtils.readIcon("/com/fr/design/images/m_web/connection"), IconUtils.readIcon("/com/fr/design/images/m_web/connection"),
EditLockUtils.CONNECTION_LOCKED_TOOLTIPS, EditLockUtils.CONNECTION_LOCKED_TOOLTIPS,
StringUtils.EMPTY null
); );
editButton.setPreferredSize(buttonSize); editButton.setPreferredSize(buttonSize);
editButton.addActionListener(new ActionListener() { editButton.addActionListener(new ActionListener() {
@ -124,7 +124,7 @@ public class ConnectionComboBoxPanel extends ItemEditableComboBoxPanel {
boolean actionLock = EditLockUtils.lock(LockItem.CONNECTION); boolean actionLock = EditLockUtils.lock(LockItem.CONNECTION);
if (!actionLock) { if (!actionLock) {
// 锁定失败,代表已经被其他用户锁定,跳出弹窗提示 // 锁定失败,代表已经被其他用户锁定,跳出弹窗提示
EditLockUtils.showLockMessage(); EditLockUtils.showLockMessage(this);
return; return;
} }
// 锁定成功,执行后续操作 // 锁定成功,执行后续操作

Loading…
Cancel
Save