[fix]eventListeners回调进入多次 review by qiw

luoxiao-supermap · luoxiao-supermap · commit 6e946fbad3fd · 2023-07-05T10:19:29.000+08:00
diff --git a/src/common/iServer/AddressMatchService.js b/src/common/iServer/AddressMatchService.js
@@ -71,11 +71,15 @@ export class AddressMatchService extends CommonServiceBase {
           if (eventId === result.result.eventId && callback) {
             delete result.result.eventId;
             callback(result);
+            this.events.un(eventListeners);
+            return false;
           }
         },
         processFailed: function(result) {
           if ((eventId === result.error.eventId || eventId === result.eventId) && callback) {
             callback(result);
+            this.events.un(eventListeners);
+            return false;
           }
         }
       }
diff --git a/src/common/iServer/DatasetService.js b/src/common/iServer/DatasetService.js
@@ -103,11 +103,15 @@ export class DatasetService extends CommonServiceBase {
           if (eventId === result.result.eventId && callback) {
             delete result.result.eventId;
             callback(result);
+            this.events.un(eventListeners);
+            return false;
           }
         },
         processFailed: function(result) {
           if ((eventId === result.error.eventId || eventId === result.eventId) && callback) {
             callback(result);
+            this.events.un(eventListeners);
+            return false;
           }
         }
       }
diff --git a/src/common/iServer/DatasourceService.js b/src/common/iServer/DatasourceService.js
@@ -80,11 +80,15 @@ export class DatasourceService extends CommonServiceBase {
           if (eventId === result.result.eventId && callback) {
             delete result.result.eventId;
             callback(result);
+            this.events.un(eventListeners);
+            return false;
           }
         },
         processFailed: function(result) {
           if ((eventId === result.error.eventId || eventId === result.eventId) && callback) {
             callback(result);
+            this.events.un(eventListeners);
+            return false;
           }
         }
       }
diff --git a/src/common/iServer/GeoprocessingService.js b/src/common/iServer/GeoprocessingService.js
@@ -165,11 +165,15 @@ export class GeoprocessingService extends CommonServiceBase {
             if (eventId === result.result.eventId && callback) {
               delete result.result.eventId;
               callback(result);
+              this.events.un(eventListeners);
+              return false;
             }
           },
           processFailed: function(result) {
             if ((eventId === result.error.eventId || eventId === result.eventId) && callback) {
               callback(result);
+              this.events.un(eventListeners);
+              return false;
             }
           }
         }
diff --git a/src/common/iServer/GetGridCellInfosService.js b/src/common/iServer/GetGridCellInfosService.js
@@ -109,11 +109,15 @@ export class GetGridCellInfosService extends CommonServiceBase {
             if (eventId === result.result.eventId && callback) {
               delete result.result.eventId;
               callback(result);
+              this.events.un(eventListeners);
+              return false;
             }
           },
           processFailed: function(result) {
             if ((eventId === result.error.eventId || eventId === result.eventId) && callback) {
               callback(result);
+              this.events.un(eventListeners);
+              return false;
             }
           }
         }
diff --git a/src/common/iServer/ImageCollectionService.js b/src/common/iServer/ImageCollectionService.js
@@ -123,11 +123,15 @@ export default class ImageCollectionService extends CommonServiceBase {
             if (eventId === result.result.eventId && callback) {
               delete result.result.eventId;
               callback(result);
+              this.events.un(eventListeners);
+              return false;
             }
           },
           processFailed: function(result) {
             if ((eventId === result.error.eventId || eventId === result.eventId) && callback) {
               callback(result);
+              this.events.un(eventListeners);
+              return false;
             }
           }
         }
diff --git a/src/common/iServer/ImageService.js b/src/common/iServer/ImageService.js
@@ -84,11 +84,15 @@ export default class ImageService extends CommonServiceBase {
       processCompleted: function (result) {
         if (eventId === result.result.eventId && callback) {
           callback(result);
+          this.events.un(eventListeners);
+          return false;
         }
       },
       processFailed: function (result) {
         if ((eventId === result.error.eventId || eventId === result.eventId) && callback) {
           callback(result);
+          this.events.un(eventListeners);
+          return false;
         }
       }
     };
