Merge branch 'develop' into 'release'

去除前端component配置

See merge request o2oa/o2oa!294

o2server/configSample/processPlatform.json

@@ -36,7 +36,7 @@
   "deleteDraft": {
     "enable": false,
     "cron": "0 0 20 * * ?",
-    "thresholdMinutes": 14400.0,
+    "thresholdMinutes": 86400.0,
     "###enable": "是否启用###",
     "###cron": "定时cron表达式###",
     "###thresholdMinutes": "设定阈值,如果超过这个时间认为是可以删除的草稿,默认为10天.###"

o2server/configSample/qiyeweixin.json

@@ -13,6 +13,9 @@
   "messageRedirectPortal": "",
   "messageEnable": false,
   "scanLoginEnable": false,
+  "attendanceSyncEnable": false,
+  "attendanceSyncAgentId": "",
+  "attendanceSyncSecret": "",
   "###enable": "是否启用.###",
   "###syncCron": "拉入同步cron,默认每10分钟同步一次.###",
   "###forceSyncCron": "强制拉入同步cron,默认在每天的8点和12点强制进行同步.###",
@@ -26,5 +29,8 @@
   "###workUrl": "企业微信消息打开工作的url地址，如：http://dev.o2oa.net/x_desktop/###",
   "###messageRedirectPortal": "企业微信消息处理完成后跳转到特定的门户页面的Id###",
   "###messageEnable": "推送消息到企业微信###",
-  "###scanLoginEnable": "企业微信扫码登录###"
+  "###scanLoginEnable": "企业微信扫码登录###",
+  "###attendanceSyncEnable": "是否启用考勤信息###",
+  "###attendanceSyncAgentId": "企业微信考勤打卡应用id###",
+  "###attendanceSyncSecret": "企业微信考勤打卡应用secret###"
 }

o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionAppend.java

@@ -31,6 +31,7 @@ import com.x.processplatform.core.entity.content.Work;
 import com.x.processplatform.core.entity.element.Activity;
 import com.x.processplatform.core.entity.element.ActivityType;
 import com.x.processplatform.core.entity.element.Manual;
+import com.x.processplatform.core.entity.element.Process;
 import com.x.processplatform.core.entity.element.Route;
 import com.x.processplatform.core.express.service.processing.jaxrs.task.WrapAppend;
 import com.x.processplatform.service.processing.ApplicationDictHelper;
@@ -104,8 +105,9 @@ class ActionAppend extends BaseAction {
 							}
 						}
 					}
+					Process process = business.element().get(task.getProcess(), Process.class);
 					identities = business.organization().identity().list(ListTools.trim(identities, true, true));
