shineout 1.10.12 → 1.10.13

package/es/Cascader/Cascader.js

@@ -183,6 +183,7 @@ function (_PureComponent) {
     } else {
       var v = value[value.length - 1];
       var data = this.datum.getDataById(v);
+      if (data === null) return;
 
       try {
         var id = this.datum.getKey(data);
@@ -345,7 +346,6 @@ function (_PureComponent) {
         onItemClick = _this$props7.onItemClick,
         expandTrigger = _this$props7.expandTrigger,
         childrenKey = _this$props7.childrenKey,
-        absolute = _this$props7.absolute,
         height = _this$props7.height;
     var path = this.state.path;
     var props = {

package/es/Cascader/Result.js

@@ -313,7 +313,7 @@ function (_PureComponent) {
 
     var items = this.handleNode(nodes, render);
 
-    if (compressed) {
+    if (compressed && items.length) {
       items = this.renderMore(items);
     }
 

package/es/DatePicker/Container.js

@@ -23,6 +23,7 @@ import { getRTLPosition } from '../utils/strings';
 import List from '../AnimationList';
 import { getLocale } from '../locale';
 import DateFns from './utils';
+import ParamFns from './paramUtils';
 import { isRTL } from '../config';
 import InputTitle from '../InputTitle';
 import { inputTitleClass } from '../InputTitle/styles';
@@ -61,6 +62,7 @@ function (_PureComponent) {
       picker0: false,
       picker1: false
     };
+    _this.disabledMap = {};
     _this.pickerId = "picker_" + getUidStr();
     _this.bindElement = _this.bindElement.bind(_assertThisInitialized(_assertThisInitialized(_this)));
     _this.bindPicker = _this.bindPicker.bind(_assertThisInitialized(_assertThisInitialized(_this)));
@@ -77,6 +79,8 @@ function (_PureComponent) {
     _this.parseDate = _this.parseDate.bind(_assertThisInitialized(_assertThisInitialized(_this)));
     _this.dateToCurrent = _this.dateToCurrent.bind(_assertThisInitialized(_assertThisInitialized(_this)));
     _this.shouldFocus = _this.shouldFocus.bind(_assertThisInitialized(_assertThisInitialized(_this)));
+    _this.handleDisabled = _this.handleDisabled.bind(_assertThisInitialized(_assertThisInitialized(_this)));
+    _this.disabledRegister = _this.disabledRegister.bind(_assertThisInitialized(_assertThisInitialized(_this)));
     _this.bindClickAway = _this.bindClickAway.bind(_assertThisInitialized(_assertThisInitialized(_this)));
     _this.clearClickAway = _this.clearClickAway.bind(_assertThisInitialized(_assertThisInitialized(_this)));
     _this.handleClickAway = _this.handleClickAway.bind(_assertThisInitialized(_assertThisInitialized(_this)));
@@ -297,11 +301,58 @@ function (_PureComponent) {
     }
   };
 
+  _proto.disabledRegister = function disabledRegister(disabled, mode) {
+    this.disabledMap[mode] = disabled;
+  };
+
+  _proto.handleDisabled = function handleDisabled(date) {
+    var mode = this.props.type;
+    var disabledMap = this.disabledMap;
+    var _this$props3 = this.props,
+        min = _this$props3.min,
+        max = _this$props3.max,
+        range = _this$props3.range,
+        disabled = _this$props3.disabled,
+        disabledTime = _this$props3.disabledTime;
+
+    switch (mode) {
+      case 'time':
+        return ParamFns.handleDisabled(date, min, max, range, disabled, disabledTime);
+
+      case 'date':
+        return disabledMap.day(date);
+
+      case 'week':
+        return disabledMap.day(date);
+
+      case 'month':
+        return disabledMap.month(date);
+
+      case 'datetime':
+        return ParamFns.handleDisabled(date, min, max, range, disabled, disabledTime) || disabledMap.day(date);
+
+      default:
+        return false;
+    }
+  };
+
   _proto.handleTextChange = function handleTextChange(date, index, e) {
     var _this4 = this;
 
+    var _this$props4 = this.props,
+        disabledTime = _this$props4.disabledTime,
+        disabled = _this$props4.disabled,
+        max = _this$props4.max,
+        min = _this$props4.min,
+        range = _this$props4.range;
     var format = this.getFormat();
     var val = date ? utils.format(date, format) : '';
+    var isDisabled;
+
+    if (disabled || disabledTime || max || min || range) {
+      isDisabled = this.handleDisabled(date);
+      if (isDisabled) return;
+    }
 
     if (!this.props.range) {
       var close = !(e && e.target && this.element.contains(e.target));
@@ -382,10 +433,10 @@ function (_PureComponent) {
   };
 
   _proto.renderText = function renderText(value, placeholder, key) {
-    var _this$props3 = this.props,
-        inputable = _this$props3.inputable,
-        formatResult = _this$props3.formatResult,
-        disabled = _this$props3.disabled;
+    var _this$props5 = this.props,
+        inputable = _this$props5.inputable,
+        formatResult = _this$props5.formatResult,
+        disabled = _this$props5.disabled;
     var date = this.parseDate(value);
     var className = classnames(datepickerClass('txt', this.state["picker" + key] && 'text-focus'), utils.isInvalid(date) && inputClass('placeholder'));
     var resultFormat = formatResult || this.getFormat();
@@ -409,13 +460,13 @@ function (_PureComponent) {
   _proto.renderResult = function renderResult() {
     var _this6 = this;
 
-    var _this$props4 = this.props,
-        disabled = _this$props4.disabled,
-        range = _this$props4.range,
-        placeholder = _this$props4.placeholder,
-        type = _this$props4.type,
-        innerTitle = _this$props4.innerTitle,
-        inputable = _this$props4.inputable;
+    var _this$props6 = this.props,
+        disabled = _this$props6.disabled,
+        range = _this$props6.range,
+        placeholder = _this$props6.placeholder,
+        type = _this$props6.type,
+        innerTitle = _this$props6.innerTitle,
+        inputable = _this$props6.inputable;
     var value = this.props.value;
     if (!value && range) value = []; // const isEmpty = !value || value.length === 0
 
@@ -451,10 +502,10 @@ function (_PureComponent) {
     var _this$state = this.state,
         focus = _this$state.focus,
         position = _this$state.position;
-    var _this$props5 = this.props,
-        absolute = _this$props5.absolute,
-        zIndex = _this$props5.zIndex,
-        quickSelect = _this$props5.quickSelect;
+    var _this$props7 = this.props,
+        absolute = _this$props7.absolute,
+        zIndex = _this$props7.zIndex,
+        quickSelect = _this$props7.quickSelect;
     var props = {
       absolute: absolute,
       focus: focus,
@@ -479,18 +530,18 @@ function (_PureComponent) {
     var _this7 = this;
 
     if (!this.firstRender) return undefined;
-    var _this$props6 = this.props,
-        range = _this$props6.range,
-        type = _this$props6.type,
-        value = _this$props6.value,
-        min = _this$props6.min,
-        max = _this$props6.max,
-        disabled = _this$props6.disabled,
-        allowSingle = _this$props6.allowSingle,
-        hourStep = _this$props6.hourStep,
-        minuteStep = _this$props6.minuteStep,
-        secondStep = _this$props6.secondStep,
-        disabledTime = _this$props6.disabledTime;
+    var _this$props8 = this.props,
+        range = _this$props8.range,
+        type = _this$props8.type,
+        value = _this$props8.value,
+        min = _this$props8.min,
+        max = _this$props8.max,
+        disabled = _this$props8.disabled,
+        allowSingle = _this$props8.allowSingle,
+        hourStep = _this$props8.hourStep,
+        minuteStep = _this$props8.minuteStep,
+        secondStep = _this$props8.secondStep,
+        disabledTime = _this$props8.disabledTime;
     var format = this.getFormat();
     var quicks = this.getQuick(format);
     var Component = range ? Range : Picker;
@@ -515,17 +566,18 @@ function (_PureComponent) {
       hourStep: hourStep,
       minuteStep: minuteStep,
       secondStep: secondStep,
-      disabledTime: disabledTime
+      disabledTime: disabledTime,
+      disabledRegister: this.disabledRegister
     }, this.props.children);
   };
 
   _proto.render = function render() {
-    var _this$props7 = this.props,
-        range = _this$props7.range,
-        size = _this$props7.size,
-        disabled = _this$props7.disabled,
-        align = _this$props7.align,
-        innerTitle = _this$props7.innerTitle;
+    var _this$props9 = this.props,
+        range = _this$props9.range,
+        size = _this$props9.size,
+        disabled = _this$props9.disabled,
+        align = _this$props9.align,
+        innerTitle = _this$props9.innerTitle;
     var focus = this.state.focus;
     var rtl = isRTL();
     var className = datepickerClass('inner', range && 'range', size && "size-" + size, focus && 'focus', disabled === true && 'disabled', align && "align-" + align, getCurrentPosition(this.state.position), rtl && 'rtl', innerTitle && 'inner-title');

package/es/DatePicker/Day.js

@@ -33,7 +33,9 @@ function (_PureComponent) {
     _this.handleYearMode = _this.handleModeChange.bind(_assertThisInitialized(_assertThisInitialized(_this)), 'year');
     _this.handleWeekLeave = _this.handleWeek.bind(_assertThisInitialized(_assertThisInitialized(_this)), null);
     _this.handleTimeChange = _this.handleTimeChange.bind(_assertThisInitialized(_assertThisInitialized(_this)));
+    _this.handleDisabled = _this.handleDisabled.bind(_assertThisInitialized(_assertThisInitialized(_this)));
     _this.formatWithDefaultTime = _this.formatWithDefaultTime.bind(_assertThisInitialized(_assertThisInitialized(_this)));
+    props.disabledRegister(_this.handleDisabled, 'day');
     return _this;
   }
 
@@ -133,21 +135,16 @@ function (_PureComponent) {
     this.props.onDayHover(date);
   };
 
-  _proto.renderDay = function renderDay(date, minD, maxD) {
+  _proto.handleDisabled = function handleDisabled(date, minDate, maxDate) {
     var _this$props6 = this.props,
-        current = _this$props6.current,
-        disabled = _this$props6.disabled,
-        value = _this$props6.value,
         index = _this$props6.index,
-        type = _this$props6.type,
-        rangeDate = _this$props6.rangeDate,
+        disabled = _this$props6.disabled,
         range = _this$props6.range,
         rangeTemp = _this$props6.rangeTemp,
         min = _this$props6.min,
         max = _this$props6.max;
-    var hover = this.state.hover;
-    var hmsDate = utils.toDate(date);
-    utils.setTime(hmsDate, current);
+    var minD = minDate || min && utils.toDate(utils.format(min, minStr, new Date()));
+    var maxD = maxDate || max && utils.toDate(utils.format(max, maxStr, new Date()));
     var isDisabled = disabled ? disabled(date) : false; // only for single, single picker don't has index
 
     if (index === undefined && !isDisabled) {
@@ -167,6 +164,20 @@ function (_PureComponent) {
       }
     }
 
+    return isDisabled;
+  };
+
+  _proto.renderDay = function renderDay(date, minD, maxD) {
+    var _this$props7 = this.props,
+        current = _this$props7.current,
+        value = _this$props7.value,
+        index = _this$props7.index,
+        type = _this$props7.type,
+        rangeDate = _this$props7.rangeDate;
+    var hover = this.state.hover;
+    var hmsDate = utils.toDate(date);
+    utils.setTime(hmsDate, current);
+    var isDisabled = this.handleDisabled(date, minD, maxD);
     var classList = [utils.isSameDay(date, this.today) && 'today', current.getMonth() !== date.getMonth() && 'other-month', isDisabled && 'disabled'];
     var hoverClass;
     var hoverProps = {};
@@ -206,10 +217,10 @@ function (_PureComponent) {
   };
 
   _proto.renderTimepicker = function renderTimepicker() {
-    var _this$props7 = this.props,
-        rangeDate = _this$props7.rangeDate,
-        index = _this$props7.index,
-        showTimePicker = _this$props7.showTimePicker;
+    var _this$props8 = this.props,
+        rangeDate = _this$props8.rangeDate,
+        index = _this$props8.index,
+        showTimePicker = _this$props8.showTimePicker;
     if (this.props.type !== 'datetime') return undefined;
     if (!showTimePicker) return undefined;
     var format = this.props.format;
@@ -239,11 +250,11 @@ function (_PureComponent) {
   _proto.render = function render() {
     var _this2 = this;
 
-    var _this$props8 = this.props,
-        current = _this$props8.current,
-        min = _this$props8.min,
-        index = _this$props8.index,
-        max = _this$props8.max;
+    var _this$props9 = this.props,
+        current = _this$props9.current,
+        min = _this$props9.min,
+        index = _this$props9.index,
+        max = _this$props9.max;
     var days = this.getDays();
     this.today = utils.newDate();
     var minDate = min && utils.toDate(utils.format(min, minStr, new Date()));
@@ -318,6 +329,7 @@ Day.propTypes = {
   type: PropTypes.string.isRequired,
   value: PropTypes.object,
   defaultTime: PropTypes.array,
-  allowSingle: PropTypes.bool
+  allowSingle: PropTypes.bool,
+  disabledRegister: PropTypes.func
 };
 export default Day;

package/es/DatePicker/Month.js

@@ -21,6 +21,8 @@ function (_PureComponent) {
     _this.handleNextYear = _this.handleYearChange.bind(_assertThisInitialized(_assertThisInitialized(_this)), 1);
     _this.handlePrevYear = _this.handleYearChange.bind(_assertThisInitialized(_assertThisInitialized(_this)), -1);
     _this.handleYearClick = _this.handleYearClick.bind(_assertThisInitialized(_assertThisInitialized(_this)));
+    _this.handleDisabled = _this.handleDisabled.bind(_assertThisInitialized(_assertThisInitialized(_this)));
+    props.disabledRegister(_this.handleDisabled, 'month');
     return _this;
   }
 
@@ -49,20 +51,15 @@ function (_PureComponent) {
     if (!isMonthType) onModeChange('day');
   };
 
-  _proto.renderMonth = function renderMonth(m, i) {
+  _proto.handleDisabled = function handleDisabled(date) {
     var _this$props3 = this.props,
-        value = _this$props3.value,
         min = _this$props3.min,
         disabled = _this$props3.disabled,
         range = _this$props3.range,
         type = _this$props3.type,
-        current = _this$props3.current,
         index = _this$props3.index,
         rangeDate = _this$props3.rangeDate,
         max = _this$props3.max;
-    var date = utils.toDate(MONTHBASE);
-    date.setMonth(i);
-    date.setFullYear(current.getFullYear());
     var isDisabled = min && utils.compareMonth(min, date, 1) >= 0;
 
     if (!isDisabled) {
@@ -85,6 +82,17 @@ function (_PureComponent) {
       }
     }
 
+    return isDisabled;
+  };
+
+  _proto.renderMonth = function renderMonth(m, i) {
+    var _this$props4 = this.props,
+        value = _this$props4.value,
+        current = _this$props4.current;
+    var date = utils.toDate(MONTHBASE);
+    date.setMonth(i);
+    date.setFullYear(current.getFullYear());
+    var isDisabled = this.handleDisabled(date);
     var className = datepickerClass(utils.isSameMonth(value, date) && 'active', isDisabled && 'disabled');
     return React.createElement("span", {
       key: i,
@@ -130,6 +138,7 @@ Month.propTypes = {
   type: PropTypes.string.isRequired,
   value: PropTypes.object,
   index: PropTypes.number,
-  rangeDate: PropTypes.array
+  rangeDate: PropTypes.array,
+  disabledRegister: PropTypes.func
 };
 export default Month;

package/es/DatePicker/TimeScroll.js

@@ -100,6 +100,7 @@ function (_PureComponent) {
         step = _this$props2.step,
         ampm = _this$props2.ampm;
     var value = Math.round(this.element.scrollTop / lineHeight);
+    if (value * step === this.props.value) return;
 
     if (typeof step === 'number' && step > 0 && !ampm && value !== this.props.value) {
       this.props.onChange(value * step);

package/es/DatePicker/paramUtils.js

@@ -35,11 +35,40 @@ function handleTimeDisabled(date, disabledTime) {
   return undefined;
 }
 
-function judgeTimeByRange() {
+function handleDisabled() {
   for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
     args[_key] = arguments[_key];
   }
 
+  var date = args[0],
+      min = args[1],
+      max = args[2],
+      range = args[3],
+      disabled = args[4],
+      disabledTime = args[5];
+  var isDisabled;
+  if (disabled) isDisabled = disabled(date);
+  if (disabledTime) isDisabled = isDisabled || handleTimeDisabled(date, disabledTime);
+  if (isDisabled) return true;
+
+  if (!isDisabled && min) {
+    if (compareAsc(date, min) < 0) return true;
+    if (range && compareAsc(date, addSeconds(min, range)) > 0) return true;
+  }
+
+  if (!isDisabled && max) {
+    if (compareAsc(date, max) > 0) return true;
+    if (range && compareAsc(date, addSeconds(max, -range)) < 0) return true;
+  }
+
+  return false;
+}
+
+function judgeTimeByRange() {
+  for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+    args[_key2] = arguments[_key2];
+  }
+
   var target = args[0],
       value = args[1],
       mode = args[2],
@@ -75,7 +104,7 @@ function judgeTimeByRange() {
       break;
 
     case 'ampm':
-      if (target === 0) {
+      {
         var hours = date.getHours();
 
         if (target === 1 && hours < 12) {
@@ -84,29 +113,14 @@ function judgeTimeByRange() {
           date.setHours(hours - 12);
         }
       }
-
       break;
 
     default:
       break;
   }
 
-  var isDisabled;
-  if (disabled) isDisabled = disabled(date);
-  if (disabledTime) isDisabled = isDisabled || handleTimeDisabled(date, disabledTime);
-  if (isDisabled) return [true];
-
-  if (!isDisabled && min) {
-    if (compareAsc(date, min) < 0) return [true];
-    if (range && compareAsc(date, addSeconds(min, range)) > 0) return [true];
-  }
-
-  if (!isDisabled && max) {
-    if (compareAsc(date, max) > 0) return [true];
-    if (range && compareAsc(date, addSeconds(max, -range)) < 0) return [true];
-  }
-
-  return [false, date];
+  var isDisabled = handleDisabled(date, min, max, range, disabled, disabledTime);
+  return [isDisabled, date];
 }
 
 export default {
@@ -117,5 +131,7 @@ export default {
   timeHandleChangeParams: timeHandleChangeParams,
   quickHandleChangeParams: quickHandleChangeParams,
   weekHandleChangeParams: weekHandleChangeParams,
-  judgeTimeByRange: judgeTimeByRange
+  judgeTimeByRange: judgeTimeByRange,
+  handleTimeDisabled: handleTimeDisabled,
+  handleDisabled: handleDisabled
 };

package/es/Scroll/Scroll.js

@@ -63,6 +63,7 @@ function (_PureComponent) {
       passive: false
     });
     this.inner.addEventListener('scroll', this.handleInnerScroll);
+    this.wheelElement.addEventListener('scroll', this.handleInnerScroll);
   };
 
   _proto.componentDidUpdate = function componentDidUpdate(prevProps) {
@@ -80,6 +81,7 @@ function (_PureComponent) {
     this.wheelElement.removeEventListener('touchstart', this.handleTouchStart);
     this.wheelElement.removeEventListener('touchmove', this.handleTouchMove);
     this.inner.removeEventListener('scroll', this.handleInnerScroll);
+    this.wheelElement.removeEventListener('scroll', this.handleInnerScroll);
   };
 
   _proto.getWheelRect = function getWheelRect() {
@@ -259,20 +261,31 @@ function (_PureComponent) {
 
     this.setStartPoint(position);
     this.boundleScroll();
-  } // inner scroll
+  } // handle inner scroll cased by input focus
   ;
 
   _proto.handleInnerScroll = function handleInnerScroll(e) {
     var target = e.target;
     var _this$props6 = this.props,
         left = _this$props6.left,
-        scrollWidth = _this$props6.scrollWidth;
+        scrollWidth = _this$props6.scrollWidth,
+        top = _this$props6.top,
+        scrollHeight = _this$props6.scrollHeight;
 
     var _this$getWheelRect2 = this.getWheelRect(),
-        width = _this$getWheelRect2.width;
-
-    if (target.scrollLeft) {
-      this.handleScroll(left + target.scrollLeft / (scrollWidth - width), this.props.top, undefined, 0);
+        width = _this$getWheelRect2.width,
+        height = _this$getWheelRect2.height;
+
+    if (target.scrollLeft || target.scrollTop) {
+      var sLeft = target.scrollLeft ? left + target.scrollLeft / (scrollWidth - width) : left;
+      var sTop = target.scrollTop ? top + target.scrollTop / (scrollHeight - height) : top;
+      sTop = Math.min(1, sTop);
+      sTop = Math.max(0, sTop);
+      sLeft = Math.min(1, sLeft);
+      sLeft = Math.max(0, sLeft);
+      this.handleScroll(sLeft, sTop, undefined, undefined, {
+        drag: true
+      });
       target.scrollLeft = 0;
       target.scrollTop = 0;
     }

package/es/TreeSelect/datum.js

@@ -42,7 +42,8 @@ export default function datum(Origin) {
 
     _proto.componentDidUpdate = function componentDidUpdate(prevProps) {
       if (!shallowEqual(prevProps.data, this.props.data)) {
-        this.datum.updateDisabled(this.props.disabled);
+        var disabled = this.props.disabled;
+        this.datum.updateDisabled(typeof disabled === 'function' ? disabled : undefined);
         this.datum.setData(this.props.data, true);
         this.forceUpdate();
       }

package/es/index.d.ts

@@ -1,7 +1,7 @@
 // Created by scripts/src-index.js.
 import * as utils from './utils'
 
-export default { utils, version: '1.10.12' }
+export default { utils, version: '1.10.13' }
 export { utils }
 export { setLocale } from './locale'
 export { color, style } from './utils/expose'

package/es/index.js

@@ -2,7 +2,7 @@
 import * as utils from './utils';
 export default {
   utils: utils,
-  version: '1.10.12'
+  version: '1.10.13'
 };
 export { utils };
 export { setLocale } from './locale';

package/lib/Cascader/Cascader.js

@@ -209,6 +209,7 @@ function (_PureComponent) {
     } else {
       var v = value[value.length - 1];
       var data = this.datum.getDataById(v);
+      if (data === null) return;
 
       try {
         var id = this.datum.getKey(data);
@@ -371,7 +372,6 @@ function (_PureComponent) {
         onItemClick = _this$props7.onItemClick,
         expandTrigger = _this$props7.expandTrigger,
         childrenKey = _this$props7.childrenKey,
-        absolute = _this$props7.absolute,
         height = _this$props7.height;
     var path = this.state.path;
     var props = {

package/lib/Cascader/Result.js

@@ -339,7 +339,7 @@ function (_PureComponent) {
 
     var items = this.handleNode(nodes, render);
 
-    if (compressed) {
+    if (compressed && items.length) {
       items = this.renderMore(items);
     }