From 87e34056fef79dd4534f4f26bfd634eb91308885 Mon Sep 17 00:00:00 2001
From: unknown <caixiangyi@zoneland.net>
Date: Mon, 4 Jan 2021 14:41:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE=E7=BD=91?=
 =?UTF-8?q?=E6=A0=BC=E4=B8=AD=E9=99=84=E4=BB=B6=E7=BC=96=E8=BE=91=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E4=B8=8B=E6=89=93=E5=BC=80=E6=8A=A5=E9=94=99=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 o2web/jsdoc.conf.json                                  | 3 +++
 o2web/source/o2_core/o2/widget/AttachmentController.js | 3 +++
 o2web/source/o2_core/o2/xScript/Environment.js         | 1 +
 o2web/source/x_component_process_Xform/Attachment.js   | 4 +++-
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/o2web/jsdoc.conf.json b/o2web/jsdoc.conf.json
index a086e8894d..db896aff1b 100644
--- a/o2web/jsdoc.conf.json
+++ b/o2web/jsdoc.conf.json
@@ -40,6 +40,9 @@
     },
     "metadata": {
         "title": "O2OA前台API" //最终生成的文档中标题
+    },
+    "o2" : {
+        "actionDir" : "./o2web/jsdoc/"
     }
 }
 //执行命令: jsdoc -c ./o2web/jsdoc.conf.json
\ No newline at end of file
diff --git a/o2web/source/o2_core/o2/widget/AttachmentController.js b/o2web/source/o2_core/o2/widget/AttachmentController.js
index 2c9e108c7d..b70d089946 100644
--- a/o2web/source/o2_core/o2/widget/AttachmentController.js
+++ b/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();
                     }
                 }
             });
diff --git a/o2web/source/o2_core/o2/xScript/Environment.js b/o2web/source/o2_core/o2/xScript/Environment.js
index 3548b601e8..a95aa00422 100644
--- a/o2web/source/o2_core/o2/xScript/Environment.js
+++ b/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.
diff --git a/o2web/source/x_component_process_Xform/Attachment.js b/o2web/source/x_component_process_Xform/Attachment.js
index 523bbceb5a..efdeb780ab 100644
--- a/o2web/source/x_component_process_Xform/Attachment.js
+++ b/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);
         });
-- 
GitLab