视图管理增加跳页设置

o2web/source/o2_core/o2/widget/Paging.js

@@ -88,7 +88,7 @@ o2.widget.Paging = new Class({
             this.createPrev();
         }
 
-        if( this.options.hasBatchTuring && ( min > 1 ) ){ //showWithDisable
+        if( this.options.hasTruningBar && this.options.hasBatchTuring && ( min > 1 ) ){ //showWithDisable
             this.createPrevBatch( min );
         }
 
@@ -109,7 +109,7 @@ o2.widget.Paging = new Class({
             }
         }
 
-        if( this.options.hasBatchTuring && ( max < pageSize )){ //showWithDisable
+        if( this.options.hasTruningBar && this.options.hasBatchTuring && ( max < pageSize )){ //showWithDisable
             this.createNextBatch( max );
         }
 
@@ -290,6 +290,7 @@ o2.widget.Paging = new Class({
         });
     },
     gotoPage: function (num) {
+        if( typeOf(num) === "string" )num = num.toInt();
         if (num < 1 || num > this.options.pageSize) return;
         this.fireEvent("jumpingPage", [num]);
         this.options.currentPage = num;

o2web/source/x_component_query_Query/Viewer.js

@@ -710,14 +710,17 @@ MWF.xApplication.query.Query.Viewer = MWF.QViewer = new Class({
         this.viewPageAreaNode.empty();
         this.paging = new o2.widget.Paging(this.viewPageAreaNode, {
             countPerPage: this.json.pageSize || this.options.perPageCount,
-            visiblePages: 6,
+            visiblePages: this.viewJson.visiblePages ? this.viewJson.visiblePages.toInt() : 9,
             currentPage: this.currentPage,
             itemSize: this.count,
             pageSize: this.pages,
-            hasNextPage: true,
-            hasPrevPage: true,
-            hasTruningBar: true,
-            hasJumper: true,
+            hasNextPage: typeOf( this.viewJson.hasPreNextPage ) === "boolean" ? this.viewJson.hasPreNextPage : true,
+            hasPrevPage: typeOf( this.viewJson.hasPreNextPage ) === "boolean" ? this.viewJson.hasPreNextPage : true,
+            hasTruningBar: typeOf( this.viewJson.hasTruningBar ) === "boolean" ? this.viewJson.hasTruningBar : true,
+            hasBatchTuring: typeOf( this.viewJson.hasBatchTuring ) === "boolean" ? this.viewJson.hasBatchTuring : true,
+            hasFirstPage: typeOf( this.viewJson.hasFirstLastPage ) === "boolean" ? this.viewJson.hasFirstLastPage : true,
+            hasLastPage: typeOf( this.viewJson.hasFirstLastPage ) === "boolean" ? this.viewJson.hasFirstLastPage : true,
+            hasJumper: typeOf( this.viewJson.hasPageJumper ) === "boolean" ? this.viewJson.hasPageJumper : true,
             hiddenWithDisable: false,
             hiddenWithNoItem: true,
             text: {
@@ -736,8 +739,6 @@ MWF.xApplication.query.Query.Viewer = MWF.QViewer = new Class({
     _initPage: function(){
         this.count = this.bundleItems.length;
 
-        this.json.pageSize = 2;
-
         var i = this.count/this.json.pageSize;
         this.pages = (i.toInt()<i) ? i.toInt()+1 : i;
         this.currentPage = 1;

o2web/source/x_component_query_ViewDesigner/$View/default/css.wcss

@@ -168,6 +168,13 @@
         "line-height": "24px",
         "border-bottom": "1px dashed #CCC"
     },
+    "editTableTitleNoWidth": {
+        "font-weight": "bold",
+        "font-size": "12px",
+        "height": "24px",
+        "line-height": "24px",
+        "border-bottom": "1px dashed #CCC"
+    },
     "editTableValue": {
         "height": "24px",
         "line-height": "24px",

o2web/source/x_component_query_ViewDesigner/$View/view.html

@@ -38,14 +38,6 @@
                     <input class="editTableRadio" name="data.isSequence" text{($.data.isSequence!=='yes')?'checked':''} type="radio" value="no"/>否
                 </td>
             </tr>
-            <tr>
-                <td class="editTableTitle">最大行数:</td>
-                <td class="editTableValue"><input type="number" name="count" value="text{$.count || 600}" class="editTableInput"/></td>
-            </tr>
-            <tr>
-                <td class="editTableTitle">每页行数:</td>
-                <td class="editTableValue"><input type="number" name="pageSize" value="text{$.pageSize || 20}" class="editTableInput"/></td>
-            </tr>
 <!--            <tr>-->
 <!--                <td class="editTableTitle">视图样式:</td>-->
 <!--                <td class="editTableValue">-->
@@ -72,6 +64,66 @@
             <!--<td class="editTableValue"><input type="text" name="max" value="text{$.max}" class="editTableInput"/></td>-->
             <!--</tr>-->
         </table>
+        <div style="height:24px; text-align: center; line-height: 24px; background-color: #EEE; border-top: 1px solid #999; font-weight: bold">分页</div>
+        <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
+            <tr>
+                <td class="editTableTitleNoWidth">最大行数:</td>
+                <td class="editTableValue"><input type="number" name="count" value="text{$.count || 600}" class="editTableInput"/></td>
+            </tr>
+            <tr>
+                <td class="editTableTitleNoWidth">每页行数:</td>
+                <td class="editTableValue"><input type="number" name="pageSize" value="text{$.pageSize || 20}" class="editTableInput"/></td>
+            </tr>
+            <tr>
+                <td class="editTableTitleNoWidth">显示数字分页:</td>
+                <td class="editTableValue">
+                    <input class="editTableRadio" name="data.hasTruningBar" text{($.data.hasTruningBar!==false)?'checked':''}  onclick="
+                    if (this.checked){
+                        $('text{$.id}visiblePagesTr').setStyle('display', 'table-row');
+                        $('text{$.id}hasBatchTuringTr').setStyle('display', 'table-row');
+                    }" type="radio" value="true"/>是
+                    <input class="editTableRadio" name="data.hasTruningBar" text{($.data.hasTruningBar===false)?'checked':''}   onclick="
+                    if (this.checked){
+                        $('text{$.id}visiblePagesTr').setStyle('display', 'none');
+                        $('text{$.id}hasBatchTuringTr').setStyle('display', 'none');
+                    }" type="radio" value="false"/>否
+                </td>
+            </tr>
+            <tr id="text{$.id}visiblePagesTr">
+                <td class="editTableTitleNoWidth">数字显示个数:</td>
+                <td class="editTableValue"><input type="number" name="data.visiblePages" value="text{$.data.visiblePages || 9}" onchange="
+                    $('text{$.id}visiblePagesText').set('text', this.value);
+                " class="editTableInput"/></td>
+            </tr>
+            <tr id="text{$.id}hasBatchTuringTr">
+                <td class="editTableTitleNoWidth">显示前后<span id="text{$.id}visiblePagesText">text{$.data.visiblePages || 9}</span>页:</td>
+                <td class="editTableValue">
+                    <input class="editTableRadio" name="data.hasBatchTuring" text{($.data.hasBatchTuring!==false)?'checked':''} type="radio" value="true"/>是
+                    <input class="editTableRadio" name="data.hasBatchTuring" text{($.data.hasBatchTuring===false)?'checked':''} type="radio" value="false"/>否
+                </td>
+            </tr>
+            <tr>
+                <td class="editTableTitleNoWidth">显示首页末页:</td>
+                <td class="editTableValue">
+                    <input class="editTableRadio" name="data.hasFirstLastPage" text{($.data.hasFirstLastPage!==false)?'checked':''} type="radio" value="true"/>是
+                    <input class="editTableRadio" name="data.hasFirstLastPage" text{($.data.hasFirstLastPage===false)?'checked':''} type="radio" value="false"/>否
+                </td>
+            </tr>
+            <tr>
+                <td class="editTableTitleNoWidth">显示上页下页:</td>
+                <td class="editTableValue">
+                    <input class="editTableRadio" name="data.hasPreNextPage" text{($.data.hasPreNextPage!==false)?'checked':''} type="radio" value="true"/>是
+                    <input class="editTableRadio" name="data.hasPreNextPage" text{($.data.hasPreNextPage===false)?'checked':''} type="radio" value="false"/>否
+                </td>
+            </tr>
+            <tr>
+                <td class="editTableTitleNoWidth">显示跳页:</td>
+                <td class="editTableValue">
+                    <input class="editTableRadio" name="data.hasPageJumper" text{($.data.hasPageJumper!==false)?'checked':''} type="radio" value="true"/>是
+                    <input class="editTableRadio" name="data.hasPageJumper" text{($.data.hasPageJumper===false)?'checked':''} type="radio" value="false"/>否
+                </td>
+            </tr>
+        </table>
 
         <div style="height:24px; text-align: center; line-height: 24px; background-color: #EEE; border-top: 1px solid #999; font-weight: bold">权限</div>
         <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable" id="processEditStarter">