@gmfe/react 2.14.21-beta.1 → 2.14.26-beta.0

package/src/component/calendar/content.js

@@ -1,89 +1,89 @@
-import React from 'react'
-import PropTypes from 'prop-types'
-import moment from 'moment'
-import _ from 'lodash'
-import Day from './day'
-
-const Content = props => {
-  const { begin, end, onSelect, will, hoverDay, onHoverDay } = props
-
-  const day = moment(will)
-    .startOf('month')
-    .day(0)
-    .add(-1, 'day')
-
-  const group = _.groupBy(_.range(42), v => parseInt(v / 7))
-
-  const getDisabled = m => {
-    let { min, max, disabledDate } = props
-    min = min ? moment(min).startOf('day') : null
-    max = max ? moment(max).startOf('day') : null
-
-    let disabled = false
-
-    if (disabledDate) {
-      disabled = disabledDate(m.toDate(), {
-        begin: begin && begin.toDate(),
-        end: end && end.toDate()
-      })
-    } else {
-      if (min && m < min) {
-        disabled = true
-      }
-      if (max && m > max) {
-        disabled = true
-      }
-    }
-    return disabled
-  }
-
-  return (
-    <div className='gm-calendar-content'>
-      {_.map(group, (v, i) => (
-        <div key={i} className='gm-calendar-content-div'>
-          {_.map(v, (value, index) => {
-            const mm = moment(day.add(1, 'day'))
-            return (
-              <Day
-                key={index}
-                value={mm}
-                begin={begin}
-                end={end}
-                disabled={getDisabled(mm)}
-                onClick={onSelect}
-                will={will}
-                hoverDay={hoverDay}
-                onHoverDay={onHoverDay}
-              />
-            )
-          })}
-        </div>
-      ))}
-    </div>
-  )
-}
-
-Content.propTypes = {
-  /** 开始日期 */
-  begin: PropTypes.object,
-  /** 结束日期 */
-  end: PropTypes.object,
-  /** 选中日期，参数 begin end */
-  onSelect: PropTypes.func.isRequired,
-  /** 键盘用 */
-  will: PropTypes.object.isRequired,
-
-  /** Date对象，表示可选的最小日期 */
-  min: PropTypes.object,
-  /** Date对象，表示可选的最大日期 */
-  max: PropTypes.object,
-  /** 自定义日期是否可选。传入参数为Date对象，返回true or false。 有此属性则min max无效。 */
-  disabledDate: PropTypes.func,
-
-  /** 当前鼠标hover日期 */
-  hoverDay: PropTypes.object,
-  /** 鼠标hover日期修改函数 */
-  onHoverDay: PropTypes.func
-}
-
-export default Content
+import React from 'react'
+import PropTypes from 'prop-types'
+import moment from 'moment'
+import _ from 'lodash'
+import Day from './day'
+
+const Content = props => {
+  const { begin, end, onSelect, will, hoverDay, onHoverDay } = props
+
+  const day = moment(will)
+    .startOf('month')
+    .day(0)
+    .add(-1, 'day')
+
+  const group = _.groupBy(_.range(42), v => parseInt(v / 7))
+
+  const getDisabled = m => {
+    let { min, max, disabledDate } = props
+    min = min ? moment(min).startOf('day') : null
+    max = max ? moment(max).startOf('day') : null
+
+    let disabled = false
+
+    if (disabledDate) {
+      disabled = disabledDate(m.toDate(), {
+        begin: begin && begin.toDate(),
+        end: end && end.toDate()
+      })
+    } else {
+      if (min && m < min) {
+        disabled = true
+      }
+      if (max && m > max) {
+        disabled = true
+      }
+    }
+    return disabled
+  }
+
+  return (
+    <div className='gm-calendar-content'>
+      {_.map(group, (v, i) => (
+        <div key={i} className='gm-calendar-content-div'>
+          {_.map(v, (value, index) => {
+            const mm = moment(day.add(1, 'day'))
+            return (
+              <Day
+                key={index}
+                value={mm}
+                begin={begin}
+                end={end}
+                disabled={getDisabled(mm)}
+                onClick={onSelect}
+                will={will}
+                hoverDay={hoverDay}
+                onHoverDay={onHoverDay}
+              />
+            )
+          })}
+        </div>
+      ))}
+    </div>
+  )
+}
+
+Content.propTypes = {
+  /** 开始日期 */
+  begin: PropTypes.object,
+  /** 结束日期 */
+  end: PropTypes.object,
+  /** 选中日期，参数 begin end */
+  onSelect: PropTypes.func.isRequired,
+  /** 键盘用 */
+  will: PropTypes.object.isRequired,
+
+  /** Date对象，表示可选的最小日期 */
+  min: PropTypes.object,
+  /** Date对象，表示可选的最大日期 */
+  max: PropTypes.object,
+  /** 自定义日期是否可选。传入参数为Date对象，返回true or false。 有此属性则min max无效。 */
+  disabledDate: PropTypes.func,
+
+  /** 当前鼠标hover日期 */
+  hoverDay: PropTypes.object,
+  /** 鼠标hover日期修改函数 */
+  onHoverDay: PropTypes.func
+}
+
+export default Content

