Merge branch 'apps_dev' of https://e.coding.net/yilidev/yilipalkaifa/apps into apps_dev

com.actionsoft.apps.coe.pal.batch/src/com/actionsoft/apps/coe/pal/batch/web/create/shape/ImportShapeExcel1.java

@@ -628,7 +628,7 @@ public class ImportShapeExcel1 {
 
 		double leftLine = leftMinLine;
 		//递归处理父级所有图形+连线的x的偏移量
-		double upLeftLine = this.changeUpLeftOffset(nodes.get(0), levelMap, nodeMap, offset, leftLine);
+		double upLeftLine = this.changeUpLeftOffset(nodes.get(0).getShapeNum(), levelMap, nodeMap, offset, leftLine);
 
 		leftLine = Math.min(leftLine,upLeftLine);
 
@@ -637,17 +637,16 @@ public class ImportShapeExcel1 {
 		leftLine = Math.min(leftLine,moveLeftLine);
 
 		//递归处理子级所有图形+连线x的偏移量
-		double subLeftLine = this.changeSubLeftOffset(nodes.get(0), levelMap, nodeMap, offset, leftLine);
+		double subLeftLine = this.changeSubLeftOffset(nodes.get(0).getShapeNum(), levelMap, nodeMap, offset, leftLine);
 		leftLine = Math.min(leftLine,subLeftLine);
 
 		return Math.min(leftLine,leftMinLine);
 
 	}
 
-	private double changeUpLeftOffset(CellObject node,Map<String, Map<String, List<CellObject>>> levelMap,Map<String,List<JSONObject>> nodeMap,double offset,double leftMinLine){
+	private double changeUpLeftOffset(String shapeNum,Map<String, Map<String, List<CellObject>>> levelMap,Map<String,List<JSONObject>> nodeMap,double offset,double leftMinLine){
 
 		double leftLine = leftMinLine;
-		String shapeNum = node.getShapeNum();
 		if (!shapeNum.contains(".")){
 			return leftLine;
 		}
@@ -655,21 +654,31 @@ public class ImportShapeExcel1 {
 		String[] split = shapeNum.split("\\.");
 		String level = ""+ (Integer.parseInt(split[0])-1);
 		String branch = split[1];
+		if (Integer.parseInt(level)<0){
+			return leftLine;
+		}
 
 		Map<String, List<CellObject>> numList = levelMap.get(level);
-
+		if (null == numList){
+			//层级跳级处理
+			double upLeftLine = this.changeUpLeftOffset(level+"."+branch, levelMap, nodeMap, offset, leftLine);
+			leftLine = Math.min(leftLine,upLeftLine);
+			return Math.min(leftLine,leftMinLine);
+		}
 
 		List<CellObject> upList = numList.get(level + "." + branch);
 		if (upList == null || upList.isEmpty()){
-			return leftLine;
+			//分支父级跳级处理
+			double upLeftLine = this.changeUpLeftOffset(level+"."+branch, levelMap, nodeMap, offset, leftLine);
+			leftLine = Math.min(leftLine,upLeftLine);
+			return Math.min(leftLine,leftMinLine);
 		}
-		double upLeftLine = this.changeUpLeftOffset(upList.get(0), levelMap, nodeMap, offset, leftLine);
 
+		double upLeftLine = this.changeUpLeftOffset(upList.get(0).getShapeNum(), levelMap, nodeMap, offset, leftLine);
 		leftLine = Math.min(leftLine,upLeftLine);
 
 		//移动父级节点
 		double moveLeftLine = this.moveLeftNode(upList, nodeMap, offset, leftLine,true,false);
-
 		leftLine = Math.min(leftLine,moveLeftLine);
 
 		return Math.min(leftLine,leftMinLine);
@@ -723,9 +732,8 @@ public class ImportShapeExcel1 {
 		return leftLine;
 	}
 
-	private double changeSubLeftOffset(CellObject node,Map<String, Map<String, List<CellObject>>> levelMap,Map<String,List<JSONObject>> nodeMap,double offset,double leftMinLine){
+	private double changeSubLeftOffset(String shapeNum,Map<String, Map<String, List<CellObject>>> levelMap,Map<String,List<JSONObject>> nodeMap,double offset,double leftMinLine){
 		double leftLine = leftMinLine;
-		String shapeNum = node.getShapeNum();
 
 		if (!shapeNum.contains(".")){
 			return leftLine;
@@ -735,8 +743,18 @@ public class ImportShapeExcel1 {
 		String[] split = shapeNum.split("\\.");
 		String level = ""+ (Integer.parseInt(split[0])+1);
 		String branch = split[1];
+		if (Integer.parseInt(level)<0){
+			return leftLine;
+		}
 
 		Map<String, List<CellObject>> numList = levelMap.get(level);
+		if(null == numList){
+			//层级跳级处理
+			double subLeftOffset = this.changeSubLeftOffset(level+"."+branch, levelMap, nodeMap, offset, leftLine);
+			leftLine = Math.min(leftLine,subLeftOffset);
+			return Math.min(leftLine,leftMinLine);
+		}
+
 		List<CellObject> subList = numList.get(level + "." + branch);
 		if (subList == null || subList.isEmpty()){
 			subList = numList.get(level);
@@ -766,17 +784,19 @@ public class ImportShapeExcel1 {
 					}
 
 				}
+			}else {
+				//下级分支跳级直连
+				double subLeftOffset = this.changeSubLeftOffset(level+"."+branch, levelMap, nodeMap, offset, leftLine);
+				leftLine = Math.min(leftLine,subLeftOffset);
 			}
-			return leftLine;
+			return Math.min(leftLine,leftMinLine);
 		}
 
-		double subLeftOffset = this.changeSubLeftOffset(subList.get(0), levelMap, nodeMap, offset, leftLine);
-
+		double subLeftOffset = this.changeSubLeftOffset(subList.get(0).getShapeNum(), levelMap, nodeMap, offset, leftLine);
 		leftLine = Math.min(leftLine,subLeftOffset);
 
 		//移动子级节点
 		double moveLeftLine = this.moveLeftNode(subList, nodeMap, offset, leftLine,true,true);
-
 		leftLine = Math.min(leftLine,moveLeftLine);
 
 		return Math.min(leftLine,leftMinLine);
@@ -786,7 +806,7 @@ public class ImportShapeExcel1 {
 
 		double rightLine = rightMaxLine;
 		//递归处理父级所有图形+连线的x的偏移量
-		double upRightOffset = this.changeUpRightOffset(nodes.get(0), levelMap, nodeMap, offset, rightLine);
+		double upRightOffset = this.changeUpRightOffset(nodes.get(0).getShapeNum(), levelMap, nodeMap, offset, rightLine);
 
 		rightLine = Math.max(rightLine,upRightOffset);
 
@@ -795,15 +815,14 @@ public class ImportShapeExcel1 {
 		rightLine = Math.max(rightLine,moveRightOffset);
 
 		//递归处理子级所有图形+连线x的偏移量
-		double subRightOffset = this.changeSubRightOffset(nodes.get(0), levelMap, nodeMap, offset, rightLine);
+		double subRightOffset = this.changeSubRightOffset(nodes.get(0).getShapeNum(), levelMap, nodeMap, offset, rightLine);
 		rightLine = Math.max(subRightOffset,rightLine);
 
 		return Math.max(rightLine,rightMaxLine);
 	}
 
-	private double changeUpRightOffset(CellObject node,Map<String, Map<String, List<CellObject>>> levelMap,Map<String,List<JSONObject>> nodeMap,double offset,double rightMaxLine){
+	private double changeUpRightOffset(String shapeNum,Map<String, Map<String, List<CellObject>>> levelMap,Map<String,List<JSONObject>> nodeMap,double offset,double rightMaxLine){
 		double rightLine = rightMaxLine;
-		String shapeNum = node.getShapeNum();
 		if (!shapeNum.contains(".")){
 			return rightLine;
 		}
@@ -812,14 +831,28 @@ public class ImportShapeExcel1 {
 		String[] split = shapeNum.split("\\.");
 		String level = ""+ (Integer.parseInt(split[0])-1);
 		String branch = split[1];
-		Map<String, List<CellObject>> numList = levelMap.get(level);
-		List<CellObject> upList = numList.get(level + "." + branch);
-		if (upList == null || upList.isEmpty()){
+		if (Integer.parseInt(level)<0){
 			return rightLine;
 		}
 
-		double upRightOffset = this.changeUpRightOffset(upList.get(0), levelMap, nodeMap, offset, rightLine);
 
+		Map<String, List<CellObject>> numList = levelMap.get(level);
+		if (null == numList){
+			//层级跳级 处理
+			double upRightOffset = this.changeUpRightOffset(level+"."+branch, levelMap, nodeMap, offset, rightLine);
+			rightLine = Math.max(rightLine,upRightOffset);
+			return Math.max(rightLine,rightMaxLine);
+		}
+
+		List<CellObject> upList = numList.get(level + "." + branch);
+		if (upList == null || upList.isEmpty()){
+			//分支父级跳级处理
+			double upRightOffset = this.changeUpRightOffset(level+"."+branch, levelMap, nodeMap, offset, rightLine);
+			rightLine = Math.max(rightLine,upRightOffset);
+			return Math.max(rightLine,rightMaxLine);
+		}
+
+		double upRightOffset = this.changeUpRightOffset(upList.get(0).getShapeNum(), levelMap, nodeMap, offset, rightLine);
 		rightLine = Math.max(rightLine,upRightOffset);
 
 		//移动父节点x的偏移量
@@ -878,10 +911,8 @@ public class ImportShapeExcel1 {
 		return rightLine;
 	}
 
-	private double changeSubRightOffset(CellObject node,Map<String, Map<String, List<CellObject>>> levelMap,Map<String,List<JSONObject>> nodeMap,double offset,double rightMaxLine){
+	private double changeSubRightOffset(String shapeNum,Map<String, Map<String, List<CellObject>>> levelMap,Map<String,List<JSONObject>> nodeMap,double offset,double rightMaxLine){
 		double rightLine = rightMaxLine;
-		String shapeNum = node.getShapeNum();
-
 		if (!shapeNum.contains(".")){
 			return rightLine;
 		}
@@ -890,10 +921,18 @@ public class ImportShapeExcel1 {
 		String[] split = shapeNum.split("\\.");
 		String level = ""+ (Integer.parseInt(split[0])+1);
 		String branch = split[1];
+		if (Integer.parseInt(level)<0){
+			return rightLine;
+		}
 
 		Map<String, List<CellObject>> numList = levelMap.get(level);
+		if(null == numList){
+			//层级跳级处理
+			double subRightOffset = this.changeSubRightOffset(level + "." + branch, levelMap, nodeMap, offset, rightLine);
+			rightLine = Math.max(rightLine,subRightOffset);
+			return Math.max(rightLine,rightMaxLine);
+		}
 		List<CellObject> subList = numList.get(level + "." + branch);
-
 		if (subList == null || subList.isEmpty()){
 			subList = numList.get(level);
 			if (subList != null){
@@ -919,17 +958,19 @@ public class ImportShapeExcel1 {
 						}
 					}
 				}
+			}else{
+				//分支下级跳级处理
+				double subRightOffset = this.changeSubRightOffset(level + "." + branch, levelMap, nodeMap, offset, rightLine);
+				rightLine = Math.max(rightLine,subRightOffset);
 			}
-			return rightLine;
+			return Math.max(rightLine,rightMaxLine);
 		}
 
-		double subRightOffset = this.changeSubRightOffset(subList.get(0), levelMap, nodeMap, offset, rightLine);
-
+		double subRightOffset = this.changeSubRightOffset(subList.get(0).getShapeNum(), levelMap, nodeMap, offset, rightLine);
 		rightLine = Math.max(rightLine,subRightOffset);
 
 		//移动子级节点
 		double moveRightOffset = this.moveRightNode(subList, nodeMap, offset, rightLine, true, true);
-
 		rightLine = Math.max(rightLine,moveRightOffset);
 
 		return Math.max(rightLine,rightMaxLine);
@@ -1498,6 +1539,12 @@ public class ImportShapeExcel1 {
 		}
 
 		Map<String, List<CellObject>> numList = levelMap.get(level);
+		if (null == numList){
+			//跳级 直接递归找上级
+			List<CellObject> upBranchNode = this.findUpBranchNode(levelMap, level + "." + branch);
+			list.addAll(upBranchNode);
+			return list;
+		}
 
 		List<CellObject> cellObjects = numList.get(level + "." + branch);
 		if (cellObjects==null){

com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.ma.js

@@ -64,6 +64,7 @@ function getWsId() {
 		type : "POST",
 		dataType : "JSON",
 		data : param,
+		async: false,
 		success : function(r) {
 			if (r.result == 'ok') {
 				var wsId=$("#WSID").val();
@@ -767,7 +768,6 @@ function addProcess(type) {
 		buttons:[
 			{text:'确定',cls:"blue",handler:function(){
 					window.$.simpleAlert("请稍等...", "loading");
-					debugger;
 					if (type == 'new') {
 						if (treeCheckedNewArr.length == 0) {
 							$.simpleAlert('发布流程不能为空');
@@ -1025,7 +1025,6 @@ function openPortalPage(uuid, taskId) {
 
 // 打开流程选择dialog
 function openQueryDataDialog(type) {
-	debugger;
 	$('#treeDataDiv').html('<div id="loadImg" style="width:100%;height:100%;text-align:center;vertical-align: middle;margin: auto;"></div>');
 	$('#searchData').html('<input id="processName" style="width:700px;" type="text" class="awsui-txt" placeholder="快速查询">');
 	$("#loadImg").loading({
@@ -1103,7 +1102,7 @@ function getNotPublishTreeData(type) {
 		sid : sid,
 		cmd : "com.actionsoft.apps.coe.pal.publisher_publish_tree_ma_data_query",
 		teamId: teamId,
-		wsId: '0285ff6a-e418-4d8b-a5b1-22240296f769',
+		wsId: wsId,
 		type: type,
 		flag: true
 	}
@@ -1143,7 +1142,7 @@ function loadNewData(treeNode) {
 		var dataModel = {
 			url : "./w?sid=" + jQuery("#sid").val()
 				+ "&cmd=com.actionsoft.apps.coe.pal.publisher_publish_tree_ma_data_query&flag=" + false + "&pid=" + pid
-				+ "&wsId=" + '0285ff6a-e418-4d8b-a5b1-22240296f769' + "&type=" + "new" + "&teamId=" + teamId,
+				+ "&wsId=" + wsId + "&type=" + "new" + "&teamId=" + teamId,
 			method : "POST",
 			dataType : "json"
 		}
@@ -1221,7 +1220,7 @@ function getPublishedTreeData(type) {
 		sid : sid,
 		cmd : "com.actionsoft.apps.coe.pal.publisher_publish_tree_ma_data_query",
 		teamId: teamId,
-		wsId: '0285ff6a-e418-4d8b-a5b1-22240296f769',
+		wsId: wsId,
 		type: type,
 		flag: true
 	}
@@ -2004,7 +2003,7 @@ function formSave(isTransact){
 
 	var params = {
 		title : $("#title").val(),
-		wsId: '0285ff6a-e418-4d8b-a5b1-22240296f769',
+		wsId: wsId,
 		teamId: $("#teamId").val(),
 		teamName: $("#teamName").val(),
 		processInstId:$("#processInstId").val()
@@ -2371,9 +2370,7 @@ function downloadReport(uuid, taskId) {
 			uuid: uuid
 		},
 		success : function(r) {
-			debugger;
 			if (r.result == "ok") {
-				debugger;
 				window.open (r.data.url);
 			} else {
 

com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.multiple.js

@@ -65,6 +65,7 @@ function getWsId() {
 		type : "POST",
 		dataType : "JSON",
 		data : param,
+        async: false,
 		success : function(r) {
 			if (r.result == 'ok') {
 				var wsId=$("#WSID").val();

com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/CoEPALController.java

@@ -3009,9 +3009,9 @@ public class CoEPALController {
 	 * @return
 	 */
 	@Mapping("com.actionsoft.apps.coe.pal_pl_repository_designer_CreateSystemModelBySelectType")
-	public String CreateSystemModelBySelectType(UserContext me,String title,String type,String method,String uuid,String parentId) {
+	public String CreateSystemModelBySelectType(UserContext me,String wsId,String title,String type,String method,String uuid,String parentId) {
 		CoeProcessLevelWeb web = new CoeProcessLevelWeb(me);
-		return web.CreateSystemModelBySelectType(title,type,method,uuid,parentId);
+		return web.CreateSystemModelBySelectType(wsId,title,type,method,uuid,parentId);
 	}
 
 

com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/web/CoeProcessLevelWeb.java

@@ -8400,7 +8400,7 @@ public class CoeProcessLevelWeb extends ActionWeb {
 	 * @return
 	 * by zhaolei
 	 */
-	public String CreateSystemModelBySelectType(String title,String type,String method,String uuid,String parentId){
+	public String CreateSystemModelBySelectType(String wsId,String title,String type,String method,String uuid,String parentId){
 
 		ResponseObject ro = ResponseObject.newOkResponse();
 
@@ -8431,7 +8431,36 @@ public class CoeProcessLevelWeb extends ActionWeb {
 					shape.put("id", shapeId);
 					shape.put("text",title);
 				}
+            //图形的数据属性配置
+			List<PALMethodAttributeModel> attributeModels = CoeDesignerShapeAPIManager.getInstance().getAllValidShapeAttributeModels(wsId, plModel.getMethodId());
+			for (PALMethodAttributeModel attributeModel : attributeModels) {
 
+				//todo：根据importProperty的类型获取具体保存数据值
+				JSONObject arributeObj = new JSONObject();
+				arributeObj.put("key", attributeModel.getKey());
+				arributeObj.put("isRequired", attributeModel.getIsRequired());
+				arributeObj.put("ref", attributeModel.getRef());
+				arributeObj.put("readonly", attributeModel.getReadonly());
+				arributeObj.put("scope", attributeModel.getScope());
+				arributeObj.put("name", attributeModel.getTitle());
+				arributeObj.put("id", attributeModel.getKey());
+				arributeObj.put("type", attributeModel.getType());
+				arributeObj.put("groupPath", attributeModel.getGroupPath());
+				arributeObj.put("desc", attributeModel.getDesc());
+				arributeObj.put("value", attributeModel.getValue());
+
+				JSONArray dataAttributes = shape.getJSONArray("dataAttributes");
+				if (!dataAttributes.isEmpty() && dataAttributes.size() > 0) {
+					for (Object attribute : dataAttributes) {
+						JSONObject obj = (JSONObject) attribute;
+						if (obj.containsKey("attributesJsonArray")) {
+							obj.getJSONArray("attributesJsonArray").add(arributeObj);
+							break;
+						}
+					}
+				}
+
+			}
 
 				JSONObject props = shape.getJSONObject("props");// 位置大小
 

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-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-773ec048.b5e5d032.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-7f2e89b2.e0cd2ccf.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-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-773ec048.42d708a6.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-7f2e89b2.e179f783.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.10b9304e.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.10b9304e.js></script></body></html>
+        var jdHref = "./jd";</script><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-18ba0bf3.b9b5de63.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-1fd5b92a.9170273e.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-3a7599c6.bb861d84.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-532765fe.0cca68dd.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-632a23b2.5118bec3.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-6c83edf4.6c467910.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-9d1e04c4.d1caea12.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-af1b24b0.222fcd29.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-f3e4ff48.721c4dc9.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-18ba0bf3.d0d27872.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-1fd5b92a.07c16352.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d0ab156.ca03ae9d.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.3038704d.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d216d3a.96ada280.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d224b23.e62adedc.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d224ef1.44cb7f2b.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-3a7599c6.5d555915.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-532765fe.9bb04323.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-5ca06e36.c64d879b.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-632a23b2.ffa525a8.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-6c83edf4.93b8726a.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-9d1e04c4.ddede9a0.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-af1b24b0.a6158eab.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/js/chunk-f3e4ff48.6d7f9787.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/app.634e376c.css rel=preload as=style><link href=../apps/com.actionsoft.apps.coe.pal/main/js/app.f200d041.js rel=preload as=script><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-vendors.bd2b52b4.js rel=preload as=script><link href=../apps/com.actionsoft.apps.coe.pal/main/css/app.634e376c.css rel=stylesheet></head><body style=margin:0;><div id=app></div><script src=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-vendors.bd2b52b4.js></script><script src=../apps/com.actionsoft.apps.coe.pal/main/js/app.f200d041.js></script></body></html>

com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.htm

@@ -2948,7 +2948,7 @@
    		<div style="width: 550px;height: 280px;vertical-align: top;">
     		<button id="upShapeFile" onclick="return false;" type="button" class="awsui-btn awsui-btn-green" style="margin-left: 20px;margin-top:10px">新增</button>
     		<div style="margin-left: 20px;padding: 5px; font-size: 12px; color: rgb(120, 120, 120);">
-				<span>附件格式支持:jpg, jpeg, gif, png, bmp, pdf, doc, docx, ppt, pptx, xls, xlsx, txt</span>
+				<span>附件格式支持:jpg, jpeg, gif, png, bmp, pdf, doc, docx, ppt, pptx, xls, xlsx, txt  文件大小不超过10M</span>
 			</div>
     		<div style="height:210px;overflow-x: hidden;overflow-y:auto;">
 	    		<table class="awsui-ux">
@@ -2977,7 +2977,7 @@
         <div style="width: 550px;height: 280px;vertical-align: top;">
             <button id="pupShapeFile" onclick="return false;" type="button" class="awsui-btn awsui-btn-green" style="margin-left: 20px;margin-top:10px">新增</button>
             <div style="margin-left: 20px;padding: 5px; font-size: 12px; color: rgb(120, 120, 120);">
-                <span>附件格式支持:doc, docx</span>
+                <span>附件格式支持:doc, docx 文件大小不超过10M</span>
             </div>
             <div style="height:210px;overflow-x: hidden;overflow-y:auto;">
                 <table class="awsui-ux">

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

@@ -3133,13 +3133,20 @@ function getRelevanceShapeNameByShapeId(objIds, shapeId) {
 							}
 						}
 					}
-					//判断如果为岗位/角色，鼠标悬浮显示
+					//判断如果为岗位/角色/相关文件/支持文件 鼠标悬浮显示
 					if(objId=="post"){
 						$("input[objid='" + objId + "']").attr('title', shapeNames.join(","));
 					}
 					if(objId=="role"){
 						$("input[objid='" + objId + "']").attr('title', shapeNames.join(","));
 					}
+					if(objId=="R_relevant_flies"){
+						$("input[objid='" + objId + "']").attr('title', shapeNames.join(","));
+					}
+					if(objId=="support_files"){
+						$("input[objid='" + objId + "']").attr('title', shapeNames.join(","));
+					}
+
 					$("input[objid='" + objId + "']").val(shapeNames.join(","));
 					$("input[objid_shapeId='" + objId + "']").val(shapeRelationValue.join(","));
 					$("input[objid_shapeId='" + objId + "']").attr('ref', JSON.stringify(ref));

com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/scripts/diagraming/designer.ui.js

@@ -15,6 +15,8 @@ var UI = {
 					$.simpleAlert("该模型不允许修改名称！", 'error');
 					return;
 				}*/
+
+
 				$(this).hide();
 				$("#title_container").append("<input type='text' maxlength='400'/>");
 				$("#title_container").children("input").val(title.replace(/(^\s+)|(\s+$)/g, "")).select();
@@ -34,9 +36,13 @@ var UI = {
 		 * @constructor
 		 */
 		function Nameverify() {
-
 			var newTitle = $.trim($("#title_container").children("input").val());
 			newTitle = newTitle.replace(/(^\s+)|(\s+$)/g, "");
+			var judgeFn = new RegExp(/\s+/g);
+			if (judgeFn.test(newTitle)) {
+				$.simpleAlert("模型名称不允许包含空格！", 'error');
+				return;
+			}
 			var oldTitle = $(".diagram_title").text();
 			oldTitle = oldTitle.replace(/(^\s+)|(\s+$)/g, "");
 			if (newTitle != oldTitle && chartId != "") {

com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/css/chunk-532765fe.0cca68dd.css

@@ -0,0 +1 @@
+#commonRepository[data-v-5a94998a] .el-dialog__body,#commonRepository[data-v-5a94998a] .el-main{padding:0 20px}#commonRepository[data-v-5a94998a] .el-footer{padding:0}#commonRepository[data-v-5a94998a] .el-table__row .operate-icon-display{display:none}#commonRepository[data-v-5a94998a] .el-table__row:hover .operate-icon-display{display:inline-block}

com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/main/css/chunk-bb3b9f20.f7f4b256.css

@@ -1 +0,0 @@
-#commonRepository[data-v-c633f5ea] .el-dialog__body,#commonRepository[data-v-c633f5ea] .el-main{padding:0 20px}#commonRepository[data-v-c633f5ea] .el-footer{padding:0}#commonRepository[data-v-c633f5ea] .el-table__row .operate-icon-display{display:none}#commonRepository[data-v-c633f5ea] .el-table__row:hover .operate-icon-display{display:inline-block}

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

@@ -1 +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._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}}]);
+(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("0b56"),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.3038704d.js

@@ -1 +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._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}}]);
+(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("0b56"),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.96ada280.js

@@ -1 +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._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}}]);
+(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("0b56"),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.e62adedc.js

@@ -1 +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._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}}]);
+(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("0b56"),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.44cb7f2b.js

@@ -1 +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._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}}]);
+(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("0b56"),l=Object(u["a"])(c,n,a,!1,null,null,null);s["default"]=l.exports}}]);