Bläddra i källkod

Merge branch 'fix/Process.log_defaultText_execption' into 'develop'

Merge of fix/[流程管理]修复意见很长时,流程记录显示异常的问题 to develop

See merge request o2oa/o2oa!337
蔡祥熠 5 år sedan
förälder
incheckning
baf8cf1117

+ 3 - 3
o2web/source/x_component_process_Xform/$Form/default/css.wcss

@@ -258,14 +258,14 @@
     },
     "logTaskTextNode": {
         "margin-right": "10px",
-        "overflow": "hidden",
+        "overflow": "hidden"
         //"float": "left",
         //"margin-left": "28px"
     },
     "logTaskFloatTextNode": {
         "margin-right": "10px",
-        "overflow": "hidden",
-        "float": "left",
+        "overflow": "hidden"
+//        "float": "left",
         //"margin-left": "28px"
     },
     "logReadTextNode": {

+ 6 - 0
o2web/source/x_component_process_Xform/Log.js

@@ -407,6 +407,9 @@ MWF.xApplication.process.Xform.Log = MWF.APPLog =  new Class({
             left = iconNode.getStyle("margin-left").toInt();
             left = left + 28;
         }
+        if( !nodeStyle ){
+            textNode.setStyle("margin-left",left+"px");
+        }
         var html;
         var company = "";
         if (!isTask){
@@ -1452,6 +1455,9 @@ MWF.xApplication.process.Xform.Log = MWF.APPLog =  new Class({
             left = iconNode.getStyle("margin-left").toInt();
             left = left + 28;
         }
+        if( !nodeStyle ){
+            textNode.setStyle("margin-left",left+"px");
+        }
         var html;
         var company = "";
         if (!isTask){