shineout 1.10.14 → 1.10.15

package/css/DatePicker/Container.js

@@ -335,35 +335,36 @@ function (_PureComponent) {
     }
   };
 
-  _proto.disabledRegister = function disabledRegister(disabled, mode) {
-    this.disabledMap[mode] = disabled;
+  _proto.disabledRegister = function disabledRegister(disabled, mode, index) {
+    if (index === undefined) {
+      this.disabledMap[mode] = disabled;
+      return;
+    }
+
+    if (!this.disabledMap[mode]) this.disabledMap[mode] = [];
+    this.disabledMap[mode][index] = disabled;
   };
 
-  _proto.handleDisabled = function handleDisabled(date) {
+  _proto.handleDisabled = function handleDisabled(date, index) {
     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;
+    var isRange = index !== undefined;
 
     switch (mode) {
       case 'time':
-        return _paramUtils.default.handleDisabled(date, min, max, range, disabled, disabledTime);
+        return isRange ? disabledMap.time[index](date, undefined, undefined, true) : disabledMap.time(date, undefined, undefined, true);
 
       case 'date':
-        return disabledMap.day(date);
+        return isRange ? disabledMap.day[index](date) : disabledMap.day(date);
 
       case 'week':
-        return disabledMap.day(date);
+        return isRange ? disabledMap.day[index](date) : disabledMap.day(date);
 
       case 'month':
-        return disabledMap.month(date);
+        return isRange ? disabledMap.month[index](date) : disabledMap.month(date);
 
       case 'datetime':
-        return _paramUtils.default.handleDisabled(date, min, max, range, disabled, disabledTime) || disabledMap.day(date);
+        return isRange ? disabledMap.time[index](date, undefined, undefined, true) || disabledMap.day[index](date) : disabledMap.time(date, undefined, undefined, true) || disabledMap.day(date);
 
       default:
         return false;
@@ -373,18 +374,18 @@ function (_PureComponent) {
   _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 _this$props3 = this.props,
+        disabledTime = _this$props3.disabledTime,
+        disabled = _this$props3.disabled,
+        max = _this$props3.max,
+        min = _this$props3.min,
+        range = _this$props3.range;
     var format = this.getFormat();
     var val = date ? _utils.default.format(date, format) : '';
     var isDisabled;
 
     if (disabled || disabledTime || max || min || range) {
-      isDisabled = this.handleDisabled(date);
+      isDisabled = this.handleDisabled(date, index);
       if (isDisabled) return;
     }
 
@@ -394,7 +395,7 @@ function (_PureComponent) {
       return;
     }
 
-    var value = [].concat((0, _immer.default)(this.props.value, function (draft) {
+    var value = [].concat((0, _immer.default)(this.props.value === undefined && range ? [] : this.props.value, function (draft) {
       draft[index] = val;
     }));
     if (_utils.default.compareAsc(value[0], value[1]) > 0) value.push(value.shift());
@@ -467,10 +468,10 @@ function (_PureComponent) {
   };
 
   _proto.renderText = function renderText(value, placeholder, key) {
-    var _this$props5 = this.props,
-        inputable = _this$props5.inputable,
-        formatResult = _this$props5.formatResult,
-        disabled = _this$props5.disabled;
+    var _this$props4 = this.props,
+        inputable = _this$props4.inputable,
+        formatResult = _this$props4.formatResult,
+        disabled = _this$props4.disabled;
     var date = this.parseDate(value);
     var className = (0, _classnames.default)((0, _styles.datepickerClass)('txt', this.state["picker" + key] && 'text-focus'), _utils.default.isInvalid(date) && (0, _styles2.inputClass)('placeholder'));
     var resultFormat = formatResult || this.getFormat();
@@ -494,13 +495,13 @@ function (_PureComponent) {
   _proto.renderResult = function renderResult() {
     var _this6 = this;
 
-    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 _this$props5 = this.props,
+        disabled = _this$props5.disabled,
+        range = _this$props5.range,
+        placeholder = _this$props5.placeholder,
+        type = _this$props5.type,
+        innerTitle = _this$props5.innerTitle,
+        inputable = _this$props5.inputable;
     var value = this.props.value;
     if (!value && range) value = []; // const isEmpty = !value || value.length === 0
 
@@ -536,10 +537,10 @@ function (_PureComponent) {
     var _this$state = this.state,
         focus = _this$state.focus,
         position = _this$state.position;
-    var _this$props7 = this.props,
-        absolute = _this$props7.absolute,
-        zIndex = _this$props7.zIndex,
-        quickSelect = _this$props7.quickSelect;
+    var _this$props6 = this.props,
+        absolute = _this$props6.absolute,
+        zIndex = _this$props6.zIndex,
+        quickSelect = _this$props6.quickSelect;
     var props = {
       absolute: absolute,
       focus: focus,
@@ -564,18 +565,18 @@ function (_PureComponent) {
     var _this7 = this;
 
     if (!this.firstRender) return undefined;
-    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 _this$props7 = this.props,
+        range = _this$props7.range,
+        type = _this$props7.type,
+        value = _this$props7.value,
+        min = _this$props7.min,
+        max = _this$props7.max,
+        disabled = _this$props7.disabled,
+        allowSingle = _this$props7.allowSingle,
+        hourStep = _this$props7.hourStep,
+        minuteStep = _this$props7.minuteStep,
+        secondStep = _this$props7.secondStep,
+        disabledTime = _this$props7.disabledTime;
     var format = this.getFormat();
     var quicks = this.getQuick(format);
     var Component = range ? _Range.default : _Picker.default;
@@ -606,12 +607,12 @@ function (_PureComponent) {
   };
 
   _proto.render = function render() {
-    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 _this$props8 = this.props,
+        range = _this$props8.range,
+        size = _this$props8.size,
+        disabled = _this$props8.disabled,
+        align = _this$props8.align,
+        innerTitle = _this$props8.innerTitle;
     var focus = this.state.focus;
     var rtl = (0, _config.isRTL)();
     var className = (0, _styles.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/css/DatePicker/Day.js

@@ -54,7 +54,7 @@ function (_PureComponent) {
     _this.handleTimeChange = _this.handleTimeChange.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
     _this.handleDisabled = _this.handleDisabled.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
     _this.formatWithDefaultTime = _this.formatWithDefaultTime.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
-    props.disabledRegister(_this.handleDisabled, 'day');
+    props.disabledRegister(_this.handleDisabled, 'day', props.index);
     return _this;
   }
 
@@ -226,7 +226,7 @@ function (_PureComponent) {
     } else if (rangeDate && current.getMonth() === date.getMonth()) {
       hoverProps.onMouseEnter = this.handleDayHover.bind(this, date);
       classList.push(_utils.default.isSameDay(date, rangeDate[index]) && 'active');
-      hoverClass = (0, _styles.datepickerClass)(_utils.default.compareAsc(rangeDate[0], date) <= 0 && _utils.default.compareAsc(rangeDate[1], date) >= 0 && 'hover', // Datetime Picker range end datetime classname #330
+      hoverClass = (0, _styles.datepickerClass)(_utils.default.compareDay(rangeDate[0], date) <= 0 && _utils.default.compareDay(rangeDate[1], date) >= 0 && 'hover', // Datetime Picker range end datetime classname #330
       _utils.default.isSameDay(rangeDate[index], date) && "hover-" + (index === 0 ? 'start' : 'end') + " active");
     } else if (value) {
       classList.push(_utils.default.isSameDay(date, value) && 'active');
@@ -351,7 +351,7 @@ Day.propTypes = {
   onChangeSync: _propTypes.default.func,
   onDayHover: _propTypes.default.func,
   onModeChange: _propTypes.default.func.isRequired,
-  range: _propTypes.default.number,
+  range: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.bool]),
   rangeDate: _propTypes.default.array,
   rangeTemp: _propTypes.default.oneOfType([_propTypes.default.object, _propTypes.default.string]),
   showTimePicker: _propTypes.default.bool,

package/css/DatePicker/Month.js

@@ -40,7 +40,7 @@ function (_PureComponent) {
     _this.handlePrevYear = _this.handleYearChange.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)), -1);
     _this.handleYearClick = _this.handleYearClick.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
     _this.handleDisabled = _this.handleDisabled.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
-    props.disabledRegister(_this.handleDisabled, 'month');
+    props.disabledRegister(_this.handleDisabled, 'month', props.index);
     return _this;
   }
 

package/css/DatePicker/Time.js

@@ -39,6 +39,8 @@ function (_PureComponent) {
     _this.handleMinuteChange = _this.handleChange.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)), 'minute');
     _this.handleSecondChange = _this.handleChange.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)), 'second');
     _this.handleAMPMChange = _this.handleChange.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)), 'ampm');
+    _this.handleDisabled = _this.handleDisabled.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
+    props.disabledRegister(_this.handleDisabled, 'time', props.index);
     return _this;
   }
 
@@ -62,16 +64,25 @@ function (_PureComponent) {
     return this.props.value || this.defaultValue;
   };
 
-  _proto.handleChange = function handleChange(type, val) {
-    var _this$props3;
-
+  _proto.handleDisabled = function handleDisabled(value, val, mode, onlyVaild) {
     var _this$props2 = this.props,
         disabled = _this$props2.disabled,
-        format = _this$props2.format,
         min = _this$props2.min,
         max = _this$props2.max,
         range = _this$props2.range,
         disabledTime = _this$props2.disabledTime;
+
+    var _paramUtils$judgeTime = _paramUtils.default.judgeTimeByRange(val, value, mode, min, max, range, disabled, disabledTime),
+        isDisabled = _paramUtils$judgeTime[0],
+        date = _paramUtils$judgeTime[1];
+
+    return onlyVaild ? isDisabled : [isDisabled, date];
+  };
+
+  _proto.handleChange = function handleChange(type, val) {
+    var _this$props3;
+
+    var format = this.props.format;
     var value = this.getValue();
     var mode = type;
 
@@ -83,9 +94,9 @@ function (_PureComponent) {
       }
     }
 
-    var _paramUtils$judgeTime = _paramUtils.default.judgeTimeByRange(val, value, mode, min, max, range, disabled, disabledTime),
-        isDisabled = _paramUtils$judgeTime[0],
-        date = _paramUtils$judgeTime[1];
+    var _this$handleDisabled = this.handleDisabled(value, val, mode),
+        isDisabled = _this$handleDisabled[0],
+        date = _this$handleDisabled[1];
 
     if (isDisabled) return;
 
@@ -206,14 +217,15 @@ Time.propTypes = {
   min: _propTypes.default.oneOfType([_propTypes.default.object, _propTypes.default.string]),
   max: _propTypes.default.oneOfType([_propTypes.default.object, _propTypes.default.string]),
   onChange: _propTypes.default.func.isRequired,
-  range: _propTypes.default.number,
+  range: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.bool]),
   value: _propTypes.default.object,
   defaultTime: _propTypes.default.array,
   index: _propTypes.default.number,
   hourStep: _propTypes.default.number,
   minuteStep: _propTypes.default.number,
   secondStep: _propTypes.default.number,
-  disabledTime: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.func])
+  disabledTime: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.func]),
+  disabledRegister: _propTypes.default.func
 };
 var _default = Time;
 exports.default = _default;

