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

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

@@ -1452,9 +1452,9 @@ public class CoEPALController {
 
 	// @Mapping("COE_PAL_PL_RESPOSITORY_DESIGNER_SHAPES_TREE_NODE")
 	@Mapping("com.actionsoft.apps.coe.pal_pl_repository_designer_shapes_tree_node")
-	public String COEPALRepositoryDesignerRelevanceShapesTreeDate(UserContext me, String wsId, String pid) {
+	public String COEPALRepositoryDesignerRelevanceShapesTreeDate(UserContext me, String wsId, String pid,String attrId,String ruuid) {
 		DesignerRelationShapeWeb web = new DesignerRelationShapeWeb(me);
-		return web.getTreeJson(wsId, pid);
+		return web.getTreeJson(wsId, pid,attrId,ruuid);
 	}
 	
 // @Mapping("COE_PAL_PL_RESPOSITORY_DESIGNER_PROCESS_MODELS_TREE_NODE")

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

@@ -32,6 +32,7 @@ import com.actionsoft.bpms.bpmn.modeler.constant.BPMNFileConstant;
 import com.actionsoft.bpms.bpmn.modeler.io.BPMNIO;
 import com.actionsoft.bpms.bpmn.modeler.util.BPMNFileUtil;
 import com.actionsoft.bpms.commons.cache.Cache;
+import com.actionsoft.bpms.commons.database.RowMap;
 import com.actionsoft.bpms.commons.htmlframework.AlertWindow;
 import com.actionsoft.bpms.commons.login.constant.LoginConst;
 import com.actionsoft.bpms.commons.mvc.view.ResponseObject;
@@ -46,10 +47,7 @@ import com.actionsoft.bpms.server.UserContext;
 import com.actionsoft.bpms.server.fs.DCContext;
 import com.actionsoft.bpms.server.fs.dc.DCProfileManager;
 import com.actionsoft.bpms.server.fs.dc.DCUtil;
-import com.actionsoft.bpms.util.Base64;
+import com.actionsoft.bpms.util.*;
-import com.actionsoft.bpms.util.UUIDGener;
-import com.actionsoft.bpms.util.UtilFile;
-import com.actionsoft.bpms.util.UtilString;
 import com.actionsoft.apps.coe.pal.constant.CoEConstant;
 import com.actionsoft.apps.coe.pal.pal.manage.publish.dao.PublishFrequencyDao;
 import com.actionsoft.apps.coe.pal.pal.manage.publish.dao.PublishListHistory;
@@ -1253,6 +1251,7 @@ public class PALRepositoryQueryAPIManager {
 			jsonObject.put("open", i == 1);
 			jsonObject.put("plCategory", method);
 
+
 			result.add(jsonObject);
 			if ("isUsed".equals(type)) {
 				result.addAll(getUsedPalRepositoryTreeDataByPid(context, wsId, method));
@@ -1343,6 +1342,23 @@ public class PALRepositoryQueryAPIManager {
 	}
 
 
+	/**
+	 *
+	 * @param context
+	 * @param wsId
+	 * @param pid
+	 * @param uuid
+	 * @return
+	 */
+	public JSONArray getUsedPalRepositoryTreeDataByPidAnduuid(UserContext context, String wsId, String pid,String attrId,String uuid) {
+		List<PALRepositoryModel> list = getUsedPalRepositoryModelsByPid(wsId, pid); // 根据父节点Id获取使用中的子节点
+		Collections.sort(list, new Comparator1()); // 按级别排序
+		JSONArray result = list2JsonByuuid(context, list, true, false,attrId,uuid);
+		return result;
+	}
+
+
+
 	/**************************************************** 获取流程树 **********************************************************/
 
 	/**
@@ -1426,7 +1442,7 @@ public class PALRepositoryQueryAPIManager {
 	 * @param type
 	 * @return
 	 */
-	public JSONArray getPermPalRepositoryTreeDataByUser(UserContext context, String wsId, String teamId, String type) {
+	public JSONArray getPermPalRepositoryTreeDataByUser(UserContext context, String wsId, String teamId, String type,String uuid) {
 		JSONArray result = new JSONArray();
 
 		List<PALRepositoryModel> list = null;
@@ -1678,6 +1694,7 @@ public class PALRepositoryQueryAPIManager {
 	private JSONArray list2Json(UserContext context, List<PALRepositoryModel> list, boolean isUsed, boolean isPublished, String removeIds, String param) {
 		JSONArray jsonArray = new JSONArray();
 		for (PALRepositoryModel model : list) {
+
 			JSONObject object = new JSONObject();
 			object.put("id", model.getId().trim());
 			object.put("pid", model.getNewParentId().trim());
@@ -1769,6 +1786,130 @@ public class PALRepositoryQueryAPIManager {
 		return jsonArray;
 	}
 
+
+
+ /*********************************************************************重写通过流程model列表，获取流程树的json数组***by zhaolei*****************************************************/
+
+	/**
+	 * 通过流程model列表，获取流程树的json数组
+	 *
+	 * @param context
+	 * @param list
+	 * @return
+	 */
+	public JSONArray list2JsonByuuid(UserContext context, List<PALRepositoryModel> list, boolean isUsed, boolean isPublished,String attrId,String uuid) {
+		return list2JsonByuuid(context, list, isUsed, isPublished, null, null,attrId,uuid);
+	}
+
+	private JSONArray list2JsonByuuid(UserContext context, List<PALRepositoryModel> list, boolean isUsed, boolean isPublished, String removeIds, String param,String attrId,String uuid) {
+		JSONArray jsonArray = new JSONArray();
+		for (PALRepositoryModel model : list) {
+
+			if(model.getMethodId().equals("control.kpi") || model.getMethodId().equals("org.role") ){
+				List data=new ArrayList();
+				data.add(0,model.getMethodId());
+				data.add(1,uuid);
+
+				RowMap rowMap = DBSql.getMap("SELECT EXT2 FROM APP_ACT_COE_PAL_REPOSITORY WHERE ID=? AND EXT2=?",model.getId(),data.toString());
+				if (rowMap != null) {
+					JSONObject object = new JSONObject();
+					object.put("id", model.getId().trim());
+					object.put("pid", model.getNewParentId().trim());
+					if (removeIds != null && removeIds.contains(model.getId().trim())) {
+						object.put("nocheck", true);
+					} else {
+						object.put("nocheck", false);
+					}
+					object.put("plNo", CoeProcessLevelUtil.getProcessLevelNoByUUId(model.getId(), model.getWsId()).trim());
+					object.put("name", I18nRes.findValue(CoEConstant.APP_ID, context.getLanguage(), model.getName()).trim());
+					object.put("wsId", model.getWsId());
+					PALMethodModel methodModel = PALMethodCache.getPALMethodModelById(model.getMethodId());
+					if (methodModel == null || methodModel.isFolder()) {// 没有该建模方法或者是文件夹类
+						object.put("title", object.get("name"));
+					} else {
+						object.put("title", object.get("name") + " " + VersionUtil.getVersionStrV(model.getVersion()).trim());
+					}
+					//三员管理文件密级校验
+					if (HighSecurityUtil.isON() && HighSecurityUtil.fileSecuritySwitch()){
+						ResponseObject responseObject = new CoeProcessLevelWeb(DispatcherRequest.getUserContext()).checkFilePemission(model.getId());
+						if (responseObject.isErr() && (methodModel != null && !methodModel.isFolder())){
+							object.put("nocheck", true);
+						}
+					}
+					object.put("drop", false);
+					object.put("isSystemFile", model.isSystemFile());
+					object.put("plMethodId", model.getMethodId().trim());
+					if (methodModel == null || methodModel.isFolder()) {// 没有该建模方法或者是文件夹类
+						object.put("iconFont", "&#58930;");
+					} else {
+						object.put("iconFont", "&#59101;");
+					}
+					List<PALRepositoryModel> children = null;
+					if (isUsed) {
+						children = getUsedPalRepositoryModelsByPid(model.getWsId(), model.getId());
+						if (param != null && "designer".equals(param) && children != null && children.size() > 0) {// 过滤掉发布版本
+							List<PALRepositoryModel> tempChildren = new ArrayList<>();
+							for (PALRepositoryModel model2 : children) {
+								if (!model2.isPublish()) {
+									tempChildren.add(model2);
+								}
+							}
+							children = tempChildren;
+						}
+					} else if (isPublished) {
+						children = getPublishedPalRepositoryModelsByPid(model.getWsId(), model.getId());
+					}
+					if (children == null || children.size() == 0) {
+						object.put("isParent", false);
+						//String icon = object.getString("icon");
+						object.put("leaf", true);// 叶子节点
+						// object.put("icon", icon.replace("16.png", "16.leaf.png"));
+					} else {
+						object.put("isParent", true);
+						object.put("open", false);
+					}
+
+					object.put("plLevel", model.getLevel());
+					object.put("plOrdexIndex", model.getOrderIndex());
+					object.put("plDiagramUrl", model.getDiagramUrl());
+					object.put("isDrops", model.isSystemFile());
+					object.put("isPublish", model.isPublish());
+					object.put("isStop", model.isStop());
+					object.put("isApproval", model.isApproval());
+					object.put("ext1", model.getExt1());
+					object.put("ext2", model.getExt2());
+					object.put("ext3", model.getExt3());
+					object.put("ext4", model.getExt4());
+					object.put("isUse", model.isUse());
+					object.put("url", "./w?sid=" + context.getSessionId() + "&cmd=com.actionsoft.apps.coe.pal_pl_repository_portal_page&ruuid=" + model.getId() + "&type=1&wsid=" + model.getWsId());
+					object.put("plCategory", model.getMethodCategory());
+					object.put("versionId", model.getVersionId());
+					object.put("orderIndex", model.getOrderIndex());
+					object.put("isBottomLevel", model.isBottomLevel());
+					String dutyDeptId = model.getDutyDept();
+					object.put("dutyDeptId", dutyDeptId == null ? "" : dutyDeptId);
+					String plDutyDeptName = dutyDeptId;
+					if (!UtilString.isEmpty(dutyDeptId)) {
+						if (SDK.getORGAPI().getDepartmentById(dutyDeptId) != null) {
+							plDutyDeptName = SDK.getORGAPI().getDepartmentById(dutyDeptId).getName();
+						}
+					}
+					object.put("dutyDeptName", UtilString.isEmpty(dutyDeptId) ? "" : plDutyDeptName);
+					String plDutyPerson = model.getDutyUser();
+					object.put("dutyPersonId", model.getDutyUser() == null ? "" : model.getDutyUser());
+					object.put("dutyPersionName", UtilString.isEmpty(plDutyPerson) ? "" : SDK.getORGAPI().getUserAliasNames(plDutyPerson));
+					jsonArray.add(object);
+				}
+			}
+
+
+		}
+		return jsonArray;
+	}
+
+
+	/*******************************************************************************************************************************************/
+
 	/**
 	 * 对于不完整的流程树（有权限限制等），重新设置父节点Id
 	 *
@@ -1998,7 +2139,7 @@ public class PALRepositoryQueryAPIManager {
 	 * @param pid
 	 * @return
 	 */
-	public String getPublishProcessIsVisibleModelList(UserContext context, String wsId, String pid) {
+	public String getPublishProcessIsVisibleModelList(UserContext context, String wsId, String pid,String uuid) {
 		List<PALRepositoryModel> subPublishList = getPublishedPalRepositoryModelsByPid(wsId, pid);// 发布的子流程
 		List<PALRepositoryModel> subUseList = getUsedPalRepositoryModelsByPid(wsId, pid);// 使用中的子流程
 		List<PALRepositoryModel> list = new ArrayList<PALRepositoryModel>(); // 获取所有子流程

com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/relation/web/DesignerRelationShapeWeb.java

@@ -767,8 +767,12 @@ public class DesignerRelationShapeWeb extends ActionWeb {
 					JSONObject jsonObject = objects.getJSONObject(i);
 					String url = jsonObject.getString("url");
 					String id = jsonObject.getString("id");
+
 					if (UtilString.isNotEmpty(url)) {
-						RowMap rowMap = DBSql.getMap("SELECT EXT2 FROM APP_ACT_COE_PAL_REPOSITORY WHERE ID=? AND EXT2=?", id, ruuid);
+						List data=new ArrayList();
+						data.add(0,jsonObject.getString("plMethodId"));
+						data.add(1,ruuid);
+						RowMap rowMap = DBSql.getMap("SELECT EXT2 FROM APP_ACT_COE_PAL_REPOSITORY WHERE ID=? AND EXT2=?", id, data.toString());
 						if (rowMap != null) {
 							jsonArr_new.add(objects.getJSONObject(i));
 						}
@@ -1070,8 +1074,14 @@ public class DesignerRelationShapeWeb extends ActionWeb {
 	 * @param pid
 	 * @return
 	 */
-	public String getTreeJson(String wsId, String pid) {
+	public String getTreeJson(String wsId, String pid,String attrId,String uuid) {
-		JSONArray list = PALRepositoryQueryAPIManager.getInstance().getUsedPalRepositoryTreeDataByPid(_uc, wsId, pid);
+		JSONArray list;
+		if(attrId.equals("Process_performance_metrics")){
+			list= PALRepositoryQueryAPIManager.getInstance().getUsedPalRepositoryTreeDataByPidAnduuid(_uc, wsId,pid,attrId,uuid);
+		}else{
+			list= PALRepositoryQueryAPIManager.getInstance().getUsedPalRepositoryTreeDataByPid(_uc, wsId, pid);
+		}
+
 		JSONArray result = new JSONArray();
 		for (int i = 0; i < list.size(); i++) {
 			JSONObject node = list.getJSONObject(i);

com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/job/SynchronousOrgJob.java

@@ -1,17 +1,11 @@
 package com.actionsoft.apps.coe.pal.pal.repository.job;
 
-import com.actionsoft.apps.coe.pal.pal.backup.dao.CoEPALBackup;
+
-import com.actionsoft.apps.coe.pal.pal.backup.extend.CoEPALBackupProcessor;
-import com.actionsoft.apps.coe.pal.pal.backup.model.CoEPALBackupModel;
-import com.actionsoft.apps.coe.pal.pal.method.model.PALMethodAttributeModel;
-import com.actionsoft.apps.coe.pal.pal.repository.cache.PALRepositoryCache;
 import com.actionsoft.apps.coe.pal.pal.repository.dao.CoeProcessLevelDaoFacotory;
 import com.actionsoft.apps.coe.pal.pal.repository.dao.PALRepository;
-import com.actionsoft.apps.coe.pal.pal.repository.designer.CoeDesignerShapeAPIManager;
 import com.actionsoft.apps.coe.pal.pal.repository.designer.manage.CoeDesignerAPIManager;
 import com.actionsoft.apps.coe.pal.pal.repository.designer.model.BaseModel;
 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.impl.PALRepositoryModelImpl;
 import com.actionsoft.apps.coe.pal.pal.repository.util.CoeProcessLevelUtil;
 
@@ -27,8 +21,6 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import jodd.util.StringUtil;
 
-import org.apache.commons.lang.StringUtils;
-import org.checkerframework.checker.units.qual.C;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 

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

@@ -8178,8 +8178,6 @@ public class CoeProcessLevelWeb extends ActionWeb {
 //			}
 		}
 
-		System.out.println("modelId====================="+model.getId());
-
 		// 保存文件属性
 		PALRepositoryAPIManager.getInstance().updateRepositoryProperty(model.getId());
 
@@ -8384,12 +8382,15 @@ public class CoeProcessLevelWeb extends ActionWeb {
 				String plRid = UUIDGener.getUUID();
 				String id = UUIDGener.getUUID();
 
+				List data=new ArrayList();
+				data.add(0,methodId);
+				data.add(1,uuid);
 
 				Timestamp nowTime = new Timestamp(System.currentTimeMillis());
 				PALRepositoryModelImpl model = CoeProcessLevelUtil.createPALRepositoryModel(id, plRid, wsId, plname + titleName,
 						"", 1, parentId, category, true, 1,
 						id, false, methodId, "0", 1, null,
-						null, "admin", "admin", nowTime, null, uuid,
+						null, "admin", "admin", nowTime, null, data.toString(),
 						null, null, null, null, null, null, null, 1);
 
 				coeProcessLevel.insert(model);
@@ -8550,7 +8551,10 @@ public class CoeProcessLevelWeb extends ActionWeb {
 	 */
 	public String relationFindSameRole(String uuid,String methodId){
 		ResponseObject ro = ResponseObject.newOkResponse();
-		RowMap rowMap=DBSql.getMap("SELECT EXT2 FROM APP_ACT_COE_PAL_REPOSITORY WHERE EXT2=? AND PLMETHODID=?",uuid,methodId);
+		List data=new ArrayList();
+		data.add(0,methodId);
+		data.add(1,uuid);
+		RowMap rowMap=DBSql.getMap("SELECT EXT2 FROM APP_ACT_COE_PAL_REPOSITORY WHERE EXT2=? AND PLMETHODID=?",data.toString(),methodId);
 		if(rowMap!=null){
 			ro.put("result", "ok");
 		}else{

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-230af8b6.d7d4b03d.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-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.ad686911.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-0df035f6.5d5601d8.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-21453108.ee636e90.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-230af8b6.ef5422b9.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-23a660f0.a0811617.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d0ab156.128f137a.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d0f078a.b230933d.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.7474d207.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d224b23.5d50ea7e.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d224ef1.3618651e.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-3178e2bf.e4bd60ae.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-79148172.6e616cff.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-7f2e89b2.005521e6.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-b158b92a.011e3ae6.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-bb3b9f20.90babfc9.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.f48a2dba.js rel=preload as=script><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-vendors.54a27270.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.54a27270.js></script><script src=../apps/com.actionsoft.apps.coe.pal/main/js/app.f48a2dba.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-62d9fc39.2e64e8d5.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-866d5568.59811566.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-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-62d9fc39.928e4937.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-866d5568.463c2fdd.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-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.c5fa5ed3.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.c5fa5ed3.js></script></body></html>

com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.view.portal.framework.html

@@ -621,12 +621,7 @@
                     }
                 }
             }
-           /* var output = initOutputFileLink();
+
-            if (output != 0) {
-                output = 40;
-            } else {
-                output = 0;
-            }*/
             $(window).trigger('resize');
             var newHeight = $(window).height() - $('#toolbarName').height() - $('#newadd_tools').height() - 41 - 0;
             // $('.newadd_portalAttr').height(newHeight-100);
@@ -716,20 +711,16 @@
     </script>
     <style>
         body{height:100%!important;}
-        .newadd_body{ margin: 0;color: #333333; text-align: left;background-color: #f1f5f7;}
         .newadd_title{font-size: 18px;font-weight: bold; margin-bottom:20px;display: block }
-        .newadd_card {
+        .newadd_card {
-           /* float: left;*/
+            width: 100%;
-            width:100%;
-            height:100%;
             background-color: #fff;
             background-clip: border-box;
             border-radius: 4px;
-            box-shadow: 0 2px 4px rgb(0, 0, 0, 0.2);
+            box-shadow: 0 2px 4px rgb(0 0 0 / 20%);
             margin-bottom: 20px;
-            position:relative;
+            height: 90%!important;
-            min-height:100%;
+            position: relative;
-            padding: 0 2%;
         }
         .page .footer{position:absolute; left:0; bottom:0; height:200px; width:100%;}
         .newadd_card .title{font-size: 16px; margin: 20px;}
@@ -786,16 +777,34 @@
             padding-top: 20px;
         }
         #pinglun{clear: both;overflow: hidden;height: auto;}
-        .suofang{height:40px;background-color:white;border-top:1px solid #efefef;vertical-align:middle;position: relative;border-bottom-left-radius: 10px;border-bottom-right-radius: 10px;}
+        .suofang {
+            height: 40px;
+            background-color: white;
+            border-top: 1px solid #efefef;
+            vertical-align: middle;
+            position: absolute;
+            border-bottom-left-radius: 10px;
+            border-bottom-right-radius: 10px;
+            bottom: 0;
+            width: 100%;
+        }
         .processfiledown li{line-height: 20px;}
         .awsui-table td{border:0!important; padding: 2px 0!important;}
         .iconTabClass{
             float: left;display: block; width: 18px; height: 18px; background:url("iconnew.png") no-repeat; background-size: 100%;}
+        .newadd_body {
+            margin: 0;
+            color: #333333;
+            text-align: left;
+            background-color: #f1f5f7;
+            /* overflow: hidden; */
+            padding: 20px;
+        }
     </style>
 </head>
 
 <body  class="newadd_body">
-<div style="padding:20px">
+<div>
     <!--<canvas id="support_canvas" style="display: none;"></canvas>-->
 
     <div>
@@ -902,7 +911,7 @@
         </div>
     </div>
     <div class="clearfix"></div>
-    <!--  弹框表格  -->
+  <!--  &lt;!&ndash;  弹框表格  &ndash;&gt;
     <div id="attribute-table-window2"  style="width:500px;height:325px;display:none;">
         <div style='margin:0px;height:235px;width:500px;'>
             <div style="height: 225px;width: 493px;overflow:auto;">
@@ -914,36 +923,36 @@
                 <div style="margin-top: 5px" id="attribute-add-content2"></div>
             </div>
         </div>
-    </div>
+    </div>-->
 
     <!--    <button name="dock_btn_enlarge" type="button" class="awsui-btn" onclick="canvasresizeMax();">放大</button>-->
     <!--    <button name="dock_btn_narrow" type="button" class="awsui-btn" onclick="canvasresizeMin();">缩小</button>-->
 
 
-    <div id="designer">
+    <!--<div id="designer">
         <div id="designer_viewport" class="readonly">
 
-            <!-- Graphic Dock Window -->
+            &lt;!&ndash; Graphic Dock Window &ndash;&gt;
 
         </div>
-    </div>
+    </div>-->
 
 </div>
-<div style="width:510px;display:none;" id="shapes_dialog">
+<!--<div style="width:510px;display:none;" id="shapes_dialog">
     <div id="content" class="dlg-content awsui-ux">
         <ul id="shape_manage_list">
             <#liStr>
         </ul>
     </div>
-</div>
+</div>-->
 
-<div id="designer-version-manager" style="width:600px; display:none;">
+<!--<div id="designer-version-manager" style="width:600px; display:none;">
     <div id='contentDiv' style='margin-top:1px;height:220px;' class="dlg-content">
         <iframe width="100%" id="designerManager" name="coeCreateUser" frameBorder="0" style="width: 100%; height: 220px;"></iframe>
     </div>
 </div>
 
-<!-- 不支持HTML5的页面显示图片 -->
+&lt;!&ndash; 不支持HTML5的页面显示图片 &ndash;&gt;
 <div id="mainDiv" style="display: none;">
     <div class="view_box">
         <div id="chartDivBox" style="background: none;">
@@ -958,7 +967,7 @@
             </div>
         </div>
     </div>
-</div>
+</div>-->
 
 <div title="" style="width:550px;display:none;" id="upfile-dialog">
     <div id='upfile-content' style='height:330px;'>

com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/action.xml

@@ -884,6 +884,8 @@
 	<cmd-bean name="com.actionsoft.apps.coe.pal_pl_repository_designer_shapes_tree_node">
 		<param name="wsId" />
 		<param name="pid" />
+		<param name="attrId" />
+		<param name="ruuid" />
 	</cmd-bean>
 	<cmd-bean name="com.actionsoft.apps.coe.pal_pl_repository_designer_shapes_tree_query">
 		<param name="autoContent"/>

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

@@ -1106,8 +1106,7 @@ function openRelationDialog(obj, callback) {
 											methodId:method
 										},
 										success : function(msg) {
-											debugger;
+											if (msg.data.result== "ok") {
-											if (msg.data.result == "ok") {
 												window.top.$.simpleAlert("请勿重复"+methodName+"!!!");
 											}else{
 												//跳转表单/绩效模型

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}}]);