fix icl-1492 我的资源范例删除操作提示与实际情况不一致

xilanhuaweidapao · xilanhuaweidapao · commit f48b1689556a · 2023-07-11T14:21:55.000+08:00
diff --git a/examples/leaflet/iPortalQueryMyResources.html b/examples/leaflet/iPortalQueryMyResources.html
@@ -381,8 +381,14 @@ <h5 class='panel-title text-center' data-i18n="resources.title_iPortalQueryMyRes
         };
         new L.supermap.iPortalUser(iPortalUrl).deleteResources(deleteParams).then(result=>{
             $('#deleteModel').modal('hide');
-            widgets.alert.showAlert(resources.text_deleteSuccess, true);
             deleteIds = [];
+            if (result.succeed) {
+              widgets.alert.showAlert(resources.text_deleteSuccess, true);
+              // 删除成功重新请求列表
+              queryResouces(queryParams);
+            } else {
+              widgets.alert.showAlert(resources.msg_deleteFailure + "," + resources.msg_resourceNotExist, false);
+            }
         }).catch(err => {
             widgets.alert.showAlert(resources.msg_deleteFailure, false);
         })
@@ -422,19 +428,29 @@ <h5 class='panel-title text-center' data-i18n="resources.title_iPortalQueryMyRes
     function viewResource(ids){
         $("#edit-and-detail-plot").tabs('select',0);
         var item = new L.supermap.iPortalResource(iPortalUrl,{resourceId:ids,resourceType:resourceType});
-        item.load().then(()=>{
+        item.load().then((result)=>{
+            // 资源不存在或无权限提示
+            if (result && !result.succeed) {
+              widgets.alert.showAlert(resources.msg_resourceNotExist, false);
+              return;
+            }
             //创建详情面板
-            new L.supermap.Plotting.initIportalStylePanel("iPortalDetailPanel",resourceType,item.sourceJSON,'detail');
+            new L.supermap.plotting.initIportalStylePanel("iPortalDetailPanel",resourceType,item.sourceJSON,'detail');
         });
     }
     //点击编辑属性按钮
     function editResource(ids){
         viewResource(ids)
         $("#edit-and-detail-plot").tabs('select',1);
         var item = new L.supermap.iPortalResource(iPortalUrl,{resourceId:ids,resourceType:resourceType});
-        item.load().then(()=>{
+        item.load().then((result)=>{
+            // 资源不存在或无权限提示
+            if (result && !result.succeed) {
+              widgets.alert.showAlert(resources.msg_resourceNotExist, false);
+              return;
+            }
             //创建属性面板 
-            new L.supermap.Plotting.initIportalStylePanel("plotPanel", resourceType, item.sourceJSON,'edit');
+            new L.supermap.plotting.initIportalStylePanel("plotPanel", resourceType, item.sourceJSON,'edit');
             itemData = item.sourceJSON;
             //填充attributes对象
             switch (resourceType) {
@@ -1285,7 +1301,11 @@ <h5 class='panel-title text-center' data-i18n="resources.title_iPortalQueryMyRes
             usersSettingEntities = [];
             departmentSettingEntities = [];
             groupsSettingEntities = [];
-            widgets.alert.showAlert(resources.msg_shareSuccess, true);
+            if (result.succeed) {
+              widgets.alert.showAlert(resources.msg_shareSuccess, true);
+            } else {
+              widgets.alert.showAlert(resources.msg_shareFailed + "," + resources.msg_resourceNotExist, false);
+            }
         }).catch(err => {
             widgets.alert.showAlert(resources.msg_shareFailed, false);
         })
diff --git a/examples/locales/en-US/resources.js b/examples/locales/en-US/resources.js
@@ -1702,6 +1702,7 @@ window.examplesResources = {
         "msg_queryFailure": "Query failed",
         "msg_updateFailure": "Update failed",
         "msg_deleteFailure": "Delete failed",
+        "msg_resourceNotExist": "The resource does not exist or has no permission",
         "msg_getRoute": "Please get the routing object by query!",
         "msg_MByQuery": "The measured value is:",
         "msg_queryRouteSuccess": "Query route object successful",
diff --git a/examples/locales/zh-CN/resources.js b/examples/locales/zh-CN/resources.js
@@ -1653,6 +1653,7 @@ window.examplesResources = {
         "msg_queryFailure": "查询失败",
         "msg_updateFailure": "更新失败",
         "msg_deleteFailure": "删除失败",
+        "msg_resourceNotExist": "资源不存在或无权限",
         "msg_getRoute": "请通过查询获取路由对象！",
         "msg_MByQuery": "查询获取的M值为：",
         "msg_queryRouteSuccess": "查询路由对象成功",
diff --git a/examples/openlayers/iPortalQueryMyResources.html b/examples/openlayers/iPortalQueryMyResources.html
@@ -382,8 +382,14 @@ <h5 class='panel-title text-center' data-i18n="resources.title_iPortalQueryMyRes
         };
         new ol.supermap.iPortalUser(iPortalUrl).deleteResources(deleteParams).then(result=>{
             $('#deleteModel').modal('hide');
-            widgets.alert.showAlert(resources.text_deleteSuccess, true);
             deleteIds = [];
+            if (result.succeed) {
+              widgets.alert.showAlert(resources.text_deleteSuccess, true);
+              // 删除成功重新请求列表
+              queryResouces(queryParams);
+            } else {
+              widgets.alert.showAlert(resources.msg_deleteFailure + "," + resources.msg_resourceNotExist, false);
+            }
         }).catch(err => {
             widgets.alert.showAlert(resources.msg_deleteFailure, false);
         })
@@ -423,7 +429,12 @@ <h5 class='panel-title text-center' data-i18n="resources.title_iPortalQueryMyRes
     function viewResource(ids){
         $("#edit-and-detail-plot").tabs('select',0);
         var item = new ol.supermap.iPortalResource(iPortalUrl,{resourceId:ids,resourceType:resourceType});
-        item.load().then(()=>{
+        item.load().then((result)=>{
+            // 资源不存在或无权限提示
+            if (result && !result.succeed) {
+              widgets.alert.showAlert(resources.msg_resourceNotExist, false);
+              return;
+            }
             //创建详情面板
             L.supermap.plotting.initIportalStylePanel("iPortalDetailPanel",resourceType,item.sourceJSON,'detail');
         });
@@ -433,7 +444,12 @@ <h5 class='panel-title text-center' data-i18n="resources.title_iPortalQueryMyRes
         viewResource(ids)
         $("#edit-and-detail-plot").tabs('select',1);
         var item = new ol.supermap.iPortalResource(iPortalUrl,{resourceId:ids,resourceType:resourceType});
-        item.load().then(()=>{
+        item.load().then((result)=>{
+            // 资源不存在或无权限提示
+            if (result && !result.succeed) {
+              widgets.alert.showAlert(resources.msg_resourceNotExist, false);
+              return;
+            }
             //创建属性面板 
             L.supermap.plotting.initIportalStylePanel("plotPanel", resourceType, item.sourceJSON,'edit');
             itemData = item.sourceJSON;
@@ -1286,7 +1302,11 @@ <h5 class='panel-title text-center' data-i18n="resources.title_iPortalQueryMyRes
             usersSettingEntities = [];
             departmentSettingEntities = [];
             groupsSettingEntities = [];
-            widgets.alert.showAlert(resources.msg_shareSuccess, true);
+            if (result.succeed) {
+              widgets.alert.showAlert(resources.msg_shareSuccess, true);
+            } else {
+              widgets.alert.showAlert(resources.msg_shareFailed + "," + resources.msg_resourceNotExist, false);
+            }
         }).catch(err => {
             widgets.alert.showAlert(resources.msg_shareFailed, false);
         })
