@gmfe/react 2.14.20 → 2.14.26-beta.0

package/src/component/date_picker/overlay.js

@@ -1,119 +1,119 @@
-import React, { useState } from 'react'
-import PropTypes from 'prop-types'
-import _ from 'lodash'
-import Button from '../button'
-import { getLocale } from '@gmfe/locales'
-import Flex from '../flex'
-import Calendar from '../calendar/calendar'
-import TimeSelect from './time_select'
-import { setTimes, getTimeCells } from '../date_range_picker/util'
-
-const Overlay = props => {
-  const {
-    date,
-    willActiveSelected,
-    min,
-    max,
-    onSelect,
-    timeLimit,
-    disabledDate,
-    enabledTimeSelect,
-    renderBottom
-  } = props
-
-  const [selectedDate, setSelectedDate] = useState(date)
-
-  // 选择日期后渲染时间，有默认时间则展示，无展示为可选的第一个时间
-  const getTime = () => {
-    const { defaultTime, disabledSpan, timeSpan } = timeLimit || {}
-    if (defaultTime) {
-      return defaultTime
-    }
-
-    const cells = getTimeCells(timeSpan)
-    cells.pop() // 去掉 24:00
-    if (disabledSpan) {
-      const index = _.findIndex(cells, cell => {
-        const _cell = setTimes(date, cell)
-        const disabled = disabledSpan ? disabledSpan(_cell, date) : false
-        return !disabled
-      })
-      return cells[index]
-    }
-    return cells[0]
-  }
-
-  const handleSelect = (value, type) => {
-    if (!enabledTimeSelect) {
-      onSelect(value)
-      return
-    }
-
-    let date = null
-    let time = null
-    if (type === 'date') {
-      date = value
-      time = getTime()
-    } else {
-      date = selectedDate
-      time = value
-    }
-    const newDate = setTimes(date, time)
-    setSelectedDate(newDate)
-  }
-
-  return (
-    <Flex column className='gm-date-picker'>
-      <Calendar
-        className='gm-date-picker'
-        selected={selectedDate}
-        onSelect={value => handleSelect(value, 'date')}
-        willActiveSelected={willActiveSelected}
-        min={min}
-        max={max}
-        disabledDate={disabledDate}
-      />
-      <TimeSelect
-        date={selectedDate}
-        timeLimit={timeLimit}
-        onSelectTime={value => handleSelect(value, 'time')}
-        enabledTimeSelect={enabledTimeSelect}
-      />
-      {enabledTimeSelect && (
-        <Flex
-          justifyEnd
-          className='gm-border-top gm-padding-lr-10 gm-padding-tb-5'
-        >
-          <Button
-            type='primary'
-            className='gm-padding-lr-20'
-            disabled={!selectedDate}
-            onClick={() => onSelect(selectedDate)}
-            style={{ height: '28px' }}
-          >
-            {getLocale('确定')}
-          </Button>
-        </Flex>
-      )}
-      {renderBottom && renderBottom}
-    </Flex>
-  )
-}
-
-Overlay.propTypes = {
-  date: PropTypes.object,
-  willActiveSelected: PropTypes.object,
-  min: PropTypes.object,
-  max: PropTypes.object,
-  onSelect: PropTypes.func,
-  disabledDate: PropTypes.func,
-  timeLimit: PropTypes.shape({
-    defaultTime: PropTypes.object,
-    disabledSpan: PropTypes.func,
-    timeSpan: PropTypes.number
-  }),
-  enabledTimeSelect: PropTypes.bool,
-  renderBottom: PropTypes.element
-}
-
-export default Overlay
+import React, { useState } from 'react'
+import PropTypes from 'prop-types'
+import _ from 'lodash'
+import Button from '../button'
+import { getLocale } from '@gmfe/locales'
+import Flex from '../flex'
+import Calendar from '../calendar/calendar'
+import TimeSelect from './time_select'
+import { setTimes, getTimeCells } from '../date_range_picker/util'
+
+const Overlay = props => {
+  const {
+    date,
+    willActiveSelected,
+    min,
+    max,
+    onSelect,
+    timeLimit,
+    disabledDate,
+    enabledTimeSelect,
+    renderBottom
+  } = props
+
+  const [selectedDate, setSelectedDate] = useState(date)
+
+  // 选择日期后渲染时间，有默认时间则展示，无展示为可选的第一个时间
+  const getTime = () => {
+    const { defaultTime, disabledSpan, timeSpan } = timeLimit || {}
+    if (defaultTime) {
+      return defaultTime
+    }
+
+    const cells = getTimeCells(timeSpan)
+    cells.pop() // 去掉 24:00
+    if (disabledSpan) {
+      const index = _.findIndex(cells, cell => {
+        const _cell = setTimes(date, cell)
+        const disabled = disabledSpan ? disabledSpan(_cell, date) : false
+        return !disabled
+      })
+      return cells[index]
+    }
+    return cells[0]
+  }
+
+  const handleSelect = (value, type) => {
+    if (!enabledTimeSelect) {
+      onSelect(value)
+      return
+    }
+
+    let date = null
+    let time = null
+    if (type === 'date') {
+      date = value
+      time = getTime()
+    } else {
+      date = selectedDate
+      time = value
+    }
+    const newDate = setTimes(date, time)
+    setSelectedDate(newDate)
+  }
+
+  return (
+    <Flex column className='gm-date-picker'>
+      <Calendar
+        className='gm-date-picker'
+        selected={selectedDate}
+        onSelect={value => handleSelect(value, 'date')}
+        willActiveSelected={willActiveSelected}
+        min={min}
+        max={max}
+        disabledDate={disabledDate}
+      />
+      <TimeSelect
+        date={selectedDate}
+        timeLimit={timeLimit}
+        onSelectTime={value => handleSelect(value, 'time')}
+        enabledTimeSelect={enabledTimeSelect}
+      />
+      {enabledTimeSelect && (
+        <Flex
+          justifyEnd
+          className='gm-border-top gm-padding-lr-10 gm-padding-tb-5'
+        >
+          <Button
+            type='primary'
+            className='gm-padding-lr-20'
+            disabled={!selectedDate}
+            onClick={() => onSelect(selectedDate)}
+            style={{ height: '28px' }}
+          >
+            {getLocale('确定')}
+          </Button>
+        </Flex>
+      )}
+      {renderBottom && renderBottom}
+    </Flex>
+  )
+}
+
+Overlay.propTypes = {
+  date: PropTypes.object,
+  willActiveSelected: PropTypes.object,
+  min: PropTypes.object,
+  max: PropTypes.object,
+  onSelect: PropTypes.func,
+  disabledDate: PropTypes.func,
+  timeLimit: PropTypes.shape({
+    defaultTime: PropTypes.object,
+    disabledSpan: PropTypes.func,
+    timeSpan: PropTypes.number
+  }),
+  enabledTimeSelect: PropTypes.bool,
+  renderBottom: PropTypes.element
+}
+
+export default Overlay

