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

Merge remote-tracking branch 'origin/apps_dev' into apps_dev

Browse Source
This commit is contained in:
3120626891@qq.com 2022-07-18 14:55:00 +08:00
commit 0d7dabea15
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -305,23 +305,23 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) {
// 目前支持到文本的输入 ,需求定下了再改 // 目前支持到文本的输入 ,需求定下了再改
constr = '<tr>'; 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 id="' + shape.id + obj.id + '" class="tableContent">' + '【' + obj.name + '】'+':' + obj.value + '</td>';
constr += '</tr>'; constr += '</tr>';
} else if (!obj.readonly && obj.type == "link") { } else if (!obj.readonly && obj.type == "link") {
constr = '<tr>'; 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 + '" colspan="2" class="tableContent">' + obj.value + '</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 += '<td id="' + shape.id + obj.id + '" class="tableContent">' + '【' + obj.name + '】'+':' + '<a href="' + obj.value + '" target="_blank">' + obj.value + '</a>' + '</td>';
constr += '</tr>'; constr += '</tr>';
} else if (!obj.readonly && obj.type == "number") { } else if (!obj.readonly && obj.type == "number") {
constr = '<tr>'; 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 id="' + shape.id + obj.id + '" class="tableContent">' + '【' + obj.name + '】'+':' + obj.value + '</td>';
constr += '</tr>'; constr += '</tr>';
} else if (!obj.readonly && obj.type == "boolean") { } else if (!obj.readonly && obj.type == "boolean") {
constr = '<tr>'; 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 + ':' + '</td>'; constr += '<td id="' + shape.id + obj.id + '" class="tableContent">' + '【' + obj.name + '】'+ ':' + '</td>';
constr += '</tr>'; constr += '</tr>';
} else if (!obj.readonly && obj.type == "textarea") { } else if (!obj.readonly && obj.type == "textarea") {
constr = '<tr>'; constr = '<tr>';
@ -329,7 +329,7 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) {
if (obj.value == undefined) { if (obj.value == undefined) {
obj.value = ''; obj.value = '';
} }
constr += '<td id="' + shape.id + obj.id + '"class="tableContent">' + '【活动描述】' + obj.name + ':' + obj.value.replace(/\n/g, '<br>') + '</td>'; constr += '<td id="' + shape.id + obj.id + '"class="tableContent">' + '【' + obj.name + '】'+ ':' + obj.value.replace(/\n/g, '<br>') + '</td>';
constr += '</tr>'; constr += '</tr>';
} else if (obj.readonly && obj.type == "relation") { } else if (obj.readonly && obj.type == "relation") {
var relationValue = ""; var relationValue = "";
@ -338,12 +338,12 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) {
} }
constr = '<tr>'; 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 + ':' + relationValue + '</td>'; constr += '<td id="' + shape.id + obj.id + '" class="tableContent">' + '【' + obj.name + '】'+ ':' + relationValue + '</td>';
constr += '</tr>'; constr += '</tr>';
} else if (obj.type == "select" || obj.type == "select_m") { } else if (obj.type == "select" || obj.type == "select_m") {
constr = '<tr>'; 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 id="' + shape.id + obj.id + '" class="tableContent">' + '【' + obj.name + '】'+ ':' + obj.value + '</td>';
constr += '</tr>'; constr += '</tr>';
selectFlag = true; selectFlag = true;
@ -362,7 +362,7 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) {
} }
constr = '<tr>'; 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 + ':' + relationValue + '</td>'; constr += '<td id="' + shape.id + obj.id + '" class="tableContent">' + '【' + obj.name +'】'+ ':' + relationValue + '</td>';
constr += '</tr>'; constr += '</tr>';
} else if (obj.readonly && obj.type == "deptAddress") { } else if (obj.readonly && obj.type == "deptAddress") {
deptAddress = true; deptAddress = true;
@ -374,7 +374,7 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) {
} }
constr = '<tr>'; 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 + ':' + relationValue + '</td>'; constr += '<td id="' + shape.id + obj.id + '" class="tableContent">' + '【' + obj.name +'】'+ ':' + relationValue + '</td>';
constr += '</tr>'; constr += '</tr>';
} else if (obj.readonly && obj.type == "awsorg") { } else if (obj.readonly && obj.type == "awsorg") {
var relationValue = ""; var relationValue = "";
@ -383,7 +383,7 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) {
} }
constr = '<tr>'; 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 + ':' + relationValue + '</td>'; constr += '<td id="' + shape.id + obj.id + '" class="tableContent">' + '【' + obj.name +'】'+ ':' + relationValue + '</td>';
constr += '</tr>'; constr += '</tr>';
} else if (obj.readonly && obj.type == "hidden") { } else if (obj.readonly && obj.type == "hidden") {
constr = '<tr ' + mouseout + mouseover + ' objid="' + obj.id + '" class="tagContentTableTr" style="display:none;">' constr = '<tr ' + mouseout + mouseover + ' objid="' + obj.id + '" class="tagContentTableTr" style="display:none;">'
@ -399,7 +399,7 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) {
} }
constr = '<tr>'; 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 + ':' + '<span id="' + obj.id + ' " onclick="openDialog(' + JSON.stringify(obj.value).replace(/\"/g, "'") + ')"> ' + tableInput + '</span>' + '</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>';
} }
} }
@ -1457,7 +1457,7 @@ function initProcessDesc() {
for(var i = 1; i <= length; i++) { for(var i = 1; i <= length; i++) {
var obj = processDesc[i]; var obj = processDesc[i];
t += '<tr><td>'; t += '<tr><td>';
t += '<div class="tableContent">' +'【流程属性】'+ obj.name + '：</div>'; t += '<div class="tableContent">' + "【"+obj.name +"】"+ '：</div>';
var value = obj.value; var value = obj.value;
if (value == undefined) { if (value == undefined) {
value = ''; value = '';