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

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 += '<td id="' + shape.id + obj.id + '"  class="tableContent">' + '【' + obj.name  +'】'+'&nbsp;'+ relationValue + '</td>';
 					constr += '</tr>';
 				} 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;">'
 						+ '	<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 + '"  />'
@@ -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 += '<table  class="awsui-table">';
@@ -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 += '<div class="task-box">';
@@ -1837,7 +1836,7 @@ function initShapeAttribute(obj) {
 				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 += '<tr name="trHeader">';
-				t += '<td class="tableHeader" >' +no+"."+shape.text + '</td>';
+				t += '<td class="tableHeader" >' +no+"."+shape.text +'</td>';
 				t += '</tr>';
 				t += '<tr>';
 				/*t += '<td style="padding-left:20px;" class="tableContent"></td>';*/
@@ -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;
+		}
 	}
 }