package/src/component/date_picker/style.less

@@ -1,22 +1,22 @@
-.gm-date-picker {
-  border: 1px solid #fff;
-
-  .gm-date-picker-date {
-    height: 30px;
-    margin: 0 10px 4px 10px;
-  }
-
-  .gm-date-picker-select-time {
-    padding: 3px 5px;
-    margin-left: 5px;
-    border: 1px solid @gm-border-color;
-    color: @brand-primary;
-    outline: none;
-    background-color: #fff;
-    cursor: pointer;
-
-    &:focus {
-      border: 1px solid @brand-primary;
-    }
-  }
-}
+.gm-date-picker {
+  border: 1px solid #fff;
+
+  .gm-date-picker-date {
+    height: 30px;
+    margin: 0 10px 4px 10px;
+  }
+
+  .gm-date-picker-select-time {
+    padding: 3px 5px;
+    margin-left: 5px;
+    border: 1px solid @gm-border-color;
+    color: @brand-primary;
+    outline: none;
+    background-color: #fff;
+    cursor: pointer;
+
+    &:focus {
+      border: 1px solid @brand-primary;
+    }
+  }
+}

package/src/component/date_picker/time_select.js

@@ -1,62 +1,62 @@
-import React from 'react'
-import PropTypes from 'prop-types'
-import moment from 'moment'
-import classNames from 'classnames'
-
-import Flex from '../flex'
-import TimeSpanPicker from '../time_span/time_span_picker'
-import { setTimes } from '../date_range_picker/util'
-
-const TimeSelect = props => {
-  const { date, timeLimit, onSelectTime, enabledTimeSelect } = props
-
-  if (!enabledTimeSelect) {
-    return null
-  }
-
-  const handleDisabledSpan = value => {
-    if (timeLimit && timeLimit.disabledSpan) {
-      const d = setTimes(date, value)
-      return timeLimit.disabledSpan(d, date)
-    }
-    return false
-  }
-
-  return (
-    <Flex alignCenter className='gm-date-picker-date'>
-      <span
-        className={classNames({
-          'gm-text-primary': date
-        })}
-      >
-        {date ? moment(date).format('YYYY-MM-DD') : '选择日期'}
-      </span>
-      {date && (
-        <TimeSpanPicker
-          date={date}
-          onChange={onSelectTime}
-          span={timeLimit && timeLimit.timeSpan}
-          disabledSpan={handleDisabledSpan}
-          isInPopup
-        >
-          <button className='gm-date-picker-select-time'>
-            {moment(date).format('HH:mm')}
-          </button>
-        </TimeSpanPicker>
-      )}
-    </Flex>
-  )
-}
-
-TimeSelect.propTypes = {
-  date: PropTypes.object,
-  timeLimit: PropTypes.shape({
-    defaultTime: PropTypes.object,
-    disabledSpan: PropTypes.func,
-    timeSpan: PropTypes.number
-  }),
-  enabledTimeSelect: PropTypes.bool,
-  onSelectTime: PropTypes.func
-}
-
-export default TimeSelect
+import React from 'react'
+import PropTypes from 'prop-types'
+import moment from 'moment'
+import classNames from 'classnames'
+
+import Flex from '../flex'
+import TimeSpanPicker from '../time_span/time_span_picker'
+import { setTimes } from '../date_range_picker/util'
+
+const TimeSelect = props => {
+  const { date, timeLimit, onSelectTime, enabledTimeSelect } = props
+
+  if (!enabledTimeSelect) {
+    return null
+  }
+
+  const handleDisabledSpan = value => {
+    if (timeLimit && timeLimit.disabledSpan) {
+      const d = setTimes(date, value)
+      return timeLimit.disabledSpan(d, date)
+    }
+    return false
+  }
+
+  return (
+    <Flex alignCenter className='gm-date-picker-date'>
+      <span
+        className={classNames({
+          'gm-text-primary': date
+        })}
+      >
+        {date ? moment(date).format('YYYY-MM-DD') : '选择日期'}
+      </span>
+      {date && (
+        <TimeSpanPicker
+          date={date}
+          onChange={onSelectTime}
+          span={timeLimit && timeLimit.timeSpan}
+          disabledSpan={handleDisabledSpan}
+          isInPopup
+        >
+          <button className='gm-date-picker-select-time'>
+            {moment(date).format('HH:mm')}
+          </button>
+        </TimeSpanPicker>
+      )}
+    </Flex>
+  )
+}
+
+TimeSelect.propTypes = {
+  date: PropTypes.object,
+  timeLimit: PropTypes.shape({
+    defaultTime: PropTypes.object,
+    disabledSpan: PropTypes.func,
+    timeSpan: PropTypes.number
+  }),
+  enabledTimeSelect: PropTypes.bool,
+  onSelectTime: PropTypes.func
+}
+
+export default TimeSelect