From 2345dc0c14bffa56dca49165060942c0101ad119 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=94=A1=E7=A5=A5=E7=86=A0?= <caixiangyi@zoneland.net>
Date: Sat, 22 Aug 2020 04:40:29 +0000
Subject: [PATCH] Merge branch 'fix/Process.org_isinput_execption' into 'wrdp'
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Merge of fix/[流程管理]修复人员选择组件设置为只读，允许输入时的问题 to wrdp

See merge request o2oa/o2oa!1441

(cherry picked from commit 59709be306489f55fc8d028347a77ee14e26f955)

19de354d 修复人员选择组件设置为只读，允许输入的时候的问题
---
 o2web/source/x_component_cms_Xform/Readerfield.js     | 1 +
 o2web/source/x_component_process_Xform/Org.js         | 2 ++
 o2web/source/x_component_process_Xform/Orgfield.js    | 1 +
 o2web/source/x_component_process_Xform/Personfield.js | 2 ++
 4 files changed, 6 insertions(+)

diff --git a/o2web/source/x_component_cms_Xform/Readerfield.js b/o2web/source/x_component_cms_Xform/Readerfield.js
index ab6a9c60a2..acb8675b4e 100644
--- a/o2web/source/x_component_cms_Xform/Readerfield.js
+++ b/o2web/source/x_component_cms_Xform/Readerfield.js
@@ -437,6 +437,7 @@ MWF.xApplication.cms.Xform.Readerfield = MWF.CMSReaderfield =  new Class({
             } else {
                 var node = this.node.getFirst();
                 if (node) {
+                    node.empty();
                     comboxValues.each(function (v, i) {
                         this.creteShowNode(v, (i === comboxValues.length - 1)).inject(node);
                     }.bind(this));
diff --git a/o2web/source/x_component_process_Xform/Org.js b/o2web/source/x_component_process_Xform/Org.js
index 3d150c6e86..9993ea717e 100644
--- a/o2web/source/x_component_process_Xform/Org.js
+++ b/o2web/source/x_component_process_Xform/Org.js
@@ -775,6 +775,7 @@ MWF.xApplication.process.Xform.Org = MWF.APPOrg =  new Class({
             }else{
                 var node = this.node.getFirst();
                 if (node){
+                    node.empty();
                     comboxValues.each(function(v, i){
                         this.creteShowNode(v, (i===comboxValues.length-1)).inject(node);
                     }.bind(this));
@@ -900,6 +901,7 @@ MWF.xApplication.process.Xform.Org = MWF.APPOrg =  new Class({
             }else{
                 var node = this.node.getFirst();
                 if (node){
+                    node.empty();
                     comboxValues.each(function(v, i){
                         this.creteShowNode(v, (i===comboxValues.length-1)).inject(node);
                     }.bind(this));
diff --git a/o2web/source/x_component_process_Xform/Orgfield.js b/o2web/source/x_component_process_Xform/Orgfield.js
index aa781ca09e..2af9ec4d8a 100644
--- a/o2web/source/x_component_process_Xform/Orgfield.js
+++ b/o2web/source/x_component_process_Xform/Orgfield.js
@@ -450,6 +450,7 @@ MWF.xApplication.process.Xform.Orgfield = MWF.APPOrgfield =  new Class({
             }else{
                 var node = this.node.getFirst();
                 if (node){
+                    node.empty();
                     comboxValues.each(function(v, i){
                         this.creteShowNode(v, (i===comboxValues.length-1)).inject(node);
                     }.bind(this));
diff --git a/o2web/source/x_component_process_Xform/Personfield.js b/o2web/source/x_component_process_Xform/Personfield.js
index 2853369873..966eda25bd 100644
--- a/o2web/source/x_component_process_Xform/Personfield.js
+++ b/o2web/source/x_component_process_Xform/Personfield.js
@@ -706,6 +706,7 @@ MWF.xApplication.process.Xform.Personfield = MWF.APPPersonfield =  new Class({
             }else{
                 var node = this.node.getFirst();
                 if (node){
+                    node.empty();
                     comboxValues.each(function(v, i){
                         this.creteShowNode(v, (i===comboxValues.length-1)).inject(node);
                     }.bind(this));
@@ -834,6 +835,7 @@ MWF.xApplication.process.Xform.Personfield = MWF.APPPersonfield =  new Class({
             }else{
                 var node = this.node.getFirst();
                 if (node){
+                    node.empty();
                     comboxValues.each(function(v, i){
                         this.creteShowNode(v, (i===comboxValues.length-1)).inject(node);
                     }.bind(this));
-- 
GitLab