From cfcfab899a43a3164a9f7fbdbb3f99931ad66ac0 Mon Sep 17 00:00:00 2001
From: unknown <caixiangyi@zoneland.net>
Date: Wed, 2 Dec 2020 16:14:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DsetData=E6=9C=AA=E6=A3=80?=
 =?UTF-8?q?=E6=9F=A5description=E5=92=8Cvalidation=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 o2web/source/x_component_process_Xform/$Input.js   | 8 ++++++++
 o2web/source/x_component_process_Xform/Checkbox.js | 1 +
 o2web/source/x_component_process_Xform/Radio.js    | 1 +
 o2web/source/x_component_process_Xform/Select.js   | 1 +
 4 files changed, 11 insertions(+)

diff --git a/o2web/source/x_component_process_Xform/$Input.js b/o2web/source/x_component_process_Xform/$Input.js
index 4296b41e82..0f8ac120f0 100644
--- a/o2web/source/x_component_process_Xform/$Input.js
+++ b/o2web/source/x_component_process_Xform/$Input.js
@@ -308,6 +308,10 @@ MWF.xApplication.process.Xform.$Input = MWF.APP$Input =  new Class({
         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();
+                }
             }.bind(this), function(){});
             this.moduleValueAG = p;
             p.then(function(){
@@ -318,6 +322,10 @@ MWF.xApplication.process.Xform.$Input = MWF.APP$Input =  new Class({
         }else{
             this.moduleValueAG = null;
             this.__setValue(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/Checkbox.js b/o2web/source/x_component_process_Xform/Checkbox.js
index 3ffe2e4692..c9bc727528 100644
--- a/o2web/source/x_component_process_Xform/Checkbox.js
+++ b/o2web/source/x_component_process_Xform/Checkbox.js
@@ -306,6 +306,7 @@ MWF.xApplication.process.Xform.Checkbox = MWF.APPCheckbox =  new Class({
 					}
 				}
 			});
+            this.validationMode();
 		}
         this.fireEvent("setData");
 	},
diff --git a/o2web/source/x_component_process_Xform/Radio.js b/o2web/source/x_component_process_Xform/Radio.js
index 3167edfb78..81a4141e73 100644
--- a/o2web/source/x_component_process_Xform/Radio.js
+++ b/o2web/source/x_component_process_Xform/Radio.js
@@ -360,6 +360,7 @@ MWF.xApplication.process.Xform.Radio = MWF.APPRadio =  new Class({
 					inputs[i].set("checked", false);
 				}
 			}
+            this.validationMode();
 		}
         this.fireEvent("setData");
 	},
diff --git a/o2web/source/x_component_process_Xform/Select.js b/o2web/source/x_component_process_Xform/Select.js
index 2913c20d70..e982697181 100644
--- a/o2web/source/x_component_process_Xform/Select.js
+++ b/o2web/source/x_component_process_Xform/Select.js
@@ -401,6 +401,7 @@ MWF.xApplication.process.Xform.Select = MWF.APPSelect =  new Class({
 					}
 				}
 			});
+			this.validationMode();
 		}
 		this.fireEvent("setData", [data]);
 	}
-- 
GitLab