beyond-rails 0.0.186 → 0.0.191

data/src/js/jquery/bindModalFn.js

@@ -1,14 +1,65 @@
 export default function bindModalFn(beyond, $) {
 
-  const { Modal } = beyond
-
-  $.fn.modal = function(settings) {
+  $.fn.modal = function(settings, html) {
 
-    const options = $.extend({}, $.fn.modal.defaults, settings)
-    const modals = this.map((i, dom) => new Modal(dom, options))
+    if (typeof settings === 'string') {
+      const method = settings
+      initModals(this, $.fn.modal.defaults)
+      if (method === 'open?') {
+        return this.map((i, dom) => dom._modal.visible())
+      }
+      this.each((i, dom) => dom._modal[method](html))
+    }
+    else {
+      const options = $.extend({}, $.fn.modal.defaults, settings)
+      initModals(this, options)
+    }
 
-    this.destroy = () => modals.each((i, m) => m.destroy())
+    this.destroy = () => this.each((i, dom) => dom._modal && dom._modal.destroy())
 
     return this
   }
+
+  $.uniqModal = getUniqModalSelector
+}
+
+function initModals(self, options) {
+  const { Modal } = beyond
+  self.each((i, dom) => {
+    if (! dom._modal) {
+      dom._modal = new Modal(dom, options)
+    }
+  })
+}
+
+function getUniqModalSelector() {
+  const id = 'beyond-uniq-modal'
+  const dom = document.getElementById(id)
+  if (dom) {
+    return $(`#${id}`)
+  }
+  const div = document.createElement('div')
+  div.id = id
+  div.className = 'modal'
+  div.innerHTML = `
+    <div class="modal-dialog">
+      <div class="modal-content">
+        <div class="modal-header">
+          <h5 class="modal-title">視窗標題</h5>
+          <button type="button" class="btn-close" data-close aria-label="Close">
+            <i class="icon icon-cross"></i>
+          </button>
+        </div>
+        <div class="modal-body bg-content">
+          視窗內文
+        </div>
+        <div class="modal-footer">
+          <button data-cancel class="btn btn-outline">取消</button>
+          <button data-confirm class="btn btn-primary">確認</button>
+        </div>
+      </div>
+    </div>
+  `
+  document.body.appendChild(div)
+  return $(div)
 }

data/src/js/utils/index.js

@@ -33,6 +33,10 @@ import isFunction from 'lodash.isfunction'
 import noop from 'lodash.noop'
 import range from 'lodash.range'
 import throttle from 'lodash.throttle'
+import uniqBy from 'lodash.uniqby'
+import sortBy from 'lodash.sortby'
+
+import mem from 'mem'
 
 export {
   // @superlanding
@@ -69,5 +73,10 @@ export {
   isFunction,
   noop,
   range,
-  throttle
+  throttle,
+  uniqBy,
+  sortBy,
+
+  // others
+  mem
 }

data/src/js/utils/isDef.js

@@ -0,0 +1,3 @@
+export default function isDef(value) {
+  return (typeof value !== 'undefined')
+}

data/src/js/utils/isInt.js

@@ -0,0 +1,3 @@
+export default function isInt(value) {
+  return (value % 1) === 0
+}

data/src/js/utils/isUndef.js

@@ -0,0 +1,3 @@
+export default function isUndef(value) {
+  return (typeof value === 'undefined')
+}

data/src/sass/_beyond.scss

@@ -50,3 +50,4 @@
 @import './components/_tooltip';
 @import './components/_switch';
 @import './components/_mega-menu';
+@import './components/_chart';

data/src/sass/abstracts/_variables.scss

@@ -1,7 +1,7 @@
 $beyond-use-helper: false !default;
 
 // texts
-$text-color-strong: #3c4257;
+$text-color-strong: #1a1f36;
 $text-color: #3c4257;
 $text-color-light: #828695;
 

data/src/sass/components/_breadcrumb.scss

@@ -14,4 +14,7 @@
   .breadcrumb-item.active {
     color: #6c757d;
   }
+  .breadcrumb-item a {
+    color: #000;
+  }
 }

data/src/sass/components/_chart.scss

@@ -0,0 +1,14 @@
+.chart {
+  font-family: Roboto;
+}
+
+.chart-menu {
+  display: none;
+  position: absolute;
+  background-color: #fff;
+  padding: 10px 13px;
+  box-shadow: 4px 4px 15px 1px rgba(68,  68, 72, .12);
+  color: #3c4257;
+  z-index: 1;
+  border: 1px solid #e8e8e8;
+}

data/src/sass/components/_mega-menu.scss

@@ -1,37 +1,33 @@
+$mega-menu-text-color: #0a2540;
+$mega-menu-text-color-ex: #8A8D90;
+
+@mixin mega-menu-text() {
+  transition: .3s color;
+  color: $mega-menu-text-color;
+  &:hover {
+    color: $mega-menu-text-color-ex;
+  }
+}
+
 .mega-menu {
-  padding-top: .2rem;
-  padding-bottom: .2rem;
+  font-size: .9375rem;
+}
+.mega-menu-divider {
+  border-bottom: 1px solid #ebebeb;
 }
 .mega-menu-col {
   padding: .7rem 1.5rem;
   flex-grow: 1;
-  transition: .3s background-color;
-  &:hover {
-    background-color: #f6f6f6;
-  }
   min-width: 180px;
-  color: $text-color;
   display: flex;
   align-items: center;
-  i {
-    margin-right: .6rem;
-  }
-}
-.mega-menu-label {
-  padding-left: 1.5rem;
-  margin-top: 1rem;
-  margin-bottom: .5rem;
-  color: $text-color-light;
-  font-size: 12px;
+  @include mega-menu-text;
 }
 .mega-menu-item {
   transition: .3s background-color;
-  &:hover {
-    background-color: #f6f6f6;
-  }
-  color: $text-color;
   display: block;
-  padding: .5rem 2.2rem;
+  padding: .7rem 1.5rem;
+  @include mega-menu-text;
 }
 .mega-menu-icon-box {
   display: table;
@@ -42,15 +38,19 @@
 }
 .mega-menu-icon-box-item {
   cursor: pointer;
-  transition: .3s background-color;
-  &:hover {
-    background-color: #f6f6f6;
-  }
+  transition: .3s all;
   display: table-cell;
-  padding: 1rem 1.8rem;
-  color: $text-color;
+  padding: 1rem 1.5rem;
   text-align: center;
+  @include mega-menu-text;
+  &:hover {
+    i {
+      color: $mega-menu-text-color;
+    }
+  }
   i {
+    transition: .3s color;
+    color: #88add2;
     display: block;
     margin-bottom: .4rem;
   }

data/src/sass/components/_modal.scss

@@ -61,7 +61,6 @@
     text-align: right;
     .btn {
       padding: 6px 12px;
-      min-width: 62px;
       font-size: 14px;
       font-weight: 400;
     }
@@ -70,3 +69,15 @@
     }
   }
 }
