Browse Source

Pull request #3488: REPORT-43833 【10.0.14】远程设计数据连接/服务器数据集增加锁定

Merge in DESIGN/design from ~YVAN/design:release/10.0 to release/10.0

* commit '753ece1aab42e86aec8c1951d3f2e41533709459':
  REPORT-43833 【10.0.14】远程设计数据连接/服务器数据集增加锁定 漏掉了这个panel,将解锁放到aftercommit()中
feature/big-screen
Yvan 4 years ago
parent
commit
57f05a920e
  1. 4
      designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionComboBoxPanel.java

4
designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionComboBoxPanel.java

@ -144,8 +144,6 @@ public class ConnectionComboBoxPanel extends ItemEditableComboBoxPanel {
connectionListDialog.setDoOKSucceed(false);
return;
}
// 关闭定义数据连接页面,为其解锁
EditLockUtils.unlock(LockItem.CONNECTION);
Configurations.modify(new WorkerFacade(ConnectionConfig.class) {
@Override
public void run() {
@ -161,6 +159,8 @@ public class ConnectionComboBoxPanel extends ItemEditableComboBoxPanel {
@Override
public void afterCommit() {
DesignerContext.getDesignerBean("databasename").refreshBeanElement();
// 关闭定义数据连接页面,为其解锁
EditLockUtils.unlock(LockItem.CONNECTION);
}
}));

Loading…
Cancel
Save