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

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

See merge request o2oa/o2oa!316

o2web/source/x_component_cms_FormDesigner/Module/Form/template/form_mobile.json

@@ -18,10 +18,30 @@
         "html": ""
       },
       "events": {
+        "queryLoad" : {
+          "code": "",
+          "html": ""
+        },
+        "beforeLoad" : {
+          "code": "",
+          "html": ""
+        },
+        "beforeModulesLoad":{
+          "code": "",
+          "html": ""
+        },
+        "afterModulesLoad":{
+          "code": "",
+          "html": ""
+        },
         "postLoad": {
           "code": "",
           "html": ""
         },
+        "load": {
+          "code": "",
+          "html": ""
+        },
         "afterLoad": {
           "code": "",
           "html": ""
@@ -66,10 +86,6 @@
           "code": "",
           "html": ""
         },
-        "load": {
-          "code": "",
-          "html": ""
-        },
         "unload": {
           "code": "",
           "html": ""

o2web/source/x_component_cms_FormDesigner/Module/Form/template/form_publish_edit.json

@@ -18,10 +18,30 @@
         "html": ""
       },
       "events": {
+        "queryLoad" : {
+          "code": "",
+          "html": ""
+        },
+        "beforeLoad" : {
+          "code": "",
+          "html": ""
+        },
+        "beforeModulesLoad":{
+          "code": "",
+          "html": ""
+        },
+        "afterModulesLoad":{
+          "code": "",
+          "html": ""
+        },
         "postLoad": {
           "code": "",
           "html": ""
         },
+        "load": {
+          "code": "",
+          "html": ""
+        },
         "afterLoad": {
           "code": "",
           "html": ""
@@ -50,10 +70,6 @@
           "code": "",
           "html": ""
         },
-        "load": {
-          "code": "",
-          "html": ""
-        },
         "unload": {
           "code": "",
           "html": ""

o2web/source/x_component_cms_FormDesigner/Module/Form/template/form_publish_read.json

@@ -18,11 +18,33 @@
         "html": ""
       },
       "events": {
+        "queryLoad" : {
+          "code": "",
+          "html": ""
+        },
+        "beforeLoad" : {
+          "code": "",
+          "html": ""
+        },
+        "beforeModulesLoad":{
+          "code": "",
+          "html": ""
+        },
+        "afterModulesLoad":{
+          "code": "",
+          "html": ""
+        },
         "postLoad": {
           "code": "",
           "html": ""
         },
+        "load": {
+          "code": "",
+          "html": ""
+        },
         "afterLoad": {
+          "code": "",
+          "html": ""
         },
         "beforeSave": {
           "code": "",
@@ -48,10 +70,6 @@
           "code": "",
           "html": ""
         },
-        "load": {
-          "code": "",
-          "html": ""
-        },
         "unload": {
           "code": "",
           "html": ""

o2web/source/x_component_cms_Xform/Readerfield.js

@@ -25,9 +25,13 @@ MWF.xApplication.cms.Xform.Readerfield = MWF.CMSReaderfield =  new Class({
     setDescriptionEvent: function(){
         if (this.descriptionNode){
             this.descriptionNode.addEvents({
-                "mousedown": function(){
+                "mousedown": function(ev){
                     this.descriptionNode.setStyle("display", "none");
                     this.clickSelect();
+                    ev.stopPropagation();
+                }.bind(this),
+                "click" : function (ev) {
+                    ev.stopPropagation();
                 }.bind(this)
             });
         }
@@ -193,7 +197,10 @@ MWF.xApplication.cms.Xform.Readerfield = MWF.CMSReaderfield =  new Class({
         if (this.json.showIcon!='no') this.iconNode = new Element("div", {
             "styles": this.form.css[this.iconStyle],
             "events": {
-                "click": this.clickSelect.bind(this)
+                "click": function (ev) {
+                    this.clickSelect();
+                    ev.stopPropagation();
+                }.bind(this)
             }
         }).inject(this.node, "before");
 
@@ -231,7 +238,11 @@ MWF.xApplication.cms.Xform.Readerfield = MWF.CMSReaderfield =  new Class({
 		if( !this.readonly ) {
 			this.node.setStyle("cursor" , "pointer");
 			this.node.addEvents({
-				"click": this.clickSelect.bind(this)
+				"click": function (ev) {
+                    this.clickSelect();
+                    ev.stopPropagation();
+                }.bind(this)
+                //this.clickSelect.bind(this)
 			});
 			if (this.json.showIcon!='no')this.iconNode = new Element("div", {  //this.form.css[this.iconStyle],
 				"styles": {
@@ -244,7 +255,11 @@ MWF.xApplication.cms.Xform.Readerfield = MWF.CMSReaderfield =  new Class({
 			if (this.iconNode){
                 this.iconNode.setStyle("cursor" , "pointer");
                 this.iconNode.addEvents({
-                    "click": this.clickSelect.bind(this)
+                    "click": function (ev) {
+                        this.clickSelect();
+                        ev.stopPropagation();
+                    }.bind(this)
+                    //this.clickSelect.bind(this)
                 });
 			}
 		}

o2web/source/x_component_process_FormDesigner/Module/Form/form.html

@@ -78,6 +78,11 @@
         </table>
 
         <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
+<!--            <tr>-->
+<!--                <td colspan="2" class="editTableValue"><b>提交表单:</b>-->
+<!--                    <div class="MWFFormSelect" name="submitForm"></div>-->
+<!--                </td>-->
+<!--            </tr>-->
             <tr>
                 <td colspan="2" class="editTableValue"><b>提交意见手写板宽度:</b>
                     <input type="text" name="tabletWidth" value="text{$.tabletWidth}" class="editTableInputNoWidth" style="width: 50px;margin-right:3px;" />px

o2web/source/x_component_process_Xform/Org.js

@@ -48,10 +48,14 @@ MWF.xApplication.process.Xform.Org = MWF.APPOrg =  new Class({
     setDescriptionEvent: function(){
         if (this.descriptionNode){
             this.descriptionNode.addEvents({
-                "mousedown": function(){
+                "mousedown": function( ev ){
                     this.descriptionNode.setStyle("display", "none");
                     this.clickSelect();
-                }.bind(this)
+                    ev.stopPropagation();
+                }.bind(this),
+                "click" : function (ev) {
+                    ev.stopPropagation();
+                }
             });
         }
     },
@@ -544,7 +548,11 @@ MWF.xApplication.process.Xform.Org = MWF.APPOrg =  new Class({
             this.iconNode = new Element("div", {
                 "styles": this.form.css[this.iconStyle],
                 "events": {
-                    "click": this.clickSelect.bind(this)
+                    "click": function (ev) {
+                        this.clickSelect();
+                        ev.stopPropagation();
+                    }.bind(this)
+                    //this.clickSelect.bind(this)
                 }
             }).inject(this.node, "before");
         }else if( this.form.json.nodeStyleWithhideModuleIcon ){
@@ -581,14 +589,22 @@ MWF.xApplication.process.Xform.Org = MWF.APPOrg =  new Class({
             "id": this.json.id,
             "MWFType": this.json.type,
             "events": {
-                "click": this.clickSelect.bind(this)
+                "click": function (ev) {
+                    this.clickSelect();
+                    ev.stopPropagation();
+                }.bind(this)
+                //this.clickSelect.bind(this)
             }
         });
         if (this.json.showIcon!='no' && !this.form.json.hideModuleIcon) {
             this.iconNode = new Element("div", {
                 "styles": this.form.css[this.iconStyle],
                 "events": {
-                    "click": this.clickSelect.bind(this)
+                    "click": function (ev) {
+                        this.clickSelect();
+                        ev.stopPropagation();
+                    }.bind(this)
+                    //this.clickSelect.bind(this)
                 }
             }).inject(this.node, "before");
         }else if( this.form.json.nodeStyleWithhideModuleIcon ){

o2web/source/x_component_process_Xform/Orgfield.js

@@ -25,10 +25,14 @@ MWF.xApplication.process.Xform.Orgfield = MWF.APPOrgfield =  new Class({
     setDescriptionEvent: function(){
         if (this.descriptionNode){
             this.descriptionNode.addEvents({
-                "mousedown": function(){
+                "mousedown": function( ev ){
                     this.descriptionNode.setStyle("display", "none");
                     this.clickSelect();
-                }.bind(this)
+                    ev.stopPropagation();
+                }.bind(this),
+                "click" : function (ev) {
+                    ev.stopPropagation();
+                }
             });
         }
     },
@@ -195,7 +199,11 @@ MWF.xApplication.process.Xform.Orgfield = MWF.APPOrgfield =  new Class({
             this.iconNode = new Element("div", {
                 "styles": this.form.css[this.iconStyle],
                 "events": {
-                    "click": this.clickSelect.bind(this)
+                    "click": function (ev) {
+                        this.clickSelect();
+                        ev.stopPropagation();
+                    }.bind(this)
+                    //this.clickSelect.bind(this)
                 }
             }).inject(this.node, "before");
         }else if( this.form.json.nodeStyleWithhideModuleIcon ){
@@ -236,7 +244,11 @@ MWF.xApplication.process.Xform.Orgfield = MWF.APPOrgfield =  new Class({
 		if( !this.readonly ) {
 			this.node.setStyle("cursor" , "pointer");
 			this.node.addEvents({
-				"click": this.clickSelect.bind(this)
+				"click": function (ev) {
+                    this.clickSelect();
+                    ev.stopPropagation();
+                }.bind(this)
+                //this.clickSelect.bind(this)
 			});
             if (this.json.showIcon!='no' && !this.form.json.hideModuleIcon) {
                 this.iconNode = new Element("div", {  //this.form.css[this.iconStyle],
@@ -253,7 +265,11 @@ MWF.xApplication.process.Xform.Orgfield = MWF.APPOrgfield =  new Class({
             if (this.iconNode){
                 this.iconNode.setStyle("cursor" , "pointer");
                 this.iconNode.addEvents({
-                    "click": this.clickSelect.bind(this)
+                    "click": function (ev) {
+                        this.clickSelect();
+                        ev.stopPropagation();
+                    }.bind(this)
+                    //this.clickSelect.bind(this)
                 });
 			}
 

o2web/source/x_component_process_Xform/Personfield.js

@@ -48,10 +48,14 @@ MWF.xApplication.process.Xform.Personfield = MWF.APPPersonfield =  new Class({
     setDescriptionEvent: function(){
         if (this.descriptionNode){
             this.descriptionNode.addEvents({
-                "mousedown": function(){
+                "mousedown": function( ev ){
                     this.descriptionNode.setStyle("display", "none");
                     this.clickSelect();
-                }.bind(this)
+                    ev.stopPropagation();
+                }.bind(this),
+                "click" : function (ev) {
+                    ev.stopPropagation();
+                }
             });
         }
     },
@@ -520,7 +524,11 @@ MWF.xApplication.process.Xform.Personfield = MWF.APPPersonfield =  new Class({
             this.iconNode = new Element("div", {
                 "styles": this.form.css[this.iconStyle],
                 "events": {
-                    "click": this.clickSelect.bind(this)
+                    "click": function (ev) {
+                        this.clickSelect();
+                        ev.stopPropagation();
+                    }.bind(this)
+                    //this.clickSelect.bind(this)
                 }
             }).inject(this.node, "before");
         }else if( this.form.json.nodeStyleWithhideModuleIcon ){
@@ -557,13 +565,21 @@ MWF.xApplication.process.Xform.Personfield = MWF.APPPersonfield =  new Class({
             "id": this.json.id,
             "MWFType": this.json.type,
             "events": {
-                "click": this.clickSelect.bind(this)
+                "click": function (ev) {
+                    this.clickSelect();
+                    ev.stopPropagation();
+                }.bind(this)
+                //this.clickSelect.bind(this)
             }
         });
         if (this.json.showIcon!='no' && !this.form.json.hideModuleIcon) this.iconNode = new Element("div", {
             "styles": this.form.css[this.iconStyle],
             "events": {
-                "click": this.clickSelect.bind(this)
+                "click": function (ev) {
+                    this.clickSelect();
+                    ev.stopPropagation();
+                }.bind(this)
+                //this.clickSelect.bind(this)
             }
         }).inject(this.node, "before");