fix icl-1517 Leaflet使用DataServiceQueryView，设置onEachFeature不生效 review by luox

xilanhuaweidapao · xilanhuaweidapao · commit 9cc245ed5b72 · 2023-12-04T08:16:39.000+08:00
diff --git a/src/leaflet/components/dataservicequery/DataServiceQueryView.js b/src/leaflet/components/dataservicequery/DataServiceQueryView.js
@@ -98,7 +98,7 @@ export var DataServiceQueryView = ComponentsViewBase.extend({
      */
     setDataServiceUrl(dataServiceUrl) {
         this.dataServiceUrl = dataServiceUrl;
-        this.viewModel = new DataServiceQueryViewModel(this.dataServiceUrl);
+        this.viewModel = new DataServiceQueryViewModel(this.dataServiceUrl, this.options.onEachFeature);
 
     },
     /**
@@ -127,7 +127,7 @@ export var DataServiceQueryView = ComponentsViewBase.extend({
      */
     _initView: function () {
         // 初始化 ViewModel:
-        this.viewModel = new DataServiceQueryViewModel(this.dataServiceUrl);
+        this.viewModel = new DataServiceQueryViewModel(this.dataServiceUrl, this.options.onEachFeature);
         this.messageBox = new MessageBox();
 
         // 组件 container
diff --git a/src/leaflet/components/dataservicequery/DataServiceQueryViewModel.js b/src/leaflet/components/dataservicequery/DataServiceQueryViewModel.js
@@ -19,16 +19,18 @@ import { GetFeaturesByGeometryParameters } from '@supermap/iclient-common/iServe
  * @version 9.1.1
  * @category Components DataServiceQuery
  * @param {string} dataserviceUrl - 数据服务地址。
+ * @param {function} onEachFeature - 给该元素绑定事件和弹窗。
  * @fires DataServiceQueryViewModel#getfeaturessucceeded
  * @fires DataServiceQueryViewModel#getfeaturesfailed
  * @extends {L.Evented}
  * @usage
  */
 export class DataServiceQueryViewModel extends L.Evented {
 
-    initialize(dataserviceUrl) {
+    initialize(dataserviceUrl, onEachFeature) {
         this.dataserviceUrl = dataserviceUrl;
         this.resultLayers = [];
+        this.onEachFeature = onEachFeature;
     }
 
     /**
@@ -82,9 +84,7 @@ export class DataServiceQueryViewModel extends L.Evented {
             return;
         }
         let resultLayer = L.geoJSON(serviceResult.result.features, {
-            onEachFeature: function (feature, layer) {
-                layer.bindPopup("ID: " + feature.properties.SMID);
-            },
+            onEachFeature: this.onEachFeature,
             pointToLayer: function (geoJsonPoint, latLng) {
                 return L.circleMarker(latLng, { radius: 6})
             }
diff --git a/test/leaflet/components/dataservicequery/DataServiceQueryViewSpec.js b/test/leaflet/components/dataservicequery/DataServiceQueryViewSpec.js
@@ -10,6 +10,7 @@ var dataServiceURL = GlobeParameter.dataServiceURL;
 describe('leaflet_DataServiceQuery_DataServiceQueryView', () => {
     var serviceResult;
     var originalTimeout;
+    var options;
     beforeAll(() => {
         testDiv = document.createElement("div");
         testDiv.id = 'map';
@@ -28,7 +29,12 @@ describe('leaflet_DataServiceQuery_DataServiceQueryView', () => {
         tiledMapLayer(url).addTo(map);
 
         var dataSetNames = ['World:Countries'];
-        dataServiceQuery = dataServiceQueryView(dataServiceURL, dataSetNames);
+        options = {
+          onEachFeature(feature, layer) {
+          }
+        }
+        spyOn(options, 'onEachFeature');
+        dataServiceQuery = dataServiceQueryView(dataServiceURL, dataSetNames, options);
         dataServiceQuery.addTo(map);
     });
     beforeEach(() => {
@@ -67,7 +73,7 @@ describe('leaflet_DataServiceQuery_DataServiceQueryView', () => {
               expect(features[0].id).toBe(1);
               expect(features[1].id).toBe(2);
               expect(features[2].id).toBe(3);
-
+              expect(options.onEachFeature).toHaveBeenCalled();
               dataServiceQuery.off("getfeaturessucceeded", callbackFn);
               done();
           } catch (exception) {
@@ -337,6 +343,5 @@ describe('leaflet_DataServiceQuery_DataServiceQueryView', () => {
             done();
         }
     })
-
 });
 
