Merge branch 'cherry-pick-20f64cdf' into 'wrdp'

内容管理列式服务使用paging

See merge request o2oa/o2oa!4522

o2web/source/x_component_cms_Index/Main.js

@@ -721,17 +721,32 @@ MWF.xApplication.cms.Index.Column = new Class({
 	},
 	getDocumentData: function(callback, count, filter){
 		if(!count)count=6;
-		var id = "(0)";
+		var page = 1;
 		if(!filter){
 			filter = {
 				"appIdList": [this.data.id],
-				"statusList": ["published"]
+				"statusList": ["published"],
+				"documentType": "全部",
+				"justData": true
 			}
 		}
-		this.app.restActions.listDocumentFilterNext(id, count, filter, function(json){
+		o2.Actions.load("x_cms_assemble_control").DocumentAction.query_listWithFilterPaging(page, count, filter, function(json){
 			if (callback) callback(json);
 		});
 	},
+	// getDocumentData: function(callback, count, filter){
+	// 	if(!count)count=6;
+	// 	var id = "(0)";
+	// 	if(!filter){
+	// 		filter = {
+	// 			"appIdList": [this.data.id],
+	// 			"statusList": ["published"]
+	// 		}
+	// 	}
+	// 	this.app.restActions.listDocumentFilterNext(id, count, filter, function(json){
+	// 		if (callback) callback(json);
+	// 	});
+	// },
 	loadMoreItem: function(total, size){
 		var _self = this;
 		this.moreArea = new Element("div",{

o2web/source/x_component_cms_Module/ListExplorer.js

@@ -305,6 +305,7 @@ MWF.xApplication.cms.Module.ListExplorer.DefaultList = new Class({
     },
     initData: function(){
         this.items=[];
+        this.currentPage = 1;
         this.documents = {};
         this.isItemsLoaded = false;
         this.isItemLoadding = false;
@@ -329,6 +330,7 @@ MWF.xApplication.cms.Module.ListExplorer.DefaultList = new Class({
         this.documents = null;
         MWF.release(this.items);
         this.items=[];
+        this.currentPage = 1;
         this.documents = {};
         this.container.empty();
         this.isItemsLoaded = false;
@@ -503,7 +505,9 @@ MWF.xApplication.cms.Module.ListExplorer.DefaultList = new Class({
     },
     _getCurrentPageData: function(callback, count){
         if(!count)count=20;
-        var id = (this.items.length) ? this.items[this.items.length-1].data.id : "(0)";
+        // var id = (this.items.length) ? this.items[this.items.length-1].data.id : "(0)";
+        var page = this.currentPage || 1;
+        this.currentPage = page + 1;
         var data = {
             "categoryIdList": [this.explorer.categoryData.id ],
             "statusList": [this.explorer.options.status],
@@ -518,13 +522,21 @@ MWF.xApplication.cms.Module.ListExplorer.DefaultList = new Class({
             for(var f in filterResult ){
                 data[f] = filterResult[f];
             }
-            this.actions.listDocumentFilterNext(id, count || this.pageCount, data, function(json){
+
+            o2.Actions.load("x_cms_assemble_control").DocumentAction.query_listWithFilterPaging(page, count || this.pageCount, data, function(json){
                 if (callback) callback(json);
             });
+
+            // this.actions.listDocumentFilterNext(id, count || this.pageCount, data, function(json){
+            //     if (callback) callback(json);
+            // });
         }else{
-            this.actions.listDocumentFilterNext(id, count || this.pageCount, data, function(json){
+            o2.Actions.load("x_cms_assemble_control").DocumentAction.query_listWithFilterPaging(page, count || this.pageCount, data, function(json){
                 if (callback) callback(json);
             });
+            // this.actions.listDocumentFilterNext(id, count || this.pageCount, data, function(json){
+            //     if (callback) callback(json);
+            // });
         }
     },
 
@@ -600,7 +612,9 @@ MWF.xApplication.cms.Module.ListExplorer.ListForALL = new Class({
     },
     _getCurrentPageData: function(callback, count){
         if(!count)count=20;
-        var id = (this.items.length) ? this.items[this.items.length-1].data.id : "(0)";
+        // var id = (this.items.length) ? this.items[this.items.length-1].data.id : "(0)";
+        var page = this.currentPage || 1;
+        this.currentPage = page + 1;
         var data = {
             "appIdList": [ this.explorer.columnData.id ],
             "statusList": [ this.explorer.options.status ],
@@ -615,13 +629,19 @@ MWF.xApplication.cms.Module.ListExplorer.ListForALL = new Class({
             for(var f in filterResult ){
                 data[f] = filterResult[f];
             }
-            this.actions.listDocumentFilterNext(id, count || this.pageCount, data, function(json){
+            o2.Actions.load("x_cms_assemble_control").DocumentAction.query_listWithFilterPaging(page, count || this.pageCount, data, function(json){
                 if (callback) callback(json);
             });
+            // this.actions.listDocumentFilterNext(id, count || this.pageCount, data, function(json){
+            //     if (callback) callback(json);
+            // });
         }else{
-            this.actions.listDocumentFilterNext(id, count || this.pageCount, data, function(json){
+            o2.Actions.load("x_cms_assemble_control").DocumentAction.query_listWithFilterPaging(page, count || this.pageCount, data, function(json){
                 if (callback) callback(json);
             });
+            // this.actions.listDocumentFilterNext(id, count || this.pageCount, data, function(json){
+            //     if (callback) callback(json);
+            // });
         }
     }
 
@@ -680,7 +700,9 @@ MWF.xApplication.cms.Module.ListExplorer.ListForDraft = new Class({
     },
     _getCurrentPageData: function(callback, count){
         if(!count)count=20;
-        var id = (this.items.length) ? this.items[this.items.length-1].data.id : "(0)";
+        // var id = (this.items.length) ? this.items[this.items.length-1].data.id : "(0)";
+        var page = this.currentPage || 1;
+        this.currentPage = page + 1;
         var data = {
             "appIdList": [ this.explorer.columnData.id ],
             "statusList": [ "draft" ],
@@ -695,13 +717,19 @@ MWF.xApplication.cms.Module.ListExplorer.ListForDraft = new Class({
             for(var f in filterResult ){
                 data[f] = filterResult[f];
             }
-            this.actions.listDocumentFilterNext(id, count || this.pageCount, data, function(json){
+            o2.Actions.load("x_cms_assemble_control").DocumentAction.query_listWithFilterPaging(page, count || this.pageCount, data, function(json){
                 if (callback) callback(json);
             });
+            // this.actions.listDocumentFilterNext(id, count || this.pageCount, data, function(json){
+            //     if (callback) callback(json);
+            // });
         }else{
-            this.actions.listDocumentFilterNext(id, count || this.pageCount, data, function(json){
+            o2.Actions.load("x_cms_assemble_control").DocumentAction.query_listWithFilterPaging(page, count || this.pageCount, data, function(json){
                 if (callback) callback(json);
             });
+            // this.actions.listDocumentFilterNext(id, count || this.pageCount, data, function(json){
+            //     if (callback) callback(json);
+            // });
         }
     }