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

com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java

@@ -192,18 +192,16 @@ public class Report1Gener {
 		PALRepositoryModel repositoryModel = PALRepositoryQueryAPIManager.getInstance().queryPalRepositoryModelByPalId(repositoryId);
 
 		//流程绩效
+		dataMap.put("pl_Name_process_performance_indicator", "");
+		dataMap.put("pl_set_the_purpose", "");
+		dataMap.put("pl_Index_definition", "");
+		dataMap.put("pl_computational_formula", "");
+		dataMap.put("pl_data_sources", "");
+		dataMap.put("pl_unit_measurement", "");
+		dataMap.put("pl_statistical_period", "");
+		dataMap.put("pl_explain", "");
 		List<DesignerShapeRelationModel> metrics = DesignerShapeRelationCache.getListByAttrId(repositoryModel.getId(), "", "Process_performance_metrics");
-		if (metrics.size() == 0) {
+		if (metrics.size() != 0) {
-			dataMap.put("pl_Name_process_performance_indicator", "");
-			dataMap.put("pl_set_the_purpose", "");
-			dataMap.put("pl_Index_definition", "");
-			dataMap.put("pl_computational_formula", "");
-			dataMap.put("pl_data_sources", "");
-			dataMap.put("pl_unit_measurement", "");
-			dataMap.put("pl_statistical_period", "");
-			dataMap.put("pl_explain", "");
-
-		}else {
 			for (DesignerShapeRelationModel relation : metrics) {
 				String relationFileId = relation.getRelationFileId();// 支持或相关文件的ID
 				String relationShapeId = relation.getRelationShapeId();//实例ID
@@ -285,15 +283,47 @@ public class Report1Gener {
 				file.mkdir();
 			}
 		}
+
+		//文件属性附件处理
+		int fileIndex = 1;
+		if (search != null && search.size() > 0) {
+			// 复制附件
+			for (UpfileModel upfileModel : search) {
+				if (!"f".equals(upfileModel.getType())) {// 文件
+					continue;
+				}
+				// 复制doccenter下的文件
+				DCContext dcContext = null;
+				DCPluginProfile dcProfile = DCProfileManager.getDCProfile(CoEConstant.APP_ID, CoeFileConstant.COE_UPFILE);
+				if (dcProfile != null) {
+					dcContext = new DCContext(userContext, dcProfile, CoEConstant.APP_ID, "file", upfileModel.getPl_uuid(), upfileModel.getFileName());
+				}
+				File sourceFile = new UtilFile(dcContext.getFilePath());
+				File targetFile = new UtilFile(file.toString() + File.separator + dcContext.getFileName());
+				try {
+					UtilFile.copyFile(sourceFile, targetFile);
+				} catch (Exception e) {
+					System.out.println(e);
+					e.printStackTrace();
+				}
+				JSONObject object = new JSONObject();
+				object.put("file_name", fileIndex + "." + upfileModel.getFileName());
+				String link = fileName + File.separator + upfileModel.getFileName();
+				object.put("link", link);
+				fileTable.add(object);
+				fileIndex++;
+			}
+		}
+		//流程说明
 		if (repositoryFileElements != null) {
 			int index = 1;// 流程步骤序号
 			int dangerIndex = 1;// 风险序号
 			int regulateIndex = 1;// 控制序号
 			for (Map<String, Object> shape : repositoryFileElements) {
 				//如果图形元素不是流程步骤，不导出该元素
-				if (PrReportComment.PROCESS_STEP.indexOf((String)shape.get("type")) == -1 && "method_approval_node,method_service_node,method_manual_node".indexOf((String)shape.get("type")) == -1) {
+//				if (PrReportComment.PROCESS_STEP.indexOf((String)shape.get("type")) == -1 && "method_approval_node,method_service_node,method_manual_node".indexOf((String)shape.get("type")) == -1) {
-					continue;
+//					continue;
-				}
+//				}
 				JSONObject _tr = new JSONObject();
 				OutputWordUtil.setShapeDefaultValue2(repositoryId, _tr);	//设置默认值
 				_tr.put(OutputWordUtil.SERIAL_NUMBER, index);	//序号
@@ -333,10 +363,11 @@ public class Report1Gener {
 							e.printStackTrace();
 						}
 						JSONObject object = new JSONObject();
-						object.put("shape_file_name", upfileModel.getFileName());
+						object.put("shape_file_name", fileIndex+"."+upfileModel.getFileName());
 						String link = fileName + File.separator + upfileModel.getFileName();
 						object.put("shape_file_link", link);
 						shapeFileTable.add(object);
+						fileIndex++;
 					}
 				}
 				if(shapeFileTable.size() == 0) {// 没有附件时给空值，不然使用office打开会解析错误
@@ -385,36 +416,6 @@ public class Report1Gener {
 		// 流程步骤的指标表格
 		setTableValueOfKPI("kpi", repositoryId, KPITable, relationFileMap);
 
-		if (search != null && search.size() > 0) {
-			// 复制附件
-			int index = 1;
-			for (UpfileModel upfileModel : search) {
-				if (!"f".equals(upfileModel.getType())) {// 文件
-					continue;
-				}
-				// 复制doccenter下的文件
-				DCContext dcContext = null;
-				DCPluginProfile dcProfile = DCProfileManager.getDCProfile(CoEConstant.APP_ID, CoeFileConstant.COE_UPFILE);
-				if (dcProfile != null) {
-					dcContext = new DCContext(userContext, dcProfile, CoEConstant.APP_ID, "file", upfileModel.getPl_uuid(), upfileModel.getFileName());
-				}
-				File sourceFile = new UtilFile(dcContext.getFilePath());
-				File targetFile = new UtilFile(file.toString() + File.separator + dcContext.getFileName());
-				try {
-					UtilFile.copyFile(sourceFile, targetFile);
-				} catch (Exception e) {
-					System.out.println(e);
-					e.printStackTrace();
-				}
-				JSONObject object = new JSONObject();
-				object.put("file_name", index + "." + upfileModel.getFileName());
-				String link = fileName + File.separator + upfileModel.getFileName();
-				object.put("link", link);
-				fileTable.add(object);
-				index++;
-			}
-		}
-
 		JSONArray termTable = new JSONArray(); //术语定义Table
 		// 属性特征 属性代码KEY
 		PALRepositoryPropertyModel term = PALRepositoryPropertyCache.getPropertyByPropertyId(repositoryModel.getId(),"term");
@@ -548,7 +549,7 @@ public class Report1Gener {
 		dataMap.put(OutputWordUtil.TABLE_REPOSITORY_SHAPE, repositoryShapeTable);
 		dataMap.put("TABLE_REPOSITORY_SHAPE_COUNT", repositoryShapeTable.size());
 		dataMap.put("file_table", fileTable);
-		dataMap.put("file_table_count", fileTable.size());
+		dataMap.put("file_table_count", fileIndex);
 		dataMap.put(OutputWordUtil.TABLE_DANGER, dangerTable);
 		dataMap.put(OutputWordUtil.TABLE_REGULATE, regulateTable);
 		dataMap.put(OutputWordUtil.TABLE_KPI, KPITable);

com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report2/Report2Gener.java

@@ -1,22 +1,37 @@
 package com.actionsoft.apps.coe.pal.output.pr.report2;
 
+import java.io.File;
 import java.util.*;
 
+import com.actionsoft.apps.coe.pal.constant.CoEConstant;
 import com.actionsoft.apps.coe.pal.output.pr.util.PrReportComment;
+import com.actionsoft.apps.coe.pal.output.pr.util.ReportRepositoryCompare;
 import com.actionsoft.apps.coe.pal.pal.output.extend.GenerLogExd;
 import com.actionsoft.apps.coe.pal.pal.output.extend.OutputAppManager;
 import com.actionsoft.apps.coe.pal.pal.output.extend.OutputAppProfile;
 import com.actionsoft.apps.coe.pal.pal.output.model.OutputTaskModel;
 import com.actionsoft.apps.coe.pal.pal.output.util.OutputExcelUtil;
 import com.actionsoft.apps.coe.pal.pal.output.util.OutputWordUtil;
+import com.actionsoft.apps.coe.pal.pal.repository.PALRepositoryQueryAPIManager;
 import com.actionsoft.apps.coe.pal.pal.repository.cache.PALRepositoryCache;
 import com.actionsoft.apps.coe.pal.pal.repository.cache.PALRepositoryPropertyCache;
+import com.actionsoft.apps.coe.pal.pal.repository.designer.relation.cache.DesignerShapeRelationCache;
 import com.actionsoft.apps.coe.pal.pal.repository.designer.relation.dao.DesignerShapeRelationDao;
 import com.actionsoft.apps.coe.pal.pal.repository.designer.relation.model.DesignerShapeRelationModel;
 import com.actionsoft.apps.coe.pal.pal.repository.designer.util.CoeDesignerUtil;
 import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryModel;
 import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryPropertyModel;
+import com.actionsoft.apps.coe.pal.pal.repository.upfile.constant.CoeFileConstant;
+import com.actionsoft.apps.coe.pal.pal.repository.upfile.dao.UpFileDao;
+import com.actionsoft.apps.coe.pal.pal.repository.upfile.model.UpfileModel;
 import com.actionsoft.apps.coe.pal.system.property.CoePropertyUtil;
+import com.actionsoft.apps.coe.pal.util.HighSecurityUtil;
+import com.actionsoft.apps.resource.plugin.profile.DCPluginProfile;
+import com.actionsoft.bpms.server.DispatcherRequest;
+import com.actionsoft.bpms.server.UserContext;
+import com.actionsoft.bpms.server.fs.dc.DCProfileManager;
+import com.actionsoft.bpms.util.UtilFile;
+import com.actionsoft.bpms.util.UtilString;
 import com.actionsoft.sdk.local.SDK;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -38,6 +53,7 @@ public class Report2Gener {
 	// 防止生成过程中，停用或卸载该app
 	public static boolean isRunning = false;
 	public static final Object _lock = new Object();
+	private UserContext userContext = null;
 	GenerLogExd log = new GenerLogExd();
 	public Report2Gener() {
 	}
@@ -57,6 +73,7 @@ public class Report2Gener {
 		try {
 			synchronized (_lock) {
 				isRunning = true;
+				userContext = DispatcherRequest.getUserContext();
 				String teamId = model.getTeamId();
 				String wsId = model.getWsId();
 				log.info("execute ready...");
@@ -68,7 +85,7 @@ public class Report2Gener {
 				// ----预处理、校验----
 				OutputAppProfile appModel = OutputAppManager.getProfile(model.getProfileId());
 				String tempPath = appModel.getAppContext().getPath();
-				String tempName = "步骤竖表-流程手册.xml";
+				String tempName = "步骤竖表-流程手册2.xml";
 				log.info("begin...");
 				log.info("-------------------");
 				// ----文件处理-----
@@ -120,18 +137,21 @@ public class Report2Gener {
 					reportNameValue = reportNameValue.substring(0, 255);
 				}
 				String docName = "";
+				String fileName = "";
 				if (indexMap.containsKey(reportNameValue)) {
 					int index = indexMap.get(reportNameValue);
 					index++;
-					log.info("得到word名称为:" + reportNameValue + "(" + index + ")");
+					fileName = reportNameValue + "(" + index + ")";
-					docName = docPath + reportNameValue + "(" + index + ")" + ".doc";
+					log.info("得到word名称为:" + fileName);
+					docName = docPath + fileName + ".doc";
 					indexMap.put(reportNameValue, index);
 				} else {
-					log.info("得到word名称为:" + reportNameValue);
+					fileName = reportNameValue;
-					docName = docPath + reportNameValue + ".doc";
+					log.info("得到word名称为:" + fileName);
-					indexMap.put(reportNameValue, 1);
+					docName = docPath + fileName + ".doc";
+					indexMap.put(fileName, 1);
 				}
-				JSONObject dataMap = getData(repositoryId, wizardJsonData);
+				JSONObject dataMap = getData(repositoryId, wizardJsonData, docPath, fileName);
 				if (dataMap != null) {
 					OutputWordUtil.createDoc(dataMap, tempPath, tempName, docName);
 				}
@@ -139,135 +159,382 @@ public class Report2Gener {
 		}
 	}
 
-	private JSONObject getData(String repositoryId, JSONObject wizardJsonData) {
+	private JSONObject getData(String repositoryId, JSONObject wizardJsonData, String docPath, String fileName) {
 		JSONObject dataMap = new JSONObject();
 		boolean raciRelationType = SDK.getAppAPI().getPropertyBooleanValue("com.actionsoft.apps.coe.pal.output.pr", "DETY_POSITION_ROLE_RELATION_TYPE", false);
 
-		dataMap.put("organizationType1", "涉及部门");
+		// 记录关联属性的流程节点，防止多次查询重复文件信息耗费时间
-		dataMap.put("organizationType2", "涉及岗位\\角色");
+		Set<String> relationFileIds = new HashSet<>();
+		Map<String, Map<String, Object>> relationFileMap = new HashMap<>();
+
 		PrReportComment prReportComment = new PrReportComment();
-		PALRepositoryModel repositoryModel = PALRepositoryCache.getCache().get(repositoryId);
+		PALRepositoryModel repositoryModel = PALRepositoryQueryAPIManager.getInstance().queryPalRepositoryModelByPalId(repositoryId);
+
+		//流程绩效
+		dataMap.put("pl_Name_process_performance_indicator", "");
+		dataMap.put("pl_set_the_purpose", "");
+		dataMap.put("pl_Index_definition", "");
+		dataMap.put("pl_computational_formula", "");
+		dataMap.put("pl_data_sources", "");
+		dataMap.put("pl_unit_measurement", "");
+		dataMap.put("pl_statistical_period", "");
+		dataMap.put("pl_explain", "");
+		List<DesignerShapeRelationModel> metrics = DesignerShapeRelationCache.getListByAttrId(repositoryModel.getId(), "", "Process_performance_metrics");
+		if (metrics.size() != 0) {
+			for (DesignerShapeRelationModel relation : metrics) {
+				String relationFileId = relation.getRelationFileId();// 支持或相关文件的ID
+				String relationShapeId = relation.getRelationShapeId();//实例ID
+				//System.out.println(relationFileId + "/" + relationShapeId);//输出响应ID
+				List<Map<String, Object>> relations = CoeDesignerUtil.getShapeMessageJson4(relationFileId); //流程文件内容
+				for (Map<String, Object> entry : relations) {
+					Object attributes = entry.get("attributes");
+					String resultJson = attributes.toString();
+					JSONArray object= JSONArray.parseArray(resultJson);
+					for(int i=0; i<object.size(); i++) {
+						String key = object.getJSONObject(i).getString("key");
+						//if (key.equals("explain") || key.equals("statistical_period") || key.equals("unit_measurement") || key.equals("data_sources") || key.equals("computational_formula") || key.equals("Index_definition") || key.equals("objective") || key.equals("Name_process_performance_indicator")) {
+						if (key.equals("Name_process_performance_indicator")){//指标名称      Name_process_performance_indicator
+							String value = object.getJSONObject(i).getString("value");
+							dataMap.put("pl_Name_process_performance_indicator", value);
+						}else if (key.equals("set_the_purpose")){//设置目的      set_the_purpose
+							String value = object.getJSONObject(i).getString("value");
+							dataMap.put("pl_set_the_purpose", value);
+						}else if (key.equals("Index_definition")){//指标定义     Index_definition
+							String value = object.getJSONObject(i).getString("value");
+							dataMap.put("pl_Index_definition", value);
+						}else if (key.equals("computational_formula")){//计算公式    computational_formula
+							String value = object.getJSONObject(i).getString("value");
+							dataMap.put("pl_computational_formula", value);
+						}else if (key.equals("data_sources")){//数据来源     data_sources
+							String value = object.getJSONObject(i).getString("value");
+							dataMap.put("pl_data_sources", value);
+						}else if (key.equals("unit_measurement")){//计量单位     unit_measurement
+							String value = object.getJSONObject(i).getString("value");
+							dataMap.put("pl_unit_measurement", value);
+						}else if (key.equals("statistical_period")){//统计周期      statistical_period
+							String value = object.getJSONObject(i).getString("value");
+							dataMap.put("pl_statistical_period", value);
+						}else if (key.equals("explain")){//说    明     explain
+							String value = object.getJSONObject(i).getString("value");
+							dataMap.put("pl_explain", value);
+						}
+					}
+				}
+			}
+		}
+		dataMap.put("organizationType", "涉及部门及岗位\\角色");
 		if (repositoryModel == null) {
 			return null;
 		}
-		prReportComment.getCommentContent(dataMap, repositoryModel); // 获取一些公共的数据(手册首页的手册岗位名称、部门、时间等)
+		prReportComment.getCommentContent(dataMap, repositoryModel);//获取一些公共的数据(手册首页的手册岗位名称、部门、时间等)
+		JSONArray repositoryShapeTable = new JSONArray();//流程步骤Table
 
-		JSONArray repositoryShapeTable = new JSONArray(); // 流程步骤table
-		JSONArray shapeDangerTable = new JSONArray(); // 流程步骤的风控要求table
-		JSONArray shapeKPITable = new JSONArray(); // 流程步骤的量化指标table
 
+
+		JSONArray fileTable = new JSONArray(); //流程附件Table
+		JSONArray dangerTable = new JSONArray(); //风险Table
+		JSONArray regulateTable = new JSONArray(); //控制Table
+		JSONArray KPITable = new JSONArray(); //相关绩效考核Table
 		Set<String> dangerSet = new HashSet<String>();// 风险
-		Set<String> kpiSet = new HashSet<>();// kpi
+		Set<String> regulateSet = new HashSet<String>();// 控制
-		Map<String, Map<String, Object>> relationFileMap = new HashMap<>();
+		Set<String> KPISet = new HashSet<String>();// kpi
-
 		List<Map<String, Object>> repositoryFileElements = CoeDesignerUtil.getShapeMessageJson4(repositoryId); //流程文件内容
 		if (wizardJsonData.getBoolean("orderNuberFirst")) { // 根据页面选择进行排序
 			OutputWordUtil.orderByNumber(repositoryFileElements);
 		}
+
+		// 流程附件列表
+		UpFileDao upFileDao = new UpFileDao();
+		StringBuffer sqlWhere = new StringBuffer();
+		sqlWhere.append(" and PALREPOSITORYID ='").append(repositoryModel.getId()).append("'");
+		List<UpfileModel> search = upFileDao.search(sqlWhere.toString());
+		File file = null;
+		//三员管理下，用户密级与文件密级过滤显示
+		if(HighSecurityUtil.isON()){
+			PALRepositoryQueryAPIManager.getInstance().upFileSecurityFilter(this.userContext,search);
+		}
+		if (search != null && search.size() > 0) {
+			//创建附件目录及复制附件
+			fileName = fileName + "_file";
+			file = new File(docPath, fileName);
+			if (!file.exists()) {
+				log.info("创建附件");
+				file.mkdir();
+			}
+		}
+
+		//文件属性附件处理
+		int fileIndex = 1;
+		if (search != null && search.size() > 0) {
+			// 复制附件
+			for (UpfileModel upfileModel : search) {
+				if (!"f".equals(upfileModel.getType())) {// 文件
+					continue;
+				}
+				// 复制doccenter下的文件
+				DCContext dcContext = null;
+				DCPluginProfile dcProfile = DCProfileManager.getDCProfile(CoEConstant.APP_ID, CoeFileConstant.COE_UPFILE);
+				if (dcProfile != null) {
+					dcContext = new DCContext(userContext, dcProfile, CoEConstant.APP_ID, "file", upfileModel.getPl_uuid(), upfileModel.getFileName());
+				}
+				File sourceFile = new UtilFile(dcContext.getFilePath());
+				File targetFile = new UtilFile(file.toString() + File.separator + dcContext.getFileName());
+				try {
+					UtilFile.copyFile(sourceFile, targetFile);
+				} catch (Exception e) {
+					System.out.println(e);
+					e.printStackTrace();
+				}
+				JSONObject object = new JSONObject();
+				object.put("file_name", fileIndex + "." + upfileModel.getFileName());
+				String link = fileName + File.separator + upfileModel.getFileName();
+				object.put("link", link);
+				fileTable.add(object);
+				fileIndex++;
+			}
+		}
+		//流程说明
 		if (repositoryFileElements != null) {
 			int index = 1;// 流程步骤序号
 			int dangerIndex = 1;// 风险序号
-			int kpiIndex = 1;// 指标序号
+			int regulateIndex = 1;// 控制序号
 			for (Map<String, Object> shape : repositoryFileElements) {
 				//如果图形元素不是流程步骤，不导出该元素
-				if (PrReportComment.PROCESS_STEP.indexOf((String) shape.get("type")) == -1) {
+//				if (PrReportComment.PROCESS_STEP.indexOf((String)shape.get("type")) == -1 && "method_approval_node,method_service_node,method_manual_node".indexOf((String)shape.get("type")) == -1) {
-					continue;
+//					continue;
-				}
+//				}
-				boolean containDangerAttribute = false;
-				boolean containKPIAttribute = false;
 				JSONObject _tr = new JSONObject();
-				OutputWordUtil.setShapeDefaultValue2(repositoryId, _tr);    //设置默认值
+				OutputWordUtil.setShapeDefaultValue2(repositoryId, _tr);	//设置默认值
-				_tr.put(OutputWordUtil.SERIAL_NUMBER, index);    //序号
+				_tr.put(OutputWordUtil.SERIAL_NUMBER, index);	//序号
-				_tr.put(OutputWordUtil.REPOSITORY_NAME, specialCharTransfer(repositoryModel.getName().replace("\n", "")));    //流程名称
+				_tr.put(OutputWordUtil.REPOSITORY_NAME, specialCharTransfer(repositoryModel.getName().replace("\n", "")));	//流程名称
-				_tr.put(OutputWordUtil.SHAPE_NAME, specialCharTransfer(shape.get("text").toString()).replace("\n", OutputWordUtil.WRAPSTRING));    //步骤名称
+				_tr.put(OutputWordUtil.SHAPE_NAME, specialCharTransfer(shape.get("text").toString()).replace("\n", OutputWordUtil.WRAPSTRING));	//步骤名称
+
+				/**序号改为流程编号**/
+				/*_tr.put(OutputWordUtil.SERIAL_NUMBER, "");	//序号置空
+				if (shape.containsKey("number")) {
+					_tr.put(OutputWordUtil.SERIAL_NUMBER, shape.get("number"));
+				}*/
+				/**序号改为流程编号**/
+
+				// 节点的附件处理
+				JSONArray shapeFileTable = new JSONArray(); //流程节点附件Table
+				if (search != null && search.size() > 0) {
+					// 复制附件
+					for (UpfileModel upfileModel : search) {
+						if ("f".equals(upfileModel.getType())) {
+							continue;
+						}
+						if (!shape.get("id").equals(upfileModel.getShape_uuid())) {
+							continue;
+						}
+						// 复制doccenter下的文件
+						DCContext dcContext = null;
+						DCPluginProfile dcProfile = DCProfileManager.getDCProfile(CoEConstant.APP_ID, CoeFileConstant.COE_UPFILE);
+						if (dcProfile != null) {
+							dcContext = new DCContext(userContext, dcProfile, CoEConstant.APP_ID, upfileModel.getPl_uuid(), upfileModel.getShape_uuid(), upfileModel.getFileName());
+						}
+						File sourceFile = new UtilFile(dcContext.getFilePath());
+						File targetFile = new UtilFile(file.toString() + File.separator + dcContext.getFileName());
+						try {
+							UtilFile.copyFile(sourceFile, targetFile);
+						} catch (Exception e) {
+							System.out.println(e);
+							e.printStackTrace();
+						}
+						JSONObject object = new JSONObject();
+						object.put("shape_file_name", fileIndex+"."+upfileModel.getFileName());
+						String link = fileName + File.separator + upfileModel.getFileName();
+						object.put("shape_file_link", link);
+						shapeFileTable.add(object);
+						fileIndex++;
+					}
+				}
+				if(shapeFileTable.size() == 0) {// 没有附件时给空值，不然使用office打开会解析错误
+					JSONObject object = new JSONObject();
+					object.put("shape_file_name", "");
+					object.put("shape_file_link", "");
+					shapeFileTable.add(object);
+				}
+				_tr.put("shape_File_Table", shapeFileTable);
+
 				JSONArray dataAttributes = (JSONArray) shape.get("attributes");
-				// 组织（部门）、员工
-				List<String> dutyROrgList = new ArrayList<>();
-				List<String> approvalAOrgAList = new ArrayList<>();
-				List<String> counselorCOrgList = new ArrayList<>();
-				List<String> notifyIOrgList = new ArrayList<>();
-				// 岗位、员工
-				List<String> dutyRRoleList = new ArrayList<>();
-				List<String> approvalARoleAList = new ArrayList<>();
-				List<String> counselorCRoleList = new ArrayList<>();
-				List<String> notifyIRoleList = new ArrayList<>();
-				Map<String, List<DesignerShapeRelationModel>> map = OutputWordUtil.getShapeRelationAttrMap(repositoryId, shape.get("id").toString());
 				if (!dataAttributes.isEmpty()) {
 					for (int i = 0; i < dataAttributes.size(); i++) {
 						JSONObject obj = dataAttributes.getJSONObject(i);
 						String attrId = obj.getString("key");
 						String attrValue = obj.getString("value");
 						_tr.put("shape_" + attrId, attrValue.replace("\n", OutputWordUtil.WRAPSTRING));
-						if ("bpm_duty_r,bpm_approval_a,bpm_counselor_c,bpm_notify_i,duty_r,approval_a,counselor_c,notify_i".contains(attrId)) {
+						if (raciRelationType) {// 涉及部门、岗位/角色关联的是bpm组织部门、岗位、角色
-							if (raciRelationType) {// 涉及部门、岗位/角色关联的是bpm组织部门、岗位、角色
+							if ("bpm_duty_r".equals(attrId)) {
-								dataMap.put("organizationType1", "涉及部门\\人员");
+								_tr.put("shape_duty_r", attrValue.replace("\n", OutputWordUtil.WRAPSTRING));
-								dataMap.put("organizationType2", "涉及岗位\\角色");
+							}
-								if ("bpm_duty_r".equals(attrId)) {
+							if ("bpm_approval_a".equals(attrId)) {
-									raciRelationAwsOrg(map, "bpm_duty_r", dutyROrgList, dutyRRoleList);
+								_tr.put("shape_approval_a", attrValue.replace("\n", OutputWordUtil.WRAPSTRING));
-								} else if ("bpm_approval_a".equals(attrId)) {
+							}
-									raciRelationAwsOrg(map, "bpm_approval_a", approvalAOrgAList, approvalARoleAList);
+							if ("bpm_counselor_c".equals(attrId)) {
-								} else if ("bpm_counselor_c".equals(attrId)) {
+								_tr.put("shape_counselor_c", attrValue.replace("\n", OutputWordUtil.WRAPSTRING));
-									raciRelationAwsOrg(map, "bpm_counselor_c", counselorCOrgList, counselorCRoleList);
+							}
-								} else if ("bpm_notify_i".equals(attrId)) {
+							if ("bpm_notify_i".equals(attrId)) {
-									raciRelationAwsOrg(map, "bpm_notify_i", notifyIOrgList, notifyIRoleList);
+								_tr.put("shape_notify_i", attrValue.replace("\n", OutputWordUtil.WRAPSTRING));
-								}
-							} else {
-								if ("duty_r".equals(attrId)) {
-									raciRelationPalOrg(map, "duty_r", dutyROrgList, dutyRRoleList);
-								} else if ("approval_a".equals(attrId)) {
-									raciRelationPalOrg(map, "approval_a", approvalAOrgAList, approvalARoleAList);
-								} else if ("counselor_c".equals(attrId)) {
-									raciRelationPalOrg(map, "counselor_c", counselorCOrgList, counselorCRoleList);
-								} else if ("notify_i".equals(attrId)) {
-									raciRelationPalOrg(map, "notify_i", notifyIOrgList, notifyIRoleList);
-								}
 							}
 						}
-
 						if ("danger".equals(attrId)) {
-							JSONArray dangerTable = new JSONArray();
+							dangerIndex = setTableValueOfControlAndRisk(attrId, repositoryId, shape.get("id").toString(),dangerTable, dangerIndex, _tr.getString(OutputWordUtil.SHAPE_NAME), relationFileMap);
-							dangerIndex = setTableValueOfRiskAndKPI(attrId, repositoryId, shape.get("id").toString(),dangerTable, dangerIndex, _tr.getString(OutputWordUtil.SHAPE_NAME), relationFileMap);
 							dangerSet.clear();
-							_tr.put(OutputWordUtil.TABLE_DANGER, dangerTable);
+						}else if ("regulate".equals(attrId)) {
-							if (dangerTable.size() > 0) {
+							regulateIndex = setTableValueOfControlAndRisk(attrId, repositoryId, shape.get("id").toString(), regulateTable, regulateIndex, _tr.getString(OutputWordUtil.SHAPE_NAME), relationFileMap);
-								containDangerAttribute = true;
+							regulateSet.clear();
-							}
-
-						} else if ("kpi".equals(attrId)) {
-							JSONArray kpiTable = new JSONArray();
-							kpiIndex = setTableValueOfRiskAndKPI(attrId, repositoryId, shape.get("id").toString(), kpiTable, kpiIndex, _tr.getString(OutputWordUtil.SHAPE_NAME), relationFileMap);
-							kpiSet.clear();
-							_tr.put(OutputWordUtil.TABLE_KPI, kpiTable);
-							if (kpiTable.size() > 0) {
-								containKPIAttribute = true;
-							}
 						}
 					}
-					_tr.put("shape_duty_r_org", StringUtils.join(dutyROrgList, ",").replace("\n", OutputWordUtil.WRAPSTRING));
-					_tr.put("shape_approval_a_org", StringUtils.join(approvalAOrgAList, ",").replace("\n", OutputWordUtil.WRAPSTRING));
-					_tr.put("shape_counselor_c_org", StringUtils.join(counselorCOrgList, ",").replace("\n", OutputWordUtil.WRAPSTRING));
-					_tr.put("shape_notify_i_org", StringUtils.join(notifyIOrgList, ",").replace("\n", OutputWordUtil.WRAPSTRING));
-					_tr.put("shape_duty_r_role", StringUtils.join(dutyRRoleList, ",").replace("\n", OutputWordUtil.WRAPSTRING));
-					_tr.put("shape_approval_a_role", StringUtils.join(approvalARoleAList, ",").replace("\n", OutputWordUtil.WRAPSTRING));
-					_tr.put("shape_counselor_c_role", StringUtils.join(counselorCRoleList, ",").replace("\n", OutputWordUtil.WRAPSTRING));
-					_tr.put("shape_notify_i_role", StringUtils.join(notifyIRoleList, ",").replace("\n", OutputWordUtil.WRAPSTRING));
 				}
 				repositoryShapeTable.add(_tr);
 				index++;
-				if (containDangerAttribute) {
-					shapeDangerTable.add(_tr);
-				}
-				if (containKPIAttribute) {
-					shapeKPITable.add(_tr);
-				}
 			}
-
 		}
 
-		dataMap.put(OutputWordUtil.TABLE_REPOSITORY_SHAPE, repositoryShapeTable);
+		// 流程步骤的指标表格
-		dataMap.put(OutputWordUtil.TABLE_DANGER, shapeDangerTable);
+		setTableValueOfKPI("kpi", repositoryId, KPITable, relationFileMap);
-		dataMap.put(OutputWordUtil.TABLE_KPI, shapeKPITable);
 
+		JSONArray termTable = new JSONArray(); //术语定义Table
+		// 属性特征 属性代码KEY
+		PALRepositoryPropertyModel term = PALRepositoryPropertyCache.getPropertyByPropertyId(repositoryModel.getId(),"term");
+		if (term != null) {
+			String termVal = term.getPropertyValue();
+			JSONObject termObj = JSONObject.parseObject(termVal);
+			if (termObj != null && !termObj.isEmpty()) {
+				JSONArray tableArr = termObj.getJSONArray("table");
+				if (tableArr != null && !tableArr.isEmpty()) {
+					for (Object obj : tableArr) {
+						JSONObject obj2 = (JSONObject) obj;
+						if (!"table_head".equals(obj2.getString("id"))) {
+							String name = obj2.getString("name");
+							String desc = obj2.getString("desc");
+							JSONObject tmp = new JSONObject();
+							tmp.put("name", name);
+							tmp.put("desc", desc);
+							termTable.add(tmp);
+						}
+					}
+				}
+			}
+		}
+
+
+		JSONArray organizationTable = new JSONArray(); //组织职责Table
+		// 属性特征 属性代码KEY
+		PALRepositoryPropertyModel Organizational = PALRepositoryPropertyCache.getPropertyByPropertyId(repositoryModel.getId(),"Organizational_role");
+		if (Organizational != null){
+			String OrganizationalVal = Organizational.getPropertyValue();
+			JSONObject OrganizationalObj = JSONObject.parseObject(OrganizationalVal);
+			if (OrganizationalObj != null && !OrganizationalObj.isEmpty()) {
+				JSONArray tableArr = OrganizationalObj.getJSONArray("table");
+				if (tableArr != null && !tableArr.isEmpty()) {
+					for (Object obj : tableArr) {
+						JSONObject obj2 = (JSONObject) obj;
+						if (!"table_head".equals(obj2.getString("id"))) {
+							String name = obj2.getString("name");
+							String desc = obj2.getString("desc");
+							JSONObject tmp = new JSONObject();
+							tmp.put("name", name);
+							tmp.put("desc", desc);
+							organizationTable.add(tmp);
+						}
+					}
+				}
+			}
+		}
+
+
+		//支持文件
+		JSONArray supportfiles = new JSONArray(); //组织职责Table
+		List<DesignerShapeRelationModel> relationList = DesignerShapeRelationCache.getListByAttrId(repositoryModel.getId(), "", "support_files");
+		int index = 0;
+		for (DesignerShapeRelationModel relation : relationList) {
+			String relationFileId = relation.getRelationFileId();// 支持或相关文件的ID
+			PALRepositoryModel model = PALRepositoryCache.getCache().get(relationFileId);
+			if (model != null) {
+				index++;
+				String name = model.getName();
+				JSONObject tmp = new JSONObject();
+				tmp.put("name", name);
+				tmp.put("desc", index);
+
+
+				supportfiles.add(tmp);
+			}
+		}
+
+		//相关文件 R_relevant_flies
+		JSONArray relevant_flies = new JSONArray(); //组织职责Table
+		List<DesignerShapeRelationModel> relationList2 = DesignerShapeRelationCache.getListByAttrId(repositoryModel.getId(), "", "R_relevant_flies");
+		int count = 0;
+		for (DesignerShapeRelationModel relation : relationList2) {
+			String relationFileId = relation.getRelationFileId();// 支持或相关文件的ID
+			PALRepositoryModel model = PALRepositoryCache.getCache().get(relationFileId);
+			if (model != null) {
+				count++;
+				String name = model.getName();
+				JSONObject tmp = new JSONObject();
+				tmp.put("name", name);
+				tmp.put("desc", count);
+
+				relevant_flies.add(tmp);
+			}
+		}
+
+
+
+		//System.out.println(relations+"==========relations");
+			/*if (wizardJsonData.getBoolean("orderNuberFirst")) { // 根据页面选择进行排序
+				OutputWordUtil.orderByNumber(relations);
+			}*/
+
+
+
+
+
+		// 2张表
+		// 文件属性内容（文本内容）表
+		// 文件属性内容关联表
+
+		// 根据绩效所属模型查询绩效形状的详细信息
+
+
+
+		// 流程文件属性术语与定义（表格类型）
+
+
+
+		// 流程文件属性绩效形状的信息
+
+		// 流程文件属性相关文件和支持文件
+
+		//术语
+		dataMap.put("term_table", termTable);//table4
+		dataMap.put("term_table_count", termTable.size());//table4
+		//组织和职责
+		dataMap.put("organization_table", organizationTable);//table5
+		dataMap.put("organization_table_count",organizationTable.size());//table5
+		//支持文件
+		dataMap.put("supports_table", supportfiles);//table6
+		dataMap.put("supports_table_count", supportfiles.size());//table6
+		//相关文件
+		dataMap.put("relevant_table", relevant_flies);//table7
+		dataMap.put("relevant_table_count", relevant_flies.size());//table7
+		//流程绩效
+		//dataMap.put("Process_performance_metrics_table",process_performance_metrics);//table8
+		dataMap.put("metrics_count", metrics.size());//
+
+		dataMap.put(OutputWordUtil.TABLE_REPOSITORY_SHAPE, repositoryShapeTable);
+		dataMap.put("TABLE_REPOSITORY_SHAPE_COUNT", repositoryShapeTable.size());
+		dataMap.put("file_table", fileTable);
+		dataMap.put("file_table_count", fileIndex);
+		dataMap.put(OutputWordUtil.TABLE_DANGER, dangerTable);
+		dataMap.put(OutputWordUtil.TABLE_REGULATE, regulateTable);
+		dataMap.put(OutputWordUtil.TABLE_KPI, KPITable);
+		ReportRepositoryCompare compare = new ReportRepositoryCompare();
+		JSONArray historyVersionModify = compare.getModifyVersionHistory(repositoryId);
+		dataMap.put("history_table", historyVersionModify);
 		return dataMap;
 	}
 
@@ -389,4 +656,123 @@ public class Report2Gener {
 		}
 	}
 
+	/**
+	 * 设置流程步骤的KPI表格
+	 * @param attrId
+	 * @param fileId
+	 * @param table
+	 * @param relationFileMap
+	 * @return
+	 */
+	public int setTableValueOfKPI(String attrId, String fileId, JSONArray table, Map<String, Map<String, Object>> relationFileMap) {
+		int index = 1;
+		JSONArray result = new JSONArray();
+		DesignerShapeRelationDao dao = new DesignerShapeRelationDao();
+		List<DesignerShapeRelationModel> list = dao.query(fileId, null, attrId, null, null);
+		for (DesignerShapeRelationModel model : list) {
+			String relationFileId = model.getRelationFileId();
+			if (!relationFileMap.containsKey(relationFileId) && !UtilString.isEmpty(model.getShapeId())) {
+				Map<String, Object> shapes = new HashMap<>();
+				List<Map<String, Object>> fileElements = CoeDesignerUtil.getShapeMessageJson4(relationFileId);
+				for (Map<String, Object> shape : fileElements) {
+					String tempShapeId = shape.get("id").toString();
+					shapes.put(tempShapeId, shape);
+				}
+				relationFileMap.put(relationFileId, shapes);
+			}
+		}
+
+		Set<String> relationShapeIdSet = new HashSet<>(); // 去重
+		for (DesignerShapeRelationModel model : list) {
+			String relationFileId = model.getRelationFileId();
+			String relationShapeId = model.getRelationShapeId();
+			if (relationFileMap.containsKey(relationFileId)) {
+				Map<String, Object> elements = relationFileMap.get(relationFileId);
+				if (elements != null && elements.containsKey(relationShapeId)) {
+					Map<String, Object> shape = (Map<String, Object>) elements.get(relationShapeId);
+					if (!relationShapeIdSet.contains(shape.get("id").toString())) {
+						relationShapeIdSet.add(shape.get("id").toString());
+						result.add(shape);
+					}
+				}
+			}
+		}
+
+		for (int i = 0; i < result.size(); i++) {
+			Map<String, Object> shape = result.getJSONObject(i);
+			JSONObject _tr = new JSONObject();
+			OutputWordUtil.setShapeDefaultValue2(shape.get("uuid").toString(), _tr);	//设置默认值
+			String name = specialCharTransfer(shape.get("text").toString());
+			_tr.put(OutputWordUtil.SHAPE_NAME, name.replace("\n", OutputWordUtil.WRAPSTRING));
+			_tr.put(OutputWordUtil.SERIAL_NUMBER, index);
+			JSONArray dataAttributes = (JSONArray) shape.get("attributes");
+			for (int j = 0; j < dataAttributes.size(); j++) {
+				_tr.put("shape_" + dataAttributes.getJSONObject(j).getString("key"), specialCharTransfer(dataAttributes.getJSONObject(j).getString("value")).replace("\n", " "));
+			}
+			table.add(_tr);
+			index++;
+		}
+		return index;
+
+	}
+
+
+	public int setTableValueOfControlAndRisk(String attrId, String fileId, String shapeId, JSONArray table, int index, String processShapeName, Map<String, Map<String, Object>> relationFileMap) {
+		JSONArray result = new JSONArray();
+		DesignerShapeRelationDao dao = new DesignerShapeRelationDao();
+		List<DesignerShapeRelationModel> list = dao.query(fileId, shapeId, attrId, null, null);
+		for (DesignerShapeRelationModel model : list) {
+			String relationFileId = model.getRelationFileId();
+			if (!relationFileMap.containsKey(relationFileId) && PALRepositoryCache.getCache().get(relationFileId) != null) {
+				Map<String, Object> shapes = new HashMap<>();
+				List<Map<String, Object>> fileElements = CoeDesignerUtil.getShapeMessageJson4(relationFileId);
+				for (Map<String, Object> shape : fileElements) {
+					String tempShapeId = shape.get("id").toString();
+					shapes.put(tempShapeId, shape);
+				}
+				relationFileMap.put(relationFileId, shapes);
+			}
+		}
+
+		Set<String> relationShapeIdSet = new HashSet<>(); // 去重
+		String filterShapeName = "";
+		if ("danger".equals(attrId)) {// 风险
+			filterShapeName = "risk";
+		} else if ("regulate".equals(attrId)) {// 控制
+			filterShapeName = "control";
+		}
+		for (DesignerShapeRelationModel model : list) {
+			String relationFileId = model.getRelationFileId();
+			String relationShapeId = model.getRelationShapeId();
+			if (relationFileMap.containsKey(relationFileId)) {
+				Map<String, Object> elements = relationFileMap.get(relationFileId);
+				if (elements != null && elements.containsKey(relationShapeId)) {
+					Map<String, Object> shape = (Map<String, Object>) elements.get(relationShapeId);
+					if (!relationShapeIdSet.contains(shape.get("id").toString()) && filterShapeName.equals(shape.get("type"))) {
+						relationShapeIdSet.add(shape.get("id").toString());
+						result.add(shape);
+					}
+				}
+			}
+		}
+
+		for (int i = 0; i < result.size(); i++) {
+			Map<String, Object> shape = result.getJSONObject(i);
+			JSONObject _tr = new JSONObject();
+			OutputWordUtil.setShapeDefaultValue2(shape.get("uuid").toString(), _tr);	//设置默认值
+			String name = specialCharTransfer(shape.get("text").toString());
+			_tr.put("related_" + OutputWordUtil.SHAPE_NAME, processShapeName);
+			_tr.put(OutputWordUtil.SHAPE_NAME, name.replace("\n", OutputWordUtil.WRAPSTRING));
+			_tr.put(OutputWordUtil.SERIAL_NUMBER, index);
+			JSONArray dataAttributes = (JSONArray) shape.get("attributes");
+			for (int j = 0; j < dataAttributes.size(); j++) {
+				_tr.put("shape_" + dataAttributes.getJSONObject(j).getString("key"), specialCharTransfer(dataAttributes.getJSONObject(j).getString("value")).replace("\n", " "));
+			}
+			table.add(_tr);
+			index++;
+		}
+		return index;
+
+	}
+
 }

com.actionsoft.apps.coe.pal.output.pr/步骤横表-流程手册2.xml

@@ -4932,6 +4932,7 @@ y7fdOgAAAABJRU5ErkJggk==
                <w:p wsp:rsidR="00F14252" wsp:rsidRDefault="00F14252" wsp:rsidP="00F14252">
                     <w:pPr>
                         <w:spacing w:line="360" w:line-rule="auto"/>
+                        <w:jc w:val="center"/>
                       <w:rPr>${pl_diagram}
                             <w:rFonts w:h-ansi="宋体" w:cs="Arial" w:hint="fareast"/>
                         </w:rPr>
@@ -4939,7 +4940,7 @@ y7fdOgAAAABJRU5ErkJggk==
                     <w:r>
                         <w:pict>
                             <w:binData w:name="wordml://06000003.emz" xml:space="preserve">${pl_diagram}</w:binData>
-                            <v:shape id="图片 13" o:spid="_x0000_i1079" type="#_x0000_t75" style="width:700px;height:${pl_diagram_height}px;mso-position-horizontal-relative:page;mso-position-vertical-relative:page">
+                            <v:shape id="图片 13" o:spid="_x0000_i1079" type="#_x0000_t75" style="width:${pl_diagram_width}px;height:${pl_diagram_height}px;mso-position-horizontal-relative:page;mso-position-vertical-relative:page">
                                 <v:imagedata src="wordml://06000003.emz" o:title=""/>
                             </v:shape>
                         </w:pict>
@@ -5607,7 +5608,7 @@ y7fdOgAAAABJRU5ErkJggk==
                                         <w:sz-cs w:val="21"/>
                                         <w:lang w:val="EN-US"/>
                                     </w:rPr>
-                                    <w:t>${table2.shape_activity_description}</w:t>
+                                    <w:t>${table2.shape_name}</w:t>
                                 </w:r>
                             </w:p>
                         </w:tc>
@@ -6832,7 +6833,7 @@ y7fdOgAAAABJRU5ErkJggk==
                     </w:r>
                     <aml:annotation aml:id="9" w:type="Word.Bookmark.End"/>
                 </w:p>
-				<#if (file_table_count ==0 )>
+				<#if (file_table_count == 1 )>
                 <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
                     <w:pPr>
                         <w:rPr>
@@ -6856,6 +6857,7 @@ y7fdOgAAAABJRU5ErkJggk==
 							<w:r wsp:rsidR="00692573" wsp:rsidRPr="000D620D">
 							  <w:rPr>
 								<w:rStyle w:val="a4"/>
+                                <w:color w:val="2440b3"/>
 							  </w:rPr>
 							  <w:t>${table4.file_name}</w:t>
 							</w:r>
@@ -6863,33 +6865,34 @@ y7fdOgAAAABJRU5ErkJggk==
 						</w:p>
 				    </#list>
 					<#list repository_shape_table as table1>
-					<#list table1.shape_File_Table as table11>
+                        <#list table1.shape_File_Table as table11>
-              <w:p wsp:rsidR="00E54D8E" wsp:rsidRDefault="005011CF">
+                          <w:p wsp:rsidR="00E54D8E" wsp:rsidRDefault="005011CF">
-                <w:pPr>
+                            <w:pPr>
-                  <w:pStyle w:val="p0"/>
+    <!--                          <w:pStyle w:val="p0"/>-->
-                  <w:rPr>
+    <!--                          <w:rPr>-->
-                    <w:rFonts w:ascii="宋体" w:h-ansi="Calibri" w:cs="宋体"/>
+    <!--                            <w:rFonts w:ascii="宋体" w:h-ansi="Calibri" w:cs="宋体"/>-->
-                    <wx:font wx:val="宋体"/>
+    <!--                            <wx:font wx:val="宋体"/>-->
-                    <w:color w:val="000000"/>
+    <!--                            <w:color w:val="2440b3"/>-->
-                    <w:sz w:val="22"/>
+    <!--                            <w:sz w:val="22"/>-->
-                    <w:sz-cs w:val="20"/>
+    <!--                            <w:sz-cs w:val="20"/>-->
-                  </w:rPr>
+<!--                              </w:rPr>-->
-                </w:pPr>
+                            </w:pPr>
-                <w:hlink w:dest="${table11.shape_file_link}">
+                            <w:hlink w:dest="${table11.shape_file_link}">
-                  <w:r wsp:rsidR="00CB55CB" wsp:rsidRPr="005011CF">
+                              <w:r wsp:rsidR="00CB55CB" wsp:rsidRPr="005011CF">
-                    <w:rPr>
+                                <w:rPr>
-                      <w:rStyle w:val="a4"/>
+                                  <w:rStyle w:val="a4"/>
-                      <w:rFonts w:ascii="宋体" w:h-ansi="Calibri" w:cs="宋体" w:hint="fareast"/>
+                                  <w:color w:val="2440b3"/>
-                      <wx:font wx:val="宋体"/>
+    <!--                              <w:rFonts w:ascii="宋体" w:h-ansi="Calibri" w:cs="宋体" w:hint="fareast"/>-->
-                      <w:sz w:val="22"/>
+    <!--                              <wx:font wx:val="宋体"/>-->
-                      <w:sz-cs w:val="20"/>
+    <!--                              <w:sz w:val="22"/>-->
-                    </w:rPr>
+    <!--                              <w:sz-cs w:val="20"/>-->
-                    <w:t>${table11.shape_file_name}</w:t>
+                                </w:rPr>
-                  </w:r>
+                                <w:t>${table11.shape_file_name}</w:t>
-                </w:hlink>
+                              </w:r>
-              </w:p>
+                            </w:hlink>
-			  </#list>
+                          </w:p>
-              </#list>
+                        </#list>
+                    </#list>
                 <w:p wsp:rsidR="00B739CB" wsp:rsidRDefault="00B739CB">
                     <w:pPr>
                         <w:rPr>

com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/output/util/OutputWordUtil.java

@@ -986,6 +986,10 @@ public class OutputWordUtil {
 					if ("number".equals(obj.getString("key"))) {
 						return obj.getString("value");
 					}
+					//加入活动序号排序处理
+					if (obj.getString("key")!= null && obj.getString("key").contains("number")) {
+						return obj.getString("value");
+					}
 				}
 			}
 		}

com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/PALRepositoryQueryAPIManager.java

@@ -1498,9 +1498,20 @@ public class PALRepositoryQueryAPIManager {
 		List<String> categorys = PALMethodCache.getPalMehtodList(teamId, context.getUID(), isUsed, isPublished, true);
 		int i = 1;
 		for (String category : categorys) {
-			if (methods != null && !"".equals(methods)) {
+			if (methods != null && !"".equals(methods) ) {
-				if (methods.indexOf(category) == -1) {
+				if (methods.indexOf(category) == -1 ) {
-					continue;
+					//制度图与表单图特殊处理
+					if ("data.form".equals(methods)){
+						if (!category.equals("process")){
+							continue;
+						}
+					} else if ("control.policy".equals(methods)){
+						if (!category.equals("process")){
+							continue;
+						}
+					} else {
+						continue;
+					}
 				}
 			}
 			JSONObject jsonObject = new JSONObject();

com.actionsoft.apps.coe.pal/template/page/main.htm

@@ -13,4 +13,4 @@
         var mainType = "<#mainType>";
         var uid = "<#uid>";
         var wHref = "./w";
-        var jdHref = "./jd";</script><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-03c6285a.7d5e2b5a.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-08f4719e.e0cd2ccf.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-0df035f6.e83dbaa2.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-21453108.a3fd01d3.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-23a660f0.0ecc4095.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-473ee3da.b383fe0e.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-79148172.dc3e7967.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-b158b92a.fe2f3f84.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-bb3b9f20.f7f4b256.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-03c6285a.529dedd5.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-08f4719e.4739bcb1.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-0df035f6.52f9d178.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-21453108.61269ead.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-23a660f0.1efa21de.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d0ab156.fd29d082.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d0f078a.f290866f.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d212b99.1061dc70.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d216d3a.9f4d92b1.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d224b23.c12b6728.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d224ef1.9b69a5bc.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-3178e2bf.97e80de1.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-3a9b7577.1c8372d8.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-473ee3da.569bb590.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-79148172.25989b20.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-b158b92a.02ee2c83.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-bb3b9f20.8fc67a6c.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/app.b58aa8df.css rel=preload as=style><link href=../apps/com.actionsoft.apps.coe.pal/main/js/app.b5e7641a.js rel=preload as=script><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-vendors.335bcbdd.js rel=preload as=script><link href=../apps/com.actionsoft.apps.coe.pal/main/css/app.b58aa8df.css rel=stylesheet></head><body style=margin:0;><div id=app></div><script src=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-vendors.335bcbdd.js></script><script src=../apps/com.actionsoft.apps.coe.pal/main/js/app.b5e7641a.js></script></body></html>
+        var jdHref = "./jd";</script><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-055385ac.e55cad48.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-0a36bb41.db1c131a.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-0ba0316e.d3570084.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-4def56c4.ef0a5aa8.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-4e7e9573.38619268.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-5a76c238.283a9f57.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-6f1c20e8.c5c7126f.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-8cb92970.adde4cab.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-afa522c6.19cec89a.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-055385ac.212b1e7f.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-0a36bb41.aa7c2cb3.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-0ba0316e.a3ac659b.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d0ab156.e3edaaa6.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d0b25b0.3ebfc816.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d0f078a.9e10275b.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d216d3a.99234111.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d224b23.135c5954.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d224ef1.7eee62fe.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-4def56c4.66811286.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-4e7e9573.db603cfd.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-5a76c238.27830c12.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-5ca06e36.1dd1e85a.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-6f1c20e8.c979e2d7.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-8cb92970.9380bd91.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-afa522c6.f45844b2.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-bf7921b8.1d6eee48.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/app.b58aa8df.css rel=preload as=style><link href=../apps/com.actionsoft.apps.coe.pal/main/js/app.c2e2e0f6.js rel=preload as=script><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-vendors.16b2cce8.js rel=preload as=script><link href=../apps/com.actionsoft.apps.coe.pal/main/css/app.b58aa8df.css rel=stylesheet></head><body style=margin:0;><div id=app></div><script src=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-vendors.16b2cce8.js></script><script src=../apps/com.actionsoft.apps.coe.pal/main/js/app.c2e2e0f6.js></script></body></html>

com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/coe.pal.processlevel.create.js

@@ -930,7 +930,11 @@ function showTableDialog(obj,value,id) {
 						name: tableName,
 						table: parent.operateList
 					}
-					saveDialogTableValue(value,id,obj)
+					if(value.table.some(item => item.name == '') || value.table.some(item => item.desc == '')) {    //  表格存在空值
+						$.simpleAlert("表格内容不能存在空值",'warning')
+					} else {
+						saveDialogTableValue(value,id,obj)
+					}
 					parent.$("#attribute-table-window1").dialog("close");
 				}
 			}, {

com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.js

@@ -2117,8 +2117,12 @@ function openTableDialog(obj,value) {
 					name: tableName,
 					table: dialogTableList
 				}
-				updateAttributeById($(obj).attr("objid"), tableObj);
+				if(dialogTableList.some(item => item.name == '') || dialogTableList.some(item => item.desc == '')) {
-				$("#attribute-table-window").dialog('close');
+					$.simpleAlert("表格内容不能存在空值",'warning')
+				} else {
+					updateAttributeById($(obj).attr("objid"), tableObj);
+					$("#attribute-table-window").dialog('close');
+				}
 			}
 		}, {
 			text : '取消',
@@ -2129,17 +2133,6 @@ function openTableDialog(obj,value) {
 	})
 }
 
-// function tableInputHeight() {
-// 	var input = $("#attribute-table-content").find(".dialog_table_input_css");
-// 	input.each(function () {
-// 		$(this).on('input', function(){
-// 			if(this.scrollHeight > $(this).height()) {
-// 				var curRow = parseInt($(this).attr('rows'))
-// 				$(this).attr('rows',curRow + 1)
-// 			}
-// 		});
-// 	})
-// }
 
 function addTableTr(obj) {
 	let newTrId = Utils.newId()

com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-2d0ab156.e3edaaa6.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0ab156"],{1485:function(a,t,e){"use strict";e.r(t);var i=function(){var a=this,t=a.$createElement,e=a._self._c||t;return e("div",{staticStyle:{width:"100%",height:"100%"}},[e("iframe",{staticStyle:{border:"0"},attrs:{id:"iframe",width:"100%",height:"100%",name:"iframe",src:a.src}})])},n=[],s={name:"MappingManagement",data(){return{src:"./w?sid="+this.$store.state.sessionId+"&cmd=com.actionsoft.apps.coe.pal.mappingmanagement_main_page&dataType="+this.$route.params.dataType}}},r=s,c=e("cba8"),p=Object(c["a"])(r,i,n,!1,null,"56fd105e",null);t["default"]=p.exports}}]);

com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-2d0ab156.fd29d082.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0ab156"],{1485:function(a,t,e){"use strict";e.r(t);var i=function(){var a=this,t=a._self._c;return t("div",{staticStyle:{width:"100%",height:"100%"}},[t("iframe",{staticStyle:{border:"0"},attrs:{id:"iframe",width:"100%",height:"100%",name:"iframe",src:a.src}})])},s=[],n={name:"MappingManagement",data(){return{src:"./w?sid="+this.$store.state.sessionId+"&cmd=com.actionsoft.apps.coe.pal.mappingmanagement_main_page&dataType="+this.$route.params.dataType}}},r=n,c=e("2877"),p=Object(c["a"])(r,i,s,!1,null,"56fd105e",null);t["default"]=p.exports}}]);

com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-2d0b25b0.3ebfc816.js

@@ -1,4 +1,4 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d212b99"],{aa47:function(t,e,n){"use strict";
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0b25b0"],{2480:function(t,e,n){"use strict";
 /**!
  * Sortable 1.10.2
  * @author	RubaXa   <trash@rubaxa.org>

com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-2d0f078a.9e10275b.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0f078a"],{"9d09":function(t,e,i){"use strict";i.r(e);var s=function(){var t=this,e=t.$createElement,i=t._self._c||e;return i("div",{style:{width:"100%",height:t.mainHeight}},[i("iframe",{staticStyle:{border:"0"},attrs:{id:"orgIframe",width:"100%",height:parseInt(t.mainHeight)-4+"px",name:"orgIframe",src:t.src}})])},n=[],a={name:"BPMOrg",data(){return{src:"./w?sid="+this.$store.state.sessionId+"&cmd=com.actionsoft.apps.coe.pal_average_user_org",mainHeight:parseInt(this.$store.getters.getTopMainHeightFn)-4+"px"}},computed:{listenTopMainHeight(){return this.$store.getters.getTopMainHeightFn}},watch:{listenTopMainHeight:function(t,e){this.mainHeight=parseInt(this.$store.getters.getTopMainHeightFn)-4+"px"}}},r=a,o=i("cba8"),h=Object(o["a"])(r,s,n,!1,null,"2280cc48",null);e["default"]=h.exports}}]);

com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-2d0f078a.f290866f.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0f078a"],{"9d09":function(t,e,i){"use strict";i.r(e);var s=function(){var t=this,e=t._self._c;return e("div",{style:{width:"100%",height:t.mainHeight}},[e("iframe",{staticStyle:{border:"0"},attrs:{id:"orgIframe",width:"100%",height:parseInt(t.mainHeight)-4+"px",name:"orgIframe",src:t.src}})])},n=[],r={name:"BPMOrg",data(){return{src:"./w?sid="+this.$store.state.sessionId+"&cmd=com.actionsoft.apps.coe.pal_average_user_org",mainHeight:parseInt(this.$store.getters.getTopMainHeightFn)-4+"px"}},computed:{listenTopMainHeight(){return this.$store.getters.getTopMainHeightFn}},watch:{listenTopMainHeight:function(t,e){this.mainHeight=parseInt(this.$store.getters.getTopMainHeightFn)-4+"px"}}},a=r,o=i("2877"),h=Object(o["a"])(a,s,n,!1,null,"2280cc48",null);e["default"]=h.exports}}]);

com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-2d216d3a.99234111.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d216d3a"],{c3b6:function(t,e,i){"use strict";i.r(e);var a=function(){var t=this,e=t.$createElement,i=t._self._c||e;return i("div",{style:{width:"100%",height:t.mainHeight},attrs:{id:"cooperation"}},[i("iframe",{staticStyle:{border:"0"},attrs:{id:"coopIframe",width:"100%",height:parseInt(t.mainHeight)-4+"px",name:"coopIframe",src:t.src}})])},n=[],s={name:"cooperationCreate",data(){return{src:wHref+"?sid="+this.$store.state.sessionId+"&mainPage=create&cmd=com.actionsoft.apps.coe.pal.cooperation_main",mainHeight:parseInt(this.$store.getters.getTopMainHeightFn)-4+"px"}},computed:{listenTopMainHeight(){return this.$store.getters.getTopMainHeightFn}},watch:{listenTopMainHeight:function(t,e){this.mainHeight=parseInt(this.$store.getters.getTopMainHeightFn)-4+"px"}}},r=s,o=i("cba8"),c=Object(o["a"])(r,a,n,!1,null,"6a826a48",null);e["default"]=c.exports}}]);

com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-2d216d3a.9f4d92b1.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d216d3a"],{c3b6:function(t,e,i){"use strict";i.r(e);var a=function(){var t=this,e=t._self._c;return e("div",{style:{width:"100%",height:t.mainHeight},attrs:{id:"cooperation"}},[e("iframe",{staticStyle:{border:"0"},attrs:{id:"coopIframe",width:"100%",height:parseInt(t.mainHeight)-4+"px",name:"coopIframe",src:t.src}})])},n=[],s={name:"cooperationCreate",data(){return{src:wHref+"?sid="+this.$store.state.sessionId+"&mainPage=create&cmd=com.actionsoft.apps.coe.pal.cooperation_main",mainHeight:parseInt(this.$store.getters.getTopMainHeightFn)-4+"px"}},computed:{listenTopMainHeight(){return this.$store.getters.getTopMainHeightFn}},watch:{listenTopMainHeight:function(t,e){this.mainHeight=parseInt(this.$store.getters.getTopMainHeightFn)-4+"px"}}},o=s,r=i("2877"),c=Object(r["a"])(o,a,n,!1,null,"6a826a48",null);e["default"]=c.exports}}]);

com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-2d224b23.135c5954.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d224b23"],{e0df:function(t,e,i){"use strict";i.r(e);var a=function(){var t=this,e=t.$createElement,i=t._self._c||e;return i("div",{style:{width:"100%",height:t.mainHeight},attrs:{id:"cooperationUpdate"}},[i("iframe",{staticStyle:{border:"0"},attrs:{id:"coopIframe",width:"100%",height:parseInt(t.mainHeight)-4+"px",name:"coopIframe",src:t.src}})])},n=[],s={name:"CooperationUpdate",data(){return{src:wHref+"?sid="+this.$store.state.sessionId+"&mainPage=update&cmd=com.actionsoft.apps.coe.pal.cooperation_main",mainHeight:parseInt(this.$store.getters.getTopMainHeightFn)-4+"px"}},computed:{listenTopMainHeight(){return this.$store.getters.getTopMainHeightFn}},watch:{listenTopMainHeight:function(t,e){this.mainHeight=parseInt(this.$store.getters.getTopMainHeightFn)-4+"px"}}},o=s,r=i("cba8"),p=Object(r["a"])(o,a,n,!1,null,"543345d8",null);e["default"]=p.exports}}]);

com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-2d224b23.c12b6728.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d224b23"],{e0df:function(t,e,i){"use strict";i.r(e);var a=function(){var t=this,e=t._self._c;return e("div",{style:{width:"100%",height:t.mainHeight},attrs:{id:"cooperationUpdate"}},[e("iframe",{staticStyle:{border:"0"},attrs:{id:"coopIframe",width:"100%",height:parseInt(t.mainHeight)-4+"px",name:"coopIframe",src:t.src}})])},n=[],s={name:"CooperationUpdate",data(){return{src:wHref+"?sid="+this.$store.state.sessionId+"&mainPage=update&cmd=com.actionsoft.apps.coe.pal.cooperation_main",mainHeight:parseInt(this.$store.getters.getTopMainHeightFn)-4+"px"}},computed:{listenTopMainHeight(){return this.$store.getters.getTopMainHeightFn}},watch:{listenTopMainHeight:function(t,e){this.mainHeight=parseInt(this.$store.getters.getTopMainHeightFn)-4+"px"}}},o=s,r=i("2877"),p=Object(r["a"])(o,a,n,!1,null,"543345d8",null);e["default"]=p.exports}}]);

com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-2d224ef1.7eee62fe.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d224ef1"],{e1f5:function(e,s,t){"use strict";t.r(s);var n=function(){var e=this,s=e.$createElement,t=e._self._c||s;return t("div",{staticClass:"devGetSession"},[e._v(" 正在获取session ")])},a=[],d=t("a18c"),o=t("0f08"),i=t("4360");o["a"].post({url:"jd",data:{userid:devUserInfo.userid,pwd:devUserInfo.pwd,lang:"cn",cmd:"com.actionsoft.apps.getsession.get",deviceType:"pc"}}).then((function(e){"error"==e.result?alert("获取session错误："+e.msg):(i["a"].commit("edit",{sessionId:e.data.sid}),d["a"].replace("/"))}));var r={data(){return{dwList:[]}},methods:{},mounted(){}},c=r,u=t("cba8"),l=Object(u["a"])(c,n,a,!1,null,null,null);s["default"]=l.exports}}]);

com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/js/chunk-2d224ef1.9b69a5bc.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d224ef1"],{e1f5:function(e,s,t){"use strict";t.r(s);var n=function(){var e=this,s=e._self._c;return s("div",{staticClass:"devGetSession"},[e._v(" 正在获取session ")])},a=[],d=t("a18c"),o=t("0f08"),i=t("4360");o["a"].post({url:"jd",data:{userid:devUserInfo.userid,pwd:devUserInfo.pwd,lang:"cn",cmd:"com.actionsoft.apps.getsession.get",deviceType:"pc"}}).then((function(e){"error"==e.result?alert("获取session错误："+e.msg):(i["a"].commit("edit",{sessionId:e.data.sid}),d["a"].replace("/"))}));var r={data(){return{dwList:[]}},methods:{},mounted(){}},c=r,u=t("2877"),l=Object(u["a"])(c,n,a,!1,null,null,null);s["default"]=l.exports}}]);