[fix]common service解绑事件 review by qiw

luoxiao-supermap · luoxiao-supermap · commit 6c9f982e49fb · 2023-07-05T13:52:09.000+08:00
diff --git a/src/common/iServer/AddressMatchService.js b/src/common/iServer/AddressMatchService.js
@@ -71,14 +71,14 @@ export class AddressMatchService extends CommonServiceBase {
           if (eventId === result.result.eventId && callback) {
             delete result.result.eventId;
             callback(result);
-            this.events.un(eventListeners);
+            this.events && this.events.un(eventListeners);
             return false;
           }
         },
         processFailed: function(result) {
           if ((eventId === result.error.eventId || eventId === result.eventId) && callback) {
             callback(result);
-            this.events.un(eventListeners);
+            this.events && this.events.un(eventListeners);
             return false;
           }
         }
diff --git a/src/common/iServer/DatasetService.js b/src/common/iServer/DatasetService.js
@@ -103,14 +103,14 @@ export class DatasetService extends CommonServiceBase {
           if (eventId === result.result.eventId && callback) {
             delete result.result.eventId;
             callback(result);
-            this.events.un(eventListeners);
+            this.events && this.events.un(eventListeners);
             return false;
           }
         },
         processFailed: function(result) {
           if ((eventId === result.error.eventId || eventId === result.eventId) && callback) {
             callback(result);
-            this.events.un(eventListeners);
+            this.events && this.events.un(eventListeners);
             return false;
           }
         }
diff --git a/src/common/iServer/DatasourceService.js b/src/common/iServer/DatasourceService.js
@@ -80,14 +80,14 @@ export class DatasourceService extends CommonServiceBase {
           if (eventId === result.result.eventId && callback) {
             delete result.result.eventId;
             callback(result);
-            this.events.un(eventListeners);
+            this.events && this.events.un(eventListeners);
             return false;
           }
         },
         processFailed: function(result) {
           if ((eventId === result.error.eventId || eventId === result.eventId) && callback) {
             callback(result);
-            this.events.un(eventListeners);
+            this.events && this.events.un(eventListeners);
             return false;
           }
         }
diff --git a/src/common/iServer/GeoprocessingService.js b/src/common/iServer/GeoprocessingService.js
@@ -165,14 +165,14 @@ export class GeoprocessingService extends CommonServiceBase {
             if (eventId === result.result.eventId && callback) {
               delete result.result.eventId;
               callback(result);
-              this.events.un(eventListeners);
+              this.events && this.events.un(eventListeners);
               return false;
             }
           },
           processFailed: function(result) {
             if ((eventId === result.error.eventId || eventId === result.eventId) && callback) {
               callback(result);
-              this.events.un(eventListeners);
+              this.events && this.events.un(eventListeners);
               return false;
             }
           }
diff --git a/src/common/iServer/GetGridCellInfosService.js b/src/common/iServer/GetGridCellInfosService.js
@@ -109,14 +109,14 @@ export class GetGridCellInfosService extends CommonServiceBase {
             if (eventId === result.result.eventId && callback) {
               delete result.result.eventId;
               callback(result);
-              this.events.un(eventListeners);
+              this.events && this.events.un(eventListeners);
               return false;
             }
           },
           processFailed: function(result) {
             if ((eventId === result.error.eventId || eventId === result.eventId) && callback) {
               callback(result);
-              this.events.un(eventListeners);
+              this.events && this.events.un(eventListeners);
               return false;
             }
           }
diff --git a/src/common/iServer/ImageCollectionService.js b/src/common/iServer/ImageCollectionService.js
@@ -123,14 +123,14 @@ export default class ImageCollectionService extends CommonServiceBase {
             if (eventId === result.result.eventId && callback) {
               delete result.result.eventId;
               callback(result);
-              this.events.un(eventListeners);
+              this.events && this.events.un(eventListeners);
               return false;
             }
           },
           processFailed: function(result) {
             if ((eventId === result.error.eventId || eventId === result.eventId) && callback) {
               callback(result);
-              this.events.un(eventListeners);
+              this.events && this.events.un(eventListeners);
               return false;
             }
           }
