Merge remote-tracking branch 'origin/master'

com.actionsoft.apps.coe.pal.batch/src/com/actionsoft/apps/coe/pal/batch/web/create/process/ProcessUtil.java

@@ -43,6 +43,36 @@ public class ProcessUtil {
 			}
 			list.add(I18nRes.findValue(CoEConstant.APP_ID, palMethodModel.getId()));
 		}
+		List<PALMethodModel> methodControlModels = PALMethodManager.getInstance().getPALMethodModelListByMethod("control");
+		Map<String, String> map2 = new HashMap<String, String>();
+		for (int i = 0; i < size; i++) {
+			map2.put(listApps.get(i).getId(), listApps.get(i).getRuntimeState());
+		}
+		for (int i = 0, methodSize = methodControlModels.size(); i < methodSize; i++) {
+			PALMethodModel palMethodModel = methodControlModels.get(i);
+			String appId = palMethodModel.getId();
+			if (map2.containsKey("com.actionsoft.apps.coe.method." + appId)) {
+				String methodId1 = map2.get("com.actionsoft.apps.coe.method." + appId);
+				if (methodId1.equals(AppsConst.RUNTIME_STATE_STOPPED) || methodId1.equals(AppsConst.RUNTIME_STATE_FAILED) || methodId1.equals(AppsConst.RUNTIME_STATE_READY) || methodId1.equals(AppsConst.RUNTIME_STATE_STARTING) || methodId1.equals(AppsConst.RUNTIME_STATE_STOPPING) || methodId1.equals(AppsConst.RUNTIME_STATE_UNINSTALLED) || methodId1.equals(AppsConst.RUNTIME_STATE_UNINSTALLING) || methodId1.equals(AppsConst.RUNTIME_STATE_FAILED))
+					continue;
+			}
+			list.add(I18nRes.findValue(CoEConstant.APP_ID, palMethodModel.getId()));
+		}
+		List<PALMethodModel> methodDataModels = PALMethodManager.getInstance().getPALMethodModelListByMethod("data");
+		Map<String, String> map3 = new HashMap<String, String>();
+		for (int i = 0; i < size; i++) {
+			map3.put(listApps.get(i).getId(), listApps.get(i).getRuntimeState());
+		}
+		for (int i = 0, methodSize = methodDataModels.size(); i < methodSize; i++) {
+			PALMethodModel palMethodModel = methodDataModels.get(i);
+			String appId = palMethodModel.getId();
+			if (map3.containsKey("com.actionsoft.apps.coe.method." + appId)) {
+				String methodId1 = map3.get("com.actionsoft.apps.coe.method." + appId);
+				if (methodId1.equals(AppsConst.RUNTIME_STATE_STOPPED) || methodId1.equals(AppsConst.RUNTIME_STATE_FAILED) || methodId1.equals(AppsConst.RUNTIME_STATE_READY) || methodId1.equals(AppsConst.RUNTIME_STATE_STARTING) || methodId1.equals(AppsConst.RUNTIME_STATE_STOPPING) || methodId1.equals(AppsConst.RUNTIME_STATE_UNINSTALLED) || methodId1.equals(AppsConst.RUNTIME_STATE_UNINSTALLING) || methodId1.equals(AppsConst.RUNTIME_STATE_FAILED))
+					continue;
+			}
+			list.add(I18nRes.findValue(CoEConstant.APP_ID, palMethodModel.getId()));
+		}
 		return list;
 	}
 	
@@ -96,6 +126,36 @@ public class ProcessUtil {
 			}
 			result.put(I18nRes.findValue(CoEConstant.APP_ID, palMethodModel.getId()), palMethodModel.getId());
 		}
