Browse Source

Pull request #15270: REPORT-139278 【fr-fbp冒烟】【数据源】数据连接选择没有驱动的数据库类型,检测时缺少驱动,点击取消按钮,修改的内容实际上60S内保存成功,时间一过会复原

Merge in DESIGN/design from ~DESTINY.LIN/design:fbp/master to fbp/master

* commit '9d7e8191010679bafb9394abe7921e88ff279674':
  REPORT-139278 【fr-fbp冒烟】【数据源】数据连接选择没有驱动的数据库类型,检测时缺少驱动,点击取消按钮,修改的内容实际上保存成功
fbp/master
Destiny.Lin-林锦龙 4 weeks ago
parent
commit
0f50e38cc8
  1. 3
      designer-base/src/main/java/com/fr/design/data/datapane/TableDataPaneListPane.java
  2. 3
      designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java

3
designer-base/src/main/java/com/fr/design/data/datapane/TableDataPaneListPane.java

@ -336,9 +336,10 @@ public class TableDataPaneListPane extends JListControlPane implements TableData
for (ServerDataSetBean bean : deleteDatas) { for (ServerDataSetBean bean : deleteDatas) {
TableDataRepository.getInstance().delete(bean); TableDataRepository.getInstance().delete(bean);
} }
TableDataRepository.getInstance().invalidCache();
} catch (Exception e) { } catch (Exception e) {
FineLoggerFactory.getLogger().error(e.getMessage(), e); FineLoggerFactory.getLogger().error(e.getMessage(), e);
} finally {
TableDataRepository.getInstance().invalidCache();
} }
} }

3
designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java

@ -363,10 +363,11 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh
if (!WorkContext.getCurrent().isLocal()) { if (!WorkContext.getCurrent().isLocal()) {
EventDispatcher.fire(RemoteConfigEvent.EDIT, "ConnectionConfig"); EventDispatcher.fire(RemoteConfigEvent.EDIT, "ConnectionConfig");
} }
ConnectionRepository.getInstance().invalidCache();
} catch (Exception e) { } catch (Exception e) {
FineLoggerFactory.getLogger().error(e.getMessage(), e); FineLoggerFactory.getLogger().error(e.getMessage(), e);
throw e; throw e;
} finally {
ConnectionRepository.getInstance().invalidCache();
} }
} }

Loading…
Cancel
Save