diff --git a/designer-base/src/main/java/com/fr/design/env/HttpWorkspaceConnector.java b/designer-base/src/main/java/com/fr/design/env/HttpWorkspaceConnector.java index c92d78ad40..572e2f583c 100644 --- a/designer-base/src/main/java/com/fr/design/env/HttpWorkspaceConnector.java +++ b/designer-base/src/main/java/com/fr/design/env/HttpWorkspaceConnector.java @@ -63,11 +63,11 @@ public class HttpWorkspaceConnector implements WorkspaceConnector { HttpConstants.AUTHORIZATION_PREFIX + bean.getAccessToken(), InetAddress.getLocalHost().getHostAddress()); client.updateConnection(connection); + client.startHeartBeat(); } catch (Exception e) { client.closePool(); throw e; } - client.startHeartBeat(); CompatibleRegister.registerCompatibleEnv(); RepositoryManager.getInstance().clearLastPool(); return client; diff --git a/designer-chart/src/main/java/com/fr/design/module/ChartPreStyleListPane.java b/designer-chart/src/main/java/com/fr/design/module/ChartPreStyleListPane.java index 06b3eb5028..aa7f02fbac 100644 --- a/designer-chart/src/main/java/com/fr/design/module/ChartPreStyleListPane.java +++ b/designer-chart/src/main/java/com/fr/design/module/ChartPreStyleListPane.java @@ -118,7 +118,10 @@ public class ChartPreStyleListPane extends JListControlPane { while (keys.hasNext()) { Object key = keys.next(); ChartColorMatching value = (ChartColorMatching) config.getPreStyle(key); - + // 新配置框架不再使用mirror后 原先mirror的地方需要手动清理下namespace + if(!StringUtils.isEmpty(value.getNameSpace())) { + value.reset(); + } list.add(new NameObject(Utils.objectToString(key), value)); }