diff --git a/src/common/iServer/ImageService.js b/src/common/iServer/ImageService.js
@@ -84,14 +84,14 @@ export default class ImageService extends CommonServiceBase {
       processCompleted: function (result) {
         if (eventId === result.result.eventId && callback) {
           callback(result);
-          this.events.un(eventListeners);
+          this.events && this.events.un(eventListeners);
           return false;
         }
       },
       processFailed: function (result) {
         if ((eventId === result.error.eventId || eventId === result.eventId) && callback) {
           callback(result);
-          this.events.un(eventListeners);
+          this.events && this.events.un(eventListeners);
           return false;
         }
       }
diff --git a/src/common/iServer/KnowledgeGraphService.js b/src/common/iServer/KnowledgeGraphService.js
@@ -220,15 +220,15 @@ export class KnowledgeGraphService extends CommonServiceBase {
         if (eventId === result.result.eventId && callback) {
           delete result.result.eventId;
           callback(result);
-          this.events.un(eventListeners);
+          this.events && this.events.un(eventListeners);
           return false;
         }
       },
       processFailed: function (result) {
         if ((eventId === result.error.eventId || eventId === result.eventId) && callback) {
           delete result.eventId;
           callback(result);
-          this.events.un(eventListeners);
+          this.events && this.events.un(eventListeners);
           return false;
         }
       }
diff --git a/src/common/iServer/MapService.js b/src/common/iServer/MapService.js
@@ -85,14 +85,14 @@ export class MapService extends CommonServiceBase {
             if (eventId === result.result.eventId && callback) {
               delete result.result.eventId;
               callback(result);
-              this.events.un(eventListeners);
+              this.events && this.events.un(eventListeners);
               return false;
             }
           },
           processFailed: function(result) {
             if ((eventId === result.error.eventId || eventId === result.eventId) && callback) {
               callback(result);
-              this.events.un(eventListeners);
+              this.events && this.events.un(eventListeners);
               return false;
             }
           }
diff --git a/src/common/iServer/MeasureService.js b/src/common/iServer/MeasureService.js
@@ -73,14 +73,14 @@ export class MeasureService extends CommonServiceBase {
             if (eventId === result.result.eventId && callback) {
               delete result.result.eventId;
               callback(result);
-              this.events.un(eventListeners);
+              this.events && this.events.un(eventListeners);
               return false;
             }
           },
           processFailed: function(result) {
             if ((eventId === result.error.eventId || eventId === result.eventId) && callback) {
               callback(result);
-              this.events.un(eventListeners);
+              this.events && this.events.un(eventListeners);
               return false;
             }
           }
diff --git a/src/common/iServer/ThemeService.js b/src/common/iServer/ThemeService.js
@@ -63,14 +63,14 @@ export class ThemeService extends CommonServiceBase {
             if (eventId === result.result.eventId && callback) {
               delete result.result.eventId;
               callback(result);
-              this.events.un(eventListeners);
+              this.events && this.events.un(eventListeners);
               return false;
             }
           },
           processFailed: function(result) {
             if ((eventId === result.error.eventId || eventId === result.eventId) && callback) {
               callback(result);
-              this.events.un(eventListeners);
+              this.events && this.events.un(eventListeners);
               return false;
             }
           }
diff --git a/src/common/iServer/WebPrintingService.js b/src/common/iServer/WebPrintingService.js
@@ -162,14 +162,14 @@ export class WebPrintingService extends CommonServiceBase {
           if (eventId === result.result.eventId && callback) {
             delete result.result.eventId;
             callback(result);
-            this.events.un(eventListeners);
+            this.events && this.events.un(eventListeners);
             return false;
           }
         },
         processFailed: function(result) {
           if (eventId === result.error.eventId || eventId === result.eventId) {
             callback(result);
-            this.events.un(eventListeners);
+            this.events && this.events.un(eventListeners);
             return false;
           }
         }
diff --git a/test/common/iServer/ImageServiceSpec.js b/test/common/iServer/ImageServiceSpec.js
@@ -35,6 +35,7 @@ describe('ImageService', () => {
         var getCollectionsProcessCompleted = (res) => {
             try {
                 var result = res.result;
+                expect(result.eventId).toBeUndefined();
                 expect(result).not.toBeNull();
                 expect(result.length).toEqual(1);
                 expect(result[0].id).toEqual('Sentinel-2');

Original file line number	Diff line number	Diff line change
`@@ -71,14 +71,14 @@ export class AddressMatchService extends CommonServiceBase {`
`71`	`71`	`if (eventId === result.result.eventId && callback) {`
`72`	`72`	`delete result.result.eventId;`
`73`	`73`	`callback(result);`
`74`		`- this.events.un(eventListeners);`
	`74`	`+ this.events && this.events.un(eventListeners);`
`75`	`75`	`return false;`
`76`	`76`	`}`
`77`	`77`	`},`
`78`	`78`	`processFailed: function(result) {`
`79`	`79`	`if ((eventId === result.error.eventId \|\| eventId === result.eventId) && callback) {`
`80`	`80`	`callback(result);`
`81`		`- this.events.un(eventListeners);`
	`81`	`+ this.events && this.events.un(eventListeners);`
`82`	`82`	`return false;`
`83`	`83`	`}`
`84`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -103,14 +103,14 @@ export class DatasetService extends CommonServiceBase {`
`103`	`103`	`if (eventId === result.result.eventId && callback) {`
`104`	`104`	`delete result.result.eventId;`
`105`	`105`	`callback(result);`
`106`		`- this.events.un(eventListeners);`
	`106`	`+ this.events && this.events.un(eventListeners);`
`107`	`107`	`return false;`
`108`	`108`	`}`
`109`	`109`	`},`
`110`	`110`	`processFailed: function(result) {`
`111`	`111`	`if ((eventId === result.error.eventId \|\| eventId === result.eventId) && callback) {`
`112`	`112`	`callback(result);`
`113`		`- this.events.un(eventListeners);`
	`113`	`+ this.events && this.events.un(eventListeners);`
`114`	`114`	`return false;`
`115`	`115`	`}`
`116`	`116`	`}`
Original file line number	Diff line number	Diff line change
`@@ -80,14 +80,14 @@ export class DatasourceService extends CommonServiceBase {`
`80`	`80`	`if (eventId === result.result.eventId && callback) {`
`81`	`81`	`delete result.result.eventId;`
`82`	`82`	`callback(result);`
`83`		`- this.events.un(eventListeners);`
	`83`	`+ this.events && this.events.un(eventListeners);`
`84`	`84`	`return false;`
`85`	`85`	`}`
`86`	`86`	`},`
`87`	`87`	`processFailed: function(result) {`
`88`	`88`	`if ((eventId === result.error.eventId \|\| eventId === result.eventId) && callback) {`
`89`	`89`	`callback(result);`
`90`		`- this.events.un(eventListeners);`
	`90`	`+ this.events && this.events.un(eventListeners);`
`91`	`91`	`return false;`
`92`	`92`	`}`
`93`	`93`	`}`
Original file line number	Diff line number	Diff line change
`@@ -165,14 +165,14 @@ export class GeoprocessingService extends CommonServiceBase {`
`165`	`165`	`if (eventId === result.result.eventId && callback) {`
`166`	`166`	`delete result.result.eventId;`
`167`	`167`	`callback(result);`
`168`		`- this.events.un(eventListeners);`
	`168`	`+ this.events && this.events.un(eventListeners);`
`169`	`169`	`return false;`
`170`	`170`	`}`
`171`	`171`	`},`
`172`	`172`	`processFailed: function(result) {`
`173`	`173`	`if ((eventId === result.error.eventId \|\| eventId === result.eventId) && callback) {`
`174`	`174`	`callback(result);`
`175`		`- this.events.un(eventListeners);`
	`175`	`+ this.events && this.events.un(eventListeners);`
`176`	`176`	`return false;`
`177`	`177`	`}`
`178`	`178`	`}`
Original file line number	Diff line number	Diff line change
`@@ -109,14 +109,14 @@ export class GetGridCellInfosService extends CommonServiceBase {`
`109`	`109`	`if (eventId === result.result.eventId && callback) {`
`110`	`110`	`delete result.result.eventId;`
`111`	`111`	`callback(result);`
`112`		`- this.events.un(eventListeners);`
	`112`	`+ this.events && this.events.un(eventListeners);`
`113`	`113`	`return false;`
`114`	`114`	`}`
`115`	`115`	`},`
`116`	`116`	`processFailed: function(result) {`
`117`	`117`	`if ((eventId === result.error.eventId \|\| eventId === result.eventId) && callback) {`
`118`	`118`	`callback(result);`
`119`		`- this.events.un(eventListeners);`
	`119`	`+ this.events && this.events.un(eventListeners);`
`120`	`120`	`return false;`
`121`	`121`	`}`
`122`	`122`	`}`
Original file line number	Diff line number	Diff line change
`@@ -123,14 +123,14 @@ export default class ImageCollectionService extends CommonServiceBase {`
`123`	`123`	`if (eventId === result.result.eventId && callback) {`
`124`	`124`	`delete result.result.eventId;`
`125`	`125`	`callback(result);`
`126`		`- this.events.un(eventListeners);`
	`126`	`+ this.events && this.events.un(eventListeners);`
`127`	`127`	`return false;`
`128`	`128`	`}`
`129`	`129`	`},`
`130`	`130`	`processFailed: function(result) {`
`131`	`131`	`if ((eventId === result.error.eventId \|\| eventId === result.eventId) && callback) {`
`132`	`132`	`callback(result);`
`133`		`- this.events.un(eventListeners);`
	`133`	`+ this.events && this.events.un(eventListeners);`
`134`	`134`	`return false;`
`135`	`135`	`}`
`136`	`136`	`}`
Original file line number	Diff line number	Diff line change
`@@ -84,14 +84,14 @@ export default class ImageService extends CommonServiceBase {`
`84`	`84`	`processCompleted: function (result) {`
`85`	`85`	`if (eventId === result.result.eventId && callback) {`
`86`	`86`	`callback(result);`
`87`		`- this.events.un(eventListeners);`
	`87`	`+ this.events && this.events.un(eventListeners);`
`88`	`88`	`return false;`
`89`	`89`	`}`
`90`	`90`	`},`
`91`	`91`	`processFailed: function (result) {`
`92`	`92`	`if ((eventId === result.error.eventId \|\| eventId === result.eventId) && callback) {`
`93`	`93`	`callback(result);`
`94`		`- this.events.un(eventListeners);`
	`94`	`+ this.events && this.events.un(eventListeners);`
`95`	`95`	`return false;`
`96`	`96`	`}`
`97`	`97`	`}`
Original file line number	Diff line number	Diff line change
`@@ -220,15 +220,15 @@ export class KnowledgeGraphService extends CommonServiceBase {`
`220`	`220`	`if (eventId === result.result.eventId && callback) {`
`221`	`221`	`delete result.result.eventId;`
`222`	`222`	`callback(result);`
`223`		`- this.events.un(eventListeners);`
	`223`	`+ this.events && this.events.un(eventListeners);`
`224`	`224`	`return false;`
`225`	`225`	`}`
`226`	`226`	`},`
`227`	`227`	`processFailed: function (result) {`
`228`	`228`	`if ((eventId === result.error.eventId \|\| eventId === result.eventId) && callback) {`
`229`	`229`	`delete result.eventId;`
`230`	`230`	`callback(result);`
`231`		`- this.events.un(eventListeners);`
	`231`	`+ this.events && this.events.un(eventListeners);`
`232`	`232`	`return false;`
`233`	`233`	`}`
`234`	`234`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,14 +85,14 @@ export class MapService extends CommonServiceBase {`
`85`	`85`	`if (eventId === result.result.eventId && callback) {`
`86`	`86`	`delete result.result.eventId;`
`87`	`87`	`callback(result);`
`88`		`- this.events.un(eventListeners);`
	`88`	`+ this.events && this.events.un(eventListeners);`
`89`	`89`	`return false;`
`90`	`90`	`}`
`91`	`91`	`},`
`92`	`92`	`processFailed: function(result) {`
`93`	`93`	`if ((eventId === result.error.eventId \|\| eventId === result.eventId) && callback) {`
`94`	`94`	`callback(result);`
`95`		`- this.events.un(eventListeners);`
	`95`	`+ this.events && this.events.un(eventListeners);`
`96`	`96`	`return false;`
`97`	`97`	`}`
`98`	`98`	`}`
Original file line number	Diff line number	Diff line change
`@@ -73,14 +73,14 @@ export class MeasureService extends CommonServiceBase {`
`73`	`73`	`if (eventId === result.result.eventId && callback) {`
`74`	`74`	`delete result.result.eventId;`
`75`	`75`	`callback(result);`
`76`		`- this.events.un(eventListeners);`
	`76`	`+ this.events && this.events.un(eventListeners);`
`77`	`77`	`return false;`
`78`	`78`	`}`
`79`	`79`	`},`
`80`	`80`	`processFailed: function(result) {`
`81`	`81`	`if ((eventId === result.error.eventId \|\| eventId === result.eventId) && callback) {`
`82`	`82`	`callback(result);`
`83`		`- this.events.un(eventListeners);`
	`83`	`+ this.events && this.events.un(eventListeners);`
`84`	`84`	`return false;`
`85`	`85`	`}`
`86`	`86`	`}`