Browse Source

Update queryParams option.

zhixin 11 years ago
parent
commit
292cc387cd
3 changed files with 22 additions and 15 deletions
  1. 2 2
      docs/docs.js
  2. 8 8
      docs/examples.html
  3. 12 5
      src/bootstrap-table.js

+ 2 - 2
docs/docs.js

@@ -88,8 +88,8 @@ $(function () {
                 {
                 {
                     name: 'queryParams',
                     name: 'queryParams',
                     type: 'Function',
                     type: 'Function',
-                    description: 'When request remote data, sending additional parameters by format the queryParams.',
-                    'default': 'function(pageSize, pageNumber, searchText) {return {};}'
+                    description: 'When request remote data, sending additional parameters by format the queryParams, the parameters object contains: pageSize, pageNumber, searchText.',
+                    'default': 'function(params) {return {};}'
                 },
                 },
                 {
                 {
                     name: 'pagination',
                     name: 'pagination',

+ 8 - 8
docs/examples.html

@@ -411,21 +411,21 @@
                     </table>
                     </table>
                     <script>
                     <script>
                         // url: /examples/bootstrap_table/data?offset=0&limit=10&search=test
                         // url: /examples/bootstrap_table/data?offset=0&limit=10&search=test
-                        function queryParams(pageSize, pageNumber, searchText) {
+                        function queryParams(params) {
                             return {
                             return {
-                                limit: pageSize,
-                                offset: pageSize * (pageNumber - 1),
-                                search: searchText
+                                limit: params.pageSize,
+                                offset: params.pageSize * (params.pageNumber - 1),
+                                search: params.searchText
                             };
                             };
                         }
                         }
 
 
                         // url: /examples/bootstrap_table/data?page=1&number=10&search=test
                         // url: /examples/bootstrap_table/data?page=1&number=10&search=test
                         /*
                         /*
-                        function queryParams(pageSize, pageNumber, searchText) {
+                        function queryParams(params) {
                             return {
                             return {
-                                page: pageNumber,
-                                number: pageSize,
-                                search: searchText
+                                page: params.pageNumber,
+                                number: params.pageSize,
+                                search: params.searchText
                             };
                             };
                         }
                         }
                         */
                         */

+ 12 - 5
src/bootstrap-table.js

@@ -67,7 +67,7 @@
         method: 'get',
         method: 'get',
         url: undefined,
         url: undefined,
         contentType: 'application/json',
         contentType: 'application/json',
-        queryParams: function(pageSize, pageNumber, searchText) {return {};},
+        queryParams: function(params) {return {};}, // pageSize, pageNumber, searchText
         pagination: false,
         pagination: false,
         sidePagination: 'client', // client or server
         sidePagination: 'client', // client or server
         totalRows: 0, // server side need to set
         totalRows: 0, // server side need to set
@@ -665,11 +665,18 @@
         this.$loading.show();
         this.$loading.show();
 
 
         if (typeof this.options.queryParams === 'function') {
         if (typeof this.options.queryParams === 'function') {
-            data = this.options.queryParams(this.options.pageSize,
-                this.options.pageNumber, this.searchText);
+            data = this.options.queryParams({
+                pageSize: this.options.pageSize,
+                pageNumber: this.options.pageNumber,
+                searchText: this.searchText
+            });
         } else if (typeof this.options.queryParams === 'string') {
         } else if (typeof this.options.queryParams === 'string') {
-            data = eval(this.options.queryParams +
-                '(this.options.pageSize, this.options.pageNumber, this.searchText)');
+            data = eval([this.options.queryParams,
+                '({',
+                    'pageSize: this.options.pageSize,',
+                    'pageNumber: this.options.pageNumber,',
+                    'searchText: this.searchText',
+                '})'].join(''));
         }
         }
 
 
         $.ajax({
         $.ajax({