提交封装资源删除和更改属性的API接口 --reviewed by huangqh

杜美瑶 · 杜美瑶 · commit 3f43303e7790 · 2019-12-09T10:53:16.000+08:00
diff --git a/src/common/iPortal/iPortalResource.js b/src/common/iPortal/iPortalResource.js
@@ -37,6 +37,7 @@ export class IPortalResource extends IPortalServiceBase {
         this.thumbnail = null;
         this.updateTime = 0;
         this.userName = "";
+        this.sourceJSON = {};//返回门户资源详细信息
         Util.extend(this, resourceInfo); // INSIGHTS_WORKSPACE MAP_DASHBOARD
         this.resourceUrl = portalUrl + "/web/"+this.resourceType.replace("_","").toLowerCase()+"s/" + this.resourceId;
         if (this.withCredentials) {
@@ -59,38 +60,20 @@ export class IPortalResource extends IPortalServiceBase {
                 if (resourceInfo.error) {
                     return resourceInfo;
                 }
-                for (var key in resourceInfo) {
-                    me[key] = resourceInfo[key];
-                }
+                me.sourceJSON = resourceInfo;
             });
     }
 
     /**
      * @function SuperMap.IPortalResource.prototype.update
-     * @description 更新地图参数。
+     * @description 更新资源属性信息。
      * @returns {Promise} 返回包含更新操作状态的 Promise 对象。
      */
     update() {
-        var resourceUpdateParam = {
-            units: this.units,
-            level: this.level,
-            center: this.center,
-            controls: this.controls,
-            description: this.description,
-            epsgCode: this.epsgCode,
-            extent: this.extent,
-            status: this.status,
-            tags: this.tags,
-            layers: this.layers,
-            title: this.title,
-            thumbnail: this.thumbnail,
-            sourceType: this.sourceType,
-            authorizeSetting: this.authorizeSetting
-        };
         var options = {
             headers: {'Content-Type': 'application/x-www-form-urlencoded'}
         };
-        return this.request("PUT", this.resourceUrl, JSON.stringify(resourceUpdateParam), options);
+        return this.request("PUT", this.resourceUrl, JSON.stringify(this.sourceJSON), options);
     }
 
 }
diff --git a/src/common/iPortal/iPortalUser.js b/src/common/iPortal/iPortalUser.js
@@ -0,0 +1,37 @@
+/* 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
+ * which accompanies this distribution and is available at http://www.apache.org/licenses/LICENSE-2.0.html.*/
+import {SuperMap} from '../SuperMap';
+import {IPortalServiceBase} from './iPortalServiceBase';
+/**
+ * @class SuperMap.IPortalUser
+ * @classdesc iPortal 门户中用户信息的封装类。用于管理用户资源，包括可删除，添加资源。
+ * @category iPortal/Online
+ * @param {string} iportalUrl - iportal根地址。
+ * @extends {SuperMap.iPortalServiceBase}
+ *
+ */
+export class IPortalUser extends IPortalServiceBase {
+    constructor(iportalUrl) {
+        super(iportalUrl);
+        this.iportalUrl = iportalUrl;
+    }
+
+    /**
+     * @function SuperMap.prototype.deleteResources
+     * @description 删除资源。
+     * @param {Object} deleteParams - 删除资源所需的参数对象：{ids,resourceType}。
+     * @returns {Promise} 返回包含删除操作状态的 Promise 对象。
+     */
+    deleteResources(deleteParams) {
+        var resourceName = deleteParams.resourceType.replace("_","").toLowerCase();
+        var deleteResourceUrl = this.iportalUrl+"/web/" + resourceName +"s.json?ids=" + encodeURI(JSON.stringify(deleteParams.ids));
+        if( resourceName === 'data') {
+            deleteResourceUrl = this.iportalUrl + "/web/mycontent/datas/delete.json";
+            return this.request("POST", deleteResourceUrl, JSON.stringify(deleteParams.ids));
+        }
+        return this.request("DELETE", deleteResourceUrl);
+    }
+}
+
+SuperMap.iPortalUser = IPortalUser;
diff --git a/src/common/iPortal/index.js b/src/common/iPortal/index.js
@@ -18,6 +18,7 @@ import {IPortalInsight} from './iPortalInsight'
 import {IPortalInsightsQueryParam} from './iPortalInsightsQueryParam';
 import {IPortalScene} from './iPortalScene'
 import {IPortalScenesQueryParam} from './iPortalScenesQueryParam';
