From 8173e27685e900e81f3270ee477c244678f55b6f Mon Sep 17 00:00:00 2001
From: Yvan <Yvan@fanruan.com>
Date: Wed, 27 Jan 2021 14:56:27 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-43833=20=E3=80=9010.0.14=E3=80=91?=
 =?UTF-8?q?=E8=BF=9C=E7=A8=8B=E8=AE=BE=E8=AE=A1=E6=95=B0=E6=8D=AE=E8=BF=9E?=
 =?UTF-8?q?=E6=8E=A5/=E6=9C=8D=E5=8A=A1=E5=99=A8=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=9B=86=E5=A2=9E=E5=8A=A0=E9=94=81=E5=AE=9A=20=E6=BC=8F?=
 =?UTF-8?q?=E6=8E=89=E4=BA=86=E8=BF=99=E4=B8=AApanel=EF=BC=8C=E5=B0=86?=
 =?UTF-8?q?=E8=A7=A3=E9=94=81=E6=94=BE=E5=88=B0aftercommit()=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/data/datapane/connect/ConnectionComboBoxPanel.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionComboBoxPanel.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionComboBoxPanel.java
index afd65f3e5..d441984c2 100644
--- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionComboBoxPanel.java
+++ b/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);
                     }
                 }));