+
+.modal.static {
+  overflow-y: initial;
+  background-color: transparent;
+  opacity: 1;
+  position: static;
+  display: block;
+  .modal-dialog {
+    transform: scale(1);
+    margin: 0 auto;
+  }
+}

data/src/sass/components/_nav.scss

@@ -43,6 +43,7 @@
       margin-right: .8rem;
     }
   }
+  .nav-item:active,
   .nav-item.active {
     color: $color-primary;
   }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beyond-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.186
+  version: 0.0.191
 platform: ruby
 authors:
 - kmsheng
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-31 00:00:00.000000000 Z
+date: 2020-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sassc
@@ -18,6 +18,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -25,46 +28,55 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: autoprefixer-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '9.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.1
+        version: 9.7.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '9.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.1
+        version: 9.7.6
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
 description: 
@@ -101,6 +113,7 @@ files:
 - src/js/components/Alert.js
 - src/js/components/Autocomplete.js
 - src/js/components/AutocompleteMenu.js
+- src/js/components/BarChart.js
 - src/js/components/Btn.js
 - src/js/components/Checkbox.js
 - src/js/components/DateInput.js
@@ -109,6 +122,7 @@ files:
 - src/js/components/Datepicker.js
 - src/js/components/DatepickerBtnArrow.js
 - src/js/components/Dropdown.js
+- src/js/components/LineChart.js
 - src/js/components/Menu.js
 - src/js/components/Modal.js
 - src/js/components/Navbar.js
@@ -124,6 +138,8 @@ files:
 - src/js/components/Tooltip.js
 - src/js/consts/createdComponents.js
 - src/js/consts/index.js
+- src/js/decorators/chartCommon.js
+- src/js/decorators/supportDom.js
 - src/js/index.js
 - src/js/jquery/bindAlertFn.js
 - src/js/jquery/bindAutocompleteFn.js
@@ -160,10 +176,12 @@ files:
 - src/js/utils/getFloatedTargetPos.js
 - src/js/utils/getKey.js
 - src/js/utils/index.js
+- src/js/utils/isDef.js
+- src/js/utils/isInt.js
 - src/js/utils/isTouchDevice.js
+- src/js/utils/isUndef.js
 - src/js/utils/msToS.js
 - src/js/utils/promisify.js
-- src/js/utils/supportDom.js
 - src/js/utils/unbindAll.js
 - src/sass/_beyond-sprockets.scss
 - src/sass/_beyond.scss
@@ -181,6 +199,7 @@ files:
 - src/sass/components/_btn-group.scss
 - src/sass/components/_btn.scss
 - src/sass/components/_card.scss
+- src/sass/components/_chart.scss
 - src/sass/components/_checkbox.scss
 - src/sass/components/_date-input.scss
 - src/sass/components/_date-menu.scss