Explorar o código

修复数据网格中附件编辑状态下打开报错的问题

unknown %!s(int64=5) %!d(string=hai) anos
pai
achega
6658febf36

+ 3 - 0
o2web/jsdoc.conf.json

@@ -40,6 +40,9 @@
     },
     "metadata": {
         "title": "O2OA前台API" //最终生成的文档中标题
+    },
+    "o2" : {
+        "actionDir" : "./o2web/jsdoc/"
     }
 }
 //执行命令: jsdoc -c ./o2web/jsdoc.conf.json

+ 3 - 0
o2web/source/o2_core/o2/widget/AttachmentController.js

@@ -477,6 +477,7 @@ o2.widget.AttachmentController = o2.widget.ATTER  = new Class({
             },
             "click": function(e){
                 if (!this.retrieve("disabled")) _self.doAction(e, this, click);
+                e.stopPropagation();
             }
         });
         this.actions.push(actionNode);
@@ -1665,6 +1666,7 @@ o2.widget.AttachmentController.Attachment = new Class({
                 "click": function(e){
                     if (!this.retrieve("disabled")){
                         click.apply(_self.controller, [e, this]);
+                        e.stopPropagation();
                     }
                 }
             });
@@ -1689,6 +1691,7 @@ o2.widget.AttachmentController.Attachment = new Class({
                 "click": function(e){
                     if (!this.retrieve("disabled")){
                         click.apply(_self.controller, [e, this]);
+                        e.stopPropagation();
                     }
                 }
             });

+ 1 - 0
o2web/source/o2_core/o2/xScript/Environment.js

@@ -428,6 +428,7 @@ MWF.xScript.Environment = function(ev){
         /**
          * 当前流程实例正在流转中,并且当前用户有待办,则返回当前用户的待办对象,否则返回null。
          * @summary 获取当前流程与当前用户相关的待办对象:task对象。
+         * @o2ActionOut x_processplatform_assemble_surface.TaskAction.get
          * @method getTask
          * @static
          * @return {(Task|Null)} 当前用户的待办任务对象:task。当前用户没有对此流程实例的待办时,或流程实例已经流转结束,返回null.

+ 3 - 1
o2web/source/x_component_process_Xform/Attachment.js

@@ -1245,6 +1245,7 @@ MWF.xApplication.process.Xform.Attachment = MWF.APPAttachment = new Class(
         return (this.attachmentController) ? this.attachmentController.getAttachmentNames() : null;
     },
     createUploadFileNode: function () {
+        debugger;
         var accept = "*";
         if (!this.json.attachmentExtType || (this.json.attachmentExtType.indexOf("other") != -1 && !this.json.attachmentExtOtherType)) {
         } else {
@@ -1712,7 +1713,8 @@ MWF.xApplication.process.Xform.Attachment = MWF.APPAttachment = new Class(
                 "length": att.data.length,
                 "extension": att.data.extension,
                 "lastUpdateTime": att.data.lastUpdateTime,
-                "activityName": att.data.activityName
+                "activityName": att.data.activityName,
+                "control" : att.data.control
             }
             data.push(o);
         });