Merge branch 'feature/api_dialog' into 'develop'

Merge of feature/api_dialog api中加入了dialog方法 to develop

See merge request o2oa/o2oa!877

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){

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
          * 弹出框选项:<br/>
          * 如果有buttonList参数，则ok，cancel参数无效。<br/>
@@ -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 );
         },
 
         /**给表单添加事件。

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 );
             },
 
             /**给页面添加事件。

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 );
         },
 
         /**　给视图添加事件。

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"]) {