Merge branch 'wrdp' into 'develop'

Wrdp

See merge request o2oa/o2oa!2253

o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/ActivityType.java

@@ -2,6 +2,23 @@ package com.x.processplatform.core.entity.element;
 
 import com.x.base.core.entity.JpaObject;
 
+/**
+ * 流程节点枚举类型
+ * agent：脚本节点
+ * begin：开始节点
+ * cancel：取消节点
+ * choice：选择活动节点
+ * delay：定时活动节点
+ * end：结束节点
+ * embed：流程调用节点
+ * invoke：服务调用节点
+ * manual：人工节点
+ * merge：合并活动节点
+ * message：
+ * parallel：并行活动节点
+ * service：服务节点
+ * split：拆分节点
+ */
 public enum ActivityType {
 	agent, begin, cancel, choice, delay, end, embed, invoke, manual, merge, message, parallel, service, split;
 

o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ActionAssignCreate.java

@@ -27,6 +27,7 @@ import com.x.base.core.project.http.EffectivePerson;
 import com.x.base.core.project.jaxrs.WoId;
 import com.x.base.core.project.logger.Logger;
 import com.x.base.core.project.logger.LoggerFactory;
+import com.x.base.core.project.organization.Unit;
 import com.x.base.core.project.tools.ListTools;
 import com.x.base.core.project.tools.StringTools;
 import com.x.processplatform.core.entity.content.Attachment;
@@ -86,6 +87,10 @@ class ActionAssignCreate extends BaseAction {
 			work.setCreatorIdentity(identityDn);
 			work.setCreatorPerson(business.organization().person().getWithIdentity(identityDn));
 			work.setCreatorUnit(business.organization().unit().getWithIdentity(identityDn));
+			if (StringUtils.isNotEmpty(work.getCreatorUnit())) {
+				Unit unit = business.organization().unit().getObject(work.getCreatorUnit());
+				work.setCreatorUnitLevelName(unit.getLevelName());
+			}
 			/* 通过赋值调用的是不能被作为草稿删除的 */
 			work.setDataChanged(true);
 			if (ListTools.isNotEmpty(wi.getAttachmentList())) {

o2web/source/x_component_Template/MTooltips.js

@@ -129,7 +129,10 @@ var MTooltips = new Class({
                             }
                             e.stopPropagation();
                         }.bind(this);
-                        this.container.addEvent("mousedown", this.containerMousedownFun )
+                        this.container.addEvent("mousedown", this.containerMousedownFun );
+                        this.node.addEvent("mousedown", function (e) {
+                            e.stopPropagation();
+                        })
                     }
                 }
                 if( this.options.hideByClickBody ){
@@ -139,7 +142,10 @@ var MTooltips = new Class({
                         }
                         e.stopPropagation();
                     }.bind(this);
-                    $(document.body).addEvent("mousedown", this.bodyMousedownFun )
+                    $(document.body).addEvent("mousedown", this.bodyMousedownFun );
+                    this.node.addEvent("mousedown", function (e) {
+                        e.stopPropagation();
+                    })
                 }
             }
         }
@@ -828,9 +834,9 @@ var MTooltips = new Class({
         }
 
         if( this.positionX === "left" ){
-            left = targetCoondinates.left - nodeSize.x;
+            left = targetCoondinates.right - nodeSize.x;
         }else if( this.positionX === "right" ){
-            left = targetCoondinates.right;
+            left = targetCoondinates.left;
         }else if( this.positionX === "center" ){
             left = targetCoondinates.left + (targetCoondinates.width/2) - ( nodeSize.x / 2 )
         }