From f29d4197d9a2ec6010a638ddc87cb7fe2a321b3c Mon Sep 17 00:00:00 2001
From: huqi <hq_1980@hotmail.com>
Date: Thu, 3 Dec 2020 10:22:37 +0800
Subject: [PATCH] =?UTF-8?q?setData=E4=BF=AE=E5=A4=8D=E5=92=8Corg=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6change=E4=BA=8B=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../x_component_process_Xform/$Input.js       | 20 +++++++++----------
 o2web/source/x_component_process_Xform/Org.js |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/o2web/source/x_component_process_Xform/$Input.js b/o2web/source/x_component_process_Xform/$Input.js
index 0f8ac120f0..071a6a16dd 100644
--- a/o2web/source/x_component_process_Xform/$Input.js
+++ b/o2web/source/x_component_process_Xform/$Input.js
@@ -307,11 +307,11 @@ MWF.xApplication.process.Xform.$Input = MWF.APP$Input =  new Class({
         // }else{
         if (!!data && o2.typeOf(data.then)=="function"){
             var p = o2.promiseAll(data).then(function(v){
-                this.__setValue(v);
-                if (this.node.getFirst() && !this.readonly && !this.json.isReadonly) {
-                    this.checkDescription();
-                    this.validationMode();
-                }
+                this.__setData(v);
+                // if (this.node.getFirst() && !this.readonly && !this.json.isReadonly) {
+                //     this.checkDescription();
+                //     this.validationMode();
+                // }
             }.bind(this), function(){});
             this.moduleValueAG = p;
             p.then(function(){
@@ -321,11 +321,11 @@ MWF.xApplication.process.Xform.$Input = MWF.APP$Input =  new Class({
             }.bind(this));
         }else{
             this.moduleValueAG = null;
-            this.__setValue(data);
-            if (this.node.getFirst() && !this.readonly && !this.json.isReadonly) {
-                this.checkDescription();
-                this.validationMode();
-            }
+            this.__setData(data);
+            // if (this.node.getFirst() && !this.readonly && !this.json.isReadonly) {
+            //     this.checkDescription();
+            //     this.validationMode();
+            // }
         }
             //this.__setData(data);
         //}
diff --git a/o2web/source/x_component_process_Xform/Org.js b/o2web/source/x_component_process_Xform/Org.js
index c2037d4ed6..15e3a17e07 100644
--- a/o2web/source/x_component_process_Xform/Org.js
+++ b/o2web/source/x_component_process_Xform/Org.js
@@ -873,7 +873,7 @@ MWF.xApplication.process.Xform.Org = MWF.APPOrg =  new Class({
         }else if (values.length || oldValues.length) {
             change = true;
         }
-        // if (change) this.fireEvent("change");
+        if (change) this.fireEvent("change");
     },
     setData: function(value){
         if (!value) return false;
-- 
GitLab