Merge branch 'wrdp' into 'release'

Wrdp

See merge request o2oa/o2oa!2417

o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/ExternalDataSource.java

@@ -67,7 +67,7 @@ public class ExternalDataSource extends ConfigObject {
 	private List<String> excludes;
 	@FieldDescribe("默认日志级别,FATAL, ERROR, WARN, INFO, TRACE. 完成的配置为DefaultLevel=WARN, Tool=TRACE, Enhance=TRACE, METADATA=TRACE, Runtime=TRACE, Query=TRACE, DataCache=TRACE, JDBC=TRACE, SQL=TRACE")
 	private String logLevel = DEFAULT_LOGLEVEL;
-	@FieldDescribe("事务隔离级别:default,none,read-committed,read-uncommitted,repeatable-read,serializable.默认使用default(数据库设置的事务级别).")
+	@FieldDescribe("事务隔离级别:default,none,read-uncommitted,read-committed,repeatable-read,serializable.默认使用default(数据库设置的事务级别).")
 	private String transactionIsolation;
 	@FieldDescribe("测试入池连接,默认false.")
 	private Boolean testConnectionOnCheckin;
@@ -88,7 +88,7 @@ public class ExternalDataSource extends ConfigObject {
 
 	public static final String DEFAULT_LOGLEVEL = "WARN";
 
-	public static final String DEFAULT_TRANSACTIONISOLATION = "default";
+	public static final String DEFAULT_TRANSACTIONISOLATION = "read-committed";
 
 	public static final Boolean DEFAULT_TESTCONNECTIONONCHECKIN = false;
 

o2web/source/x_component_process_Work/Main.js

@@ -685,8 +685,8 @@ MWF.xApplication.process.Work.Main = new Class({
             this.formNode.setStyles(this.css.formNode);
             var uri = window.location.href;
             //var cl = (uri.indexOf("$all")!=-1) ? "$all" : "Form";
-           // var cl = "$all";
-           // MWF.xDesktop.requireApp("process.Xform", cl, function(){
+            var cl = "$all";
+            MWF.xDesktop.requireApp("process.Xform", cl, function(){
             //MWF.xDesktop.requireApp("process.Xform", "Form", function(){
                 this.appForm = new MWF.APPForm(this.formNode, this.form, {});
                 this.appForm.businessData = {
@@ -735,7 +735,7 @@ MWF.xApplication.process.Work.Main = new Class({
                     }
                     this.fireEvent("postLoadForm");
                 }.bind(this));
-            //}.bind(this));
+            }.bind(this));
         }
     },
 

o2web/source/x_component_process_Xform/Select.js

@@ -322,16 +322,20 @@ MWF.xApplication.process.Xform.Select = MWF.APPSelect =  new Class({
 		return {"value": value, "text": text};
 	},
     getInputData: function(){
-		var ops = this.node.getElements("option");
-		var value = [];
-		ops.each(function(op){
-			if (op.selected){
-				var v = op.get("value");
-				if (v) value.push(v);
-			}
-		});
-        if (!value.length) return null;
-		return (value.length==1) ? value[0] : value;
+		if( this.readonly || this.json.isReadonly ){
+			return this._getBusinessData();
+		}else{
+			var ops = this.node.getElements("option");
+			var value = [];
+			ops.each(function(op){
+				if (op.selected){
+					var v = op.get("value");
+					if (v) value.push(v);
+				}
+			});
+			if (!value.length) return null;
+			return (value.length==1) ? value[0] : value;
+		}
 	},
     resetData: function(){