package/css/DatePicker/TimeScroll.js

@@ -186,7 +186,7 @@ TimeScroll.propTypes = {
   disabled: _propTypes.default.func,
   min: _propTypes.default.oneOfType([_propTypes.default.object, _propTypes.default.string]),
   max: _propTypes.default.oneOfType([_propTypes.default.object, _propTypes.default.string]),
-  range: _propTypes.default.number,
+  range: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.bool]),
   current: _propTypes.default.object,
   mode: _propTypes.default.string,
   disabledTime: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.func])

package/css/DatePicker/paramUtils.js

@@ -7,6 +7,8 @@ exports.default = void 0;
 
 var _utils = _interopRequireDefault(require("./utils"));
 
+var _is = require("../utils/is");
+
 var TIME_FORMAT = _utils.default.TIME_FORMAT,
     compareAsc = _utils.default.compareAsc,
     addSeconds = _utils.default.addSeconds,
@@ -61,12 +63,12 @@ function handleDisabled() {
 
   if (!isDisabled && min) {
     if (compareAsc(date, min) < 0) return true;
-    if (range && compareAsc(date, addSeconds(min, range)) > 0) return true;
+    if (range && (0, _is.isNumber)(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;
+    if (range && (0, _is.isNumber)(range) && compareAsc(date, addSeconds(max, -range)) < 0) return true;
   }
 
   return false;

package/css/DatePicker/utils.js

@@ -202,6 +202,13 @@ function toDateWithFormat(dirtyDate, fmt, def) {
   return date;
 }
 
+function compareDay(dateLeft, dateRight) {
+  if (!dateLeft || !dateRight) return NaN;
+  var left = new Date(dateLeft.getFullYear(), dateLeft.getMonth(), dateLeft.getDate());
+  var right = new Date(dateRight.getFullYear(), dateRight.getMonth(), dateRight.getDate());
+  return compareAsc(left, right);
+}
+
 function compareMonth(dateLeft, dateRight, pad) {
   if (pad === void 0) {
     pad = 0;
@@ -300,6 +307,7 @@ var _default = {
   cloneTime: cloneTime,
   compareAsc: compareAsc,
   compareMonth: compareMonth,
+  compareDay: compareDay,
   getDaysOfMonth: getDaysOfMonth,
   format: formatted,
   isInvalid: isInvalid,

package/css/Select/Select.js

@@ -119,16 +119,12 @@ function (_PureComponent) {
     this.clearClickAway();
   };
 
-  _proto.getText = function getText(key) {
-    return this.props.text[key] || (0, _locale.getLocale)(key);
-  };
-
   _proto.getDisabledStatus = function getDisabledStatus() {
-    if (typeof this.props.disabled == 'function') {
+    if (typeof this.props.disabled === 'function') {
       return this.props.disabled;
-    } else {
-      return !!this.props.disabled;
     }
+
+    return !!this.props.disabled;
   };
 
   _proto.getFocusSelected = function getFocusSelected() {
@@ -473,19 +469,19 @@ function (_PureComponent) {
   _proto.handleDelete = function handleDelete(e) {
     var _this$props10 = this.props,
         multiple = _this$props10.multiple,
-        filterText = _this$props10.filterText,
+        inputText = _this$props10.inputText,
         datum = _this$props10.datum,
         value = _this$props10.value,
         data = _this$props10.data;
     if (!multiple) return;
 
-    if (filterText) {
+    if (inputText) {
       this.deleteLock = true;
     } else if (this.deleteLock) {
       this.cancelDeleteLock();
     }
 
-    if (filterText || this.deleteLock) return;
+    if (inputText || this.deleteLock) return;
     if (!value || !value.length) return;
     e.preventDefault();
     var raws = Array.isArray(value) ? value : [value];
@@ -698,7 +694,8 @@ Select.propTypes = (0, _objectSpread2.default)({}, (0, _proptypes.getProps)(_pro
   reFocus: _propTypes.default.bool,
   header: _propTypes.default.node,
   maxLength: _propTypes.default.number,
-  innerTitle: _propTypes.default.node
+  innerTitle: _propTypes.default.node,
+  inputText: _propTypes.default.string
 });
 Select.defaultProps = {
   clearable: false,

package/css/Select/filter.js

@@ -40,7 +40,8 @@ var _default = function _default(Origin) {
       _this.state = {
         innerFilter: undefined,
         innerData: undefined,
-        filterText: ''
+        filterText: '',
+        text: ''
       };
       _this.handleCreate = _this.handleCreate.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
       _this.handleFilter = _this.handleFilter.bind((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)));
@@ -139,7 +140,10 @@ var _default = function _default(Origin) {
       var _this$props5 = this.props,
           filterDelay = _this$props5.filterDelay,
           onFilter = _this$props5.onFilter,
-          onCreate = _this$props5.onCreate; // not filter
+          onCreate = _this$props5.onCreate;
+      this.setState({
+        text: text
+      }); // not filter
 
       if (!text) {
         this.setState({
@@ -246,11 +250,13 @@ var _default = function _default(Origin) {
           other = (0, _objectWithoutPropertiesLoose2.default)(_this$props8, ["treeData", "onFilter", "onCreate"]);
       var _this$state2 = this.state,
           filterText = _this$state2.filterText,
-          innerData = _this$state2.innerData;
+          innerData = _this$state2.innerData,
+          text = _this$state2.text;
       var filterFn = onFilter || onCreate ? this.handleFilter : undefined;
       var dataGenerator = treeData ? this.filterTreeData : this.filterData;
       var props = (0, _objectSpread2.default)({}, other, {
         filterText: filterText,
+        inputText: text,
         result: this.getResultByValues(),
         inputable: !!onCreate,
         onCreate: onCreate ? this.handleCreate : undefined,

package/css/Table/Tr.js

@@ -9,6 +9,8 @@ exports.default = exports.ROW_HEIGHT_UPDATE_EVENT = void 0;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
+var _objectSpread3 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread"));
+
 var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
 
 var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inheritsLoose"));
@@ -233,7 +235,14 @@ function (_Component) {
         rowClassName = _this$props6.rowClassName,
         treeExpandKeys = _this$props6.treeExpandKeys,
         rowEvents = _this$props6.rowEvents,
-        other = (0, _objectWithoutPropertiesLoose2.default)(_this$props6, ["columns", "data", "rowData", "striped", "index", "expandRender", "offsetLeft", "offsetRight", "hasNotRenderRows", "rowClassName", "treeExpandKeys", "rowEvents"]);
+        reset = (0, _objectWithoutPropertiesLoose2.default)(_this$props6, ["columns", "data", "rowData", "striped", "index", "expandRender", "offsetLeft", "offsetRight", "hasNotRenderRows", "rowClassName", "treeExpandKeys", "rowEvents"]);
+    var other = Object.keys(reset).filter(function (key) {
+      return !['format', 'prediction', 'value', 'onChange'].includes(key);
+    }).reduce(function (r, key) {
+      var _objectSpread2;
+
+      return (0, _objectSpread3.default)({}, r, (_objectSpread2 = {}, _objectSpread2[key] = reset[key], _objectSpread2));
+    }, {});
     var tds = [];
     var skip = 0;
 

package/css/index.d.ts

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

package/css/index.js

@@ -224,6 +224,6 @@ exports.Upload = _Upload.default;
 // Created by scripts/src-index.js.
 var _default = {
   utils: utils,
-  version: '1.10.14'
+  version: '1.10.15'
 };
 exports.default = _default;