+		List<PALMethodModel> methodControlModels = PALMethodManager.getInstance().getPALMethodModelListByMethod("control");
+		Map<String, String> map2 = new HashMap<String, String>();
+		for (int i = 0; i < size; i++) {
+			map2.put(listApps.get(i).getId(), listApps.get(i).getRuntimeState());
+		}
+		for (int i = 0, methodSize = methodControlModels.size(); i < methodSize; i++) {
+			PALMethodModel palMethodModel = methodControlModels.get(i);
+			String appId = palMethodModel.getId();
+			if (map2.containsKey("com.actionsoft.apps.coe.method." + appId)) {
+				String methodId1 = map2.get("com.actionsoft.apps.coe.method." + appId);
+				if (methodId1.equals(AppsConst.RUNTIME_STATE_STOPPED) || methodId1.equals(AppsConst.RUNTIME_STATE_FAILED) || methodId1.equals(AppsConst.RUNTIME_STATE_READY) || methodId1.equals(AppsConst.RUNTIME_STATE_STARTING) || methodId1.equals(AppsConst.RUNTIME_STATE_STOPPING) || methodId1.equals(AppsConst.RUNTIME_STATE_UNINSTALLED) || methodId1.equals(AppsConst.RUNTIME_STATE_UNINSTALLING) || methodId1.equals(AppsConst.RUNTIME_STATE_FAILED))
+					continue;
+			}
+			result.put(I18nRes.findValue(CoEConstant.APP_ID, palMethodModel.getId()), palMethodModel.getId());
+		}
+		List<PALMethodModel> methodDataModels = PALMethodManager.getInstance().getPALMethodModelListByMethod("data");
+		Map<String, String> map3 = new HashMap<String, String>();
+		for (int i = 0; i < size; i++) {
+			map3.put(listApps.get(i).getId(), listApps.get(i).getRuntimeState());
+		}
+		for (int i = 0, methodSize = methodDataModels.size(); i < methodSize; i++) {
+			PALMethodModel palMethodModel = methodDataModels.get(i);
+			String appId = palMethodModel.getId();
+			if (map3.containsKey("com.actionsoft.apps.coe.method." + appId)) {
+				String methodId1 = map3.get("com.actionsoft.apps.coe.method." + appId);
+				if (methodId1.equals(AppsConst.RUNTIME_STATE_STOPPED) || methodId1.equals(AppsConst.RUNTIME_STATE_FAILED) || methodId1.equals(AppsConst.RUNTIME_STATE_READY) || methodId1.equals(AppsConst.RUNTIME_STATE_STARTING) || methodId1.equals(AppsConst.RUNTIME_STATE_STOPPING) || methodId1.equals(AppsConst.RUNTIME_STATE_UNINSTALLED) || methodId1.equals(AppsConst.RUNTIME_STATE_UNINSTALLING) || methodId1.equals(AppsConst.RUNTIME_STATE_FAILED))
+					continue;
+			}
+			result.put(I18nRes.findValue(CoEConstant.APP_ID, palMethodModel.getId()), palMethodModel.getId());
+		}
 		return result;
 	}
 

com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishWeb.java

