From 5c2da47369f6ac279eaa0831c4562c3c07777e0c Mon Sep 17 00:00:00 2001
From: huqi <hq_1980@hotmail.com>
Date: Thu, 3 Jun 2021 19:07:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0OOXML=E5=AF=B9=E8=B1=A1?=
 =?UTF-8?q?=EF=BC=8C=E7=94=A8=E4=BA=8E=E7=89=88=E5=BC=8F=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E4=B8=BAword?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../x_processplatform_assemble_surface.json   |  2 ++
 .../Documenteditor.js                         | 32 +++++++++++++++----
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/o2web/source/o2_core/o2/xAction/services/x_processplatform_assemble_surface.json b/o2web/source/o2_core/o2/xAction/services/x_processplatform_assemble_surface.json
index 0fc6a78a16..87da75f4ba 100644
--- a/o2web/source/o2_core/o2/xAction/services/x_processplatform_assemble_surface.json
+++ b/o2web/source/o2_core/o2/xAction/services/x_processplatform_assemble_surface.json
@@ -223,6 +223,8 @@
 
   "uploadAttachment": {"uri": "/jaxrs/attachment/upload/work/{id}", "method": "POST", "enctype": "formData"},
   "uploadAttachmentByWorkCompleted": {"uri": "/jaxrs/attachment/upload/workcompleted/{id}", "method": "POST", "enctype": "formData"},
+  "V2UploadWorkOrWorkCompleted": {"uri": "/jaxrs/attachment/v2/upload/workorworkcompleted/{workOrWorkCompleted}", "method": "POST", "enctype": "formData"},
+
 
   "replaceAttachment": {"uri": "/jaxrs/attachment/update/{id}/work/{workid}", "method": "POST", "enctype": "formData"},
 
diff --git a/o2web/source/x_component_process_Xform/Documenteditor.js b/o2web/source/x_component_process_Xform/Documenteditor.js
index 31360872c7..6c24090d77 100644
--- a/o2web/source/x_component_process_Xform/Documenteditor.js
+++ b/o2web/source/x_component_process_Xform/Documenteditor.js
@@ -3377,23 +3377,41 @@ MWF.xApplication.process.Xform.Documenteditor = MWF.APPDocumenteditor =  new Cla
                         oo_content.name = fileName
                         var formData = new FormData();
                         formData.append("site", this.json.toWordSite || "$doc");
+                        formData.append("fileName", fileName);
                         formData.append('file', oo_content);
 
-                        if (this.form.businessData.workCompleted){
-                            o2.Actions.get("x_processplatform_assemble_surface").uploadAttachmentByWorkCompleted(this.form.businessData.workCompleted.id, formData, oo_content,function(json){
+                        o2.Actions.get("x_processplatform_assemble_surface").V2UploadWorkOrWorkCompleted(this.form.businessData.work.id, formData, oo_content, function(json){
+                            if (this.form.businessData.workCompleted){
                                 o2.Actions.get("x_processplatform_assemble_surface").getAttachmentWorkcompleted(json.data.id, this.form.businessData.workCompleted.id,function(attjson){
                                     if (callback) callback(attjson.data);
                                     this.showToWord(attjson.data);
                                 }.bind(this));
-                            }.bind(this));
-                        }else{
-                            o2.Actions.get("x_processplatform_assemble_surface").uploadAttachment(this.form.businessData.work.id, formData, oo_content,function(json){
+                            }else{
                                 o2.Actions.get("x_processplatform_assemble_surface").getAttachment(json.data.id, this.form.businessData.work.id,function(attjson){
                                     if (callback) callback(attjson.data);
                                     this.showToWord(attjson.data);
                                 }.bind(this));
-                            }.bind(this));
-                        }
+                            }
+                        }.bind(this));
+
+                        //
+                        //
+                        //
+                        // if (this.form.businessData.workCompleted){
+                        //     o2.Actions.get("x_processplatform_assemble_surface").uploadAttachmentByWorkCompleted(this.form.businessData.workCompleted.id, formData, oo_content,function(json){
+                        //         o2.Actions.get("x_processplatform_assemble_surface").getAttachmentWorkcompleted(json.data.id, this.form.businessData.workCompleted.id,function(attjson){
+                        //             if (callback) callback(attjson.data);
+                        //             this.showToWord(attjson.data);
+                        //         }.bind(this));
+                        //     }.bind(this));
+                        // }else{
+                        //     o2.Actions.get("x_processplatform_assemble_surface").uploadAttachment(this.form.businessData.work.id, formData, oo_content,function(json){
+                        //         o2.Actions.get("x_processplatform_assemble_surface").getAttachment(json.data.id, this.form.businessData.work.id,function(attjson){
+                        //             if (callback) callback(attjson.data);
+                        //             this.showToWord(attjson.data);
+                        //         }.bind(this));
+                        //     }.bind(this));
+                        // }
 
                         //if (callback) callback(oo_content, fileName);
                     }.bind(this));
-- 
GitLab