diff --git a/o2web/source/o2_core/o2/xScript/CMSEnvironment.js b/o2web/source/o2_core/o2/xScript/CMSEnvironment.js
index 4f0b473d8483807bf851ae79a34b197ccc2244d5..19f62df55263f0707e2a35439b27dab664b1b534 100644
--- a/o2web/source/o2_core/o2/xScript/CMSEnvironment.js
+++ b/o2web/source/o2_core/o2/xScript/CMSEnvironment.js
@@ -1719,7 +1719,7 @@ MWF.xScript.CMSEnvironment = function(ev){
_form.notice(content, type, target, where, offset, option);
},
"dialog": function ( options ) {
- _form.dialog( options );
+ return _form.dialog( options );
},
"addEvent": function(e, f){_form.addEvent(e, f);},
"openWork": function(id, completedId, title, options){
diff --git a/o2web/source/o2_core/o2/xScript/Environment.js b/o2web/source/o2_core/o2/xScript/Environment.js
index 7c285296cc6e6696a9814547eb820d8ae40fd1a5..6d7ea5282f5dde515a6a8d396198e3cec8236ea2 100644
--- a/o2web/source/o2_core/o2/xScript/Environment.js
+++ b/o2web/source/o2_core/o2/xScript/Environment.js
@@ -3128,6 +3128,7 @@ MWF.xScript.Environment = function(ev){
/**弹出一个对话框层。
* @method dialog
* @static
+ * @return {Object} 对话框对象。
* @param {(Object)} options
* 弹出框选项:
* 如果有buttonList参数,则ok,cancel参数无效。
@@ -3184,7 +3185,7 @@ MWF.xScript.Environment = function(ev){
* @example
* //打开一个对话框,使用html作为内容
* var _self = this;
- * this.form.dialog({
+ * var dlg = this.form.dialog({
* "title": "填写内容",
* "width": "500",
* "height": "300",
@@ -3292,7 +3293,7 @@ MWF.xScript.Environment = function(ev){
* });
*/
"dialog": function ( options ) {
- _form.dialog( options );
+ return _form.dialog( options );
},
/**给表单添加事件。
diff --git a/o2web/source/o2_core/o2/xScript/PageEnvironment.js b/o2web/source/o2_core/o2/xScript/PageEnvironment.js
index 14372be602ef4199c2f860e6df9518d242dd8845..3148a819e13a285088328fa6082a570494344424 100644
--- a/o2web/source/o2_core/o2/xScript/PageEnvironment.js
+++ b/o2web/source/o2_core/o2/xScript/PageEnvironment.js
@@ -1815,7 +1815,7 @@ if (!MWF.xScript || !MWF.xScript.PageEnvironment) {
* @see module:form.dialog
*/
"dialog": function ( options ) {
- _form.dialog( options );
+ return _form.dialog( options );
},
/**给页面添加事件。
diff --git a/o2web/source/o2_core/o2/xScript/ViewEnvironment.js b/o2web/source/o2_core/o2/xScript/ViewEnvironment.js
index 4367627f935fe3d88e8841ba34ef017f4eb6e7cf..91d3ad08b9206b642a02013f452e8219aa237248 100644
--- a/o2web/source/o2_core/o2/xScript/ViewEnvironment.js
+++ b/o2web/source/o2_core/o2/xScript/ViewEnvironment.js
@@ -4315,7 +4315,7 @@ MWF.xScript.ViewEnvironment = function (ev) {
* @see module:form.dialog
*/
"dialog": function ( options ) {
- _form.dialog( options );
+ return _form.dialog( options );
},
/** 给视图添加事件。
diff --git a/o2web/source/x_component_process_Xform/Form.js b/o2web/source/x_component_process_Xform/Form.js
index f9c9ac794909fd84855cf1e041ec4915290790dc..ad652f83348d34842e9c94ccc1f740e6aad6cb34 100644
--- a/o2web/source/x_component_process_Xform/Form.js
+++ b/o2web/source/x_component_process_Xform/Form.js
@@ -2921,9 +2921,11 @@ MWF.xApplication.process.Xform.Form = MWF.APPForm = new Class(
opts[key] = options[key];
}
}
+ var dialog;
MWF.require("MWF.xDesktop.Dialog", function(){
- var dialog = o2.DL.open(opts)
- })
+ dialog = o2.DL.open(opts)
+ }, null, false);
+ return dialog;
},
addSplit: function () {
if (!this.businessData.control["allowAddSplit"]) {