Bladeren bron

Merge branch 'fix/Query.view_pagejump_error' into 'develop'

Merge of fix/[数据中心]解决视图某些情况下跳页报错的问题 to develop

See merge request o2oa/o2oa!480
蔡祥熠 5 jaren geleden
bovenliggende
commit
7a425e248f
1 gewijzigde bestanden met toevoegingen van 3 en 3 verwijderingen
  1. 3 3
      o2web/source/x_component_query_Query/Viewer.js

+ 3 - 3
o2web/source/x_component_query_Query/Viewer.js

@@ -395,7 +395,7 @@ MWF.xApplication.query.Query.Viewer = MWF.QViewer = new Class({
             }
         }.bind(this));
     },
-    loadCurrentPageData: function( callback ){
+    loadCurrentPageData: function( callback, async ){
         //是否需要在翻页的时候清空之前的items ?
         this.items = [];
 
@@ -432,7 +432,7 @@ MWF.xApplication.query.Query.Viewer = MWF.QViewer = new Class({
             this.fireEvent("postLoadPage");
 
             if(callback)callback();
-        }.bind(this));
+        }.bind(this), null, async === false ? false : true );
     },
 
 
@@ -2194,7 +2194,7 @@ MWF.xApplication.query.Query.Viewer.Paging = new Class({
             onJumpingPage : function( pageNum, itemNum ){
                 this.view.currentPage = pageNum;
                 this.fireEvent("jump");
-                this.view.loadCurrentPageData();
+                this.view.loadCurrentPageData( null, false );
             }.bind(this),
             onPostLoad : function () {
                 if( firstLoading ){