Browse Source

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

将弹窗关闭后解锁的操作,放到afterCommit中
feature/big-screen
Yvan 4 years ago
parent
commit
7b271caeba
  1. 4
      designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java
  2. 4
      designer-base/src/main/java/com/fr/design/os/impl/DatabaseDialogAction.java

4
designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java

@ -103,8 +103,6 @@ public class GlobalTableDataAction extends UpdateAction implements ResponseDataS
globalTableDataDialog.setDoOKSucceed(false);
return;
}
// 关闭服务器数据集页面,为其解锁
EditLockUtils.unlock(LockItem.SERVER_TABLE_DATA);
DesignTableDataManager.clearGlobalDs();
// 保存时 移除服务器数据集列名缓存
for (String name : tableDataConfig.getTableDatas().keySet()) {
@ -128,6 +126,8 @@ public class GlobalTableDataAction extends UpdateAction implements ResponseDataS
// 刷新共有数据集
TableDataTreePane.getInstance(DesignModelAdapter.getCurrentModelAdapter());
fireDSChanged(globalTableDataPane.getDsChangedNameMap());
// 关闭服务器数据集页面,为其解锁
EditLockUtils.unlock(LockItem.SERVER_TABLE_DATA);
}
}));
}

4
designer-base/src/main/java/com/fr/design/os/impl/DatabaseDialogAction.java

@ -52,8 +52,6 @@ public class DatabaseDialogAction implements OSBasedAction {
databaseListDialog.setDoOKSucceed(false);
return;
}
// 定义数据连接弹窗关闭后,解锁
EditLockUtils.unlock(LockItem.CONNECTION);
Configurations.modify(new WorkerFacade(ConnectionConfig.class) {
@Override
public void run() {
@ -69,6 +67,8 @@ public class DatabaseDialogAction implements OSBasedAction {
@Override
public void afterCommit() {
DesignerContext.getDesignerBean("databasename").refreshBeanElement();
// 定义数据连接弹窗关闭后,解锁
EditLockUtils.unlock(LockItem.CONNECTION);
}
}));
}

Loading…
Cancel
Save