Merge branch 'apps_dev' of https://e.coding.net/yilidev/yilipalkaifa/apps into apps_dev
This commit is contained in:
commit
13c83e51c2
@ -495,7 +495,6 @@ function openLinkUrl(type, url, target, uuid, obj) {
|
||||
}
|
||||
|
||||
function openLinkUrlRewrite(type, url, target, uuid, obj, fileName, inspected) {
|
||||
var sid = $("#sid").val();
|
||||
if (target == "0") {
|
||||
target = $(obj).attr("target");
|
||||
}
|
||||
@ -509,7 +508,7 @@ function openLinkUrlRewrite(type, url, target, uuid, obj, fileName, inspected) {
|
||||
}
|
||||
window.location.href = url;
|
||||
} else {
|
||||
window.open(url+sid, target);
|
||||
window.open(url, target);
|
||||
}
|
||||
} else {
|
||||
if (inspected) { //已经进行过权限判断，不需要再判断
|
||||
@ -3518,85 +3517,85 @@ function openRelationDig(obj,value) {
|
||||
}]
|
||||
});
|
||||
}else{
|
||||
$("#attr_dialog_normal_relevance_shapes_div").dialog({
|
||||
buttons : [
|
||||
{
|
||||
text : '刷新',
|
||||
cls : "yellow",
|
||||
handler : function() {
|
||||
// 刷新页面
|
||||
document.getElementById("attr_content_iframe_relevance_shapes").contentWindow.location.reload(true);
|
||||
}
|
||||
},{
|
||||
text : "新建角色模型",
|
||||
cls : "green",
|
||||
handler : function() {
|
||||
//根据角色
|
||||
$.ajax({
|
||||
type : "POST",
|
||||
url : "./jd?sid="
|
||||
+ CLB.sid
|
||||
+ "&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer_relation_find_same_role",
|
||||
data : {
|
||||
uuid:ruuid,
|
||||
methodId:methodId
|
||||
},
|
||||
success : function(msg) {
|
||||
if (msg.data.result == "ok") {
|
||||
window.top.$.simpleAlert("请勿重复新建角色模型!!!");
|
||||
}else{
|
||||
//跳转角色
|
||||
$.ajax({
|
||||
type : "POST",
|
||||
url : "./jd?sid="
|
||||
+ CLB.sid
|
||||
+ "&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer_relation_shape_createDialogModel",
|
||||
data : {
|
||||
uuid:ruuid,
|
||||
methodId:methodId,
|
||||
wsId:wsId
|
||||
},
|
||||
success : function(msg) {
|
||||
if (msg.result == "ok") {
|
||||
window.open("./w?uuid=" + msg.data.uuid+"&teamId"
|
||||
+ "&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer&sid=" + encodeURIComponent($('#sid').val()));
|
||||
$("#attr_dialog_normal_relevance_shapes_div").dialog({
|
||||
buttons : [
|
||||
{
|
||||
text : '刷新',
|
||||
cls : "yellow",
|
||||
handler : function() {
|
||||
// 刷新页面
|
||||
document.getElementById("attr_content_iframe_relevance_shapes").contentWindow.location.reload(true);
|
||||
}
|
||||
},{
|
||||
text : "新建角色模型",
|
||||
cls : "green",
|
||||
handler : function() {
|
||||
//根据角色
|
||||
$.ajax({
|
||||
type : "POST",
|
||||
url : "./jd?sid="
|
||||
+ CLB.sid
|
||||
+ "&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer_relation_find_same_role",
|
||||
data : {
|
||||
uuid:ruuid,
|
||||
methodId:methodId
|
||||
},
|
||||
success : function(msg) {
|
||||
if (msg.data.result == "ok") {
|
||||
window.top.$.simpleAlert("请勿重复新建角色模型!!!");
|
||||
}else{
|
||||
//跳转角色
|
||||
$.ajax({
|
||||
type : "POST",
|
||||
url : "./jd?sid="
|
||||
+ CLB.sid
|
||||
+ "&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer_relation_shape_createDialogModel",
|
||||
data : {
|
||||
uuid:ruuid,
|
||||
methodId:methodId,
|
||||
wsId:wsId
|
||||
},
|
||||
success : function(msg) {
|
||||
if (msg.result == "ok") {
|
||||
window.open("./w?uuid=" + msg.data.uuid+"&teamId"
|
||||
+ "&cmd=com.actionsoft.apps.coe.pal_pl_repository_designer&sid=" + encodeURIComponent($('#sid').val()));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
}
|
||||
}, {
|
||||
text : '确定',
|
||||
cls : "blue",
|
||||
handler : function() {
|
||||
var tmpObjId = $(obj).attr("objid");
|
||||
getRelevanceShapes(tmpObjId,value);
|
||||
var tmpShape = Utils.getSelected()[0];
|
||||
var tmpTitle = tmpShape.title;
|
||||
if (tmpShape.name == "linker") {
|
||||
return;
|
||||
}
|
||||
if (tmpTitle.indexOf("泳道") > -1 || tmpTitle.indexOf("泳池") > -1 || tmpTitle.indexOf("分隔") > -1) {
|
||||
return;
|
||||
}, {
|
||||
text : '确定',
|
||||
cls : "blue",
|
||||
handler : function() {
|
||||
var tmpObjId = $(obj).attr("objid");
|
||||
getRelevanceShapes(tmpObjId,value);
|
||||
var tmpShape = Utils.getSelected()[0];
|
||||
var tmpTitle = tmpShape.title;
|
||||
if (tmpShape.name == "linker") {
|
||||
return;
|
||||
}
|
||||
if (tmpTitle.indexOf("泳道") > -1 || tmpTitle.indexOf("泳池") > -1 || tmpTitle.indexOf("分隔") > -1) {
|
||||
return;
|
||||
}
|
||||
if (isForceShowError && tmpAttrIdValue.indexOf(tmpObjId) > -1) {
|
||||
$.simpleAlert("已设置不允许修改，请在应用参数中设置", 'error');
|
||||
isForceShowError = false;
|
||||
}
|
||||
tmpAttrIdValue = [];
|
||||
}
|
||||
if (isForceShowError && tmpAttrIdValue.indexOf(tmpObjId) > -1) {
|
||||
$.simpleAlert("已设置不允许修改，请在应用参数中设置", 'error');
|
||||
isForceShowError = false;
|
||||
}, {
|
||||
text : '关闭',
|
||||
handler : function() {
|
||||
$("#attr_dialog_normal_relevance_shapes_div").dialog('close');
|
||||
}
|
||||
tmpAttrIdValue = [];
|
||||
}
|
||||
}, {
|
||||
text : '关闭',
|
||||
handler : function() {
|
||||
$("#attr_dialog_normal_relevance_shapes_div").dialog('close');
|
||||
}
|
||||
}]
|
||||
});
|
||||
}
|
||||
}]
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
}else{
|
||||
@ -3726,27 +3725,25 @@ function saveRelevanceShapesTODB(shapesObj, shapeId, shapeName, fileName,
|
||||
}
|
||||
}
|
||||
//by bzp 校验角色和岗位不能同时选择
|
||||
if(shape.category!="org_role") {
|
||||
if (objId == 'role' || objId == 'post') {
|
||||
if (objId == 'role') {
|
||||
//判断岗位
|
||||
var tmp = $("input[objid='post']").val();
|
||||
if (tmp.length > 0) {
|
||||
$.simpleAlert("不能同时选择岗位和角色");
|
||||
return;
|
||||
}
|
||||
}
|
||||
if (objId == 'post') {
|
||||
//判断角色
|
||||
var tmp = $("input[objid='role']").val();
|
||||
if (tmp.length > 0) {
|
||||
$.simpleAlert("不能同时选择岗位和角色");
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
//by bzp end
|
||||
if(objId == 'role' || objId == 'post'){
|
||||
if(objId == 'role'){
|
||||
//判断岗位
|
||||
var tmp = $("input[objid='post']").val();
|
||||
if(tmp.length > 0){
|
||||
$.simpleAlert("不能同时选择岗位和角色");
|
||||
return;
|
||||
}
|
||||
}
|
||||
if(objId == 'post'){
|
||||
//判断角色
|
||||
var tmp = $("input[objid='role']").val();
|
||||
if(tmp.length > 0){
|
||||
$.simpleAlert("不能同时选择岗位和角色");
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
//by bzp end
|
||||
var ref = $("input[objid_shapeId='" + objId + "']").attr("ref");
|
||||
$.ajax({
|
||||
type : "POST",
|
||||
@ -4398,8 +4395,8 @@ function delPolicyFile(obj) {
|
||||
data : {
|
||||
sid: sid,
|
||||
appId: "com.actionsoft.apps.coe.pal.datamigration",
|
||||
repositoryName: "migration",
|
||||
groupValue:"policyFile",
|
||||
repositoryName: "migration",
|
||||
groupValue:"policyFile",
|
||||
ruuid:ruuid,
|
||||
fileName:name
|
||||
},
|
||||
|
||||
Loading…
Reference in New Issue
Block a user