【bug】迁徙图打开失败，原因是找不到layerInfo.xyField字段

ChenGuanglin · ChenGuanglin · commit cf92dae532fd · 2019-10-30T16:41:03.000+08:00
review by zhaoq
diff --git a/src/openlayers/mapping/WebMap.js b/src/openlayers/mapping/WebMap.js
@@ -1447,9 +1447,10 @@ export class WebMap extends ol.Observable {
                 colTitles[i] = Util.trim(colTitles[i]);
             }
         }
+        // 迁徙图xyField暂时用from中的
         let fileCode = layerInfo.projection,
-            xIdx = colTitles.indexOf(Util.trim(layerInfo.xyField.xField)),
-            yIdx = colTitles.indexOf(Util.trim(layerInfo.xyField.yField)),
+            xIdx = colTitles.indexOf(Util.trim((layerInfo.xyField && layerInfo.xyField.xField) || (layerInfo.from && layerInfo.from.xField))),
+            yIdx = colTitles.indexOf(Util.trim((layerInfo.xyField && layerInfo.xyField.yField) || (layerInfo.from && layerInfo.from.yField))),
             baseLayerEpsgCode = this.baseProjection,
             features = [];
 

Original file line number	Diff line number	Diff line change
`@@ -1447,9 +1447,10 @@ export class WebMap extends ol.Observable {`
`1447`	`1447`	`colTitles[i] = Util.trim(colTitles[i]);`
`1448`	`1448`	`}`
`1449`	`1449`	`}`
	`1450`	`+ // 迁徙图xyField暂时用from中的`
`1450`	`1451`	`let fileCode = layerInfo.projection,`
`1451`		`- xIdx = colTitles.indexOf(Util.trim(layerInfo.xyField.xField)),`
`1452`		`- yIdx = colTitles.indexOf(Util.trim(layerInfo.xyField.yField)),`
	`1452`	`+ xIdx = colTitles.indexOf(Util.trim((layerInfo.xyField && layerInfo.xyField.xField) \|\| (layerInfo.from && layerInfo.from.xField))),`
	`1453`	`+ yIdx = colTitles.indexOf(Util.trim((layerInfo.xyField && layerInfo.xyField.yField) \|\| (layerInfo.from && layerInfo.from.yField))),`
`1453`	`1454`	`baseLayerEpsgCode = this.baseProjection,`
`1454`	`1455`	`features = [];`
`1455`	`1456`