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-07-17 18:16:00 +08:00
parent d958482768
commit 28f2dfb99c
1 changed files with 162 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -293,113 +293,118 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) {
for (var index = 0; index < attributesJsonArray.length; index++) { for (var index = 0; index < attributesJsonArray.length; index++) {
var obj = attributesJsonArray[index]; var obj = attributesJsonArray[index];
if (obj != null && obj != undefined && obj.value != undefined) { if (obj != null && obj != undefined && obj.value != undefined) {
var constr = '<tr>'; if(obj.name=="活动序号"){
/*constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';*/ break;
constr += '<td class="tableContent">' + obj.name +':'+ obj.value + '</td>'; }
constr += '</tr>'; var constr = '<tr>';
if ((!obj.readonly && obj.type == "string")
|| (!obj.readonly && obj.type == "list")) {
// 目前支持到文本的输入 ,需求定下了再改
constr = '<tr>';
/*constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';*/ /*constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';*/
constr += '<td id="' + shape.id + obj.id + '" class="tableContent">' + obj.name +':'+ obj.value + '</td>'; constr += '<td class="tableContent">' + obj.name + ':' + obj.value + '</td>';
constr += '</tr>';
} else if(!obj.readonly && obj.type == "link") {
constr = '<tr>';
/*constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';*/
// constr += '<td id="' + shape.id + obj.id + '" colspan="2" class="tableContent">' + obj.value + '</td>';
constr += '<td id="' + shape.id + obj.id + '" class="tableContent">' + obj.name +':'+ '<a href="' + obj.value + '" target="_blank">' + obj.value + '</a>' + '</td>';
constr += '</tr>';
} else if (!obj.readonly && obj.type == "number") {
constr = '<tr>';
/*constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';*/
constr += '<td id="' + shape.id + obj.id + '" class="tableContent">' + obj.name +':'+ obj.value + '</td>';
constr += '</tr>';
} else if (!obj.readonly && obj.type == "boolean") {
constr = '<tr>';
/*constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';*/
constr += '<td id="' + shape.id + obj.id + '" class="tableContent">'+ obj.name +':'+'</td>';
constr += '</tr>';
} else if (!obj.readonly && obj.type == "textarea") {
constr = '<tr>';
/*constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';*/
if (obj.value == undefined) {
obj.value = '';
}
constr += '<td id="' + shape.id + obj.id + '"class="tableContent">' + obj.name +':'+ obj.value.replace(/\n/g,'<br>') + '</td>';
constr += '</tr>';
} else if (obj.readonly && obj.type == "relation") {
var relationValue = "";
if(relationShapesData[shape.id] !==null && relationShapesData[shape.id][obj.id] != null) {
relationValue = relationShapesData[shape.id][obj.id];
}
constr = '<tr>';
/*constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';*/
constr += '<td id="' + shape.id + obj.id + '" class="tableContent">' + obj.name +':'+ relationValue + '</td>';
constr += '</tr>';
} else if (obj.type == "select" || obj.type == "select_m") {
constr = '<tr>';
/*constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';*/
constr += '<td id="' + shape.id + obj.id + '" class="tableContent">' + obj.name +':'+ obj.value + '</td>';
constr += '</tr>'; constr += '</tr>';
if ((!obj.readonly && obj.type == "string")
|| (!obj.readonly && obj.type == "list")) {
// 目前支持到文本的输入 ,需求定下了再改
constr = '<tr>';
/*constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';*/
constr += '<td id="' + shape.id + obj.id + '" class="tableContent">' + '【活动描述】' + obj.name + ':' + obj.value + '</td>';
constr += '</tr>';
} else if (!obj.readonly && obj.type == "link") {
constr = '<tr>';
/*constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';*/
// constr += '<td id="' + shape.id + obj.id + '" colspan="2" class="tableContent">' + obj.value + '</td>';
constr += '<td id="' + shape.id + obj.id + '" class="tableContent">' + '【活动描述】' + obj.name + ':' + '<a href="' + obj.value + '" target="_blank">' + obj.value + '</a>' + '</td>';
constr += '</tr>';
} else if (!obj.readonly && obj.type == "number") {
constr = '<tr>';
/*constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';*/
constr += '<td id="' + shape.id + obj.id + '" class="tableContent">' + '【活动描述】' + obj.name + ':' + obj.value + '</td>';
constr += '</tr>';
} else if (!obj.readonly && obj.type == "boolean") {
constr = '<tr>';
/*constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';*/
constr += '<td id="' + shape.id + obj.id + '" class="tableContent">' + '【活动描述】' + obj.name + ':' + '</td>';
constr += '</tr>';
} else if (!obj.readonly && obj.type == "textarea") {
constr = '<tr>';
/*constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';*/
if (obj.value == undefined) {
obj.value = '';
}
constr += '<td id="' + shape.id + obj.id + '"class="tableContent">' + '【活动描述】' + obj.name + ':' + obj.value.replace(/\n/g, '<br>') + '</td>';
constr += '</tr>';
} else if (obj.readonly && obj.type == "relation") {
var relationValue = "";
if (relationShapesData[shape.id] !== null && relationShapesData[shape.id][obj.id] != null) {
relationValue = relationShapesData[shape.id][obj.id];
}
constr = '<tr>';
/*constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';*/
constr += '<td id="' + shape.id + obj.id + '" class="tableContent">' + '【活动描述】' + obj.name + ':' + relationValue + '</td>';
constr += '</tr>';
} else if (obj.type == "select" || obj.type == "select_m") {
constr = '<tr>';
/*constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';*/
constr += '<td id="' + shape.id + obj.id + '" class="tableContent">' + '【活动描述】' + obj.name + ':' + obj.value + '</td>';
constr += '</tr>';
selectFlag = true; selectFlag = true;
var selectValue = { "objId" : obj.id, var selectValue = {
"objValue" : obj.value, "objId": obj.id,
"objType": obj.type}; "objValue": obj.value,
selectValues.push(selectValue); "objType": obj.type
}else if (obj.readonly && obj.type == "userAddress") { };
userAddress = true; selectValues.push(selectValue);
userObjIds.push(obj.id); } else if (obj.readonly && obj.type == "userAddress") {
var relationValue = ""; userAddress = true;
if(relationShapesData[shape.id] !==null && relationShapesData[shape.id][obj.id] != null) { userObjIds.push(obj.id);
relationValue = relationShapesData[shape.id][obj.id]; var relationValue = "";
if (relationShapesData[shape.id] !== null && relationShapesData[shape.id][obj.id] != null) {
relationValue = relationShapesData[shape.id][obj.id];
}
constr = '<tr>';
/*constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';*/
constr += '<td id="' + shape.id + obj.id + '" class="tableContent">' + '【活动描述】' + obj.name + ':' + relationValue + '</td>';
constr += '</tr>';
} else if (obj.readonly && obj.type == "deptAddress") {
deptAddress = true;
deptObjIds.push(obj.id);
deptIds += "," + obj.value;
var relationValue = "";
if (relationShapesData[shape.id] !== null && relationShapesData[shape.id][obj.id] != null) {
relationValue = relationShapesData[shape.id][obj.id];
}
constr = '<tr>';
/*constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';*/
constr += '<td id="' + shape.id + obj.id + '" class="tableContent">' + '【活动描述】' + obj.name + ':' + relationValue + '</td>';
constr += '</tr>';
} else if (obj.readonly && obj.type == "awsorg") {
var relationValue = "";
if (relationShapesData[shape.id] !== null && relationShapesData[shape.id][obj.id] != null) {
relationValue = relationShapesData[shape.id][obj.id];
}
constr = '<tr>';
/*constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';*/
constr += '<td id="' + shape.id + obj.id + '" class="tableContent">' + '【活动描述】' + obj.name + ':' + relationValue + '</td>';
constr += '</tr>';
} else if (obj.readonly && obj.type == "hidden") {
constr = '<tr ' + mouseout + mouseover + ' objid="' + obj.id + '" class="tagContentTableTr" style="display:none;">'
+ ' <td>' + obj.name + '</td>'
+ ' <td class="tagContentTableTrTd">'
+ ' <input objid="' + obj.id + '" class="attribute_input_css" name="attribute_name_input_' + obj.id + '" value="' + obj.value + '" scope="' + obj.groupPath + '" readonly="' + obj.readonly + '" />'
//+ '<div objid="' + obj.id + '" onclick="removeTrAttribute(this)" id= "ico_attribute_delete_"' + obj.id + ' class="ico_attribute_delete"></div>'
+ '</td></tr>';
} else if (obj.type == "table") {
let tableInput = '请输入'
if (obj.value.table.length > 1) {
tableInput = '请查看'
}
constr = '<tr>';
/*constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';*/
constr += '<td id="' + shape.id + obj.id + '" class="tableContent">' + '【活动描述】' + obj.name + ':' + '<span id="' + obj.id + ' " onclick="openDialog(' + JSON.stringify(obj.value).replace(/\"/g, "'") + ')"> ' + tableInput + '</span>' + '</td>';
constr += '</tr>';
} }
constr = '<tr>';
/*constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';*/
constr += '<td id="' + shape.id + obj.id + '" class="tableContent">' + obj.name +':'+ relationValue + '</td>';
constr += '</tr>';
} else if (obj.readonly && obj.type == "deptAddress") {
deptAddress = true;
deptObjIds.push(obj.id);
deptIds += "," + obj.value;
var relationValue = "";
if(relationShapesData[shape.id] !==null && relationShapesData[shape.id][obj.id] != null) {
relationValue = relationShapesData[shape.id][obj.id];
}
constr = '<tr>';
/*constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';*/
constr += '<td id="' + shape.id + obj.id + '" class="tableContent">' + obj.name +':'+ relationValue + '</td>';
constr += '</tr>';
} else if (obj.readonly && obj.type == "awsorg") {
var relationValue = "";
if(relationShapesData[shape.id] !==null && relationShapesData[shape.id][obj.id] != null) {
relationValue = relationShapesData[shape.id][obj.id];
}
constr = '<tr>';
/*constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';*/
constr += '<td id="' + shape.id + obj.id + '" class="tableContent">' + obj.name +':'+ relationValue + '</td>';
constr += '</tr>';
} else if (obj.readonly && obj.type == "hidden") {
constr = '<tr ' + mouseout + mouseover + ' objid="' + obj.id + '" class="tagContentTableTr" style="display:none;">'
+ ' <td>' + obj.name + '</td>'
+ ' <td class="tagContentTableTrTd">'
+ ' <input objid="' + obj.id + '" class="attribute_input_css" name="attribute_name_input_' + obj.id + '" value="'+obj.value +'" scope="' + obj.groupPath + '" readonly="'+obj.readonly+'" />'
//+ '<div objid="' + obj.id + '" onclick="removeTrAttribute(this)" id= "ico_attribute_delete_"' + obj.id + ' class="ico_attribute_delete"></div>'
+ '</td></tr>';
} else if (obj.type == "table") {
let tableInput = '请输入'
if(obj.value.table.length > 1) {
tableInput = '请查看'
}
constr = '<tr>';
/*constr += '<td style="padding-left:20px;" class="tableContent">' + obj.name + '</td>';*/
constr += '<td id="' + shape.id + obj.id + '" class="tableContent">' + obj.name +':'+ '<span id="'+ obj.id +' " onclick="openDialog(' + JSON.stringify(obj.value).replace(/\"/g,"'") +')"> ' + tableInput + '</span>' + '</td>';
constr += '</tr>';
} }
$('#' + tbodyId + ' table[name=' + shape.id + ']').append(constr); $('#' + tbodyId + ' table[name=' + shape.id + ']').append(constr);
} }
}
if (selectFlag) { if (selectFlag) {
getSelectOptions(shape.category, selectValues); //处理select类型 getSelectOptions(shape.category, selectValues); //处理select类型
} }
@ -1657,14 +1662,14 @@ function sortModelByNumber() {
// 序号升序，无序号在后面 // 序号升序，无序号在后面
var recordId = []; var recordId = [];
var hasNumArr = []; var hasNumArr = [];
for (var shapeId in Model.define.elements) { /*for (var shapeId in Model.define.elements) {
var shape = Model.define.elements[shapeId]; var shape = Model.define.elements[shapeId];
for (var i = 0; i < shape.dataAttributes.length; i++) { for (var i = 0; i < shape.dataAttributes.length; i++) {
var attrArr = shape.dataAttributes[i]; var attrArr = shape.dataAttributes[i];
if (attrArr.attributesJsonArray && attrArr.attributesJsonArray.length > 0) { if (attrArr.attributesJsonArray && attrArr.attributesJsonArray.length > 0) {
for (var j = 0; j < attrArr.attributesJsonArray.length; j++) { for (var j = 0; j < attrArr.attributesJsonArray.length; j++) {
var attr = attrArr.attributesJsonArray[j]; var attr = attrArr.attributesJsonArray[j];
/*if (attr != null && attr.id && attr.id == 'number') { if (attr != null && attr.id && attr.id == 'number') {
var number = attr.value; var number = attr.value;
if(typeof number == 'string') { if(typeof number == 'string') {
number = number.replace(/^\s+|\s+$/g,"") number = number.replace(/^\s+|\s+$/g,"")
@ -1678,33 +1683,52 @@ function sortModelByNumber() {
recordId.push(shapeId); recordId.push(shapeId);
} }
break; break;
}*/
//根据活动序号排序
if (attr != null && attr.id) {
var number = attr.value;
if(attr.id=="activity_number"){
if(typeof number == 'string') {
number = number.replace(/^\s+|\s+$/g,"")
};
if(number != undefined && number != null && number != "") {
var obj = {};
obj.text = shape.text;
obj.id = shapeId;
obj.orderIndex = number;
hasNumArr.push(obj);
recordId.push(shapeId);
}
}
break;
} }
} }
break; break;
} }
} }
}*/
/*******************************排序方法重构***by zhaolei**********************************************/
for (var shapeId in Model.define.elements) {
var shape = Model.define.elements[shapeId];
for (var i = 0; i < shape.dataAttributes.length; i++) {
var attrArr = shape.dataAttributes[i];
if (attrArr.attributesJsonArray && attrArr.attributesJsonArray.length > 0) {
for (var j = 0; j < attrArr.attributesJsonArray.length; j++) {
var attr = attrArr.attributesJsonArray[j];
//根据活动序号排序
if (attr != null && attr.id) {
if(attr.id=="activity_number"){
var number = attr.value;
var subNumer=number< 10 ? number.substr(1,1) : number;
if(typeof subNumer == 'string') {
subNumer = subNumer.replace(/^\s+|\s+$/g,"")
};
if(subNumer != undefined && subNumer != null && subNumer != "") {
var obj = {};
obj.text = shape.text;
obj.id = shapeId;
obj.orderIndex = subNumer;
hasNumArr.push(obj);
recordId.push(shapeId);
}
}
}
}
}
}
} }
// 有序号的元素升序排序 // 有序号的元素升序排序
var compare = function (obj1, obj2) { var compare = function (obj1, obj2) {
var val1 = obj1.orderIndex; var val1 = obj1.orderIndex;
@ -1717,14 +1741,17 @@ function sortModelByNumber() {
return 0; return 0;
} }
} }
hasNumArr.sort(compare); hasNumArr.sort(compare);
for (var shapeId in Model.define.elements) { /*for (var shapeId in Model.define.elements) {
if($.inArray(shapeId, recordId) == -1) { if($.inArray(shapeId, recordId) == -1) {
var obj = {}; var obj = {};
obj.id = shapeId; obj.id = shapeId;
hasNumArr.push(obj); hasNumArr.push(obj);
} }
} }*/
return hasNumArr; return hasNumArr;
} }
@ -1780,7 +1807,7 @@ function initShapeAttribute(obj) {
} }
//流程阅览只显示线上审批、线下审批、系统任务、人工审批 //流程阅览只显示线上审批、线下审批、系统任务、人工审批
if(shape.title=="线上审批" || shape.title=="线下审批" || shape.title=="系统任务" ||shape.title=="人工审批") { if(shape.title=="线上审批" || shape.title=="线下审批" || shape.title=="系统任务" ||shape.title=="人工任务") {
var no = ""; var no = "";
for (var i = 0; i < attributesJsonArrayT.length; i++) { for (var i = 0; i < attributesJsonArrayT.length; i++) {
@ -1791,16 +1818,14 @@ function initShapeAttribute(obj) {
no = numberValue; no = numberValue;
} }
} }
} }
var novalue=no+"."+shape.text;
var t = ''; var t = '';
t += '<div class="task-box">' t += '<div class="task-box">';
/*t += '<button type="button" class="awsui-btn awsui-btn-blue awsui-btn-sm" onclick="searchChange(\''+shape.id+'\')">'; t += '<span id="span' + shape.id + '">';
t +='<i class="awsui-iconfont" id="searchChange'+shape.id+'">&#xe718;</i>'; t += '</span>';
t += '</button>';*/ t += '<i class="awsui-iconfont newadd_up" id="searchChange' + shape.id + '" onclick="searchChange(\'' + shape.id + '\',\''+novalue+'\')">&#xe718;</i>';
t += '<i class="awsui-iconfont newadd_up" id="searchChange' + shape.id + '" onclick="searchChange(\'' + shape.id + '\')">&#xe718;</i>';
t += '<input type="hidden" name="searchChangeFlg" id="searchChangeFlg' + shape.id + '" value="0" />'; t += '<input type="hidden" name="searchChangeFlg" id="searchChangeFlg' + shape.id + '" value="0" />';
t += '<table class="awsui-table awsui-table-bordered" name="' + shape.id + '" id="' + shape.id + 'change" >'; t += '<table class="awsui-table awsui-table-bordered" name="' + shape.id + '" id="' + shape.id + 'change" >';
t += '<tr name="trHeader">'; t += '<tr name="trHeader">';
@ -1837,16 +1862,19 @@ function initShapeAttribute(obj) {
} }
} }
function searchChange(id) { function searchChange(id,text) {
debugger;
if (document.getElementById("searchChangeFlg"+id).value == "1") { if (document.getElementById("searchChangeFlg"+id).value == "1") {
document.getElementById(id+"change").style.display=""; document.getElementById(id+"change").style.display="";
document.getElementById("searchChange"+id).innerHTML = "&#xe718;"; document.getElementById("searchChange"+id).innerHTML = "&#xe718;";
document.getElementById("searchChangeFlg"+id).value = "0"; document.getElementById("searchChangeFlg"+id).value = "0";
document.getElementById("span"+id).innerHTML="";
} else { } else {
document.getElementById(id+"change").style.display="none"; document.getElementById(id+"change").style.display="none";
document.getElementById("searchChange"+id).innerHTML = "&#xe716;"; document.getElementById("searchChange"+id).innerHTML = "&#xe716;";
document.getElementById("searchChangeFlg"+id).value = "1"; document.getElementById("searchChangeFlg"+id).value = "1";
document.getElementById("span"+id).innerHTML=text;
} }
} }