From 0680923052b313f3d3c7ca8ae9d649d5ff6fbeb3 Mon Sep 17 00:00:00 2001 From: zhal <15900249928@163.com> Date: Tue, 19 Jul 2022 19:09:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E9=98=85=E8=A7=88=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=B1=9E=E6=80=A7=E9=9A=90=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../js/designer.extend.link.view.portal.js | 41 ++++++++++++++----- 1 file changed, 31 insertions(+), 10 deletions(-) diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.js b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.js index 3a08288b..acaa6ddb 100755 --- a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.js +++ b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.js @@ -251,7 +251,7 @@ function showRelevanceShapesContent() { } function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) { - debugger; + // 属性排序 var defaultMoreAttr = $('#defaultMoreAttrSort').val(); if(defaultMoreAttr.length > 0) { @@ -387,7 +387,7 @@ function getPrivateAttributeHtml(attributesJsonArray, tbodyId, shape) { constr += '' + '【' + obj.name +'】'+' '+ relationValue + ''; constr += ''; } else if (obj.readonly && obj.type == "hidden") { - constr = '' + constr = '' + ' ' + obj.name + '' + ' ' + ' ' @@ -1535,6 +1535,7 @@ function dockShowView(name) { // 点击页面时变更显示内容 function changeArributeByShape() { + if(!isClickTab) { autoClickAttr(); } @@ -1544,7 +1545,7 @@ function changeArributeByShape() { if (Utils.getSelected()[0] == null) { initShapeAttribute('0'); initUpfileData('0'); - cc(); + ProcessManual(); $('table[name=lastTable]').remove(); if($('#portalAttrDock').children('table').length > 0) { // $('#portalAttrDock').append(lastTable); @@ -1567,7 +1568,7 @@ function changeArributeByShape() { } } -function cc() { +function ProcessManual() { $('#processFileDock').empty(); var t = ''; t += ''; @@ -1665,7 +1666,7 @@ function readFile(uuid) { } function sortModelByNumber() { - debugger; + // 序号升序,无序号在后面 var recordId = []; var hasNumArr = []; @@ -1767,7 +1768,7 @@ function sortModelByNumber() { // 初始化流程步骤说明 function initShapeAttribute(obj) { - debugger; + if (obj == undefined || obj == '0') { $('#portalAttrDock').empty(); var elements = Model.define.elements; @@ -1809,14 +1810,13 @@ function initShapeAttribute(obj) { var newAttrArray = []; newAttrArray = tempAttrArray.concat(attributesJsonArrayT).filter(function(v, i, arr) { return arr.indexOf(v) === arr.lastIndexOf(v); - });; + }); attributesJsonArrayT = tempAttrArray.concat(newAttrArray); } } //流程阅览只显示线上审批、线下审批、系统任务、人工审批 if(shape.title=="线上审批" || shape.title=="线下审批" || shape.title=="系统任务" ||shape.title=="人工任务") { - var no = ""; for (var i = 0; i < attributesJsonArrayT.length; i++) { var id = attributesJsonArrayT[i].id; @@ -1827,7 +1827,6 @@ function initShapeAttribute(obj) { } } } - var novalue=no+"."+shape.text; var t = ''; t += '
'; @@ -1837,7 +1836,7 @@ function initShapeAttribute(obj) { t += ''; t += '
'; t += ''; - t += ''; + t += ''; t += ''; t += ''; /*t += '';*/ @@ -1867,6 +1866,28 @@ function initShapeAttribute(obj) { } else { $('#portalAttrDock table').hide(); $('#portalAttrDock table[name=' + obj + ']').show(); + var elements = Model.define.elements; + var sortNumShapeArr = sortModelByNumber(); + for(var sortIndex = 0; sortIndex < sortNumShapeArr.length; sortIndex++) { + var temp = sortNumShapeArr[sortIndex]; + var shape = elements[temp.id]; + if(obj==shape.id){ + continue; + } + var no = ""; + var array=shape.attributesJsonArray; + for (var i = 0; i < array.length; i++) { + var id = array[i].id; + if (id == "activity_number") { + var numberValue = array[i].value; + if (numberValue != "") { + no = numberValue; + } + } + } + + document.getElementById("span"+shape.id).innerHTML=no+"."+shape.text; + } } }
' +no+"."+shape.text + '' +no+"."+shape.text +'