diff --git a/designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java b/designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java
index 44d38db9f..d41af3205 100644
--- a/designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java
+++ b/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);
                     }
                 }));
             }
diff --git a/designer-base/src/main/java/com/fr/design/os/impl/DatabaseDialogAction.java b/designer-base/src/main/java/com/fr/design/os/impl/DatabaseDialogAction.java
index 3d343ab93..ae0f8d1cb 100644
--- a/designer-base/src/main/java/com/fr/design/os/impl/DatabaseDialogAction.java
+++ b/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);
                     }
                 }));
             }