Home Explore Help
Sign In
githab
/
bootstrap-table
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Fix bootstrapVersion error

zhixin 6 years ago
parent
71f1b6d8ba
commit
244e30303f
4 changed files with 12 additions and 32 deletions
Unified View Show Diff Stats
  1. 3 14
      src/extensions/filter-control/bootstrap-table-filter-control.js
  2. 3 14
      src/extensions/print/bootstrap-table-print.js
  3. 3 1
      src/extensions/sticky-header/bootstrap-table-sticky-header.js
  4. 3 3
      src/extensions/toolbar/bootstrap-table-toolbar.js

+ 3 - 14
src/extensions/filter-control/bootstrap-table-filter-control.js
View File 

@@ -505,19 +505,6 @@ const filterDataMethods = {
 
   }
 
   }
 
 }
 
 }
 
 
 
-const bootstrap = {
 
-  3: {
 
-    icons: {
 
-      clear: 'glyphicon-trash icon-clear'
 
-    }
 
-  },
 
-  4: {
 
-    icons: {
 
-      clear: 'fa-trash icon-clear'
 
-    }
 
-  }
 
-}[Utils.bootstrapVersion]
 
-
 
 $.extend($.fn.bootstrapTable.defaults, {
 
 $.extend($.fn.bootstrapTable.defaults, {
 
   filterControl: false,
 
   filterControl: false,
 
   onColumnSearch (field, text) {
 
   onColumnSearch (field, text) {
 
@@ -576,7 +563,9 @@ $.extend($.fn.bootstrapTable.Constructor.EVENTS, {
 
 })
 
 })
 
 
 
 $.extend($.fn.bootstrapTable.defaults.icons, {
 
 $.extend($.fn.bootstrapTable.defaults.icons, {
 
-  clear: bootstrap.icons.clear
 
+  clear: {
 
+    bootstrap3: 'glyphicon-trash icon-clear'
 
+  }[$.fn.bootstrapTable.theme] || 'fa-trash'
 
 })
 
 })
 
 
 
 $.extend($.fn.bootstrapTable.locales, {
 
 $.extend($.fn.bootstrapTable.locales, {

+ 3 - 14
src/extensions/print/bootstrap-table-print.js
View File 

@@ -4,19 +4,6 @@
 
 
 
 const Utils = $.fn.bootstrapTable.utils
 
 const Utils = $.fn.bootstrapTable.utils
 
 
 
-const bootstrap = {
 
-  3: {
 
-    icons: {
 
-      print: 'glyphicon-print icon-share'
 
-    }
 
-  },
 
-  4: {
 
-    icons: {
 
-      print: 'fa-print'
 
-    }
 
-  }
 
-}[Utils.bootstrapVersion]
 
-
 
 function printPageBuilderDefault (table) {
 
 function printPageBuilderDefault (table) {
 
   return `
 
   return `
 
   <html>
 
   <html>
 
@@ -78,7 +65,9 @@ $.extend($.fn.bootstrapTable.COLUMN_DEFAULTS, {
 
 })
 
 })
 
 
 
 $.extend($.fn.bootstrapTable.defaults.icons, {
 
 $.extend($.fn.bootstrapTable.defaults.icons, {
 
-  print: bootstrap.icons.print
 
+  print: {
 
+    bootstrap3: 'glyphicon-print icon-share'
 
+  }[$.fn.bootstrapTable.theme] || 'fa-print'
 
 })
 
 })
 
 
 
 $.BootstrapTable = class extends $.BootstrapTable {
 
 $.BootstrapTable = class extends $.BootstrapTable {

+ 3 - 1
src/extensions/sticky-header/bootstrap-table-sticky-header.js
View File 

@@ -11,7 +11,9 @@ $.extend($.fn.bootstrapTable.defaults, {
 
   stickyHeaderOffsetY: 0
 
   stickyHeaderOffsetY: 0
 
 })
 
 })
 
 
 
-const hiddenClass = Utils.bootstrapVersion === 4 ? 'd-none' : 'hidden'
 
+const hiddenClass = {
 
+  bootstrap3: 'hidden'
 
+}[$.fn.bootstrapTable.theme] || 'd-none'
 
 
 
 $.BootstrapTable = class extends $.BootstrapTable {
 
 $.BootstrapTable = class extends $.BootstrapTable {
 
   initHeader (...args) {
 
   initHeader (...args) {

+ 3 - 3
src/extensions/toolbar/bootstrap-table-toolbar.js
View File 

@@ -9,7 +9,7 @@
 
 const Utils = $.fn.bootstrapTable.utils
 
 const Utils = $.fn.bootstrapTable.utils
 
 
 
 const bootstrap = {
 
 const bootstrap = {
 
-  3: {
 
+  bootstrap3: {
 
     icons: {
 
     icons: {
 
       advancedSearchIcon: 'glyphicon-chevron-down'
 
       advancedSearchIcon: 'glyphicon-chevron-down'
 
     },
 
     },
 
@@ -24,7 +24,7 @@ const bootstrap = {
 
       `
 
       `
 
     }
 
     }
 
   },
 
   },
 
-  4: {
 
+  bootstrap4: {
 
     icons: {
 
     icons: {
 
       advancedSearchIcon: 'fa-chevron-down'
 
       advancedSearchIcon: 'fa-chevron-down'
 
     },
 
     },
 
@@ -39,7 +39,7 @@ const bootstrap = {
 
       `
 
       `
 
     }
 
     }
 
   }
 
   }
 
-}[Utils.bootstrapVersion]
 
+}[$.fn.bootstrapTable.theme]
 
 
 
 $.extend($.fn.bootstrapTable.defaults, {
 
 $.extend($.fn.bootstrapTable.defaults, {
 
   advancedSearch: false,
 
   advancedSearch: false,