浏览代码

Fix default values for watched options

Dan Kaplun 10 年之前
父节点
当前提交
c3954c7822

+ 3 - 2
dist/extensions/angular/bsTable.js

@@ -25,12 +25,13 @@
             scroll = $el.bootstrapTable('getScrollPosition');
             $el.bootstrapTable('destroy');
           }
-          options = $.extend(options ? {
+          if (options) newOptions = $.extend({}, newOptions, {
             sortName: options.sortName,
             sortOrder: options.sortOrder,
             pageNumber: options.pageNumber,
             pageSize: options.pageSize
-          } : {}, newOptions);
+          });
+          options = newOptions;
           $el.bootstrapTable(options);
           if (scroll) $el.bootstrapTable('scrollTo', scroll);
         }, true);

文件差异内容过多而无法显示
+ 1 - 1
dist/extensions/angular/bsTable.min.js


+ 3 - 2
docs/dist/extensions/angular/bsTable.js

@@ -25,12 +25,13 @@
             scroll = $el.bootstrapTable('getScrollPosition');
             $el.bootstrapTable('destroy');
           }
-          options = $.extend(options ? {
+          if (options) newOptions = $.extend({}, newOptions, {
             sortName: options.sortName,
             sortOrder: options.sortOrder,
             pageNumber: options.pageNumber,
             pageSize: options.pageSize
-          } : {}, newOptions);
+          });
+          options = newOptions;
           $el.bootstrapTable(options);
           if (scroll) $el.bootstrapTable('scrollTo', scroll);
         }, true);

文件差异内容过多而无法显示
+ 1 - 1
docs/dist/extensions/angular/bsTable.min.js


+ 3 - 2
src/extensions/angular/bsTable.js

@@ -25,12 +25,13 @@
             scroll = $el.bootstrapTable('getScrollPosition');
             $el.bootstrapTable('destroy');
           }
-          options = $.extend(options ? {
+          if (options) newOptions = $.extend({}, newOptions, {
             sortName: options.sortName,
             sortOrder: options.sortOrder,
             pageNumber: options.pageNumber,
             pageSize: options.pageSize
-          } : {}, newOptions);
+          });
+          options = newOptions;
           $el.bootstrapTable(options);
           if (scroll) $el.bootstrapTable('scrollTo', scroll);
         }, true);