beyond-rails 0.0.272 → 0.0.278

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90e90e6f38c45540cbedb5ccc0341459c5a9a210d27c472aa97b340a4b2d9814
-  data.tar.gz: 34f2a1783e2c88888e782bdb42517d0a53b2dd6505a69542519aac2689e20d2c
+  metadata.gz: 357f7181d6ead420e1734b599acbc3fdf635fcf665be35bbb26e37796e6d3eb5
+  data.tar.gz: 58958b9fe36351364410b06c08822e1963f8bd02ee9a46bfab08353a1ef9d24a
 SHA512:
-  metadata.gz: 355b5f4412816e6219309c12a2b9a779920bb9e1dda4a1c65827efddad7a51dcc20cac7fafea460fe48f7550a28b44741f7f13112d9f6d265718d1587980bd38
-  data.tar.gz: da9e828f1ecc04b2398ff6418da097a88895454f5cc24d0e9c935cacfcc5cc0da10d4b0417e1f232e61e5765cd5c627cc31404719ba995ade2d430d5a8ce7716
+  metadata.gz: be99024014dda5554c501d5ac151e91a3107d92970f16de660154124b091e384f9d463a2899ec498d5f255aacdd3050ebd5c1e9f8c23b325a42019f0c6049689
+  data.tar.gz: 2af808b2f3510ce0901ec556a2ea3b19edd8a73e7e65dd511d19c8e81ade97f04dac88adc715d94f113ca0bc42d3a61393dd7196f829201deb86fa5781388a7d

data/src/js/components/DateMenu.js

@@ -12,12 +12,13 @@ import {
   getDaysInMonth,
   getMonth,
   getYear,
-  throttle,
+  isFuture,
   range,
   set,
   startOfDay,
   startOfMonth,
   subMonths,
+  throttle,
   toPixel,
   format
 } from '../utils'
@@ -46,6 +47,7 @@ export default class DateMenu {
     this.endDate = endDate
     this.hoveredCellData = null
     this.options = options
+    this.noFuture = options.noFuture || false
     this.tz = options.tz || DEFAULT_TIMEZONE
     this.locale = options.locale || DEFAULT_LOCALE
     this.captionPattern = options.captionPattern || 'yyyy MMMM'
@@ -74,7 +76,7 @@ export default class DateMenu {
 
   getTableRows(date) {
 
-    const { startDate, endDate } = this
+    const { noFuture, startDate, endDate } = this
 
     const daysInMonth = getDaysInMonth(date)
     const firstDateOfMonth = startOfMonth(date)
@@ -118,6 +120,7 @@ export default class DateMenu {
         isStartDate: dateEq(initialStartDate, d),
         isEndDate: dateEq(initialEndDate, d),
         isSelected: (resCompareStart <= 0) && (resCompareEnd >= 0),
+        isDisabled: noFuture && isFuture(d),
         isToday: (today === formatDate(d)),
         day
       }
@@ -191,6 +194,9 @@ export default class DateMenu {
     if (row.type === CELL_TYPE_EMPTY) {
       return '<td></td>'
     }
+    if (row.isDisabled) {
+      return `<td class="cell js-disabled">${row.day}</td>`
+    }
     if (row.isStartDate || row.isEndDate) {
       return `<td class="cell selected-ex" data-date-table-cell>${row.day}</td>`
     }

data/src/js/components/Datepicker.js

@@ -63,7 +63,12 @@ export default class Datepicker {
     this.focused = true
     this.clearInputStatus()
     this.dateInput.setActive(true)
-    this.dateMenu.setDate({ date: this.menuDate })
+
+    this.dateMenu.setDate({
+      date: this.menuDate,
+      startDate: this.date
+    })
+
     this.dateMenu.show(this.dom)
     this.timeMenu && this.timeMenu.hide()
   }
@@ -88,7 +93,8 @@ export default class Datepicker {
       return
     }
 
-    const res = parse(value, dateInput.datePattern, date)
+    const res = parse(value, dateInput.datePattern, date || new Date())
+
     this.nextDate = null
     if (res.toString() === 'Invalid Date') {
       return dateInput.setDanger(true)
@@ -107,16 +113,17 @@ export default class Datepicker {
   handleDateInputBlur() {
     const { nextDate, date, dateInput } = this
 
-    if (date === null) {
+    if ((date === null) && (nextDate === null)) {
       dateInput.setDate(null)
       this.timeInput && this.timeInput.setDate(null)
       this._blurTimer = setTimeout(() => this.emitChange(), 50)
     }
     else if (nextDate) {
       this.date = nextDate
+      this.menuDate = nextDate
       dateInput.setDate(nextDate)
-      this.dateMenu.setDate({ startDate: nextDate })
       this.nextDate = null
+      this.emitChange()
     }
     else {
       dateInput.setDate(date)

data/src/js/components/PieChart.js

@@ -16,6 +16,7 @@ export default class PieChart {
     this.total = 0
 
     this.options = options
+    this.labelVisible = isDef(options.labelVisible) ? options.labelVisible : true
     this.height = options.height
     this.width = options.width
     this.padding = isDef(options.padding) ? options.padding : 30
@@ -236,8 +237,10 @@ export default class PieChart {
     this.total = data.reduce((t, row) => t + row.value, 0)
     this.data = this.setAngles(data)
     this.raf(() => {
-      const labels = this.data.map(row => row.label)
-      this.drawLabels(labels, this.styles)
+      if (this.labelVisible) {
+        const labels = this.data.map(row => row.label)
+        this.drawLabels(labels, this.styles)
+      }
       this.draw()
     })
   }

data/src/js/components/SearchDropdown.js

@@ -26,6 +26,7 @@ export default class SearchDropdown {
     this.offsetTop = options.offsetTop || 0
     this.offsetLeft = options.offsetLeft || 0
     this.noDataMsg = options.noDataMsg || '沒有資料'
+    this.getFloatedTargetPos = options.getFloatedTargetPos || getFloatedTargetPos
     this.isMenuVisible = false
     this.lastKeyword = null
     this.selectedIndex = 0
@@ -164,7 +165,7 @@ export default class SearchDropdown {
 
   adjustMenuPos() {
     const { menu, dom, offset, offsetLeft, offsetTop } = this
-    const { pos, place, align } = getFloatedTargetPos({
+    const { pos, place, align } = this.getFloatedTargetPos({
       src: dom,
       target: menu,
       place: this.place,

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

@@ -70,6 +70,10 @@
         border-style: solid;
         border-color: #e3e8ee;
       }
+      &.cell.js-disabled {
+        opacity: .4;
+        cursor: not-allowed;
+      }
       &.cell.today {
         background-color: #fffef4;
       }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beyond-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.272
+  version: 0.0.278
 platform: ruby
 authors:
 - kmsheng
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-15 00:00:00.000000000 Z
+date: 2021-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sassc
@@ -288,7 +288,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.9
 signing_key:
 specification_version: 4
 summary: beyond is a collection of frontend components which aims for admin website.