@hi-ui/hiui 3.9.5 → 3.9.7

package/es/date-picker/BasePicker.js

@@ -182,6 +182,7 @@ var BasePicker = function BasePicker(_ref) {
       }
 
       changeOutDate(oData);
+      callback(oData);
     }
   };
 

package/es/date-picker/components/Time.js

@@ -77,60 +77,34 @@ var Time = function Time(_ref) {
     if (PropsType === 'timerange' || PropsType === 'time' || PropsType === 'default' || showTime) {
       if (timeRangePanelType === 'right') {
         var _deconstructDate = (0, _utils.deconstructDate)(startDate),
+            year = _deconstructDate.year,
+            month = _deconstructDate.month,
+            sDate = _deconstructDate.date,
             hour = _deconstructDate.hour,
             minute = _deconstructDate.minute,
             second = _deconstructDate.second;
 
         var _ref2 = date ? (0, _utils.deconstructDate)(date) : (0, _utils.deconstructDate)(new Date()),
+            endYear = _ref2.year,
+            endMonth = _ref2.month,
+            endDate = _ref2.date,
             endHour = _ref2.hour,
-            endMinute = _ref2.minute;
-
-        var dateDiff = (0, _moment["default"])(date).diff((0, _moment["default"])(startDate), 'days');
-        var hourDiff = (0, _moment["default"])(date).diff((0, _moment["default"])(startDate), 'hour');
-        var minuteDiff = (0, _moment["default"])(date).diff((0, _moment["default"])(startDate), 'minutes'); // 不在同一天
-
-        if (dateDiff !== 0) {
-          isDisabled = dateDiff < 0;
-        } // 在同一天，则比较小时
-        else {
-            if (type === 'hour') {
-              isDisabled = hour > i;
-            } else {
-              // 不在同一小时
-              if (hourDiff !== 0) {
-                isDisabled = hourDiff < 0;
-              } // 在同一小时，则比较分钟
-              else {
-                  if (type === 'minute') {
-                    if (endHour === hour) {
-                      isDisabled = minute > i;
-                    }
-
-                    if (endHour < hour) {
-                      isDisabled = true;
-                    }
-                  } else {
-                    // 不在同一分
-                    if (minuteDiff !== 0) {
-                      isDisabled = minuteDiff < 0;
-                    } // 在同一分钟，则比较秒
-                    else {
-                        if (endHour === hour) {
-                          isDisabled = endMinute === minute && second > i;
-
-                          if (endMinute < minute) {
-                            isDisabled = true;
-                          }
-                        }
-
-                        if (endHour < hour) {
-                          isDisabled = true;
-                        }
-                      }
-                  }
-                }
-            }
-          }
+            endMinute = _ref2.minute,
+            endSecond = _ref2.second;
+
+        var start = new Date("".concat(year, "-").concat((0, _utils.convertMonth)(month), "-").concat(sDate, " ").concat(hour, ":").concat(minute, ":").concat(second));
+
+        if (type === 'hour') {
+          isDisabled = start > new Date("".concat(endYear, "-").concat((0, _utils.convertMonth)(endMonth), "-").concat(endDate, " ").concat(i, ":").concat(endMinute, ":").concat(endSecond));
+        }
+
+        if (type === 'minute') {
+          isDisabled = start > new Date("".concat(endYear, "-").concat((0, _utils.convertMonth)(endMonth), "-").concat(endDate, " ").concat(endHour, ":").concat(i, ":").concat(endSecond));
+        }
+
+        if (type === 'second') {
+          isDisabled = start > new Date("".concat(endYear, "-").concat((0, _utils.convertMonth)(endMonth), "-").concat(endDate, " ").concat(endHour, ":").concat(endMinute, ":").concat(i));
+        }
       }
 
       return isDisabled;

package/es/date-picker/utils.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.normalizeWeekOffset = exports.parseValue = exports.getInRangeDate = exports.getFullTime = exports.getPRCDate = exports.showLargeCalendar = exports.getTimePeriodData = exports.parseRenderDates = exports.genNewDates = exports.getView = exports.deconstructDate = void 0;
+exports.convertMonth = exports.normalizeWeekOffset = exports.parseValue = exports.getInRangeDate = exports.getFullTime = exports.getPRCDate = exports.showLargeCalendar = exports.getTimePeriodData = exports.parseRenderDates = exports.genNewDates = exports.getView = exports.deconstructDate = void 0;
 
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 
@@ -354,4 +354,16 @@ var normalizeWeekOffset = function normalizeWeekOffset(date, weekOffset) {
   return clone;
 };
 
-exports.normalizeWeekOffset = normalizeWeekOffset;
+exports.normalizeWeekOffset = normalizeWeekOffset;
+
+var convertMonth = function convertMonth(month) {
+  if (typeof Number(month) !== 'number') {
+    return '01';
+  }
+
+  var _month = month + 1;
+
+  return _month < 10 ? '0' + _month : _month;
+};
+
+exports.convertMonth = convertMonth;

package/es/search/index.js

@@ -9,8 +9,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+
 var _react = _interopRequireWildcard(require("react"));
 
 var _input = _interopRequireDefault(require("../input"));
@@ -38,7 +42,8 @@ var Search = function Search(_ref) {
       localeDatas = _ref.localeDatas,
       overlayClassName = _ref.overlayClassName,
       append = _ref.append,
-      theme = _ref.theme;
+      theme = _ref.theme,
+      rest = (0, _objectWithoutProperties2["default"])(_ref, ["onChange", "onSearch", "style", "placeholder", "prepend", "disabled", "data", "value", "loading", "localeDatas", "overlayClassName", "append", "theme"]);
 
   var _useState = (0, _react.useState)(false),
       _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
@@ -192,7 +197,7 @@ var Search = function Search(_ref) {
     style: style
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefixCls, "_input")
-  }, /*#__PURE__*/_react["default"].createElement(_input["default"], {
+  }, /*#__PURE__*/_react["default"].createElement(_input["default"], (0, _extends2["default"])({}, rest, {
     ref: searchInputContainer,
     type: "text",
     value: inputVal,
@@ -213,7 +218,7 @@ var Search = function Search(_ref) {
       setFocusIndex(null);
       setSubFocusIndex(null);
     }
-  }), append ? /*#__PURE__*/_react["default"].createElement("span", {
+  })), append ? /*#__PURE__*/_react["default"].createElement("span", {
     className: disabled ? 'disabled' : '',
     onClick: function onClick(e) {
       e.preventDefault();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hi-ui/hiui",
-  "version": "3.9.5",
+  "version": "3.9.7",
   "description": "HIUI for React",
   "scripts": {
     "test": "node_modules/.bin/standard && node_modules/.bin/stylelint --config .stylelintrc 'components/**/*.scss'",