@@ -3030,10 +3030,10 @@ public class ProcessPublishWeb extends ActionWeb {
 		if (UtilString.isEmpty(repositoryIds)) {
 			return ResponseObject.newErrResponse("参数异常").toString();
 		}
-		String[] ids = repositoryIds.split(",");
+		JSONArray ids = (JSONArray) JSONArray.parse(repositoryIds);
 		PALRepository repositoryDao = new PALRepository();
-		for (String id : ids) {
+		for (Object id : ids) {
-			repositoryDao.updateIsApproval(isApproval,id);
+			repositoryDao.updateIsApproval(isApproval,(String) id);
 		}
 		return ResponseObject.newOkResponse().toString();
 	}

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

@@ -3650,19 +3650,35 @@ public class PALRepositoryQueryAPIManager {
 				PALMethodModel methodModel = PALMethodCache.getPALMethodModelById(model.getMethodId());
 				if (methodModel != null) {// 存在该建模方法
 					if (methodModel.isFolder()) {// 文件夹类型扩展的建模方法
+
 						JSONObject methodIcon = PALMethodManager.getInstance().getPALMethodIconById(model.getMethodId());
 						icon.put("icon", methodIcon.getString("code"));
 						icon.put("color", methodIcon.getString("color"));
 					} else {// 文件类型模型文件
-						icon.put("icon", "");
+						//判断如果是组织图，更换组织图图标
-						icon.put("color", "#8E8E8E");
+						if(methodModel.getId().equals("org.role") || methodModel.getId().equals("org.normal")){
-						object.put("folder", false);// 非文件夹
+							icon.put("icon", "");
+							icon.put("color", "#ef7b40");
+							object.put("folder", false);// 非文件夹
+						}else{
+							icon.put("icon", "");
+							icon.put("color", "#8E8E8E");
+							object.put("folder", false);// 非文件夹
+						}
+
 					}
 				}
 			}
 			if (icon.isEmpty()) {// 默认
-				icon.put("icon", "");
+				//判断如果是组织图，更换组织图图标
-				icon.put("color", "#FFB718");
+				if(model.getMethodId().equals("org.role") || model.getMethodId().equals("org.normal")){
+					icon.put("icon", "");
+					icon.put("color", "#ef7b40");
+				}else{
+					icon.put("icon", "");
+					icon.put("color", "#FFB718");
+				}
+
 			}
 			object.put("icon", icon);
 			List<PALRepositoryModel> children = null;

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

@@ -8095,14 +8095,16 @@ public class CoeProcessLevelWeb extends ActionWeb {
 		// 一级架构默认值处理
 		int index=1;
 		if(repositoryPathData.size()>0){
-			for(int i=0;i<repositoryPathData.size();i++){
+			for(int i=1;i<repositoryPathData.size();i++){
+
 				String name1=((JSONObject) repositoryPathData.get(i)).getString("name");
-				if(UtilString.isNotEmpty(name1)){
+				if(repositoryPathData.get(i)!=""){
-					propertyDao.updatePropertyByPropertyId(model.getId(), "Process_Architecture_L"+index, name1);
+					if(UtilString.isNotEmpty(name1)){
-					index++;
+						propertyDao.updatePropertyByPropertyId(model.getId(), "Process_Architecture_L"+index, name1);
-
+						index++;
-
+					}
 				}
+
 			}
 		}
 
@@ -8133,7 +8135,7 @@ public class CoeProcessLevelWeb extends ActionWeb {
 		// 获取当前文件路径
 		StringBuffer sb = new StringBuffer();
 		if(repositoryPathData.size()>0){
-			for(int i=0;i<repositoryPathData.size();i++){
+			for(int i=1;i<repositoryPathData.size();i++){
 				String name=((JSONObject) repositoryPathData.get(i)).getString("name");
 				sb.append(name).append("\\");
 			}

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

@@ -563,9 +563,6 @@
 
     <script type="text/javascript" src="../apps/com.actionsoft.apps.coe.pal/lib/designer/extend/js/commentFunction.js"></script>
 
-    <!--表情选择-->
-    <link href="../apps/com.actionsoft.apps.coe.pal/css/jquery.sinaEmotion.css" rel="stylesheet">
-    <script src="../apps/com.actionsoft.apps.coe.pal/lib/designer/extend/js/jquery.sinaEmotion.js"></script>
 
 
 
@@ -641,6 +638,7 @@
     </script>
     <script>
         $(document).ready(function(){
+            $('#content_zoom').append(Math.round(Designer.config.scale * 100) + "%")
     		var output = initOutputFileLink();
     		if (output != 0) {
     			output = 40;
@@ -669,10 +667,13 @@
             $(".message-detial-reply").append("<div class='reply-title'>"+"写下你的看法"+"</div><div class='reply-box'></div><div class='reply-list'></div>");
             var addreplystr="";
             addreplystr+="<div class='reply-panel'><textarea   class='txt emotion replycontent' id='replycontent'  maxlength='5000'></textarea>";
-            addreplystr+="<span title='"+"选择表情"+"' style='background:url(../apps/com.actionsoft.apps.cms/img/system/face_emotion.png);background-size:22px 22px;display: inline-block;width: 22px;height: 22px;margin-left: 5px;' id='showemotion'></span><input type='button' class='button blue reply-add-btn' onclick=addReply('"+ruuid+"'); value='"+"提交"+"'/>";
+            //addreplystr+="<span title='"+"选择表情"+"' style='background:url(../apps/com.actionsoft.apps.cms/img/system/face_emotion.png);background-size:22px 22px;display: inline-block;width: 22px;height: 22px;margin-left: 5px;' id='showemotion'></span><input type='button' class='button blue reply-add-btn' onclick=addReply('"+ruuid+"'); value='"+"提交"+"'/>";
+            addreplystr+="<input type='button' class='button blue reply-add-btn' onclick=addReply('"+ruuid+"'); value='"+"提交"+"'/>";
+
+
             addreplystr+="</div>";
             $(".reply-box").append(addreplystr);
-            $('#showemotion').SinaEmotion($('.emotion'));
+            //$('#showemotion').SinaEmotion($('.emotion'));
             loadReplyData(ruuid,1,0);
         }
 
@@ -858,13 +859,31 @@
             $("#designer_layout").height(newHeight);
         })
 
+        function navOperate(type) {
+            if (type == 'show') {
+                $(".dock_view").hide();
+                $('#showNav').hide()
+                $('#closeNav').show()
+            } else {
+                $('#closeNav').hide()
+                $('#showNav').show()
+                Dock.showView('navigator')
+            }
+        }
+
         function canvasresizeMax() {
-            designerZoom = designerZoom * 1.1;
+            // designerZoom = designerZoom * 1.1;
-            Designer.setZoomScale(designerZoom / 100);
+            // Designer.setZoomScale(designerZoom / 100);
+            resizeMax()
+            $('#content_zoom').empty()
+            $('#content_zoom').append(Math.round(Designer.config.scale * 100) + "%")
         }
         function canvasresizeMin() {
-            designerZoom = designerZoom * 0.9;
+            // designerZoom = designerZoom * 0.9;
-            Designer.setZoomScale(designerZoom / 100);
+            // Designer.setZoomScale(designerZoom / 100);
+            resizeMin()
+            $('#content_zoom').empty()
+            $('#content_zoom').append(Math.round(Designer.config.scale * 100) + "%")
         }
     </script>
 </head>
@@ -878,7 +897,7 @@
     </div>
     <div id="tools" style="text-align:center;line-height:40px;font-size:17px;padding-right:20px;background-color:#f4f4f4;height:40px;">
     	<span><#typeName></span>
-		<div class="toolbar_info2" style="width:369px;"> 
+		<div class="toolbar_info2" style="width:332px;">
 			<div id="tab" style="display: none;font-size: 17px;">
 				<div id="processDesc" class="headerTab" onclick="clickTab('processDesc');">文件属性</div>
 				<div id="processAttr" class="headerTab" onclick="clickTab('processAttr');">活动属性</div>
@@ -905,15 +924,15 @@
         </div>
     </div>
 
-    <button name="dock_btn_enlarge" type="button" class="awsui-btn" onclick="canvasresizeMax();">放大</button>
+<!--    <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>
+<!--    <button name="dock_btn_narrow" type="button" class="awsui-btn" onclick="canvasresizeMin();">缩小</button>-->
 
 
     <div id="designer">
         <div id="designer_viewport" class="readonly">
             <div id="designer_layout" class="" style="background:white;">
                 <div id="canvas_container" style="padding:0px;background-color:white;">
-                    <div id="designer_canvas">
+                    <div id="designer_canvas" style="background-color: white !important;">
 
 
                         <canvas id="designer_grids" style="background-color:white;">您的浏览器不支持HTML5，请使用IE9及以上版本，或Chrome、Firefox等浏览器</canvas>
@@ -978,40 +997,6 @@
                 <canvas width="160px"></canvas>
                 <div></div>
             </div>
-            <div id="navigation_view" class="dock_view dock_view_navigator">
-                <div class="dock_view_header">
-                    导航
-                    <div class="ico ico_dock_collapse"></div>
-                </div>
-                <div class="navigation_bounding">
-                    <div class="navigation_view_container">
-                        <canvas id="navigation_canvas" width="120px" height="160px"></canvas>
-                        <div id="navigation_eye"></div>
-                    </div>
-                </div>
-                <div class="dock_devider" style="margin: 0px 10px"></div>
-                <div class="navigation_view_bar">
-                    <div id="dock_zoom" class="spinner active"></div>
-                    <div id="dock_btn_fullscreen" class="toolbar_button active" onclick="Dock.enterFullScreen()" awsui-qtip='全屏视图' title_pos="top">
-                        <div class="ico ico_fullscreen"></div>
-                    </div>
-                </div>
-                <div id="fullscreen_tip" class="alert error">
-                    <div class="ico dlg_close" onclick="$('#fullscreen_tip').hide();"></div>
-                    <div class="t"></div>
-                    <div class="full_suggest">
-                        <span style="float: left;">我们推荐使用以下浏览器：</span>
-                        <span style="float: left;">
-                            <a href="http://www.google.com/chrome" target="_blank">
-                                <span class="ico chrome"></span>
-                            </a>
-                            <a href="http://www.firefox.com" target="_blank">
-                                <span class="ico firefox"></span>
-                            </a>
-                        </span>
-                    </div>
-                </div>
-            </div>
             <!-- Graphic Dock Window -->
             <!-- 流程描述 -->
             <div class="dock_view_portalDescShow portalAttr" id="portalDescDock">
@@ -1024,8 +1009,32 @@
 			<div class="dock_view_portalFileShow portalAttr" id="portalFileDock"></div>
         </div>
     </div>
-	<div id="outputFile" style="height:40px;background-color:white;border-top:1px solid #efefef;vertical-align:middle;padding-top:9px;display:none;">
+    <div style="height:40px;background-color:white;border-top:1px solid #efefef;vertical-align:middle;position: relative" >
-		<!-- <span style="margin-left:40px;">报告:</span> -->
+        <div id="outputFile" style="vertical-align:middle;padding-top:9px;display:none;float: left"></div>
+        <div style="font-size: 15px;vertical-align:middle;padding-top:9px;float:right;">
+            <span class="awsui-iconfont" id="showNav" style="margin-right:30px;display: none" awsui-qtip="显示导航" onclick="navOperate('show')">
+                <i class="awsui-iconfont" style="color:#555;">&#xe722;</i>
+            </span>
+            <span class="awsui-iconfont" id="closeNav" style="margin-right:30px" awsui-qtip="关闭导航" onclick="navOperate('close')">
+                <i class="awsui-iconfont" style="color:#555;">&#xe723;</i>
+            </span>
+            <span class="awsui-iconfont" id="narrow" style="margin-right:10px;" onclick="canvasresizeMin()" awsui-qtip="缩小" >
+                <i class="awsui-iconfont" style="color:#555;">&#xe71d;</i>
+            </span>
+            <span class="awsui-iconfont" id="content_zoom" style="margin-right:10px;"></span>
+            <span class="awsui-iconfont" id="enlarge" style="margin-right:50px;" onclick="canvasresizeMax()"  awsui-qtip="放大" >
+                <i class="awsui-iconfont" style="color:#555;">&#xe71e;</i>
+            </span>
+        </div>
+        <div id="navigation_view" class="dock_view dock_view_navigator" style="position:absolute;top: -200px">
+            <div class="navigation_bounding">
+                <div class="navigation_view_container">
+                    <canvas id="navigation_canvas" width="120px" height="160px"></canvas>
+                    <div id="navigation_eye"></div>
+                </div>
+            </div>
+        </div>
+    </div>
 	</div>
     <div style="width:510px;display:none;" id="shapes_dialog">
         <div id="content" class="dlg-content awsui-ux">

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

@@ -905,7 +905,7 @@ function showTableDialog(obj,value,id) {
 				+       '<textarea type="textarea" rows="5" class="dialog_table_input_css" value="' + tableList[i].name + '">' + tableList[i].name + '</textarea>'
 				+   '</td>'
 				+   '<td style="width: 270px;">'
-				+       '<textarea type="textarea" rows="5" class="dialog_table_input_css" value="' + tableList[i].desc + '">' + tableList[i].name + '</textarea>'
+				+       '<textarea type="textarea" rows="5" class="dialog_table_input_css" value="' + tableList[i].desc + '">' + tableList[i].desc + '</textarea>'
 				+   '</td>'
 				+    '<td style="width: 80px;text-align: center;" class="dialogTableDelete" onclick="removeTr(this)">删除</td>'
 				+'</tr>'

com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/js/pal.pl.repository.designer.view.js

@@ -254,7 +254,6 @@ function previewBox_to_chartDiv(){
 }
 
 function resizeMin(){
-	debugger;
 	if (!checkHtml5()) {
 		var currentW = $("#chartDiv").width();
 		var currentH = $("#chartDiv").height();
@@ -286,7 +285,7 @@ function resizeMin(){
 }
 
 function resizeMax(){
-	if (!checkHtmld5()) {
+	if (!checkHtml5()) {
 		var currentW = $("#chartDiv").width();
 		var currentH = $("#chartDiv").height();
 		var imgW = $("#chartDiv").find("img").width();

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

@@ -620,7 +620,7 @@ function showMessageReplyList(replyList,messageid){
             var msgid=replyinfo['msgId'];
             var replycontent=replyinfo['replyContent'];
             replycontent=replaceHtml(replycontent);
-            replycontent=AnalyticEmotion(replycontent);
+            //replycontent=AnalyticEmotion(replycontent);
             replycontent=replycontent.replace("\r\n", "<br/>");
             var replyContentForValue=replaceHtml(replyinfo['replyContent']);
             var replytime=replyinfo['replyTime'];

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

@@ -1445,7 +1445,6 @@ function isObjectRelationshipModel(linker, isAlert) {
 
 // 文件属性的处理
 function initProcessDesc() {
-	debugger;
 	var length = Object.keys(processDesc).length;
 	var t = '';
 	for(var i = 1; i <= length; i++) {