【fix】UT

songyumeng · songyumeng · commit b86936f17369 · 2022-06-26T19:51:43.000+08:00
diff --git a/src/common/iServer/DataFlowService.js b/src/common/iServer/DataFlowService.js
@@ -31,7 +31,7 @@ export class DataFlowService extends CommonServiceBase {
          * {Array.<string>}
          * 此类支持的事件类型
          */
-        options.EVENT_TYPES = ["broadcastSocketConnected", "broadcastSocketError", "broadcastFailed", "broadcastSucceeded", "subscribeSocketConnected", "subscribeSocketError", "messageSucceeded", "setFilterParamSucceeded"]
+        options.EVENT_TYPES = ["broadcastSocketConnected", "broadcastSocketClosed", "broadcastSocketError", "broadcastFailed", "broadcastSucceeded", "subscribeSocketConnected", "subscribeSocketClosed", "subscribeSocketError", "messageSucceeded", "setFilterParamSucceeded"]
         super(url, options);
 
         /**
@@ -71,9 +71,11 @@ export class DataFlowService extends CommonServiceBase {
             me.events.triggerEvent('broadcastSocketConnected', e);
         };
         this.broadcastWebSocket.onclose = function (e) {
-            me.broadcastWebSocket.isOpen = false;
-            e.eventType = 'broadcastSocketConnected';
-            me.events.triggerEvent('broadcastSocketConnected', e);
+            if (me.broadcastWebSocket) {
+                me.broadcastWebSocket.isOpen = false;
+            }
+            e.eventType = 'broadcastSocketClosed';
+            me.events.triggerEvent('broadcastSocketClosed', e);
         };
         this.broadcastWebSocket.onerror = function (e) {
             e.eventType = 'broadcastSocketError';
@@ -110,6 +112,10 @@ export class DataFlowService extends CommonServiceBase {
             e.eventType = 'subscribeSocketConnected';
             me.events.triggerEvent('subscribeSocketConnected', e);
         };
+        this.subscribeWebSocket.onclose = function (e) {
+            e.eventType = 'subscribeWebSocketClosed';
+            me.events.triggerEvent('subscribeWebSocketClosed', e);
+        };
         this.subscribeWebSocket.onerror = function (e) {
             e.eventType = 'subscribeSocketError';
             me.events.triggerEvent('subscribeSocketError', e);
diff --git a/test/leaflet/overlay/DataFlowLayerSpec.js b/test/leaflet/overlay/DataFlowLayerSpec.js
@@ -105,7 +105,7 @@ describe('leaflet_DataFlowLayer', () => {
             service.on('broadcastSocketConnected', (e) => {
                 var dataFlow = service.dataFlow;
                 expect(dataFlow.CLASS_NAME).toBe("SuperMap.DataFlowService");
-                expect(dataFlow.EVENT_TYPES.length).toEqual(8);
+                expect(dataFlow.EVENT_TYPES.length).toEqual(10);
                 expect(dataFlow.broadcastWebSocket.binaryType).toBe("blob");
                 timer = window.setInterval(broadcast_Point(service), 1000);
             });
diff --git a/test/openlayers/overlay/DataFlowSpec.js b/test/openlayers/overlay/DataFlowSpec.js
