71659609 by Zelig

Merge branch 'develop' of http://g.28ms.com:8000/yangjianbin/page into develop

2 parents d365509b 968e085c
...@@ -123,9 +123,12 @@ ...@@ -123,9 +123,12 @@
123 if(draw) { 123 if(draw) {
124 ret.draw = draw; 124 ret.draw = draw;
125 } 125 }
126 // ret.draw = parseInt(json.page.currentPage); 126 ret.recordsTotal = 0;
127 ret.recordsTotal = parseInt(json.page.totalNumber); 127 ret.recordsFiltered = 0;
128 ret.recordsFiltered = parseInt(json.page.totalNumber); 128 if (json.page) {
129 ret.recordsTotal = parseInt(json.page.totalNumber);
130 ret.recordsFiltered = parseInt(json.page.totalNumber);
131 }
129 return JSON.stringify(ret); 132 return JSON.stringify(ret);
130 }, 133 },
131 data: function (data) { 134 data: function (data) {
......
...@@ -112,8 +112,12 @@ ...@@ -112,8 +112,12 @@
112 ret.draw = draw; 112 ret.draw = draw;
113 } 113 }
114 // ret.draw = parseInt(json.page.currentPage); 114 // ret.draw = parseInt(json.page.currentPage);
115 ret.recordsTotal = parseInt(json.page.totalNumber); 115 ret.recordsTotal = 0;
116 ret.recordsFiltered = parseInt(json.page.totalNumber); 116 ret.recordsFiltered = 0;
117 if (json.page) {
118 ret.recordsTotal = parseInt(json.page.totalNumber);
119 ret.recordsFiltered = parseInt(json.page.totalNumber);
120 }
117 return JSON.stringify(ret); 121 return JSON.stringify(ret);
118 }, 122 },
119 data: function (data) { 123 data: function (data) {
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!