package/src/component/calendar/day.js

@@ -1,109 +1,109 @@
-import React from 'react'
-import PropTypes from 'prop-types'
-import classNames from 'classnames'
-import moment from 'moment'
-
-const Day = props => {
-  const {
-    disabled,
-    onClick,
-    value,
-    will,
-    begin,
-    end,
-    hoverDay,
-    onHoverDay
-  } = props
-
-  const handleClick = () => {
-    if (disabled) {
-      return
-    }
-    onClick(value)
-  }
-
-  const handleMouseOver = e => {
-    if (!onHoverDay) {
-      return
-    }
-    // 获取鼠标所在hover值
-    const day = e.target.innerText
-    if (day && ((begin && !end) || (!begin && end))) {
-      !disabled && onHoverDay(moment(value))
-    } else {
-      onHoverDay(null)
-    }
-  }
-
-  const nowStart = +moment().startOf('day')
-  const valueStart = +value.startOf('day')
-  const beginStart = begin ? +begin.startOf('day') : null
-  const endStart = end ? +end.startOf('day') : null
-  const willStart = +will.startOf('day')
-  const hoverStart = hoverDay ? +hoverDay.startOf('day') : null
-
-  const isActive = () => {
-    if (begin && end) {
-      return beginStart <= valueStart && valueStart <= endStart
-    } else if (begin) {
-      return beginStart === valueStart
-    } else if (end) {
-      return endStart === valueStart
-    }
-  }
-
-  const isHover = () => {
-    if ((begin && end) || !hoverStart) {
-      return false
-    } else {
-      const date = +moment(begin || end).startOf('day')
-      const min = date < hoverStart ? date : hoverStart
-      const max = date > hoverStart ? date : hoverStart
-      return min < valueStart && valueStart < max
-    }
-  }
-
-  const cn = classNames('gm-calendar-day', {
-    // 无状态
-    'gm-calendar-day-old': will.month() > value.month(),
-    'gm-calendar-day-new': will.month() < value.month(),
-    'gm-calendar-day-now': nowStart === valueStart,
-    // 键盘
-    'gm-calendar-day-will': willStart === valueStart,
-    // 选中态
-    active: isActive(),
-    'gm-calendar-day-begin': beginStart === valueStart,
-    'gm-calendar-day-end': endStart === valueStart,
-    // hover态
-    'gm-calendar-day-hover': isHover(),
-    'gm-calendar-day-hover-end':
-      ((begin && !end) || (!begin && end)) && hoverStart === valueStart,
-    // 不可用
-    'gm-calendar-day-disabled': disabled
-  })
-
-  return (
-    <span className={cn} onClick={handleClick} onMouseOver={handleMouseOver}>
-      {value.date()}
-    </span>
-  )
-}
-
-Day.propTypes = {
-  /** 日期值 */
-  value: PropTypes.object.isRequired,
-  /** 开始日期 */
-  begin: PropTypes.object,
-  /** 结束日期 */
-  end: PropTypes.object,
-  onClick: PropTypes.func.isRequired,
-  disabled: PropTypes.bool.isRequired,
-  /** 键盘用 */
-  will: PropTypes.object.isRequired,
-
-  /** 当前鼠标hover日期 */
-  hoverDay: PropTypes.object,
-  onHoverDay: PropTypes.func
-}
-
-export default Day
+import React from 'react'
+import PropTypes from 'prop-types'
+import classNames from 'classnames'
+import moment from 'moment'
+
+const Day = props => {
+  const {
+    disabled,
+    onClick,
+    value,
+    will,
+    begin,
+    end,
+    hoverDay,
+    onHoverDay
+  } = props
+
+  const handleClick = () => {
+    if (disabled) {
+      return
+    }
+    onClick(value)
+  }
+
+  const handleMouseOver = e => {
+    if (!onHoverDay) {
+      return
+    }
+    // 获取鼠标所在hover值
+    const day = e.target.innerText
+    if (day && ((begin && !end) || (!begin && end))) {
+      !disabled && onHoverDay(moment(value))
+    } else {
+      onHoverDay(null)
+    }
+  }
+
+  const nowStart = +moment().startOf('day')
+  const valueStart = +value.startOf('day')
+  const beginStart = begin ? +begin.startOf('day') : null
+  const endStart = end ? +end.startOf('day') : null
+  const willStart = +will.startOf('day')
+  const hoverStart = hoverDay ? +hoverDay.startOf('day') : null
+
+  const isActive = () => {
+    if (begin && end) {
+      return beginStart <= valueStart && valueStart <= endStart
+    } else if (begin) {
+      return beginStart === valueStart
+    } else if (end) {
+      return endStart === valueStart
+    }
+  }
+
+  const isHover = () => {
+    if ((begin && end) || !hoverStart) {
+      return false
+    } else {
+      const date = +moment(begin || end).startOf('day')
+      const min = date < hoverStart ? date : hoverStart
+      const max = date > hoverStart ? date : hoverStart
+      return min < valueStart && valueStart < max
+    }
+  }
+
+  const cn = classNames('gm-calendar-day', {
+    // 无状态
+    'gm-calendar-day-old': will.month() > value.month(),
+    'gm-calendar-day-new': will.month() < value.month(),
+    'gm-calendar-day-now': nowStart === valueStart,
+    // 键盘
+    'gm-calendar-day-will': willStart === valueStart,
+    // 选中态
+    active: isActive(),
+    'gm-calendar-day-begin': beginStart === valueStart,
+    'gm-calendar-day-end': endStart === valueStart,
+    // hover态
+    'gm-calendar-day-hover': isHover(),
+    'gm-calendar-day-hover-end':
+      ((begin && !end) || (!begin && end)) && hoverStart === valueStart,
+    // 不可用
+    'gm-calendar-day-disabled': disabled
+  })
+
+  return (
+    <span className={cn} onClick={handleClick} onMouseOver={handleMouseOver}>
+      {value.date()}
+    </span>
+  )
+}
+
+Day.propTypes = {
+  /** 日期值 */
+  value: PropTypes.object.isRequired,
+  /** 开始日期 */
+  begin: PropTypes.object,
+  /** 结束日期 */
+  end: PropTypes.object,
+  onClick: PropTypes.func.isRequired,
+  disabled: PropTypes.bool.isRequired,
+  /** 键盘用 */
+  will: PropTypes.object.isRequired,
+
+  /** 当前鼠标hover日期 */
+  hoverDay: PropTypes.object,
+  onHoverDay: PropTypes.func
+}
+
+export default Day