Merge branch 'wrdp' into 'develop'

Wrdp

See merge request o2oa/o2oa!2265

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_process_Xform/Checkbox.js

@@ -159,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));
@@ -179,7 +180,7 @@ MWF.xApplication.process.Xform.Checkbox = MWF.APPCheckbox =  new Class({
                 this.moduleValueAG = null;
             }.bind(this));
         }else{
-            this.__setValue(value);
+            this[mothed](value);
         }
 
 
@@ -269,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/Radio.js

@@ -218,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));
@@ -239,7 +240,7 @@ MWF.xApplication.process.Xform.Radio = MWF.APPRadio =  new Class({
                 this.moduleValueAG = null;
             }.bind(this));
         }else{
-            this.__setValue(value);
+            this[mothed](value);
         }
 
 
@@ -320,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

@@ -206,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));
@@ -227,7 +228,7 @@ MWF.xApplication.process.Xform.Select = MWF.APPSelect =  new Class({
 				this.moduleValueAG = null;
 			}.bind(this));
 		}else{
-			this.__setValue(value);
+			this[mothed](value);
 		}
 
 
@@ -346,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];