质量校验换行/账号信息悬浮显示/文件权限提示语修改/pal代码打包/palvue打包

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

@@ -3789,7 +3789,7 @@ public class PALRepositoryQueryAPIManager {
 		// 新的权限校验，若是该模型已发布，按照权限范围表中的权限控制是否可访问，若是该模型尚未发布（例如在发布过程中、已停用等），则不进行权限控制，都可访问
 		if (model.isPublish()) {
 			if (!hasAccessPortalDesignerPerm(uc, model)) {
-				return AlertWindow.getWarningMessagePage("打开失败", "无该文件查看权限");
+				return AlertWindow.getWarningMessagePage("打开失败", "您所在组织/职级暂未被授予该文件的阅览权限");
 			}
 		}
 
@@ -3845,7 +3845,7 @@ public class PALRepositoryQueryAPIManager {
 		// 新的权限校验，若是该模型已发布，按照权限范围表中的权限控制是否可访问，若是该模型尚未发布（例如在发布过程中、已停用等），则不进行权限控制，都可访问
 		if (model.isPublish()) {
 			if (!hasAccessPortalDesignerPerm(uc, model)) {
-				return AlertWindow.getWarningMessagePage("打开失败", "无该文件查看权限");
+				return AlertWindow.getWarningMessagePage("打开失败", "您所在组织/职级暂未被授予该文件的阅览权限");
 			}
 		}
 

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

@@ -226,7 +226,7 @@ public class CoeDesignerWeb extends ActionWeb {
 		}
 
 		if (!CoeCooperationAPIManager.getInstance().hasRepositoryPermision(rUUID)) {
-			return AlertWindow.getWarningMessagePage("打开失败", "无该文件查看权限");
+			return AlertWindow.getWarningMessagePage("打开失败", "您所在组织/职级暂未被授予该文件的阅览权限");
 		}
 		//三员管理，文件密级权限校验
 		if (HighSecurityUtil.isON() && HighSecurityUtil.fileSecuritySwitch()){

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

@@ -9078,7 +9078,7 @@ public class CoeProcessLevelWeb extends ActionWeb {
 
 
 		if(sb1.length()>0){
-			sb.append("<span>文件属性:<span>");
+			sb.append("<span>文件属性:<span><br/>");
 			sb.append(sb1.substring(0, sb1.length()-1));
 			sb.append("未填写，请检查！").append("</br>");
 		}
@@ -9135,7 +9135,7 @@ public class CoeProcessLevelWeb extends ActionWeb {
 		}
 
 		if(sb2.length()>0){
-			sb.append("<span>数据属性:<span>");
+			sb.append("<span>数据属性:<span><br/>");
 			sb.append(sb2.substring(0, sb2.length()-1));
 			sb.append("未填写，请检查！");
 		}

com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/portal/web/NavigationWeb.java

@@ -1034,6 +1034,20 @@ public class NavigationWeb extends ActionWeb {
 		ResponseObject ro = ResponseObject.newOkResponse();
 		// 用户头像
 		ro.put("userPhoto", SDK.getPortalAPI().getUserPhoto(_uc, _uc.getUID()));
+
+		JSONObject userInfoJson=JSONObject.parseObject(SDK.getPortalAPI().getUserInfo(_uc,_uc.getUID()));
+		if(userInfoJson.get("result").equals("ok")){
+			//获取用户姓名
+			ro.put("currentUserName",userInfoJson.getJSONObject("data").get("userName"));
+
+			//获取用户角色
+			ro.put("currentUserRole", userInfoJson.getJSONObject("data").get("roleName"));
+
+			//获取用户所在部门
+			ro.put("crrentUserDep",userInfoJson.getJSONObject("data").get("departmentName"));
+		}
+
+
 		AppAPI appApi = SDK.getAppAPI();
 		// 流程发布应用是否启动
 		boolean isPbulishActive = appApi.isActive("com.actionsoft.apps.coe.pal.publisher");

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-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-313598d4.c79e8e80.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-35023512.6aa11ffc.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-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-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-313598d4.7d662292.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-35023512.c778bef2.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-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-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.4ff9c5f8.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.4ff9c5f8.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-6c83edf4.6c467910.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-7deba587.bd8bc335.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-94049888.83062a74.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-6c83edf4.93b8726a.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-7deba587.f6b716f9.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-94049888.bca19a2c.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.1d8cae57.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.1d8cae57.js></script></body></html>