Skip to content

Commit f48b168

Browse files
xilanhuaweidapaoxilanhuaweidapao
committed
fix icl-1492 我的资源范例删除操作提示与实际情况不一致
1 parent 31e620d commit f48b168

File tree

4 files changed

+52
-10
lines changed

4 files changed

+52
-10
lines changed

‎examples/leaflet/iPortalQueryMyResources.html

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -381,8 +381,14 @@ <h5 class='panel-title text-center' data-i18n="resources.title_iPortalQueryMyRes
381381
};
382382
new L.supermap.iPortalUser(iPortalUrl).deleteResources(deleteParams).then(result=>{
383383
$('#deleteModel').modal('hide');
384-
widgets.alert.showAlert(resources.text_deleteSuccess, true);
385384
deleteIds = [];
385+
if (result.succeed) {
386+
widgets.alert.showAlert(resources.text_deleteSuccess, true);
387+
// 删除成功重新请求列表
388+
queryResouces(queryParams);
389+
} else {
390+
widgets.alert.showAlert(resources.msg_deleteFailure + "," + resources.msg_resourceNotExist, false);
391+
}
386392
}).catch(err => {
387393
widgets.alert.showAlert(resources.msg_deleteFailure, false);
388394
})
@@ -422,19 +428,29 @@ <h5 class='panel-title text-center' data-i18n="resources.title_iPortalQueryMyRes
422428
function viewResource(ids){
423429
$("#edit-and-detail-plot").tabs('select',0);
424430
var item = new L.supermap.iPortalResource(iPortalUrl,{resourceId:ids,resourceType:resourceType});
425-
item.load().then(()=>{
431+
item.load().then((result)=>{
432+
// 资源不存在或无权限提示
433+
if (result && !result.succeed) {
434+
widgets.alert.showAlert(resources.msg_resourceNotExist, false);
435+
return;
436+
}
426437
//创建详情面板
427-
new L.supermap.Plotting.initIportalStylePanel("iPortalDetailPanel",resourceType,item.sourceJSON,'detail');
438+
new L.supermap.plotting.initIportalStylePanel("iPortalDetailPanel",resourceType,item.sourceJSON,'detail');
428439
});
429440
}
430441
//点击编辑属性按钮
431442
function editResource(ids){
432443
viewResource(ids)
433444
$("#edit-and-detail-plot").tabs('select',1);
434445
var item = new L.supermap.iPortalResource(iPortalUrl,{resourceId:ids,resourceType:resourceType});
435-
item.load().then(()=>{
446+
item.load().then((result)=>{
447+
// 资源不存在或无权限提示
448+
if (result && !result.succeed) {
449+
widgets.alert.showAlert(resources.msg_resourceNotExist, false);
450+
return;
451+
}
436452
//创建属性面板
437-
new L.supermap.Plotting.initIportalStylePanel("plotPanel", resourceType, item.sourceJSON,'edit');
453+
new L.supermap.plotting.initIportalStylePanel("plotPanel", resourceType, item.sourceJSON,'edit');
438454
itemData = item.sourceJSON;
439455
//填充attributes对象
440456
switch (resourceType) {
@@ -1285,7 +1301,11 @@ <h5 class='panel-title text-center' data-i18n="resources.title_iPortalQueryMyRes
12851301
usersSettingEntities = [];
12861302
departmentSettingEntities = [];
12871303
groupsSettingEntities = [];
1288-
widgets.alert.showAlert(resources.msg_shareSuccess, true);
1304+
if (result.succeed) {
1305+
widgets.alert.showAlert(resources.msg_shareSuccess, true);
1306+
} else {
1307+
widgets.alert.showAlert(resources.msg_shareFailed + "," + resources.msg_resourceNotExist, false);
1308+
}
12891309
}).catch(err => {
12901310
widgets.alert.showAlert(resources.msg_shareFailed, false);
12911311
})

‎examples/locales/en-US/resources.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1702,6 +1702,7 @@ window.examplesResources = {
17021702
"msg_queryFailure": "Query failed",
17031703
"msg_updateFailure": "Update failed",
17041704
"msg_deleteFailure": "Delete failed",
1705+
"msg_resourceNotExist": "The resource does not exist or has no permission",
17051706
"msg_getRoute": "Please get the routing object by query!",
17061707
"msg_MByQuery": "The measured value is:",
17071708
"msg_queryRouteSuccess": "Query route object successful",

‎examples/locales/zh-CN/resources.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1653,6 +1653,7 @@ window.examplesResources = {
16531653
"msg_queryFailure": "查询失败",
16541654
"msg_updateFailure": "更新失败",
16551655
"msg_deleteFailure": "删除失败",
1656+
"msg_resourceNotExist": "资源不存在或无权限",
16561657
"msg_getRoute": "请通过查询获取路由对象！",
16571658
"msg_MByQuery": "查询获取的M值为：",
16581659
"msg_queryRouteSuccess": "查询路由对象成功",

‎examples/openlayers/iPortalQueryMyResources.html

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -382,8 +382,14 @@ <h5 class='panel-title text-center' data-i18n="resources.title_iPortalQueryMyRes
382382
};
383383
new ol.supermap.iPortalUser(iPortalUrl).deleteResources(deleteParams).then(result=>{
384384
$('#deleteModel').modal('hide');
385-
widgets.alert.showAlert(resources.text_deleteSuccess, true);
386385
deleteIds = [];
386+
if (result.succeed) {
387+
widgets.alert.showAlert(resources.text_deleteSuccess, true);
388+
// 删除成功重新请求列表
389+
queryResouces(queryParams);
390+
} else {
391+
widgets.alert.showAlert(resources.msg_deleteFailure + "," + resources.msg_resourceNotExist, false);
392+
}
387393
}).catch(err => {
388394
widgets.alert.showAlert(resources.msg_deleteFailure, false);
389395
})
@@ -423,7 +429,12 @@ <h5 class='panel-title text-center' data-i18n="resources.title_iPortalQueryMyRes
423429
function viewResource(ids){
424430
$("#edit-and-detail-plot").tabs('select',0);
425431
var item = new ol.supermap.iPortalResource(iPortalUrl,{resourceId:ids,resourceType:resourceType});
426-
item.load().then(()=>{
432+
item.load().then((result)=>{
433+
// 资源不存在或无权限提示
434+
if (result && !result.succeed) {
435+
widgets.alert.showAlert(resources.msg_resourceNotExist, false);
436+
return;
437+
}
427438
//创建详情面板
428439
L.supermap.plotting.initIportalStylePanel("iPortalDetailPanel",resourceType,item.sourceJSON,'detail');
429440
});
@@ -433,7 +444,12 @@ <h5 class='panel-title text-center' data-i18n="resources.title_iPortalQueryMyRes
433444
viewResource(ids)
434445
$("#edit-and-detail-plot").tabs('select',1);
435446
var item = new ol.supermap.iPortalResource(iPortalUrl,{resourceId:ids,resourceType:resourceType});
436-
item.load().then(()=>{
447+
item.load().then((result)=>{
448+
// 资源不存在或无权限提示
449+
if (result && !result.succeed) {
450+
widgets.alert.showAlert(resources.msg_resourceNotExist, false);
451+
return;
452+
}
437453
//创建属性面板
438454
L.supermap.plotting.initIportalStylePanel("plotPanel", resourceType, item.sourceJSON,'edit');
439455
itemData = item.sourceJSON;
@@ -1286,7 +1302,11 @@ <h5 class='panel-title text-center' data-i18n="resources.title_iPortalQueryMyRes
12861302
usersSettingEntities = [];
12871303
departmentSettingEntities = [];
12881304
groupsSettingEntities = [];
1289-
widgets.alert.showAlert(resources.msg_shareSuccess, true);
1305+
if (result.succeed) {
1306+
widgets.alert.showAlert(resources.msg_shareSuccess, true);
1307+
} else {
1308+
widgets.alert.showAlert(resources.msg_shareFailed + "," + resources.msg_resourceNotExist, false);
1309+
}
12901310
}).catch(err => {
12911311
widgets.alert.showAlert(resources.msg_shareFailed, false);
12921312
})

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy