Merge branch 'fix/mobile_view_selector' into 'develop'

Fix/mobile view selector[表单组件]修复手机端视图选择样式问题

See merge request o2oa/o2oa!621

o2web/source/x_component_process_Xform/ViewSelector.js

@@ -319,8 +319,8 @@ MWF.xApplication.process.Xform.ViewSelector = MWF.APPViewSelector =  new Class({
                     "width": width,
                     "height": height,
                     "html": "",
-                    "maskNode": this.form.app.content,
-                    "container": this.form.app.content,
+                    "maskNode": layout.mobile?$(document.body) : this.form.app.content,
+                    "container": layout.mobile?$(document.body) : this.form.app.content,
                     "buttonList": [
                         {
                             "text": MWF.LP.process.button.ok,
@@ -336,6 +336,9 @@ MWF.xApplication.process.Xform.ViewSelector = MWF.APPViewSelector =  new Class({
                         }
                     ],
                     "onPostShow": function(){
+                        if(layout.mobile){
+                            dlg.node.setStyle("z-index",200);
+                        }
                         MWF.xDesktop.requireApp("query.Query", "Viewer", function(){
                             this.view = new MWF.xApplication.query.Query.Viewer(dlg.content, viewJson, {"style": "select"}, this.form.app, this.form.Macro );
                         }.bind(this));

o2web/source/x_component_query_Query/Viewer.js

@@ -2168,11 +2168,10 @@ MWF.xApplication.query.Query.Viewer.Paging = new Class({
         // }
         // this.pagingNode.empty();
         this.node.empty();
-
         this.paging = new o2.widget.Paging(this.node, {
             //style : this.options.skin && this.options.skin.pagingBar ? this.options.skin.pagingBar : "default",
             countPerPage: this.view.json.pageSize || this.view.options.perPageCount,
-            visiblePages: this.json.visiblePages ? this.json.visiblePages.toInt() : 9,
+            visiblePages: layout.mobile?5:(this.json.visiblePages ? this.json.visiblePages.toInt() : 9),
             currentPage: this.view.currentPage,
             itemSize: this.view.count,
             pageSize: this.view.pages,
@@ -2180,9 +2179,9 @@ MWF.xApplication.query.Query.Viewer.Paging = new Class({
             hasPrevPage: typeOf( this.json.hasPreNextPage ) === "boolean" ? this.json.hasPreNextPage : true,
             hasTruningBar: typeOf( this.json.hasTruningBar ) === "boolean" ? this.json.hasTruningBar : true,
             hasBatchTuring: typeOf( this.json.hasBatchTuring ) === "boolean" ? this.json.hasBatchTuring : true,
-            hasFirstPage: typeOf( this.json.hasFirstLastPage ) === "boolean" ? this.json.hasFirstLastPage : true,
-            hasLastPage: typeOf( this.json.hasFirstLastPage ) === "boolean" ? this.json.hasFirstLastPage : true,
-            hasJumper: typeOf( this.json.hasPageJumper ) === "boolean" ? this.json.hasPageJumper : true,
+            hasFirstPage: typeOf( this.json.hasFirstLastPage ) === "boolean" ? this.json.hasFirstLastPage : (layout.mobile?false:true),
+            hasLastPage: typeOf( this.json.hasFirstLastPage ) === "boolean" ? this.json.hasFirstLastPage : (layout.mobile?false:true),
+            hasJumper: typeOf( this.json.hasPageJumper ) === "boolean" ? this.json.hasPageJumper : (layout.mobile?false:true),
             hiddenWithDisable: false,
             hiddenWithNoItem: true,
             text: {