Merge branch 'fix/Process.org_select_execption' into 'release'

Merge of fix/[流程管理]修复流程选人组件可能出现重复选人界面的问题 to release

See merge request o2oa/o2oa!324

o2web/source/x_component_Selector/MultipleSelector.js

@@ -22,6 +22,7 @@ MWF.xApplication.Selector.MultipleSelector = new Class({
         "injectToBody" : false //当传入HTML URL的时候是否插入到document.body, false的时候插入到this.container
     },
     initialize: function(container, options){
+        this.active = true;
         this.setOptions(options);
 
         this.path = "/x_component_Selector/$Selector/";
@@ -376,6 +377,7 @@ MWF.xApplication.Selector.MultipleSelector = new Class({
         this.fireEvent("close");
         this.node.destroy();
         (this.maskRelativeNode || this.container).unmask();
+        this.active = false;
         MWF.release(this);
         delete this;
     },

o2web/source/x_component_Selector/Person.js

@@ -35,6 +35,7 @@ MWF.xApplication.Selector.Person = new Class({
         "itemHeight" : 29
     },
     initialize: function(container, options){
+        this.active = true;
         this.setOptions(options);
 
         this.path = "/x_component_Selector/$Selector/";
@@ -403,6 +404,7 @@ MWF.xApplication.Selector.Person = new Class({
             window.clearInterval(this.maskInterval);
             this.maskInterval = null;
         }
+        this.active = false;
         MWF.release(this);
         delete this;
     },

o2web/source/x_component_Selector/PortalFile.js

@@ -80,6 +80,7 @@ MWF.xApplication.Selector.PortalFile = new Class({
         this.items.each(function(item){
             item.destroy();
         });
+        this.active = false;
 
         MWF.release(this);
         delete this;

o2web/source/x_component_Selector/package.js

@@ -18,6 +18,7 @@ MWF.O2Selector = new Class({
     },
     initialize: function(container, options){
         //MWF.xDesktop.requireApp("Selector", "Actions.RestActions", null, false);
+        this.loading = true;
         this.setOptions(options);
         this.container = container;
 
@@ -25,6 +26,7 @@ MWF.O2Selector = new Class({
             MWF.xDesktop.requireApp("Selector", "MultipleSelector", function() {
                 this.selector = new MWF.xApplication.Selector.MultipleSelector(this.container, this.options );
                 this.selector.load();
+                this.loading = false;
             }.bind(this));
         }else{
             var type = typeOf(this.options.type) === "string" ? this.options.type.capitalize() : this.options.type;
@@ -33,21 +35,25 @@ MWF.O2Selector = new Class({
                     MWF.xDesktop.requireApp("Selector", "UnitWithType", function(){
                         this.selector = new MWF.xApplication.Selector.UnitWithType(this.container, options);
                         this.selector.load();
+                        this.loading = false;
                     }.bind(this));
                 }else if ((type.toLowerCase()==="identity") && ((this.options.dutys) && this.options.dutys.length) && this.options.categoryType.toLowerCase()==="duty"){
                     MWF.xDesktop.requireApp("Selector", "IdentityWidthDuty", function(){
                         this.selector = new MWF.xApplication.Selector.IdentityWidthDuty(this.container, options);
                         this.selector.load();
+                        this.loading = false;
                     }.bind(this));
                 }else if ((type.toLowerCase()==="identity") && ((this.options.dutys) && this.options.dutys.length) && this.options.categoryType.toLowerCase()==="unit"){
                     MWF.xDesktop.requireApp("Selector", "IdentityWidthDutyCategoryByUnit", function(){
                         this.selector = new MWF.xApplication.Selector.IdentityWidthDutyCategoryByUnit(this.container, options);
                         this.selector.load();
+                        this.loading = false;
                     }.bind(this));
                 }else{
                     MWF.xDesktop.requireApp("Selector", type, function(){
                         this.selector = new MWF.xApplication.Selector[type](this.container, options);
                         this.selector.load();
+                        this.loading = false;
                     }.bind(this));
                 }
             }

o2web/source/x_component_cms_Xform/Authorfield.js

@@ -31,7 +31,10 @@ MWF.xApplication.cms.Xform.Authorfield = MWF.CMSAuthorfield =  new Class({
 		if( !this.readonly ) {
 			this.node.setStyle("cursor" , "pointer");
 			this.node.addEvents({
-				"click": this.clickSelect.bind(this)
+				"click": function (ev) {
+					this.clickSelect(ev);
+				}.bind(this)
+				//this.clickSelect.bind(this)
 			});
 			if (this.json.showIcon!='no')this.iconNode = new Element("div", {  //this.form.css[this.iconStyle],
 				"styles": {
@@ -44,7 +47,10 @@ MWF.xApplication.cms.Xform.Authorfield = MWF.CMSAuthorfield =  new Class({
 			if (this.iconNode){
                 this.iconNode.setStyle("cursor" , "pointer");
                 this.iconNode.addEvents({
-                    "click": this.clickSelect.bind(this)
+                    "click": function (ev) {
+						this.clickSelect(ev);
+					}.bind(this)
+					//this.clickSelect.bind(this)
                 });
 			}
 		}

o2web/source/x_component_cms_Xform/Orgfield.js

@@ -30,7 +30,10 @@ MWF.xApplication.cms.Xform.Orgfield = MWF.CMSOrgfield =  new Class({
 		if( !this.readonly ) {
 			this.node.setStyle("cursor" , "pointer");
 			this.node.addEvents({
-				"click": this.clickSelect.bind(this)
+				"click": function (ev) {
+					this.clickSelect(ev);
+				}.bind(this)
+				//this.clickSelect.bind(this)
 			});
 			if (this.json.showIcon!='no')this.iconNode = new Element("div", {  //this.form.css[this.iconStyle],
 				"styles": {
@@ -43,7 +46,10 @@ MWF.xApplication.cms.Xform.Orgfield = MWF.CMSOrgfield =  new Class({
 			if (this.iconNode){
                 this.iconNode.setStyle("cursor" , "pointer");
                 this.iconNode.addEvents({
-                    "click": this.clickSelect.bind(this)
+                    "click": function (ev) {
+						this.clickSelect(ev);
+					}.bind(this)
+					//this.clickSelect.bind(this)
                 });
 			}
 		}

o2web/source/x_component_cms_Xform/Personfield.js

@@ -115,6 +115,10 @@ MWF.xApplication.cms.Xform.Personfield = MWF.CMSPersonfield =  new Class({
 
 			}.bind(this)
 		};
-		var selector = new MWF.O2Selector(this.form.app.content, options);
+		if( this.selector && this.selector.loading ) {
+		}else if( this.selector && this.selector.selector && this.selector.selector.active ){
+		}else {
+			this.selector = new MWF.O2Selector(this.form.app.content, options);
+		}
 	}
 }); 

o2web/source/x_component_cms_Xform/Readerfield.js

@@ -27,11 +27,7 @@ MWF.xApplication.cms.Xform.Readerfield = MWF.CMSReaderfield =  new Class({
             this.descriptionNode.addEvents({
                 "mousedown": function(ev){
                     this.descriptionNode.setStyle("display", "none");
-                    this.clickSelect();
-                    ev.stopPropagation();
-                }.bind(this),
-                "click" : function (ev) {
-                    ev.stopPropagation();
+                    this.clickSelect(ev);
                 }.bind(this)
             });
         }
@@ -198,8 +194,7 @@ MWF.xApplication.cms.Xform.Readerfield = MWF.CMSReaderfield =  new Class({
             "styles": this.form.css[this.iconStyle],
             "events": {
                 "click": function (ev) {
-                    this.clickSelect();
-                    ev.stopPropagation();
+                    this.clickSelect(ev);
                 }.bind(this)
             }
         }).inject(this.node, "before");
@@ -239,8 +234,7 @@ MWF.xApplication.cms.Xform.Readerfield = MWF.CMSReaderfield =  new Class({
 			this.node.setStyle("cursor" , "pointer");
 			this.node.addEvents({
 				"click": function (ev) {
-                    this.clickSelect();
-                    ev.stopPropagation();
+                    this.clickSelect(ev);
                 }.bind(this)
                 //this.clickSelect.bind(this)
 			});
@@ -256,8 +250,7 @@ MWF.xApplication.cms.Xform.Readerfield = MWF.CMSReaderfield =  new Class({
                 this.iconNode.setStyle("cursor" , "pointer");
                 this.iconNode.addEvents({
                     "click": function (ev) {
-                        this.clickSelect();
-                        ev.stopPropagation();
+                        this.clickSelect(ev);
                     }.bind(this)
                     //this.clickSelect.bind(this)
                 });
@@ -529,7 +522,7 @@ MWF.xApplication.cms.Xform.Readerfield = MWF.CMSReaderfield =  new Class({
 	_loadValue: function(){
 		this._setValue(this.getValue());
 	},
-	clickSelect: function(){
+	clickSelect: function(ev){
 		this.validationMode();
 		var count = (this.json.count) ? this.json.count : 0;
 
@@ -596,8 +589,11 @@ MWF.xApplication.cms.Xform.Readerfield = MWF.CMSReaderfield =  new Class({
 			}.bind(this)
 		};
 
-
-		var selector = new MWF.O2Selector(this.form.app.content, options);
+        if( this.selector && this.selector.loading ) {
+        }else if( this.selector && this.selector.selector && this.selector.selector.active ){
+        }else {
+            this.selector = new MWF.O2Selector(this.form.app.content, options);
+        }
 
 	},
     _loadStyles: function(){

o2web/source/x_component_process_Xform/Org.js

@@ -50,12 +50,8 @@ MWF.xApplication.process.Xform.Org = MWF.APPOrg =  new Class({
             this.descriptionNode.addEvents({
                 "mousedown": function( ev ){
                     this.descriptionNode.setStyle("display", "none");
-                    this.clickSelect();
-                    ev.stopPropagation();
-                }.bind(this),
-                "click" : function (ev) {
-                    ev.stopPropagation();
-                }
+                    this.clickSelect( ev );
+                }.bind(this)
             });
         }
     },
@@ -305,19 +301,27 @@ MWF.xApplication.process.Xform.Org = MWF.APPOrg =  new Class({
         if (!v || !v.length) if (this.descriptionNode)  this.descriptionNode.setStyle("display", "block");
     },
 
-    clickSelect: function(){
+    clickSelect: function( ev ){
         if (this.readonly)return;
         if( layout.mobile ){
             setTimeout( function(){ //如果有输入法界面，这个时候页面的计算不对，所以等100毫秒
                 var options = this.getOptions();
                 if(options){
-                    var selector = new MWF.O2Selector(this.form.app.content, options);
+                    if( this.selector && this.selector.loading ) {
+                    }else if( this.selector && this.selector.selector && this.selector.selector.active ){
+                    }else{
+                        this.selector = new MWF.O2Selector(this.form.app.content, options);
+                    }
                 }
             }.bind(this), 100 )
         }else{
             var options = this.getOptions();
             if(options){
-                var selector = new MWF.O2Selector(this.form.app.content, options);
+                if( this.selector && this.selector.loading ) {
+                }else if( this.selector && this.selector.selector && this.selector.selector.active ){
+                }else {
+                    this.selector = new MWF.O2Selector(this.form.app.content, options);
+                }
             }
         }
     },
@@ -549,8 +553,7 @@ MWF.xApplication.process.Xform.Org = MWF.APPOrg =  new Class({
                 "styles": this.form.css[this.iconStyle],
                 "events": {
                     "click": function (ev) {
-                        this.clickSelect();
-                        ev.stopPropagation();
+                        this.clickSelect(ev);
                     }.bind(this)
                     //this.clickSelect.bind(this)
                 }
@@ -590,8 +593,7 @@ MWF.xApplication.process.Xform.Org = MWF.APPOrg =  new Class({
             "MWFType": this.json.type,
             "events": {
                 "click": function (ev) {
-                    this.clickSelect();
-                    ev.stopPropagation();
+                    this.clickSelect(ev);
                 }.bind(this)
                 //this.clickSelect.bind(this)
             }
@@ -601,8 +603,7 @@ MWF.xApplication.process.Xform.Org = MWF.APPOrg =  new Class({
                 "styles": this.form.css[this.iconStyle],
                 "events": {
                     "click": function (ev) {
-                        this.clickSelect();
-                        ev.stopPropagation();
+                        this.clickSelect(ev);
                     }.bind(this)
                     //this.clickSelect.bind(this)
                 }

o2web/source/x_component_process_Xform/Orgfield.js

@@ -27,12 +27,8 @@ MWF.xApplication.process.Xform.Orgfield = MWF.APPOrgfield =  new Class({
             this.descriptionNode.addEvents({
                 "mousedown": function( ev ){
                     this.descriptionNode.setStyle("display", "none");
-                    this.clickSelect();
-                    ev.stopPropagation();
-                }.bind(this),
-                "click" : function (ev) {
-                    ev.stopPropagation();
-                }
+                    this.clickSelect( ev );
+                }.bind(this)
             });
         }
     },
@@ -200,8 +196,7 @@ MWF.xApplication.process.Xform.Orgfield = MWF.APPOrgfield =  new Class({
                 "styles": this.form.css[this.iconStyle],
                 "events": {
                     "click": function (ev) {
-                        this.clickSelect();
-                        ev.stopPropagation();
+                        this.clickSelect( ev );
                     }.bind(this)
                     //this.clickSelect.bind(this)
                 }
@@ -245,8 +240,7 @@ MWF.xApplication.process.Xform.Orgfield = MWF.APPOrgfield =  new Class({
 			this.node.setStyle("cursor" , "pointer");
 			this.node.addEvents({
 				"click": function (ev) {
-                    this.clickSelect();
-                    ev.stopPropagation();
+                    this.clickSelect( ev );
                 }.bind(this)
                 //this.clickSelect.bind(this)
 			});
@@ -266,8 +260,7 @@ MWF.xApplication.process.Xform.Orgfield = MWF.APPOrgfield =  new Class({
                 this.iconNode.setStyle("cursor" , "pointer");
                 this.iconNode.addEvents({
                     "click": function (ev) {
-                        this.clickSelect();
-                        ev.stopPropagation();
+                        this.clickSelect( ev );
                     }.bind(this)
                     //this.clickSelect.bind(this)
                 });
@@ -507,8 +500,9 @@ MWF.xApplication.process.Xform.Orgfield = MWF.APPOrgfield =  new Class({
 	_loadValue: function(){
 		this._setValue(this.getValue());
 	},
-	clickSelect: function(){
-		this.validationMode();
+	clickSelect: function( ev ){
+        debugger;
+        this.validationMode();
 		var count = (this.json.count) ? this.json.count : 0;
 
 		var selectType = typeOf( this.json.selectType ) == "array" ? this.json.selectType : [this.json.selectType];
@@ -575,7 +569,11 @@ MWF.xApplication.process.Xform.Orgfield = MWF.APPOrgfield =  new Class({
 		};
         if( this.form.json.selectorStyle )options = Object.merge( options, this.form.json.selectorStyle );
 
-		var selector = new MWF.O2Selector(this.form.app.content, options);
+        if( this.selector && this.selector.loading ) {
+        }else if( this.selector && this.selector.selector && this.selector.selector.active ){
+        }else{
+            this.selector = new MWF.O2Selector(this.form.app.content, options);
+        }
 	},
     _loadStyles: function(){
         if (this.readonly || this.json.isReadonly){

o2web/source/x_component_process_Xform/Personfield.js

@@ -50,12 +50,8 @@ MWF.xApplication.process.Xform.Personfield = MWF.APPPersonfield =  new Class({
             this.descriptionNode.addEvents({
                 "mousedown": function( ev ){
                     this.descriptionNode.setStyle("display", "none");
-                    this.clickSelect();
-                    ev.stopPropagation();
-                }.bind(this),
-                "click" : function (ev) {
-                    ev.stopPropagation();
-                }
+                    this.clickSelect( ev );
+                }.bind(this)
             });
         }
     },
@@ -384,9 +380,14 @@ MWF.xApplication.process.Xform.Personfield = MWF.APPPersonfield =  new Class({
         if (!v || !v.length) if (this.descriptionNode)  this.descriptionNode.setStyle("display", "block");
     },
 
-	clickSelect: function(){
+	clickSelect: function( ev ){
+        debugger;
         var options = this.getOptions();
-        var selector = new MWF.O2Selector(this.form.app.content, options);
+        if( this.selector && this.selector.loading ) {
+        }else if( this.selector && this.selector.selector && this.selector.selector.active ){
+        }else{
+            this.selector = new MWF.O2Selector(this.form.app.content, options);
+        }
 	},
     resetData: function(){
         var v = this.getValue();
@@ -525,8 +526,7 @@ MWF.xApplication.process.Xform.Personfield = MWF.APPPersonfield =  new Class({
                 "styles": this.form.css[this.iconStyle],
                 "events": {
                     "click": function (ev) {
-                        this.clickSelect();
-                        ev.stopPropagation();
+                        this.clickSelect( ev );
                     }.bind(this)
                     //this.clickSelect.bind(this)
                 }
@@ -566,8 +566,7 @@ MWF.xApplication.process.Xform.Personfield = MWF.APPPersonfield =  new Class({
             "MWFType": this.json.type,
             "events": {
                 "click": function (ev) {
-                    this.clickSelect();
-                    ev.stopPropagation();
+                    this.clickSelect( ev );
                 }.bind(this)
                 //this.clickSelect.bind(this)
             }
@@ -576,8 +575,7 @@ MWF.xApplication.process.Xform.Personfield = MWF.APPPersonfield =  new Class({
             "styles": this.form.css[this.iconStyle],
             "events": {
                 "click": function (ev) {
-                    this.clickSelect();
-                    ev.stopPropagation();
+                    this.clickSelect( ev );
                 }.bind(this)
                 //this.clickSelect.bind(this)
             }