shineout 1.12.4 → 1.12.6-beta.1

package/css/DatePicker/Day.js

@@ -121,11 +121,11 @@ function (_PureComponent) {
     if (type === 'week') {
       onChange.apply(void 0, _paramUtils.default.weekHandleChangeParams(date, true, true));
     } else {
-      var newDate = _utils.default.setTime(_utils.default.toDate(date), current); // only can select day with the same day of min/max
+      var newDate = _utils.default.setTime(_utils.default.toDate(date), current, this.getOptions()); // only can select day with the same day of min/max
 
 
-      if (min && _utils.default.compareAsc(newDate, min) < 0) _utils.default.setTime(newDate, min);
-      if (max && _utils.default.compareAsc(newDate, max) > 0) _utils.default.setTime(newDate, max);
+      if (min && _utils.default.compareAsc(newDate, min) < 0) newDate = _utils.default.setTime(newDate, min, this.getOptions());
+      if (max && _utils.default.compareAsc(newDate, max) > 0) newDate = _utils.default.setTime(newDate, max, this.getOptions());
       if (allowSingle && rangeDate[index] && _utils.default.clearHMS(newDate, this.getOptions()).getTime() === _utils.default.clearHMS(rangeDate[index], this.getOptions()).getTime()) newDate = '';
       onChange.apply(void 0, _paramUtils.default.dayHandleChangeParams(newDate, true, type !== 'datetime'));
     }

package/css/DatePicker/Range.js

@@ -94,6 +94,7 @@ function (_PureComponent) {
   };
 
   _proto.handleDayHover = function handleDayHover(date) {
+    // will never in
     if (this.state.rangeDate.length === 1) {
       _utils.default.cloneTime(date, this.props.value[1], this.props.format, this.getOptions()); // this.setState({ hover: date })
 
@@ -113,7 +114,7 @@ function (_PureComponent) {
     if (_utils.default.compareAsc(s, e) > 0) {
       var sWitheTime = _utils.default.toDate(s, this.getOptions());
 
-      _utils.default.setTime(sWitheTime, e);
+      _utils.default.setTime(sWitheTime, e, this.getOptions());
 
       rangeDate[1] = _utils.default.compareAsc(s, sWitheTime) > 0 ? s : sWitheTime;
     }
@@ -123,6 +124,8 @@ function (_PureComponent) {
   _proto.handleChange = function handleChange(index, date, change, end, mode, isQuickSelect, areaType) {
     var _this2 = this;
 
+    var newDate = _utils.default.toDate(date);
+
     var _this$props = this.props,
         type = _this$props.type,
         range = _this$props.range,
@@ -135,7 +138,7 @@ function (_PureComponent) {
       var _this$props2;
 
       var current = (0, _immer.default)(this.props.current, function (draft) {
-        draft[index] = date;
+        draft[index] = newDate;
       });
 
       (_this$props2 = this.props).onChange.apply(_this$props2, handleOnChangeParams(current));
@@ -146,7 +149,7 @@ function (_PureComponent) {
     if (mode === 'time') {
       var endChangedDate;
       this.setState((0, _immer.default)(function (draft) {
-        draft.rangeDate[index] = date;
+        draft.rangeDate[index] = newDate;
         var _draft$rangeDate = draft.rangeDate,
             s = _draft$rangeDate[0],
             e = _draft$rangeDate[1];
@@ -162,7 +165,7 @@ function (_PureComponent) {
         }
 
         if (range && _utils.default.compareAsc(s, e) === 1) {
-          endChangedDate = date;
+          endChangedDate = newDate;
           draft.rangeDate[1] = endChangedDate;
         }
 
@@ -174,7 +177,7 @@ function (_PureComponent) {
         var _this2$props;
 
         var current = (0, _immer.default)(_this2.props.value, function (draft) {
-          draft[index] = date;
+          draft[index] = newDate;
           if (endChangedDate) draft[1] = endChangedDate;
           draft[1 - index] = draft[1 - index] || '';
         });
@@ -189,7 +192,7 @@ function (_PureComponent) {
 
       // eslint-disable-next-line
       var rangeDate = [].concat(this.state.rangeDate);
-      rangeDate[index] = date;
+      rangeDate[index] = newDate;
       rangeDate[1 - index] = rangeDate[1 - index] || '';
       this.changeDateSmart(rangeDate);
       this.setState({
@@ -201,14 +204,14 @@ function (_PureComponent) {
       return;
     }
 
-    _utils.default.cloneTime(date, this.props.value[index], undefined, this.getOptions());
+    newDate = _utils.default.cloneTime(newDate, this.props.value[index], undefined, this.getOptions());
 
-    if (min && _utils.default.compareAsc(date, min) <= 0) {
-      _utils.default.setTime(date, min);
+    if (min && _utils.default.compareAsc(newDate, min) <= 0) {
+      newDate = _utils.default.setTime(newDate, min, this.getOptions());
     }
 
-    if (max && _utils.default.compareAsc(date, max) >= 0) {
-      _utils.default.setTime(date, max);
+    if (max && _utils.default.compareAsc(newDate, max) >= 0) {
+      newDate = _utils.default.setTime(newDate, max, this.getOptions());
     } // if (this.state.rangeDate.filter(a => a).length !== 1) {
     //   this.setState({ rangeDate: index === 1 ? [undefined, date] : [date], hover: undefined })
     //   return
@@ -217,7 +220,7 @@ function (_PureComponent) {
 
     this.setState((0, _immer.default)(function (draft) {
       // const method = utils.compareAsc(draft.rangeDate[0], date) > 0 ? 'unshift' : 'push'
-      draft.rangeDate[index] = date;
+      draft.rangeDate[index] = newDate;
       draft.rangeDate[1 - index] = draft.rangeDate[1 - index] || ''; // draft.rangeDate.map(this.fillTime)
       // range change start&end
 

package/css/DatePicker/Text.js

@@ -17,7 +17,7 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _styles = require("shineout/Input/styles");
+var _styles = require("../Input/styles");
 
 var _element = require("../utils/dom/element");
 

package/css/DatePicker/Time.js

@@ -59,7 +59,7 @@ function (_PureComponent) {
   _proto.getDefaultTime = function getDefaultTime() {
     var idx = 0;
 
-    var current = _utils.default.newDate();
+    var current = _utils.default.newDate(undefined, this.getOptions());
 
     var _this$props = this.props,
         index = _this$props.index,

package/css/DatePicker/index.d.ts

@@ -88,7 +88,7 @@ export interface DatePickerProps<T = DatePickerValue> extends StandardProps,
    *
    * default: props.format
    */
-  formatResult?: string | ((date: Date) => string);
+  formatResult?: string | ((date: Date, offsetDate: Date) => string);
 
   /**
    * a callback when the value is changing

package/css/DatePicker/utils.js

@@ -102,7 +102,7 @@ function transDateWithZone(dd, options, back) {
     console.error(new Error("timeZone is not supported: " + options.timeZone));
   }
 
-  return dd;
+  return new Date(dd);
 }
 
 function addDays(date, offset, options) {
@@ -274,7 +274,7 @@ function isInvalid(date) {
 function toDateWithFormat(dirtyDate, fmt, def, options) {
   var date;
 
-  if (typeof dirtyDate === 'string') {
+  if (typeof dirtyDate === 'string' && fmt) {
     date = parse(dirtyDate, fmt, options);
     var str = format(date, fmt, options);
 
@@ -339,24 +339,27 @@ function newDate(defaultDate, options) {
   return ud;
 }
 
-function setTime(date, old) {
-  date.setHours(old.getHours());
-  date.setMinutes(old.getMinutes());
-  date.setSeconds(old.getSeconds());
-  date.setMilliseconds(old.getMilliseconds());
-  return date;
+function setTime(date, old, options) {
+  var zd = transDateWithZone(date, options);
+  var oldZd = transDateWithZone(old, options);
+  zd.setHours(oldZd.getHours());
+  zd.setMinutes(oldZd.getMinutes());
+  zd.setSeconds(oldZd.getSeconds());
+  zd.setMilliseconds(oldZd.getMilliseconds());
+  var ud = transDateWithZone(zd, options, true);
+  return ud;
 }
 
 function cloneTime(date, old, fmt, options) {
   if (!date) return date;
   var oldDate = toDateWithFormat(old, fmt, undefined, options);
   if (isInvalid(oldDate)) return date;
-  return setTime(date, oldDate);
+  return setTime(date, oldDate, options);
 }
 
 function formatDateWithDefaultTime(date, value, defaultTime, fmt, options) {
   if (!date) return date;
-  if (value) return setTime(date, value);
+  if (value) return setTime(date, value, options);
   if (!defaultTime) return date;
   var dateHMS = toDateWithFormat(defaultTime, TIME_FORMAT, undefined, options);
   if (isInvalid(dateHMS)) return date;
@@ -405,7 +408,8 @@ function resetTimeByFormat(value, fo, options) {
 }
 
 function formatted(date, fmt, options) {
-  if (typeof fmt === 'function') return fmt(date);
+  var offsetDate = transDateWithZone(date, options);
+  if (typeof fmt === 'function') return fmt(date, offsetDate);
   return format(date, fmt, options);
 }
 
@@ -439,6 +443,7 @@ var _default = {
   TIME_FORMAT: TIME_FORMAT,
   resetTimeByFormat: resetTimeByFormat,
   changeDate: changeDate,
-  getDateInfo: getDateInfo
+  getDateInfo: getDateInfo,
+  transDateWithZone: transDateWithZone
 };
 exports.default = _default;

package/css/index.d.ts

@@ -3,7 +3,7 @@ import * as utils from './utils'
 
 declare const __default: {
   utils: typeof utils,
-  version: '1.12.4'
+  version: '1.12.6-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.4'
+  version: '1.12.6-beta.1'
 };
 exports.default = _default;