-					TaskIdentities taskIdentities = empower(business, task, identities);
+					TaskIdentities taskIdentities = empower(business,process, task, identities);
 					identities = taskIdentities.identities();
 					if (ListTools.isNotEmpty(identities)) {
 						List<TaskCompleted> os = emc.listEqualAndInAndNotEqual(TaskCompleted.class,
@@ -160,10 +162,10 @@ class ActionAppend extends BaseAction {
 		return scriptContext;
 	}
 
-	private TaskIdentities empower(Business business, Task task, List<String> identities) throws Exception {
+	private TaskIdentities empower(Business business,Process process, Task task, List<String> identities) throws Exception {
 		TaskIdentities taskIdentities = new TaskIdentities();
 		taskIdentities.addIdentities(identities);
-		taskIdentities.empower(business.organization().empower().listWithIdentityObject(task.getApplication(),
+		taskIdentities.empower(business.organization().empower().listWithIdentityObject(task.getApplication(),process.getEdition(),
 				task.getProcess(), task.getWork(), identities));
 		return taskIdentities;
 	}

o2web/source/o2_core/o2/o2.core.js

@@ -102,7 +102,7 @@
                 thisLoaded.push(m);
                 o2.runCallback(callback, "every", [m]);
                 if (module.length){
-                    _requireSequence(module, thisLoaded, thisErrorLoaded, callback);
+                    _requireSequence(fun, module, thisLoaded, thisErrorLoaded, callback, async, compression);
                 }else{
                     if (thisErrorLoaded.length){
                         o2.runCallback(callback, "failure", [thisLoaded, thisErrorLoaded]);

o2web/source/o2_core/o2/xDesktop/$Layout/applications.json

@@ -1,31 +1 @@
-[
-  {
-    "name": "ControlPanel",
-    "path": "ControlPanel",
-    "title": "控制面板",
-    "iconPath": "appicon.png",
-//    "allowList": ["系统管理员","张三"],
-//    "denyList": []
-  },
-  {
-    "name": "DesignCenter",
-    "path": "DesignCenter",
-    "title": "设计中心",
-    "iconPath": "appicon.png"
-  },
-  {
-    "name": "TaskCenter",
-    "path": "process.TaskCenter",
-    "title": "办公中心",
-    "iconPath": "appicon.png",
-    "widgetName": "TaskWidget",
-    "widgetTitle": "待办列表",
-    "widgetIconPath": "widgeticon.png"
-  },
-  {
-    "name": "cms",
-    "path": "cms.Index",
-    "title": "信息平台",
-    "iconPath": "appicon.png"
-  }
-]
+[]

o2web/source/o2_core/o2/xDesktop/$Layout/components.json

@@ -1,111 +1 @@
-[
-  {
-    "name": "ControlPanel",
-    "path": "ControlPanel",
-    "title": "控制面板",
-    "visible": true,
-    "iconPath": "appicon.png"
-  },
-  {
-    "name": "DesignCenter",
-    "path": "DesignCenter",
-    "title": "设计中心",
-    "visible": true,
-    "iconPath": "appicon.png"
-  },
-  {
-    "name": "TaskCenter",
-    "path": "process.TaskCenter",
-    "title": "办公中心",
-    "iconPath": "appicon.png",
-    "visible": true
-  },
-  {
-    "name": "cms",
-    "path": "cms.Index",
-    "title": "信息平台",
-    "visible": true,
-    "iconPath": "appicon.png"
-  },
-  {
-    "name": "Setting",
-    "path": "Setting",
-    "title": "系统设置",
-    "iconPath": "appicon.png",
-    "visible": true,
-    "allowList": ["xadmin", "Manager"]
-  },
-  {
-    "name": "AppMarket",
-    "path": "AppMarket",
-    "title": "应用市场",
-    "iconPath": "appicon.png",
-    "visible": true,
-    "allowList": ["xadmin", "Manager"]
-  },
-//  {
-//    "name": "Deployment",
-//    "path": "Deployment",
-//    "title": "部署管理",
-//    "iconPath": "appicon.png",
-//    "visible": true,
-//    "allowList": ["xadmin", "Manager"]
-//  },
-  {
-    "name": "Org",
-    "path": "Org",
-    "title": "组织管理",
-    "visible": true,
-    "iconPath": "appicon.png"
-  },
-  {
-    "name": "Profile",
-    "path": "Profile",
-    "title": "个人设置",
-    "visible": true,
-    "iconPath": "appicon.png"
-  },
-  {
-    "name": "BAM",
-    "path": "BAM",
-    "title": "流程监控",
-    "visible": true,
-    "iconPath": "appicon.png"
-  },
-
-  {
-    "name": "ApplicationExplorer",
-    "path": "process.ApplicationExplorer",
-    "title": "流程管理平台",
-    "visible": true,
-    "iconPath": "appicon.png"
-  },
-  {
-    "name": "PortalExplorer",
-    "path": "portal.PortalExplorer",
-    "title": "门户管理平台",
-    "visible": true,
-    "iconPath": "appicon.png"
-  },
-  {
-    "name": "cmsManager",
-    "path": "cms.Column",
-    "title": "内容管理平台",
-    "visible": true,
-    "iconPath": "appicon.png"
-  },
-  {
-    "name": "DataExplorer",
-    "path": "query.QueryExplorer",
-    "title": "数据中心平台",
-    "visible": true,
-    "iconPath": "appicon.png"
-  },
-  {
-    "name": "AppCenter",
-    "path": "AppCenter",
-    "title": "应用中心",
-    "visible": true,
-    "iconPath": "appicon.png"
-  }
-]
+[]

o2web/source/x_component_Homepage/TaskContent.js

@@ -23,7 +23,9 @@ MWF.xApplication.Homepage.TaskContent = new Class({
         }.bind(this));
     },
     startProcess: function(){
-        o2.requireApp([["process.TaskCenter", "lp."+o2.language], ["process.TaskCenter", ""]],"", function(){
+        // o2.requireApp("process.TaskCenter", "lp."+o2.language, null, false);
+        // o2.requireApp("process.TaskCenter", "", null, false);
+         o2.requireApp([["process.TaskCenter", "lp."+o2.language], ["process.TaskCenter", ""]],"", function(){
             var obj = {
                 "lp": MWF.xApplication.process.TaskCenter.LP,
                 "content": this.app.content,
@@ -52,7 +54,7 @@ MWF.xApplication.Homepage.TaskContent = new Class({
                 }.bind(this)
             });
             this.processStarter.load();
-        }.bind(this));
+         }.bind(this), true, true);
     },
     initSize: function(){
         this.setContentSize();

o2web/source/x_component_Setting/components.json

@@ -1,151 +1,151 @@
 [
-  {
-    "name": "ControlPanel",
-    "path": "ControlPanel",
-    "title": "控制面板",
-    "iconPath": "appicon.png"
-  },
-  {
-    "name": "Setting",
-    "path": "Setting",
-    "title": "系统设置",
-    "iconPath": "appicon.png",
-    "allowList": ["xadmin", "Manager"]
-  },
-  {
-    "name": "AppMarket",
-    "path": "AppMarket",
-    "title": "应用市场",
-    "iconPath": "appicon.png",
-    "allowList": ["xadmin", "Manager"]
-  },
-  {
-    "name": "Deployment",
-    "path": "Deployment",
-    "title": "部署管理",
-    "iconPath": "appicon.png",
-    "allowList": ["xadmin", "Manager"]
-  },
-  {
-    "name": "Org",
-    "path": "Org",
-    "title": "组织管理",
-    "iconPath": "appicon.png"
-  },
-  {
-    "name": "Profile",
-    "path": "Profile",
-    "title": "个人设置",
-    "iconPath": "appicon.png"
-  },
-  {
-    "name": "BAM",
-    "path": "BAM",
-    "title": "流程监控",
-    "iconPath": "appicon.png"
-  },
-  {
-    "name": "DesignCenter",
-    "path": "DesignCenter",
-    "title": "设计中心",
-    "iconPath": "appicon.png"
-  },
-  {
-    "name": "ApplicationExplorer",
-    "path": "process.ApplicationExplorer",
-    "title": "流程管理平台",
-    "iconPath": "appicon.png"
-  },
-  {
-    "name": "PortalExplorer",
-    "path": "portal.PortalExplorer",
-    "title": "门户管理平台",
-    "iconPath": "appicon.png"
-  },
-  {
-    "name": "cmsManager",
-    "path": "cms.Column",
-    "title": "内容管理平台",
-    "iconPath": "appicon.png"
-  },
-  {
-    "name": "DataExplorer",
-    "path": "query.QueryExplorer",
-    "title": "数据中心平台",
-    "iconPath": "appicon.png"
-  },
-  {
-    "name": "service.ServiceManager",
-    "path": "service.ServiceManager",
-    "title": "服务管理",
-    "iconPath": "appicon.png"
-  },
-
-  {
-    "name": "AppCenter",
-    "path": "AppCenter",
-    "title": "应用导出",
-    "iconPath": "appicon.png"
-  },
-  {
-    "name": "TaskCenter",
-    "path": "process.TaskCenter",
-    "title": "办公中心",
-    "iconPath": "appicon.png",
-    "widgetName": "TaskWidget",
-    "widgetTitle": "待办列表",
-    "widgetIconPath": "widgeticon.png"
-  },
-  {
-    "name": "cms",
-    "path": "cms.Index",
-    "title": "信息平台",
-    "iconPath": "appicon.png"
-  },
-
-  {
-    "name": "File",
-    "path": "File",
-    "title": "云文件",
-    "iconPath": "appicon.png",
-    "visible": true
-  },
-
-  {
-    "name": "Note",
-    "path": "Note",
-    "title": "便签",
-    "iconPath": "appicon.png",
-    "visible": true
-  },
-  {
-    "name": "Meeting",
-    "path": "Meeting",
-    "title": "会议管理",
-    "iconPath": "appicon.png",
-    "visible": true
-  },
-  {
-    "name": "Attendance",
-    "path": "Attendance",
-    "title": "考勤管理",
-    "iconPath": "appicon.png",
-    "visible": true
-  },
-  {
-    "name": "Forum",
-    "path": "Forum",
-    "title": "论坛",
-    "iconPath": "appicon.png",
-    "visible": true
-  },
-  {
-    "name": "HotArticle",
-    "path": "HotArticle",
-    "title": "热点",
-    "iconPath": "appicon.png",
-    "visible": true
-  },
+//  {
+//    "name": "ControlPanel",
+//    "path": "ControlPanel",
+//    "title": "控制面板",
+//    "iconPath": "appicon.png"
+//  },
+//  {
+//    "name": "Setting",
+//    "path": "Setting",
+//    "title": "系统设置",
+//    "iconPath": "appicon.png",
+//    "allowList": ["xadmin", "Manager"]
+//  },
+//  {
+//    "name": "AppMarket",
+//    "path": "AppMarket",
+//    "title": "应用市场",
+//    "iconPath": "appicon.png",
+//    "allowList": ["xadmin", "Manager"]
+//  },
+//  {
+//    "name": "Deployment",
+//    "path": "Deployment",
+//    "title": "部署管理",
+//    "iconPath": "appicon.png",
+//    "allowList": ["xadmin", "Manager"]
+//  },
+//  {
+//    "name": "Org",
+//    "path": "Org",
+//    "title": "组织管理",
+//    "iconPath": "appicon.png"
+//  },
+//  {
+//    "name": "Profile",
+//    "path": "Profile",
+//    "title": "个人设置",
+//    "iconPath": "appicon.png"
+//  },
+//  {
+//    "name": "BAM",
+//    "path": "BAM",
+//    "title": "流程监控",
+//    "iconPath": "appicon.png"
+//  },
+//  {
+//    "name": "DesignCenter",
+//    "path": "DesignCenter",
+//    "title": "设计中心",
+//    "iconPath": "appicon.png"
+//  },
+//  {
+//    "name": "ApplicationExplorer",
+//    "path": "process.ApplicationExplorer",
+//    "title": "流程管理平台",
+//    "iconPath": "appicon.png"
+//  },
+//  {
+//    "name": "PortalExplorer",
+//    "path": "portal.PortalExplorer",
+//    "title": "门户管理平台",
+//    "iconPath": "appicon.png"
+//  },
+//  {
+//    "name": "cmsManager",
+//    "path": "cms.Column",
+//    "title": "内容管理平台",
+//    "iconPath": "appicon.png"
+//  },
+//  {
+//    "name": "DataExplorer",
+//    "path": "query.QueryExplorer",
+//    "title": "数据中心平台",
+//    "iconPath": "appicon.png"
+//  },
+//  {
+//    "name": "service.ServiceManager",
+//    "path": "service.ServiceManager",
+//    "title": "服务管理",
+//    "iconPath": "appicon.png"
+//  },
+//
+//  {
+//    "name": "AppCenter",
+//    "path": "AppCenter",
+//    "title": "应用导出",
+//    "iconPath": "appicon.png"
+//  },
+//  {
+//    "name": "TaskCenter",
+//    "path": "process.TaskCenter",
+//    "title": "办公中心",
+//    "iconPath": "appicon.png",
+//    "widgetName": "TaskWidget",
+//    "widgetTitle": "待办列表",
+//    "widgetIconPath": "widgeticon.png"
+//  },
+//  {
+//    "name": "cms",
+//    "path": "cms.Index",
+//    "title": "信息平台",
+//    "iconPath": "appicon.png"
+//  },
+//
+//  {
+//    "name": "File",
+//    "path": "File",
+//    "title": "云文件",
+//    "iconPath": "appicon.png",
+//    "visible": true
+//  },
+//
+//  {
+//    "name": "Note",
+//    "path": "Note",
+//    "title": "便签",
+//    "iconPath": "appicon.png",
+//    "visible": true
+//  },
+//  {
+//    "name": "Meeting",
+//    "path": "Meeting",
+//    "title": "会议管理",
+//    "iconPath": "appicon.png",
+//    "visible": true
+//  },
+//  {
+//    "name": "Attendance",
+//    "path": "Attendance",
+//    "title": "考勤管理",
+//    "iconPath": "appicon.png",
+//    "visible": true
+//  },
+//  {
+//    "name": "Forum",
+//    "path": "Forum",
+//    "title": "论坛",
+//    "iconPath": "appicon.png",
+//    "visible": true
+//  },
+//  {
+//    "name": "HotArticle",
+//    "path": "HotArticle",
+//    "title": "热点",
+//    "iconPath": "appicon.png",
+//    "visible": true
+//  },
   //  {
   //    "name": "CRM",
   //    "path": "CRM",
@@ -153,33 +153,33 @@
   //    "iconPath": "appicon.png",
   //    "visible": true
   //  },
-  {
-    "name": "ExeManager",
-    "path": "ExeManager",
-    "title": "执行力管理",
-    "iconPath": "appicon.png",
-    "visible": true
-  },
-  {
-    "name": "OnlineMeeting",
-    "path": "OnlineMeeting",
-    "title": "网络会议",
-    "iconPath": "appicon.png",
-    "visible": true
-  },
-  {
-    "name": "Minder",
-    "path": "Minder",
-    "title": "脑图编辑器",
-    "iconPath": "appicon.png",
-    "visible": true
-  },
-  {
-    "name": "Calendar",
-    "path": "Calendar",
-    "title": "日程安排",
-    "iconPath": "appicon.png",
-    "visible": true
-  }
+//  {
+//    "name": "ExeManager",
+//    "path": "ExeManager",
+//    "title": "执行力管理",
+//    "iconPath": "appicon.png",
+//    "visible": true
+//  },
+//  {
+//    "name": "OnlineMeeting",
+//    "path": "OnlineMeeting",
+//    "title": "网络会议",
+//    "iconPath": "appicon.png",
+//    "visible": true
+//  },
+//  {
+//    "name": "Minder",
+//    "path": "Minder",
+//    "title": "脑图编辑器",
+//    "iconPath": "appicon.png",
+//    "visible": true
+//  },
+//  {
+//    "name": "Calendar",
+//    "path": "Calendar",
+//    "title": "日程安排",
+//    "iconPath": "appicon.png",
+//    "visible": true
+//  }
 
 ]

o2web/source/x_component_query_ViewDesigner/$View/skin/styles_official.json

@@ -35,9 +35,9 @@
     },
     "contentGroupTd": {
       "padding": "5px 5px",
-      "border-bottom": "1px solid #CCC",
+      "border-bottom": "1px solid #fd1113",
       "font-weight": "bold",
-      "background-color": "#F6F6F6",
+      "background-color": "#ffffff",
       "cursor": "pointer"
     },
     "groupCollapseNode": {