yili/apps
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

去掉编号/阅览判断名称/岗位悬浮显示

Browse Source
This commit is contained in:
zhal 2022-09-16 22:08:54 +08:00
parent beceab7742
commit b7c5361e2e
9 changed files with 103 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java
View File

@ -2632,7 +2632,7 @@ public class CoeProcessLevelWeb extends ActionWeb {
boolean isRequired = attributeModel.getIsRequired();
String desc = attributeModel.getDesc();
String input = "<input type='text' class='awsui-textbox' name=\"" + id + "\" id=\"" + id + "\" value=\"" + inputValue + "\" sid=\"" + sid + "\" uuid=\"" + uuid + "\" placeholder='" + desc + "' data-originvalue='"+ inputValue +"' " + event + "/>";
String input = "<input type='text' title=\"" + inputValue + "\" class='awsui-textbox' name=\"" + id + "\" id=\"" + id + "\" value=\"" + inputValue + "\" sid=\"" + sid + "\" uuid=\"" + uuid + "\" placeholder='" + desc + "' data-originvalue='"+ inputValue +"' " + event + "/>";
String type = attributeModel.getType();
@ -2642,7 +2642,7 @@ public class CoeProcessLevelWeb extends ActionWeb {
requiredSpan = "<span class='required'></span>";
}
if ("textarea".equals(type)) {
input = "<textarea class=\"awsui-textbox\" style=\"height:30px;\" name=\"" + id + "\" id=\"" + id + "\" isRequired='" + isRequired + "' placeholder='" + desc + "' data-originvalue='" + inputValue + "' onclick=\"openTextareaDialog($(this), '" + attributeModel.getNewTitle() + "', " + readonly + ");\" >" + inputValue + "</textarea>";
input = "<textarea class=\"awsui-textbox\" style=\"height:30px;\" name=\"" + id + "\" id=\"" + id + "\" isRequired='" + isRequired + "' placeholder='" + desc + "' data-originvalue='" + inputValue + "' onclick=\"openTextareaDialog($(this), '" + attributeModel.getNewTitle() + "', " + readonly + ");\" >" + inputValue + "</textarea>";
} else if ("select".equals(type) || "select_m".equals(type)) {
if (readonly) {
input = "<input type='text' inputType='" + type + "' objid='" + id + "' name='attribute_name_input_" + id + "' readonly=true " + " id='" + id + "' placeholder='" + desc + "' data-originvalue='" + inputValue + "' class='awsui-combobox' value='" + inputValue + "'></input>";
@ -2656,11 +2656,11 @@ public class CoeProcessLevelWeb extends ActionWeb {
} else if ("relation".equals(type)) {// 关联pal模型文件、形状
JSONObject refObj = JSONObject.parseObject(attributeModel.getRef());
event = "readonly='readonly' relationFileId=\"" + fileId + "\" relationShapeId=\"" + shapeId + "\" groupPath=\"" + attributeModel.getGroupPath() + "\" ref="+ refObj + " onclick=\"openRelationDialog($(this), 'saveContent')\"";
input = "<input type='text' class='awsui-textbox' name=\"" + id + "\" id=\"" + id + "\" value=\"" + inputValue + "\" sid=\"" + sid + "\" uuid=\"" + uuid + "\" isRequired='" + isRequired + "' placeholder='" + desc + "' data-originvalue='" + inputValue + "' " + event + "/>";
input = "<input type='text' title=\"" + inputValue + "\" class='awsui-textbox' name=\"" + id + "\" id=\"" + id + "\" value=\"" + inputValue + "\" sid=\"" + sid + "\" uuid=\"" + uuid + "\" isRequired='" + isRequired + "' placeholder='" + desc + "' data-originvalue='" + inputValue + "' " + event + "/>";
} else if ("awsorg".equals(type)) {// 关联bpm组织架构
JSONObject refObj = JSONObject.parseObject(attributeModel.getRef());
event = "readonly='readonly' data-value="+ dataArr +" groupPath=\"" + attributeModel.getGroupPath() + "\" ref="+ refObj +" onclick=\"openRelationAwsorgDialog($(this))\"";
input = "<input type='text' class='awsui-textbox' name=\"" + id + "\" id=\"" + id + "\" value=\"" + inputValue + "\" sid=\"" + sid + "\" uuid=\"" + uuid + "\" isRequired='" + isRequired + "' placeholder='" + desc + "' data-originvalue='" + inputValue + "' " + event + "/>";
input = "<input type='text' title=\"" + inputValue + "\" class='awsui-textbox' name=\"" + id + "\" id=\"" + id + "\" value=\"" + inputValue + "\" sid=\"" + sid + "\" uuid=\"" + uuid + "\" isRequired='" + isRequired + "' placeholder='" + desc + "' data-originvalue='" + inputValue + "' " + event + "/>";
} else if("DateTimePicker".equals(type)) {
input = "<input class=\"awsui-textbox\" autocomplete='off' id=\"" + id + "\" name=\"dateTimePicker\" sid=\"" + sid + "\" uuid=\"" + uuid + "\" placeholder='" + desc + "' data-originvalue='" + inputValue + "' value='" + inputValue + "' isRequired='" + isRequired + "' onblur='saveContent($(this));'>" + "</input>";
}else if ("table".equals(type)){
@ -2687,7 +2687,7 @@ public class CoeProcessLevelWeb extends ActionWeb {
}
else {
if (readonly) {
input = "<input type='text' class='awsui-textbox' name=\"" + id + "\" id=\"" + id + "\" value=\"" + inputValue + "\" sid=\"" + sid + "\" uuid=\"" + uuid + "\" data-originvalue='" + inputValue + "' readonly=true/>";
input = "<input type='text' title=\"" + inputValue + "\" class='awsui-textbox' name=\"" + id + "\" id=\"" + id + "\" value=\"" + inputValue + "\" sid=\"" + sid + "\" uuid=\"" + uuid + "\" data-originvalue='" + inputValue + "' readonly=true/>";
}
}
content.append("<tr class='tagContentTableTr' id='tr_" + id + "' > <td>" + attributeModel.getNewTitle() + "</td> <td class='tagContentTableTrTd'>" + requiredSpan + input + "</td> </tr>");

4
com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.htm
View File

@ -774,9 +774,9 @@
<div class="ico ico_risk"></div>
</div>
<div class="toolbar_devider"></div>
<div id="bar_activityNo" awsui-qtip='节点编号排序' class="toolbar_button">
<!-- <div id="bar_activityNo" awsui-qtip='节点编号排序' class="toolbar_button">
<div class="ico extend_activityNo"></div>
</div>
</div>-->
<div id="bar_importShape" awsui-qtip='上传附件并创建相应节点' class="toolbar_button" style="<#importShapeStyle>">
<div class="ico ico_importShape"></div>
</div>

2
com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.view.portal.html
View File

@ -964,7 +964,7 @@
<div id="tools">
<div class="toolbar_info2">
<div id="tab" style="display: none;font-size: 17px;">
<div id="processDesc" class="headerTab" onclick="clickTab('processDesc');">流程属性</div>
<div id="processDesc" class="headerTab" onclick="clickTab('processDesc');">文件属性</div>
<div id="processAttr" class="headerTab" onclick="clickTab('processAttr');">活动属性</div>
<div id="processFile" class="headerTab" onclick="clickTab('processFile');">文件下载</div>
</div>

2
com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.view.portal.mobile.html
View File

@ -1059,7 +1059,7 @@
<div class="clearfix"></div>
<div class="toolbar_info2">
<div id="tab" style="display: none;font-size: 1.7rem;">
<div id="processAttr" class="headerTab selected" onclick="clickTab('processAttr');">活动属性 </div>
<div id="processAttr" class="headerTab selected" onclick="clickTab('processAttr');">文件属性 </div>
<div id="processDesc" class="headerTab " onclick="clickTab('processDesc');">流程属性</div>
<div id="processFile" class="headerTab" onclick="clickTab('processFile');">文件预览</div>
<div id="fileheaderTab" class="headerTab" onclick="clickTab('fileheaderTab');">相关/支持文件</div>

107
com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.team.pal.designer.js
View File

@ -100,60 +100,63 @@ $(function() {
},
success: function (msg, textStatus, jqXHR) {
/*if(msg.result == "ok") {*/
$.ajax({
type: "POST",
url: "./jd",
data: {
sid: CLB.sid,
cmd: "com.actionsoft.apps.coe.pal_repository_process_define_save",
uuid: ruuid,
define: awsui.encode(obj),
teamId: $("#teamId").val(),
BPMInstanceName: BPMInstanceName,
messages: messageArray
},
success: function (msg, textStatus, jqXHR) {
if(msg.result == "ok") {
$.simpleAlert("close");
messageArrayForSave = {};
$("#saving_tip").css("color", "rgb(26, 164, 125)");
$("#saving_tip").text("保存成功");
recordShapeText();// 记录最新的节点及其文本text
//更多属性的处理，当节点处理完成后再处理更多属性
if (saveAttributesJson.length > 0 || removeAttributeJson.length > 0){
$.ajax({
type : "POST",
url : "./jd",
data : {
sid : encodeURI(CLB.sid),
cmd : "com.actionsoft.apps.coe.pal_pl_repository_more_attribute_save",
wsId : $("#wsId").val(),
uuid : ruuid,
attributesJson : JSON.stringify(saveAttributesJson),
removeAttributeJson : JSON.stringify(removeAttributeJson)
},
success:function(r) {
saveAttributesJson = [];
removeAttributeJson = [];
},
error:function(r) {
}
});
}
$.simpleAlert("保存成功", "ok");
//保存结束时间戳
//var saveEndTime = new Date().getTime();
//console.log("流程保存时间：", (saveEndTime - saveStartTime) + "毫秒");
} else {
$.simpleAlert("close");
$.simpleAlert(msg.data.desc, 'error', 2000);
}
},
error: function (jqXHR, textStatus, errorThrown) {
$.ajax({
type: "POST",
url: "./jd",
data: {
sid: CLB.sid,
cmd: "com.actionsoft.apps.coe.pal_repository_process_define_save",
uuid: ruuid,
define: awsui.encode(obj),
teamId: $("#teamId").val(),
BPMInstanceName: BPMInstanceName,
messages: messageArray
},
success: function (msg, textStatus, jqXHR) {
if(msg.result == "ok") {
$.simpleAlert("close");
$.simpleAlert('保存失败', 'error', 1500);
messageArrayForSave = {};
$("#saving_tip").css("color", "rgb(26, 164, 125)");
$("#saving_tip").text("保存成功");
recordShapeText();// 记录最新的节点及其文本text
//更多属性的处理，当节点处理完成后再处理更多属性
if (saveAttributesJson.length > 0 || removeAttributeJson.length > 0){
$.ajax({
type : "POST",
url : "./jd",
data : {
sid : encodeURI(CLB.sid),
cmd : "com.actionsoft.apps.coe.pal_pl_repository_more_attribute_save",
wsId : $("#wsId").val(),
uuid : ruuid,
attributesJson : JSON.stringify(saveAttributesJson),
removeAttributeJson : JSON.stringify(removeAttributeJson)
},
success:function(r) {
saveAttributesJson = [];
removeAttributeJson = [];
},
error:function(r) {
}
});
}
$.simpleAlert("保存成功", "ok");
//保存结束时间戳
//var saveEndTime = new Date().getTime();
//console.log("流程保存时间：", (saveEndTime - saveStartTime) + "毫秒");
} else {
$.simpleAlert("close");
$.simpleAlert(msg.data.desc, 'error', 2000);
}
});
},
error: function (jqXHR, textStatus, errorThrown) {
$.simpleAlert("close");
$.simpleAlert('保存失败', 'error', 1500);
}
});
/*} else {
$.simpleAlert("close");
var result = msg.data;

4
com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.framework.js
View File

@ -1493,8 +1493,8 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) {
constr = '<tr ' + mouseout + mouseover + ' objid="' + obj.id + '" class="tagContentTableTr">'
+ ' <td>' + objName + requiredSpan + '</td>'
+ ' <td class="tagContentTableTrTd">'
+ ' <input placeholder="' + obj.desc + '" objid="' + obj.id + '" class="attribute_input_css" name="attribute_name_input_' + obj.id + '" value="" scope="' + obj.groupPath + '" onclick="openRelationDig(this,' + JSON.stringify(obj).replace(/\"/g,"'") +');" />'
+ ' <input placeholder="' + obj.desc + '" ref="" value="' + obj.value + '" style="border:1px solid #ccc;margin-left:-55px;width: 25px;height: 23px;display: none;" objid_shapeId="' + obj.id + '" />'
+ ' <input placeholder="' + obj.desc + '" title="'+obj.value+'" objid="' + obj.id + '" class="attribute_input_css" name="attribute_name_input_' + obj.id + '" value="" scope="' + obj.groupPath + '" onclick="openRelationDig(this,' + JSON.stringify(obj).replace(/\"/g,"'") +');" />'
+ ' <input placeholder="' + obj.desc + '" title="'+obj.value+'" ref="" value="' + obj.value + '" style="border:1px solid #ccc;margin-left:-55px;width: 25px;height: 23px;display: none;" objid_shapeId="' + obj.id + '" />'
+ '</td></tr>';
} else if (objType == "select" || objType == "select_m") {

9
com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.js
View File

@ -1494,7 +1494,7 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) {
constr = '<tr ' + mouseout + mouseover + ' objid="' + obj.id + '" class="tagContentTableTr">'
+ ' <td>' + objName + requiredSpan + '</td>'
+ ' <td class="tagContentTableTrTd">'
+ ' <input placeholder="' + isdesc+ '" objid="' + obj.id + '" class="attribute_input_css" name="attribute_name_input_' + obj.id + '" value="" scope="' + obj.groupPath + '" onclick="openRelationDig(this,' + JSON.stringify(obj).replace(/\"/g,"'") +');" />'
+ ' <input placeholder="' + isdesc+ '" objid="' + obj.id + '" class="attribute_input_css" name="attribute_name_input_' + obj.id + '" value="" scope="' + obj.groupPath + '" onclick="openRelationDig(this,' + JSON.stringify(obj).replace(/\"/g,"'") +');" />'
+ ' <input placeholder="' + isdesc+ '" ref="" value="' + obj.value + '" style="border:1px solid #ccc;margin-left:-55px;width: 25px;height: 23px;display: none;" objid_shapeId="' + obj.id + '" />'
+ '</td></tr>';
@ -3133,6 +3133,13 @@ function getRelevanceShapeNameByShapeId(objIds, shapeId) {
}
}
}
//判断如果为岗位/角色，鼠标悬浮显示
if(objId=="post"){
$("input[objid='" + objId + "']").attr('title', shapeNames.join(","));
}
if(objId=="role"){
$("input[objid='" + objId + "']").attr('title', shapeNames.join(","));
}
$("input[objid='" + objId + "']").val(shapeNames.join(","));
$("input[objid_shapeId='" + objId + "']").val(shapeRelationValue.join(","));
$("input[objid_shapeId='" + objId + "']").attr('ref', JSON.stringify(ref));

15
com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.js
View File

@ -5,7 +5,7 @@ var selectedShapes = [];
var linkType; // 链接类型：custom：自定义链接；file：文件链接
$(document).ready(function() {
showPainting();
showByType();
setTimeout(function() {
Designer.hotkey.init();// 解决快捷健绑定不成功
DesignerCopyPaste.changeTitleListen();
@ -15,6 +15,19 @@ $(document).ready(function() {
}, 1000);
});
/**
* //制度的活动属性改为条款，表单去掉活动属性
*/
function showByType() {
if(methodId=="data.form"){
$("#processAttr").hide();
}else if(methodId=="control.policy"){
$("#processAttr").text("条款");
}
}
/**
* 兼容1024*768画布显示
*

16
com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.mobile.js
View File

@ -5,7 +5,7 @@ var selectedShapes = [];
var linkType; // 链接类型：custom：自定义链接；file：文件链接
$(document).ready(function() {
showPainting();
showByType();
setTimeout(function() {
Designer.hotkey.init();// 解决快捷健绑定不成功
DesignerCopyPaste.changeTitleListen();
@ -17,6 +17,20 @@ $(document).ready(function() {
//changeArributeByShape('portalAttrShow')
});
/**
* //制度的活动属性改为条款，表单去掉活动属性
*/
function showByType() {
if(methodId=="data.form"){
$("#processAttr").hide();
}else if(methodId=="control.policy"){
$("#processAttr").text("条款");
}
}
/**
* 兼容1024*768画布显示
*