Merge branch 'wrdp' into 'release'

Wrdp

See merge request o2oa/o2oa!2266

o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/Data.java

@@ -194,6 +194,7 @@ public class Data extends ListOrderedMap<String, Object> {
 		private Date completedTime;
 		/** 来自workCompleted的结束时间月份 */
 		private String completedTimeMonth;
+		private Date updateTime;
 
 		public String getTitle() {
 			return title;
@@ -386,6 +387,14 @@ public class Data extends ListOrderedMap<String, Object> {
 		public void setActivityArrivedTime(Date activityArrivedTime) {
 			this.activityArrivedTime = activityArrivedTime;
 		}
+
+		public Date getUpdateTime() {
+			return updateTime;
+		}
+
+		public void setUpdateTime(Date updateTime) {
+			this.updateTime = updateTime;
+		}
 	}
 
 	public static class DataAttachment extends GsonPropertyObject {

o2web/source/x_component_Profile/Main.js

@@ -699,7 +699,7 @@ MWF.xApplication.Profile.Main = new Class({
         this.passwordInputNode.addEvents({
             "blur": function(){this.removeClass("o2_profile_inforContentInput_focus mainColor_border mainColor_color");},
             "focus": function(){this.addClass("o2_profile_inforContentInput_focus mainColor_border mainColor_color");},
-            "keyup" : function(){ this.checkPassowrdStrength(  this.passwordInputNode.get("value") ) }.bind(this)
+            "keyup" : function(){ this.checkPassowrdStrength( encodeURIComponent(this.passwordInputNode.get("value")) ) }.bind(this)
         });
         this.morePasswordInputNode.addEvents({
             "blur": function(){this.removeClass("o2_profile_inforContentInput_focus mainColor_border mainColor_color");},

o2web/source/x_component_cms_Xform/Readerfield.js

@@ -75,6 +75,10 @@ MWF.xApplication.cms.Xform.Readerfield = MWF.CMSReaderfield =  new Class({
 		this.node.empty();
 		this.node.setStyle("overflow" , "hidden");
         var node = new Element("div").inject(this.node);
+        this.node.set({
+            "nodeId": this.json.id,
+            "MWFType": this.json.type
+        });
 	},
     _searchConfirmPerson: function(item){
         var inforNode = item.inforNode || new Element("div");

o2web/source/x_component_process_Xform/$Input.js

@@ -68,6 +68,10 @@ MWF.xApplication.process.Xform.$Input = MWF.APP$Input =  new Class({
     },
     _loadNodeRead: function(){
         this.node.empty();
+        this.node.set({
+            "nodeId": this.json.id,
+            "MWFType": this.json.type
+        });
     },
     loadDescription: function(){
         if (this.readonly || this.json.isReadonly)return;

o2web/source/x_component_process_Xform/Address.js

@@ -23,6 +23,10 @@ MWF.xApplication.process.Xform.Address = MWF.APPAddress =  new Class({
     },
     _loadNodeRead: function(){
         this.node.empty();
+        this.node.set({
+            "nodeId": this.json.id,
+            "MWFType": this.json.type
+        });
         //new Element("select").inject(this.node);
     },
     _loadNodeEdit: function(){

o2web/source/x_component_process_Xform/Checkbox.js

@@ -14,6 +14,10 @@ MWF.xApplication.process.Xform.Checkbox = MWF.APPCheckbox =  new Class({
     },
     _loadNodeRead: function(){
         this.node.empty();
+        this.node.set({
+            "nodeId": this.json.id,
+            "MWFType": this.json.type
+        });
         var radioValues = this.getOptions();
         var value = this.getValue();
         if (value){
@@ -155,18 +159,19 @@ MWF.xApplication.process.Xform.Checkbox = MWF.APPCheckbox =  new Class({
         }.bind(this));
 	},
 
-    _setValue: function(value){
+    _setValue: function(value, m){
+        var mothed = m || "__setValue";
 	    if (!!value){
             var p = o2.promiseAll(value).then(function(v){
                 //if (o2.typeOf(v)=="array") v = v[0];
                 if (this.moduleSelectAG){
                     this.moduleValueAG = this.moduleSelectAG;
                     this.moduleSelectAG.then(function(){
-                        this.__setValue(v);
+                        this[mothed](v);
                         return v;
                     }.bind(this));
                 }else{
-                    this.__setValue(v)
+                    this[mothed](v)
                 }
                 return v;
             }.bind(this));
@@ -175,7 +180,7 @@ MWF.xApplication.process.Xform.Checkbox = MWF.APPCheckbox =  new Class({
                 this.moduleValueAG = null;
             }.bind(this));
         }else{
-            this.__setValue(value);
+            this[mothed](value);
         }
 
 
@@ -265,7 +270,7 @@ MWF.xApplication.process.Xform.Checkbox = MWF.APPCheckbox =  new Class({
     },
 
     setData: function(data){
-	    return this._setValue(data);
+	    return this._setValue(data, "__setData");
         // if (data && data.isAG){
         //     this.moduleValueAG = data;
         //     data.addResolve(function(v){

o2web/source/x_component_process_Xform/Combox.js

@@ -23,6 +23,10 @@ MWF.xApplication.process.Xform.Combox = MWF.APPCombox =  new Class({
     },
     _loadNodeRead: function(){
         this.node.empty();
+        this.node.set({
+            "nodeId": this.json.id,
+            "MWFType": this.json.type
+        });
         //new Element("select").inject(this.node);
     },
     _loadNodeEdit: function(){

o2web/source/x_component_process_Xform/Opinion.js

@@ -22,6 +22,10 @@ MWF.xApplication.process.Xform.Opinion = MWF.APPOpinion =  new Class({
     },
     _loadNodeRead: function(){
         this.node.empty();
+        this.node.set({
+            "nodeId": this.json.id,
+            "MWFType": this.json.type
+        });
         this.node.setStyle("display", "none");
     },
     validationConfigItem: function(routeName, data){

o2web/source/x_component_process_Xform/Org.js

@@ -518,6 +518,10 @@ MWF.xApplication.process.Xform.Org = MWF.APPOrg =  new Class({
     _loadNodeRead: function(){
         this.node.empty();
         var node = new Element("div").inject(this.node);
+        this.node.set({
+            "nodeId": this.json.id,
+            "MWFType": this.json.type
+        });
     },
     _searchConfirmPerson: function(item){
         var inforNode = item.inforNode || new Element("div");

o2web/source/x_component_process_Xform/Orgfield.js

@@ -77,6 +77,10 @@ MWF.xApplication.process.Xform.Orgfield = MWF.APPOrgfield =  new Class({
 	_loadNodeRead: function(){
 		this.node.empty();
 		this.node.setStyle("overflow" , "hidden");
+        this.node.set({
+            "nodeId": this.json.id,
+            "MWFType": this.json.type
+        });
         var node = new Element("div").inject(this.node);
 	},
     _searchConfirmPerson: function(item){

o2web/source/x_component_process_Xform/Personfield.js

@@ -417,6 +417,10 @@ MWF.xApplication.process.Xform.Personfield = MWF.APPPersonfield =  new Class({
     },
     _loadNodeRead: function(){
         this.node.empty();
+        this.node.set({
+            "nodeId": this.json.id,
+            "MWFType": this.json.type
+        });
         var node = new Element("div").inject(this.node);
     },
     _searchConfirmPerson: function(item){

o2web/source/x_component_process_Xform/Radio.js

@@ -14,6 +14,10 @@ MWF.xApplication.process.Xform.Radio = MWF.APPRadio =  new Class({
     },
     _loadNodeRead: function(){
         this.node.empty();
+        this.node.set({
+            "nodeId": this.json.id,
+            "MWFType": this.json.type
+        });
         var radioValues = this.getOptions();
         var value = this.getValue();
         if (value){
@@ -214,18 +218,19 @@ MWF.xApplication.process.Xform.Radio = MWF.APPRadio =  new Class({
         // }.bind(this));
 	},
 
-    _setValue: function(value){
+    _setValue: function(value, m){
+        var mothed = m || "__setValue";
 	    if (!!value){
             var p = o2.promiseAll(value).then(function(v){
                 if (o2.typeOf(v)=="array") v = v[0];
                 if (this.moduleSelectAG){
                     this.moduleValueAG = this.moduleSelectAG;
                     this.moduleSelectAG.then(function(){
-                        this.__setValue(v);
+                        this[mothed](v);
                         return v;
                     }.bind(this));
                 }else{
-                    this.__setValue(v)
+                    this[mothed](v)
                 }
                 return v;
             }.bind(this));
@@ -235,7 +240,7 @@ MWF.xApplication.process.Xform.Radio = MWF.APPRadio =  new Class({
                 this.moduleValueAG = null;
             }.bind(this));
         }else{
-            this.__setValue(value);
+            this[mothed](value);
         }
 
 
@@ -316,7 +321,7 @@ MWF.xApplication.process.Xform.Radio = MWF.APPRadio =  new Class({
     },
 
     setData: function(data){
-        return this._setValue(data);
+        return this._setValue(data, "__setData");
         // if (data && data.isAG){
         //     this.moduleValueAG = o2.AG.all(data).then(function(v){
         //         if (o2.typeOf(v)=="array") v = v[0];

o2web/source/x_component_process_Xform/Select.js

@@ -20,6 +20,10 @@ MWF.xApplication.process.Xform.Select = MWF.APPSelect =  new Class({
     },
     _loadNodeRead: function(){
         this.node.empty();
+		this.node.set({
+			"nodeId": this.json.id,
+			"MWFType": this.json.type
+		});
         var optionItems = this.getOptions();
         var value = this.getValue();
         if (value){
@@ -202,18 +206,19 @@ MWF.xApplication.process.Xform.Select = MWF.APPSelect =  new Class({
 		this.fireEvent("addOption", [text, value])
 	},
 
-	_setValue: function(value){
+	_setValue: function(value, m){
+		var mothed = m || "__setValue";
 		if (!!value){
 			var p = o2.promiseAll(value).then(function(v){
 				if (o2.typeOf(v)=="array") v = v[0];
 				if (this.moduleSelectAG){
 					this.moduleValueAG = this.moduleSelectAG;
 					this.moduleSelectAG.then(function(){
-						this.__setValue(v);
+						this[mothed](v);
 						return v;
 					}.bind(this));
 				}else{
-					this.__setValue(v)
+					this[mothed](v)
 				}
 				return v;
 			}.bind(this));
@@ -223,7 +228,7 @@ MWF.xApplication.process.Xform.Select = MWF.APPSelect =  new Class({
 				this.moduleValueAG = null;
 			}.bind(this));
 		}else{
-			this.__setValue(value);
+			this[mothed](value);
 		}
 
 
@@ -342,7 +347,7 @@ MWF.xApplication.process.Xform.Select = MWF.APPSelect =  new Class({
 	},
 
 	setData: function(data){
-		return this._setValue(data);
+		return this._setValue(data, "__setData");
 		// if (data && data.isAG){
 		// 	this.moduleValueAG = o2.AG.all(data).then(function(v){
 		// 		if (o2.typeOf(v)=="array") v = v[0];

o2web/source/x_component_process_Xform/Subform.js

@@ -19,18 +19,18 @@ MWF.xApplication.process.Xform.Subform = MWF.APPSubform = new Class({
             }.bind(this));
         }
     },
-    active: function ( callback ) {
+    active: function (callback) {
         if (!this.loaded) {
-            this.reload( callback )
-        }else{
-            if(callback)callback();
+            this.reload(callback)
+        } else {
+            if (callback) callback();
         }
     },
-    reload: function ( callback ) {
+    reload: function (callback) {
         this.node.empty();
         this.getSubform(function () {
             this.loadSubform();
-            if(callback)callback();
+            if (callback) callback();
         }.bind(this));
     },
     loadCss: function () {
@@ -68,21 +68,20 @@ MWF.xApplication.process.Xform.Subform = MWF.APPSubform = new Class({
                 styleNode.appendChild(cssTextNode);
             }
         }
-    }
-    ,
+    },
     checkSubformNested: function (id) {
+        if (!id) return true;
         if (this.parentformIdList) {
             return !this.parentformIdList.contains(id);
         } else {
             return ![this.form.json.id].contains(id);
         }
-    }
-    ,
+    },
     checkSubformUnique: function (id) {
-        if (!this.form.subformLoaded)return true;
+        if (!id) return true;
+        if (!this.form.subformLoaded) return true;
         return !this.form.subformLoaded.contains(id);
-    }
-    ,
+    },
     getParentformIdList: function () {
         var parentformIdList;
         if (this.parentformIdList) {
@@ -92,8 +91,7 @@ MWF.xApplication.process.Xform.Subform = MWF.APPSubform = new Class({
             parentformIdList = [this.form.json.id, this.subformData.json.id];
         }
         return parentformIdList;
-    }
-    ,
+    },
     loadSubform: function () {
         if (this.subformData) {
             if (!this.checkSubformNested(this.subformData.json.id)) {
@@ -158,11 +156,11 @@ MWF.xApplication.process.Xform.Subform = MWF.APPSubform = new Class({
                     if (typeOf(data) === "string") {
                         formName = data;
                     } else {
-                        if (data.application)app = data.application;
-                        if (data.subform)formName = data.subform;
+                        if (data.application) app = data.application;
+                        if (data.subform) formName = data.subform;
                     }
                     if (formName) {
-                        if (!app)app = (this.form.businessData.work || this.form.businessData.workCompleted).application;
+                        if (!app) app = (this.form.businessData.work || this.form.businessData.workCompleted).application;
                         MWF.Actions.get("x_processplatform_assemble_surface")[method](formName, app, function (json) {
                             this.getSubformData(json.data);
                             if (callback) callback();
@@ -177,10 +175,10 @@ MWF.xApplication.process.Xform.Subform = MWF.APPSubform = new Class({
         } else {
             if (this.json.subformSelected && this.json.subformSelected !== "none") {
                 var subformData = (this.form.app.relatedFormMap) ? this.form.app.relatedFormMap[this.json.subformSelected] : null;
-                if (subformData){
+                if (subformData) {
                     this.getSubformData({"data": subformData.data});
                     if (callback) callback();
-                }else{
+                } else {
                     var app;
                     if (this.json.subformAppSelected) {
                         app = this.json.subformAppSelected;
@@ -198,7 +196,7 @@ MWF.xApplication.process.Xform.Subform = MWF.APPSubform = new Class({
         }
     },
     getSubformData: function (data) {
-        if (!data || typeOf(data) !== "object")return;
+        if (!data || typeOf(data) !== "object") return;
         var subformDataStr = null;
         // if ( this.form.json.mode !== "Mobile" && !layout.mobile){
         //     subformDataStr = data.data;
@@ -304,11 +302,11 @@ MWF.xApplication.process.Xform.SubmitForm = MWF.APPSubmitform = new Class({
                     if (typeOf(data) === "string") {
                         formName = data;
                     } else {
-                        if (data.application)app = data.application;
-                        if (data.form)formName = data.form;
+                        if (data.application) app = data.application;
+                        if (data.form) formName = data.form;
                     }
                     if (formName) {
-                        if (!app)app = (this.form.businessData.work || this.form.businessData.workCompleted).application;
+                        if (!app) app = (this.form.businessData.work || this.form.businessData.workCompleted).application;
                         MWF.Actions.get("x_processplatform_assemble_surface")[method](formName, app, function (json) {
                             this.getSubformData(json.data);
                             if (callback) callback();

o2web/source/x_component_process_Xform/Textarea.js

@@ -20,6 +20,10 @@ MWF.xApplication.process.Xform.Textarea = MWF.APPTextarea =  new Class({
     },
     _loadNodeRead: function(){
         this.node.empty();
+        this.node.set({
+            "nodeId": this.json.id,
+            "MWFType": this.json.type
+        });
     },
 
 

o2web/source/x_component_process_Xform/Textfield.js

@@ -79,6 +79,10 @@ MWF.xApplication.process.Xform.Textfield = MWF.APPTextfield =  new Class({
     },
     _loadNodeRead: function(){
         this.node.empty();
+        this.node.set({
+            "nodeId": this.json.id,
+            "MWFType": this.json.type
+        });
     },
 
     _resetNodeEdit: function(){