From 73f180d6166cc0c82963a34f4d785f28a9f68cbd Mon Sep 17 00:00:00 2001
From: huqi <hq_1980@hotmail.com>
Date: Tue, 23 Nov 2021 13:37:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=9A=E8=AF=AD=E8=A8=80?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../x_component_process_Xform/Documenteditor.js      |  2 --
 o2web/source/x_component_process_Xform/Form.js       | 12 +++++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/o2web/source/x_component_process_Xform/Documenteditor.js b/o2web/source/x_component_process_Xform/Documenteditor.js
index 8226511620..ea55a7d80b 100644
--- a/o2web/source/x_component_process_Xform/Documenteditor.js
+++ b/o2web/source/x_component_process_Xform/Documenteditor.js
@@ -2836,8 +2836,6 @@ debugger;
 
                 }.bind(this));
 
-                return "";
-
                 editor.on( 'paste', function( e ) {
                     var html = e.data.dataValue;
                     //if (this.json.fullWidth=="y") html = html.replace(/\x20/g, "　");
diff --git a/o2web/source/x_component_process_Xform/Form.js b/o2web/source/x_component_process_Xform/Form.js
index 8d3a7b2f67..d2a42efd6e 100644
--- a/o2web/source/x_component_process_Xform/Form.js
+++ b/o2web/source/x_component_process_Xform/Form.js
@@ -431,8 +431,6 @@ MWF.xApplication.process.Xform.Form = MWF.APPForm = new Class(
         }.bind(this));
     },
     loadLanguage: function(callback){
-        //formDataText
-        debugger;
         if (this.json.languageType!=="script" && this.json.languageType!=="default"){
             if (callback) callback();
             return true;
@@ -461,13 +459,13 @@ MWF.xApplication.process.Xform.Form = MWF.APPForm = new Class(
                 var application = (this.businessData.work || this.businessData.workCompleted).application;
                 var p1 = this.workAction.getDictRoot(name, application, function(d){
                     return d.data;
-                }, function(){});
+                }, function(){
+                    return true;
+                });
                 var p2 = new Promise(function(resolve, reject){
                     this.workAction.getScriptByNameV2(name, application, function(d){
                         if (d.data.text) {
                             resolve(this.Macro.exec(d.data.text, this));
-                        }else{
-                            reject("");
                         }
                     }.bind(this), function(){reject("");});
                 }.bind(this));
@@ -478,6 +476,10 @@ MWF.xApplication.process.Xform.Form = MWF.APPForm = new Class(
         if (languageJson){
             if (languageJson.then && o2.typeOf(languageJson.then)=="function"){
                 languageJson.then(function(json) {
+                    if (!json.data){
+                        var o = Object.clone(json);
+                        json.data = o;
+                    }
                     MWF.xApplication.process.Xform.LP.form = Object.merge(MWF.xApplication.process.Xform.LP.form, json);
                     if (callback) callback(true);
                 }, function(){
-- 
GitLab