+import {IPortalUser} from "./iPortalUser";
 
 export {IPortal} ;
 export {IPortalQueryParam};
@@ -35,4 +36,5 @@ export {IPortalMapdashboardsQueryParam};
 export {IPortalInsight};
 export {IPortalInsightsQueryParam} ;
 export {IPortalScene};
-export {IPortalScenesQueryParam} ;
+export {IPortalScenesQueryParam} ;
+export {IPortalUser}
diff --git a/src/common/index.js b/src/common/index.js
@@ -112,7 +112,8 @@ import {
     IPortalServiceBase,
     IPortalServicesQueryParam,
     IPortalMapdashboard,
-    IPortalMapdashboardsQueryParam
+    IPortalMapdashboardsQueryParam,
+    IPortalUser
 } from './iPortal';
 import {
     AddressMatchService,
@@ -574,7 +575,8 @@ export {
     IPortalServiceBase,
     IPortalServicesQueryParam,
     IPortalMapdashboard,
-    IPortalMapdashboardsQueryParam
+    IPortalMapdashboardsQueryParam,
+    IPortalUser
 };
 export {
     AddressMatchService,
diff --git a/src/leaflet/index.js b/src/leaflet/index.js
@@ -84,6 +84,7 @@ import {
     IPortalServicesQueryParam,
     IPortalMapdashboard,
     IPortalMapdashboardsQueryParam,
+    IPortalUser,
     //Online
     Online,
     OnlineData,
@@ -548,6 +549,7 @@ export {
     IPortalServicesQueryParam,
     IPortalMapdashboard,
     IPortalMapdashboardsQueryParam,
+    IPortalUser,
     //Online
     Online,
     OnlineData,
diff --git a/src/mapboxgl/index.js b/src/mapboxgl/index.js
@@ -84,6 +84,7 @@ export {
     IPortalServicesQueryParam,
     IPortalMapdashboard,
     IPortalMapdashboardsQueryParam,
+    IPortalUser,
     //Online
     Online,
     OnlineData,
diff --git a/src/openlayers/index.js b/src/openlayers/index.js
@@ -84,6 +84,7 @@ export {
     IPortalInsightsQueryParam,
     IPortalScene,
     IPortalScenesQueryParam,
+    IPortalUser,
     //Online
     Online,
     OnlineData,
diff --git a/test/common/iPortal/iPortalUserSpec.js b/test/common/iPortal/iPortalUserSpec.js
@@ -0,0 +1,9 @@
+import {IPortalUser} from '../../../src/common/iPortal/iPortalUser';
+
+describe('IPortalUser', () => {
+    it('constructor_default', () => {
+        var iportalUrl = 'https://iptl.supermap.io/iportal';
+        var iPortalUser = new IPortalUser(iportalUrl);
+        expect(iPortalUser.iportalUrl).toBe("https://iptl.supermap.io/iportal");
+    });
+});
diff --git a/test/test-main-common.js b/test/test-main-common.js
@@ -168,6 +168,7 @@ import './common/iPortal/iPortalInsightSpec.js';
 import './common/iPortal/iPortalInsightsQueryParamSpec.js';
 import './common/iPortal/iPortalSceneSpec.js';
 import './common/iPortal/iPortalScenesQueryParamSpec.js';
+import './common/iPortal/iPortalUserSpec.js';
 
 /**common -- thirdparty**/
 import './common/thirdparty/elasticsearch/ElasticSearchSpec.js';