diff --git a/src/common/iServer/KnowledgeGraphService.js b/src/common/iServer/KnowledgeGraphService.js
@@ -220,13 +220,16 @@ export class KnowledgeGraphService extends CommonServiceBase {
         if (eventId === result.result.eventId && callback) {
           delete result.result.eventId;
           callback(result);
+          this.events.un(eventListeners);
+          return false;
         }
       },
       processFailed: function (result) {
         if ((eventId === result.error.eventId || eventId === result.eventId) && callback) {
           delete result.eventId;
-          delete result.error.eventId;
           callback(result);
+          this.events.un(eventListeners);
+          return false;
         }
       }
     };
@@ -249,26 +252,6 @@ export class KnowledgeGraphService extends CommonServiceBase {
     }
     this.request(requestParams);
   }
-  /**
-   * @function KnowledgeGraphService.prototype.serviceProcessCompleted
-   * @param {Object} result - 服务器返回的结果对象
-   * @description 服务流程是否完成
-   */
-  serviceProcessCompleted(result, options) {
-    if (result.succeed) {
-      delete result.succeed;
-    }
-    super.serviceProcessCompleted(result, options);
-  }
-
-  /**
-   * @function KnowledgeGraphService.prototype.serviceProcessCompleted
-   * @param {Object} result - 服务器返回的结果对象
-   * @description 服务流程是否失败
-   */
-  serviceProcessFailed(result, options) {
-    super.serviceProcessFailed(result, options);
-  }
   /**
    * @private
    * @function _getGraphMapData
diff --git a/src/common/iServer/MapService.js b/src/common/iServer/MapService.js
@@ -85,11 +85,15 @@ export class MapService extends CommonServiceBase {
             if (eventId === result.result.eventId && callback) {
               delete result.result.eventId;
               callback(result);
+              this.events.un(eventListeners);
+              return false;
             }
           },
           processFailed: function(result) {
             if ((eventId === result.error.eventId || eventId === result.eventId) && callback) {
               callback(result);
+              this.events.un(eventListeners);
+              return false;
             }
           }
         }
diff --git a/src/common/iServer/MeasureService.js b/src/common/iServer/MeasureService.js
@@ -73,11 +73,15 @@ export class MeasureService extends CommonServiceBase {
             if (eventId === result.result.eventId && callback) {
               delete result.result.eventId;
               callback(result);
+              this.events.un(eventListeners);
+              return false;
             }
           },
           processFailed: function(result) {
             if ((eventId === result.error.eventId || eventId === result.eventId) && callback) {
               callback(result);
+              this.events.un(eventListeners);
+              return false;
             }
           }
         }
diff --git a/src/common/iServer/ThemeService.js b/src/common/iServer/ThemeService.js
@@ -63,11 +63,15 @@ export class ThemeService extends CommonServiceBase {
             if (eventId === result.result.eventId && callback) {
               delete result.result.eventId;
               callback(result);
+              this.events.un(eventListeners);
+              return false;
             }
           },
           processFailed: function(result) {
             if ((eventId === result.error.eventId || eventId === result.eventId) && callback) {
               callback(result);
+              this.events.un(eventListeners);
+              return false;
             }
           }
         }
diff --git a/src/common/iServer/WebPrintingService.js b/src/common/iServer/WebPrintingService.js
@@ -116,11 +116,15 @@ export class WebPrintingService extends CommonServiceBase {
               if (eventId === result.result.eventId && callback) {
                 delete result.result.eventId;
                 callback(result);
+                me.events.un(eventListeners);
+                return false;
               }
             },
             processFailed: function(result) {
               if ((eventId === result.error.eventId || eventId === result.eventId) && callback) {
                 callback(result);
+                me.events.un(eventListeners);
+                return false;
               }
             }
           }
@@ -158,11 +162,15 @@ export class WebPrintingService extends CommonServiceBase {
           if (eventId === result.result.eventId && callback) {
             delete result.result.eventId;
             callback(result);
+            this.events.un(eventListeners);
+            return false;
           }
         },
         processFailed: function(result) {
           if (eventId === result.error.eventId || eventId === result.eventId) {
             callback(result);
+            this.events.un(eventListeners);
+            return false;
           }
         }
       }

Original file line number	Diff line number	Diff line change
`@@ -71,11 +71,15 @@ 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);`
	`75`	`+ return false;`
`74`	`76`	`}`
`75`	`77`	`},`
`76`	`78`	`processFailed: function(result) {`
`77`	`79`	`if ((eventId === result.error.eventId \|\| eventId === result.eventId) && callback) {`
`78`	`80`	`callback(result);`
	`81`	`+ this.events.un(eventListeners);`
	`82`	`+ return false;`
`79`	`83`	`}`
`80`	`84`	`}`
`81`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -103,11 +103,15 @@ 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);`
	`107`	`+ return false;`
`106`	`108`	`}`
`107`	`109`	`},`
`108`	`110`	`processFailed: function(result) {`
`109`	`111`	`if ((eventId === result.error.eventId \|\| eventId === result.eventId) && callback) {`
`110`	`112`	`callback(result);`
	`113`	`+ this.events.un(eventListeners);`
	`114`	`+ return false;`
`111`	`115`	`}`
`112`	`116`	`}`
`113`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -80,11 +80,15 @@ 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);`
	`84`	`+ return false;`
`83`	`85`	`}`
`84`	`86`	`},`
`85`	`87`	`processFailed: function(result) {`
`86`	`88`	`if ((eventId === result.error.eventId \|\| eventId === result.eventId) && callback) {`
`87`	`89`	`callback(result);`
	`90`	`+ this.events.un(eventListeners);`
	`91`	`+ return false;`
`88`	`92`	`}`
`89`	`93`	`}`
`90`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -165,11 +165,15 @@ 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);`
	`169`	`+ return false;`
`168`	`170`	`}`
`169`	`171`	`},`
`170`	`172`	`processFailed: function(result) {`
`171`	`173`	`if ((eventId === result.error.eventId \|\| eventId === result.eventId) && callback) {`
`172`	`174`	`callback(result);`
	`175`	`+ this.events.un(eventListeners);`
	`176`	`+ return false;`
`173`	`177`	`}`
`174`	`178`	`}`
`175`	`179`	`}`
Original file line number	Diff line number	Diff line change
`@@ -109,11 +109,15 @@ 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);`
	`113`	`+ return false;`
`112`	`114`	`}`
`113`	`115`	`},`
`114`	`116`	`processFailed: function(result) {`
`115`	`117`	`if ((eventId === result.error.eventId \|\| eventId === result.eventId) && callback) {`
`116`	`118`	`callback(result);`
	`119`	`+ this.events.un(eventListeners);`
	`120`	`+ return false;`
`117`	`121`	`}`
`118`	`122`	`}`
`119`	`123`	`}`
Original file line number	Diff line number	Diff line change
`@@ -123,11 +123,15 @@ 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);`
	`127`	`+ return false;`
`126`	`128`	`}`
`127`	`129`	`},`
`128`	`130`	`processFailed: function(result) {`
`129`	`131`	`if ((eventId === result.error.eventId \|\| eventId === result.eventId) && callback) {`
`130`	`132`	`callback(result);`
	`133`	`+ this.events.un(eventListeners);`
	`134`	`+ return false;`
`131`	`135`	`}`
`132`	`136`	`}`
`133`	`137`	`}`
Original file line number	Diff line number	Diff line change
`@@ -84,11 +84,15 @@ 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);`
	`88`	`+ return false;`
`87`	`89`	`}`
`88`	`90`	`},`
`89`	`91`	`processFailed: function (result) {`
`90`	`92`	`if ((eventId === result.error.eventId \|\| eventId === result.eventId) && callback) {`
`91`	`93`	`callback(result);`
	`94`	`+ this.events.un(eventListeners);`
	`95`	`+ return false;`
`92`	`96`	`}`
`93`	`97`	`}`
`94`	`98`	`};`
Original file line number	Diff line number	Diff line change
`@@ -85,11 +85,15 @@ 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);`
	`89`	`+ return false;`
`88`	`90`	`}`
`89`	`91`	`},`
`90`	`92`	`processFailed: function(result) {`
`91`	`93`	`if ((eventId === result.error.eventId \|\| eventId === result.eventId) && callback) {`
`92`	`94`	`callback(result);`
	`95`	`+ this.events.un(eventListeners);`
	`96`	`+ return false;`
`93`	`97`	`}`
`94`	`98`	`}`
`95`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -73,11 +73,15 @@ 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);`
	`77`	`+ return false;`
`76`	`78`	`}`
`77`	`79`	`},`
`78`	`80`	`processFailed: function(result) {`
`79`	`81`	`if ((eventId === result.error.eventId \|\| eventId === result.eventId) && callback) {`
`80`	`82`	`callback(result);`
	`83`	`+ this.events.un(eventListeners);`
	`84`	`+ return false;`
`81`	`85`	`}`
`82`	`86`	`}`
`83`	`87`	`}`