动态展示工作流属性参数完成

activiti/src/main/resources/template/js/activitiCommon/processInstanceDetails.js

@@ -8,99 +8,23 @@ layui.config({
     winui.renderColor();
     var $ = layui.$,
         form = layui.form,
-        table = layui.table,
         flow = layui.flow;
-    
-    //流程详情
     var processInstanceId = parent.processInstanceId;
-    var taskType = parent.taskType;
-    
-    $("#activitiTitle").html(taskType);
-    
-    //时间线审批历史列表模板
+
+    // 时间线审批历史列表模板
 	var timeTreeApprovalHistory = $("#timeTreeApprovalHistory").html();
 	
-    var textTemplate = $("#textTemplate").html(),//文本展示
-    	enclosureTemplate = $("#enclosureTemplate").html(),//附件展示
-    	eichTextTemplate = $("#eichTextTemplate").html(),//富文本展示
-    	picTemplate = $("#picTemplate").html(),//图片展示
-    	tableTemplate = $("#tableTemplate").html(),//表格展示
-		voucherTemplate = $("#voucherTemplate").html();//凭证展示
-
     AjaxPostUtil.request({url: flowableBasePath + "queryBusinessData", params: {processInstanceId: processInstanceId}, type: 'json', method: 'POST', callback: function(json) {
-		console.log(json);
+		// 加载业务数据
 		dsFormUtil.initSequenceDataDetails('showForm', json.rows);
-		var jsonStr = "";//实体json对象
-		var str = "";
-		$.each(j.rows, function(i, item) {
-			//如果展示文本不为空，则展示展示文本
-			if (!isNull(item.text))
-				item.value = item.text;
-			jsonStr = {
-				bean: item
-			};
-			if(item.showType == 1){//文本展示
-				str = getDataUseHandlebars(textTemplate, jsonStr);
-			} else if (item.showType == 2){//附件展示
-				str = getDataUseHandlebars(enclosureTemplate, jsonStr);
-			} else if (item.showType == 3){//富文本展示
-				str = getDataUseHandlebars(eichTextTemplate, jsonStr);
-			} else if (item.showType == 4){//图片展示
-				var photoValue = [];
-				if (!isNull(jsonStr.bean.value)){
-					photoValue = item.value.split(",");
-				}
-				var rows = [];
-				$.each(photoValue, function(j, row){
-					rows.push({photoValue: row});
-				});
-				jsonStr.bean.photo = rows;
-				str = getDataUseHandlebars(picTemplate, jsonStr);
-			} else if (item.showType == 5){//表格展示
-				str = getDataUseHandlebars(tableTemplate, jsonStr);
-				var tableId = "messageTable" + item.orderBy;//表格id
-				var tableBoxId = "showTable" + item.orderBy;//表格外部div盒子id
-				$("#showForm").append(str);
-				$("#" + tableBoxId).html('<table id="' + tableId + '" lay-filter="' + tableId + '"></table>');
-				if(typeof item.headerTitle == 'object'){
-					item.headerTitle = JSON.stringify(item.headerTitle);
-				}
-				table.render({
-					id: tableId,
-					elem: "#" + tableId,
-					data: $.extend(true, [], getValJson(item.value, '', '')),
-					page: false,
-					cols: getValJson(item.headerTitle, '[', ']')
-				});
-				str = "";
-			} else if (item.showType == 6){//凭证展示
-				str = getDataUseHandlebars(voucherTemplate, jsonStr);
-				$("#showForm").append(str);
-				var boxId = "showVoucher" + item.orderBy;
-				// 初始化凭证
-				voucherUtil.initDataDetails(boxId, item.value);
-				str = "";
-			}else {
-				str = "";
-			}
-			$("#showForm").append(str);
-		});
-		//加载流程图片
+		// 加载流程图片
 		$("#processInstanceIdImg").attr("src", fileBasePath + 'images/upload/activiti/' + processInstanceId + ".png?cdnversion=" + Math.ceil(new Date()/3600000));
-		//加载审批历史
+		// 加载审批历史
 		inboxTimeTreeApprovalHistory();
 		matchingLanguage();
 	}});
 
-    function getValJson(val, startPrefix, endPrefix){
-    	if(typeof val == 'string'){
-    		val = startPrefix + val + endPrefix;
-			return JSON.parse(val);
-		}
-    	return val;
-	}
-
-	// 加载时间线审批历史
+	// 加载审批历史
 	function inboxTimeTreeApprovalHistory(){
 		flow.load({
 			elem: '#timeTreeApprovalHistoryList',

base-server/src/main/resources/template/js/processAttr/processAttrEdit.js

@@ -48,7 +48,6 @@ layui.config({
 						winui.window.msg('请选择表格属性.', {icon: 2, time: 2000});
 						return false;
 					}
-					console.log(tableDataList)
 					$.each(tableDataList, function (i, item) {
 						item.id = null;
 						item.className = childServiceClassName;

web/src/main/resources/template/assets/lib/layui/customer/skyeye/dsFormUtil.js

@@ -322,21 +322,14 @@ var dsFormUtil = {
             $("#" + customBoxId).append(str);
 
             if (item.showType == 5) { // 表格展示
-                var _js = `<script>
-                        layui.define(["jquery", 'table'], function(exports) {
-                            var jQuery = layui.jquery,
-                                table = layui.table;
-                            table.render({
-                                id: "messageTable${item.orderBy}",
-                                elem: "#messageTable${item.orderBy}",
-                                data: ` + JSON.stringify(item.displayValue) + `,
-                                page: false,
-                                cols: ` + JSON.stringify(dsFormUtil.getTableHead(item.attrTransformTableList)) + `
-                            });
-                        });
-                       </script>`;
-                console.log(_js)
-                $("#" + customBoxId).append(_js);
+                var table = layui.table;
+                table.render({
+                    id: "messageTable" + item.orderBy,
+                    elem: "#messageTable" + item.orderBy,
+                    data: item.displayValue,
+                    page: false,
+                    cols: dsFormUtil.getTableHead(item.attrTransformTableList)
+                });
             } else  if (item.showType == 6) { // 凭证展示
                 var boxId = "showVoucher" + item.orderBy;
                 // 初始化凭证
@@ -352,10 +345,11 @@ var dsFormUtil = {
                 field: item.attrKey,
                 title: item.label,
                 align: item.align,
-                width: item.width
+                width: item.width,
+                templet: null
             };
             if (!isNull(item.templet)) {
-                field['templet'] = item.templet;
+                field['templet'] = eval('(' + item.templet + ')');
             }
             header.push(field);
         });

web/src/main/resources/template/assets/lib/layui/lay/modules/timeaxis/timeaxis.css

+/*时间树,插件：flow*/
 @charset "utf-8";
 * {
 	margin: 0;
@@ -10,10 +11,6 @@ img {
 	border: 0
 }
 
-body {
-	font: 12px/180% Arial, Helvetica, sans-serif, "新宋体"
-}
-
 .demo {
 	width: 100%;
     margin: 15px auto 0;