发布过滤已发布数据/增加MA图形/PAL打包

com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/util/RepositoryTreeUtil.java

@@ -160,11 +160,15 @@ public class RepositoryTreeUtil {
 			return jsonArray;
 		}
 		for (PALRepositoryModel model : repositoryList) {
+
 			repositoryMap.put(model.getVersionId(), model);
 		}
 
 		List<PALRepositoryModel> list = new ArrayList<PALRepositoryModel>();
 		for (PALRepositoryModel repository : repositoryList) {
+			if(repository.isPublish()){
+				continue;
+			}
 			PALRepositoryModelImpl object = new PALRepositoryModelImpl();
 			object.setId(repository.getId());
 			object.setName(repository.getName());
@@ -183,6 +187,7 @@ public class RepositoryTreeUtil {
 		Collections.sort(list, new Comparator1());
 
 		for (PALRepositoryModel palModel : list) {
+
 			JSONObject palObject = new JSONObject();
 			palObject.put("id", palModel.getId());
 			palObject.put("name", palModel.getName());

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

@@ -8370,7 +8370,7 @@ public class CoeProcessLevelWeb extends ActionWeb {
 	 */
 	public String checkCreatePalProcessLevelRepository(String title,String method){
 		ResponseObject ro = ResponseObject.newOkResponse();
-		RowMap rowMap=DBSql.getMap("SELECT * FROM APP_ACT_COE_PAL_REPOSITORY WHERE PLNAME=? AND PLMETHODID=?",title,method);
+		RowMap rowMap=DBSql.getMap("SELECT ID FROM APP_ACT_COE_PAL_REPOSITORY WHERE PLNAME=? AND PLMETHODID=?",title,method);
 		if(rowMap!=null){
 			ro.put("result","error");
 		}else{
@@ -8518,7 +8518,7 @@ public class CoeProcessLevelWeb extends ActionWeb {
 					shapName="kpi";
 					parentId="control";
 					category="control";
-					graphTitle="绩效";
+					graphTitle="末级流程绩效";
 				}
 
 
@@ -10401,23 +10401,53 @@ public String deleteReply(String replyid, String messageid) {
 		String L1 = null;
 		String L2 = null;
 		String L3 = null;
+		String L=null;
 		JSONArray pathArray = CoeProcessLevelUtil.getRepositoryPath(targetId);
 		String updateSql = "update APP_ACT_COE_PAL_PROP set PROPERTYVALUE ='%s' where PLID ='%s' and PROPERTYID='%s'";
 		String queryKpiSql = "select PROPERTYVALUE from APP_ACT_COE_PAL_PROP where PLID ='%s' and PROPERTYID='Process_performance_metrics'";
 		String querySql = "SELECT * FROM APP_ACT_COE_PAL_SHAPE_RLAT where FILEID = '%s' and ATTRID='Process_performance_metrics'";
-		for (int i = 1; i < pathArray.size(); i++) {
+		/*for (int i = 1; i <=3; i++) {
 			JSONObject tmp = pathArray.getJSONObject(i);
+			System.out.println("tmp============"+tmp);
 			String name = tmp.getString("name");
+			System.out.println("name======"+name);
 			if (i == 1) {
-				L1 = name;
+				System.out.println(tmp==null);
+				L1 = UtilString.isEmpty(tmp) ? "/" : subName(name);
 			}
 			if (i == 2) {
-				L2 = name;
+				System.out.println(tmp==null);
+				L2 = UtilString.isEmpty(tmp) ? "/" : subName(name);
 			}
 			if (i == 3) {
-				L3 = name;
+				System.out.println("xxxxxxxxxx");
+				System.out.println(tmp==null);
+				L3 = UtilString.isEmpty(tmp) ? "/" : subName(name);
+			}
+		}*/
+		// 一级架构默认值处理
+		if(pathArray.size()>0){
+			//设置三级架构，如果没有填充值为/
+			for(int i=1;i<=3;i++){
+				if(i<=pathArray.size()-1){
+					String name1=((JSONObject) pathArray.get(i)).getString("name");
+					String str1=name1.substring(0, name1.lastIndexOf(".")+1);
+					L=name1.substring(str1.length()+1, name1.length());
+				}else{
+					L="/";
+				}
+				if (i == 1) {
+					L1 = L;
+				}
+				if (i == 2) {
+					L2 = L;
+				}
+				if (i == 3) {
+					L3 = L;
+				}
 			}
 		}
+
 		//遍历source并设置这三个的属性值
 		for (PALRepositoryModel palRepositoryModel : sourceList) {
 			String id = palRepositoryModel.getId();
@@ -10442,6 +10472,13 @@ public String deleteReply(String replyid, String messageid) {
 	}
 
 
+	public String subName(String name){
+        String str1=name.substring(0, name.lastIndexOf(".")+1);
+        name=name.substring(str1.length()+1, name.length());
+        return name;
+    }
+
+
 	/**
 	 * 复制文件
 	 * @param wsId

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

@@ -1587,7 +1587,6 @@ function changeArributeByShape() {
 }
 
 function ProcessManual(obj) {
-
 	var manualName;
 	if(methodId=="data.form"){
 		manualName="表单手册 :";
@@ -1723,10 +1722,9 @@ function  downloadZipFile(splitId,toolbarname) {
 
 // 初始化上传附件
 function initUpfileData(obj) {
-	debugger;
 	$('#alertMessage').remove();
 	if (obj == undefined || obj == '0') {
-		/*$('#portalFileDock').empty();*/
+		$('#portalFileDock').empty();
 		var t = '';
 		var splitId='';
 		var processFile = upfileData['file'];