浏览代码

added first version of the dropdown style

Dustin Utecht 6 年之前
父节点
当前提交
77916c08b1
共有 1 个文件被更改,包括 16 次插入11 次删除
  1. 16 11
      src/themes/bootstrap-table/bootstrap-table.js

+ 16 - 11
src/themes/bootstrap-table/bootstrap-table.js

@@ -1,12 +1,6 @@
 /**
-<<<<<<< HEAD
  * @author Dustin Utecht
  * https://github.com/wenzhixin/bootstrap-table/
-=======
- * @author zhixin wen <wenzhixin2010@gmail.com>
- * https://github.com/wenzhixin/bootstrap-table/
- * theme: https://github.com/jgthms/bulma/
->>>>>>> first (s)css for the bootrap-table theme
  */
 
 $.fn.bootstrapTable.theme = 'bootstrap-table'
@@ -14,20 +8,29 @@ $.fn.bootstrapTable.theme = 'bootstrap-table'
 $.extend($.fn.bootstrapTable.defaults, {
   iconsPrefix: 'icon',
   icons: {
-    paginationSwitchDown: 'grid_on',
-    paginationSwitchUp: 'grid_off',
+    paginationSwitchDown: 'icon-arrow-up-circle',
+    paginationSwitchUp: 'icon-arrow-down-circle',
     refresh: 'icon-refresh-cw',
     toggleOff: 'icon-toggle-right',
     toggleOn: 'icon-toggle-right',
     columns: 'icon-list',
-    detailOpen: 'add',
-    detailClose: 'remove',
+    detailOpen: 'icon-plus',
+    detailClose: 'icon-minus',
     fullscreen: 'icon-maximize',
+    search: 'icon-search',
     clearSearch: 'icon-trash-2'
   }
 })
 
 $.BootstrapTable = class extends $.BootstrapTable {
+  init () {
+    super.init()
+
+    $('.modal').on('click', '[data-close]', (e) => {
+      $(e.delegateTarget).removeClass('show')
+    })
+  }
+
   initConstants () {
     super.initConstants()
 
@@ -56,15 +59,17 @@ $.BootstrapTable = class extends $.BootstrapTable {
   _initDropdown () {
     const $dropdownToggles = $('.dropdown-toggle')
     $dropdownToggles.off('click').on('click', (e) => {
-      let $target = $(e.target)
+      let $target = $(e.currentTarget)
       if ($target.parents('.dropdown-toggle').length > 0) {
         $target = $target.parents('.dropdown-toggle')
       }
 
+      $dropdownToggles.next('.dropdown-menu').removeClass('open')
       $target.next('.dropdown-menu').toggleClass('open')
     })
 
     $(window).off('click').on('click', (e) => {
+      const $dropdownToggles = $('.dropdown-toggle')
       if ($(e.target).parents('.dropdown-toggle, .dropdown-menu').length === 0 && !$(e.target).hasClass('dropdown-toggle')) {
         $dropdownToggles.next('.dropdown-menu').removeClass('open')
       }