shineout 1.12.3 → 1.12.4-beta.1

package/css/DatePicker/Time.js

@@ -80,9 +80,23 @@ function (_PureComponent) {
         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, this.getOptions()),
+        disabledTime = _this$props2.disabledTime,
+        index = _this$props2.index,
+        rangeDate = _this$props2.rangeDate;
+
+    var _paramUtils$judgeTime = _paramUtils.default.judgeTimeByRange({
+      target: val,
+      value: value,
+      mode: mode,
+      min: min,
+      max: max,
+      range: range,
+      disabled: disabled,
+      disabledTime: disabledTime,
+      index: index,
+      rangeDate: rangeDate,
+      options: this.getOptions()
+    }),
         isDisabled = _paramUtils$judgeTime[0],
         date = _paramUtils$judgeTime[1];
 
@@ -121,7 +135,9 @@ function (_PureComponent) {
         secondStep = _this$props4.secondStep,
         range = _this$props4.range,
         disabled = _this$props4.disabled,
-        disabledTime = _this$props4.disabledTime;
+        disabledTime = _this$props4.disabledTime,
+        index = _this$props4.index,
+        rangeDate = _this$props4.rangeDate;
     var rtl = (0, _config.isRTL)();
     var res = [format.indexOf('H') >= 0 && _react.default.createElement(_TimeScroll.default, {
       key: "HH",
@@ -135,7 +151,9 @@ function (_PureComponent) {
       total: 24,
       step: hourStep,
       onChange: this.handleHourChange,
-      disabledTime: disabledTime
+      disabledTime: disabledTime,
+      index: index,
+      rangeDate: rangeDate
     }), format.indexOf('h') >= 0 && _react.default.createElement(_TimeScroll.default, {
       key: "hh",
       current: value,
@@ -148,7 +166,9 @@ function (_PureComponent) {
       total: 12,
       step: hourStep,
       onChange: this.handleHourChange,
-      disabledTime: disabledTime
+      disabledTime: disabledTime,
+      index: index,
+      rangeDate: rangeDate
     }), format.indexOf('m') >= 0 && _react.default.createElement(_TimeScroll.default, {
       key: "mm",
       current: value,
@@ -160,7 +180,9 @@ function (_PureComponent) {
       value: _utils.default.getDateInfo(value, 'minute', this.getOptions()),
       step: minuteStep,
       onChange: this.handleMinuteChange,
-      disabledTime: disabledTime
+      disabledTime: disabledTime,
+      index: index,
+      rangeDate: rangeDate
     }), format.indexOf('s') >= 0 && _react.default.createElement(_TimeScroll.default, {
       key: "ss",
       current: value,
@@ -172,7 +194,9 @@ function (_PureComponent) {
       value: _utils.default.getDateInfo(value, 'second', this.getOptions()),
       step: secondStep,
       onChange: this.handleSecondChange,
-      disabledTime: disabledTime
+      disabledTime: disabledTime,
+      index: index,
+      rangeDate: rangeDate
     }), /a|A/.test(format) && _react.default.createElement(_TimeScroll.default, {
       key: "ampm",
       current: value,
@@ -185,7 +209,9 @@ function (_PureComponent) {
       total: 2,
       ampm: true,
       onChange: this.handleAMPMChange,
-      disabledTime: disabledTime
+      disabledTime: disabledTime,
+      index: index,
+      rangeDate: rangeDate
     })];
 
     if (rtl) {
@@ -236,7 +262,8 @@ Time.propTypes = {
   secondStep: _propTypes.default.number,
   disabledTime: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.func]),
   disabledRegister: _propTypes.default.func,
-  timeZone: _propTypes.default.string
+  timeZone: _propTypes.default.string,
+  rangeDate: _propTypes.default.array
 };
 var _default = Time;
 exports.default = _default;

package/css/DatePicker/TimeScroll.js

@@ -148,13 +148,27 @@ function (_PureComponent) {
         ra = _this$props3.range,
         current = _this$props3.current,
         disabled = _this$props3.disabled,
-        disabledTime = _this$props3.disabledTime;
+        disabledTime = _this$props3.disabledTime,
+        index = _this$props3.index,
+        rangeDate = _this$props3.rangeDate;
     if (typeof step === 'number' && step <= 0) return null;
     if (!ampm && typeof step === 'number' && num % step !== 0) return null;
     var text = num;
     if (ampm) text = ['am', 'pm'][num];else if (total === 12 && num === 0) text = '12';else if (num < 10) text = "0" + num;
 
-    var _paramUtils$judgeTime = _paramUtils.default.judgeTimeByRange(num, current, mode, min, max, ra, disabled, disabledTime, this.getOptions()),
+    var _paramUtils$judgeTime = _paramUtils.default.judgeTimeByRange({
+      target: num,
+      value: current,
+      mode: mode,
+      min: min,
+      max: max,
+      range: ra,
+      disabled: disabled,
+      disabledTime: disabledTime,
+      options: this.getOptions(),
+      index: index,
+      rangeDate: rangeDate
+    }),
         isDisabled = _paramUtils$judgeTime[0];
 
     var className = (0, _styles.datepickerClass)(!isDisabled && value === num && 'time-active');
@@ -200,7 +214,9 @@ TimeScroll.propTypes = {
   current: _propTypes.default.object,
   mode: _propTypes.default.string,
   disabledTime: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.func]),
-  timeZone: _propTypes.default.string
+  timeZone: _propTypes.default.string,
+  index: _propTypes.default.number,
+  rangeDate: _propTypes.default.array
 };
 TimeScroll.defaultProps = {
   total: 60

package/css/DatePicker/paramUtils.js

@@ -7,11 +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,
     format = _utils.default.format;
 
 var handleOnChangeParams = function handleOnChangeParams(type) {
@@ -46,18 +43,16 @@ function handleTimeDisabled(date, disabledTime, options) {
   return undefined;
 }
 
-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],
-      options = args[6];
+function handleDisabled(params) {
+  var date = params.date,
+      min = params.min,
+      max = params.max,
+      range = params.range,
+      disabled = params.disabled,
+      disabledTime = params.disabledTime,
+      options = params.options,
+      index = params.index,
+      rangeDate = params.rangeDate;
   var isDisabled;
   if (disabled) isDisabled = disabled(date);
   if (disabledTime) isDisabled = isDisabled || handleTimeDisabled(date, disabledTime);
@@ -65,31 +60,33 @@ function handleDisabled() {
 
   if (!isDisabled && min) {
     if (compareAsc(date, min) < 0) return true;
-    if (range && (0, _is.isNumber)(range) && compareAsc(date, addSeconds(min, range, options)) > 0) return true;
   }
 
   if (!isDisabled && max) {
     if (compareAsc(date, max) > 0) return true;
-    if (range && (0, _is.isNumber)(range) && compareAsc(date, addSeconds(max, -range, options)) < 0) return true;
+  }
+
+  if (!isDisabled && index === 1 && rangeDate && rangeDate[0]) {
+    if (typeof range === 'number' && _utils.default.compareAsc(date, _utils.default.addSeconds(rangeDate[0], range, options)) > 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],
-      min = args[3],
-      max = args[4],
-      range = args[5],
-      disabled = args[6],
-      disabledTime = args[7],
-      options = args[8];
+function judgeTimeByRange(params) {
+  var target = params.target,
+      value = params.value,
+      mode = params.mode,
+      min = params.min,
+      max = params.max,
+      range = params.range,
+      disabled = params.disabled,
+      disabledTime = params.disabledTime,
+      index = params.index,
+      rangeDate = params.rangeDate,
+      options = params.options;
   var date = new Date(value.getTime());
 
   switch (mode) {
@@ -132,7 +129,17 @@ function judgeTimeByRange() {
       break;
   }
 
-  var isDisabled = handleDisabled(date, min, max, range, disabled, disabledTime, options);
+  var isDisabled = handleDisabled({
+    date: date,
+    min: min,
+    max: max,
+    range: range,
+    disabled: disabled,
+    disabledTime: disabledTime,
+    options: options,
+    index: index,
+    rangeDate: rangeDate
+  });
   return [isDisabled, date];
 }
 

package/css/index.d.ts

@@ -3,7 +3,7 @@ import * as utils from './utils'
 
 declare const __default: {
   utils: typeof utils,
-  version: '1.12.3'
+  version: '1.12.4-beta.1'
 }
 
 export default __default

package/css/index.js

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