Merge branch 'master' of https://github.com/SuperMap/iClient-JavaScript

Author: Yuki-Zhao

dist/leaflet/iclient9-leaflet-es6.js

@@ -16172,9 +16172,8 @@ SuperMap.iPortalMap = iPortalMap_IPortalMap;
  * @param {string} iportalUrl - 地址。
  */
 class iPortal_IPortal extends iPortalServiceBase_IPortalServiceBase {
-
     constructor(iportalUrl, options) {
-        super(iportalUrl,options);
+        super(iportalUrl, options);
         this.iportalUrl = iportalUrl;
         options = options || {};
         this.withCredentials = options.withCredentials || false;
@@ -16186,7 +16185,7 @@ class iPortal_IPortal extends iPortalServiceBase_IPortalServiceBase {
      * @returns {Promise} 返回包含 iportal web 资源信息的 Promise 对象。
      */
     load() {
-        return FetchRequest_FetchRequest.get(this.iportalUrl + '/web');
+        return FetchRequest_FetchRequest.get(this.iportalUrl + "/web");
     }
 
     /**
@@ -16200,9 +16199,9 @@ class iPortal_IPortal extends iPortalServiceBase_IPortalServiceBase {
             return null;
         }
         var serviceUrl = this.iportalUrl + "/web/services";
-        return this.request("GET", serviceUrl, queryParams).then(function (result) {
+        return this.request("GET", serviceUrl, queryParams).then(function(result) {
             var services = [];
-            result.content.map(function (serviceJsonObj) {
+            result.content.map(function(serviceJsonObj) {
                 services.push(new iPortalService_IPortalService(serviceUrl, serviceJsonObj));
                 return serviceJsonObj;
             });
@@ -16237,26 +16236,27 @@ class iPortal_IPortal extends iPortalServiceBase_IPortalServiceBase {
         } else {
             mapsUrl = this.iportalUrl + "/web/maps";
         }
-        return this.request("GET", mapsUrl, queryParams).then(function (result) {
+        return this.request("GET", mapsUrl, queryParams).then(function(result) {
             var mapRetult = {};
             var maps = [];
-            result.content.map(function (mapJsonObj) {
-                maps.push(new iPortalMap_IPortalMap(mapsUrl + "/" + mapJsonObj.id, mapJsonObj));
-                return mapJsonObj;
-            });
-            mapRetult.content = maps;
-            mapRetult.currentPage = result.currentPage;
-            mapRetult.pageSize = result.pageSize;
-            mapRetult.total = result.total;
-            mapRetult.totalPage = result.totalPage;
-            return mapRetult;
+            if (result.content && result.content.length > 0) {
+                result.content.map(function(mapJsonObj) {
+                    maps.push(new iPortalMap_IPortalMap(mapsUrl + "/" + mapJsonObj.id, mapJsonObj));
+                    return mapJsonObj;
+                });
+                mapRetult.content = maps;
+                mapRetult.currentPage = result.currentPage;
+                mapRetult.pageSize = result.pageSize;
+                mapRetult.total = result.total;
+                mapRetult.totalPage = result.totalPage;
+                return mapRetult;
+            }
         });
     }
 }
 
 SuperMap.iPortal = iPortal_IPortal;
 
-
 // CONCATENATED MODULE: ./src/common/iPortal/index.js
 /* Copyright© 2000 - 2019 SuperMap Software Co.Ltd. All rights reserved.
  * This program are made available under the terms of the Apache License, Version 2.0
@@ -76896,7 +76896,7 @@ const EChartsLayer_EchartsLayer = external_L_default.a.Layer.extend({
         _div.style.zIndex = 10;
         this._echartsContainer = _div;
 
-        this._map.getPanes().overlayPane.appendChild(this._echartsContainer);
+        this.getPane().appendChild(this._echartsContainer);
         const me = this;
 
         function _resizeHandler(e) {
@@ -77859,6 +77859,8 @@ var GraphicLayer_GraphicLayer = external_L_default.a.Path.extend({
     initialize: function (graphics, options) {
         this.graphics = [].concat(graphics);
         let opt = options || {};
+        // 由于是canvas实现所以不能更改pane
+        opt.pane = 'overlayPane';
         external_L_default.a.Util.setOptions(this, opt);
         //因为跟基类的renderer冲突，所以采用render这个名字
         this.options.render = this.options.render || GraphicLayer_Renderer[0];

dist/leaflet/iclient9-leaflet-es6.min.js

@@ -74635,6 +74635,8 @@ var GraphicLayer = exports.GraphicLayer = _leaflet2["default"].Path.extend({
     initialize: function initialize(graphics, options) {
         this.graphics = [].concat(graphics);
         var opt = options || {};
+        // 由于是canvas实现所以不能更改pane
+        opt.pane = 'overlayPane';
         _leaflet2["default"].Util.setOptions(this, opt);
         //因为跟基类的renderer冲突，所以采用render这个名字
         this.options.render = this.options.render || Renderer[0];
@@ -75264,7 +75266,7 @@ var EchartsLayer = exports.EchartsLayer = _leaflet2["default"].Layer.extend({
         _div.style.zIndex = 10;
         this._echartsContainer = _div;
 
-        this._map.getPanes().overlayPane.appendChild(this._echartsContainer);
+        this.getPane().appendChild(this._echartsContainer);
         var me = this;
 
         function _resizeHandler(e) {
@@ -107380,9 +107382,9 @@ var IPortal = exports.IPortal = function (_IPortalServiceBase) {
 
 
     _createClass(IPortal, [{
-        key: 'load',
+        key: "load",
         value: function load() {
-            return _FetchRequest.FetchRequest.get(this.iportalUrl + '/web');
+            return _FetchRequest.FetchRequest.get(this.iportalUrl + "/web");
         }
 
         /**
@@ -107393,7 +107395,7 @@ var IPortal = exports.IPortal = function (_IPortalServiceBase) {
          */
 
     }, {
-        key: 'queryServices',
+        key: "queryServices",
         value: function queryServices(queryParams) {
             if (!(queryParams instanceof _iPortalServicesQueryParam.IPortalServicesQueryParam)) {
                 return null;
@@ -107417,7 +107419,7 @@ var IPortal = exports.IPortal = function (_IPortalServiceBase) {
          */
 
     }, {
-        key: 'deleteServices',
+        key: "deleteServices",
         value: function deleteServices(ids) {
             var serviceUrl = this.iportalUrl + "/web/services";
             return this.request("DELETE", serviceUrl, { ids: ids });
@@ -107431,7 +107433,7 @@ var IPortal = exports.IPortal = function (_IPortalServiceBase) {
          */
 
     }, {
-        key: 'queryMaps',
+        key: "queryMaps",
         value: function queryMaps(queryParams) {
             if (!(queryParams instanceof _iPortalMapsQueryParam.IPortalMapsQueryParam)) {
                 return null;
@@ -107445,16 +107447,18 @@ var IPortal = exports.IPortal = function (_IPortalServiceBase) {
             return this.request("GET", mapsUrl, queryParams).then(function (result) {
                 var mapRetult = {};
                 var maps = [];
-                result.content.map(function (mapJsonObj) {
-                    maps.push(new _iPortalMap.IPortalMap(mapsUrl + "/" + mapJsonObj.id, mapJsonObj));
-                    return mapJsonObj;
-                });
-                mapRetult.content = maps;
-                mapRetult.currentPage = result.currentPage;
-                mapRetult.pageSize = result.pageSize;
-                mapRetult.total = result.total;
-                mapRetult.totalPage = result.totalPage;
-                return mapRetult;
+                if (result.content && result.content.length > 0) {
+                    result.content.map(function (mapJsonObj) {
+                        maps.push(new _iPortalMap.IPortalMap(mapsUrl + "/" + mapJsonObj.id, mapJsonObj));
+                        return mapJsonObj;
+                    });
+                    mapRetult.content = maps;
+                    mapRetult.currentPage = result.currentPage;
+                    mapRetult.pageSize = result.pageSize;
+                    mapRetult.total = result.total;
+                    mapRetult.totalPage = result.totalPage;
+                    return mapRetult;
+                }
             });
         }
     }]);

dist/leaflet/iclient9-leaflet.css

@@ -65063,7 +65063,7 @@ var MapExtend_MapExtend = function () {
     external_mapboxgl_default.a.Map.prototype.overlayLayersManager = {};
     external_mapboxgl_default.a.Map.prototype.addLayerBak = external_mapboxgl_default.a.Map.prototype.addLayer;
     external_mapboxgl_default.a.Map.prototype.addLayer = function (layer, before) {
-        if (layer.source) {
+        if (layer.source || layer.type === 'custom') {
             this.addLayerBak(layer, before);
             return this;
         }