@kdcloudjs/kdesign 1.7.56 → 1.7.58

package/dist/kdesign.js

@@ -1,6 +1,6 @@
 /*!
  * 
- *   @kdcloudjs/kdesign v1.7.55
+ *   @kdcloudjs/kdesign v1.7.57
  * 
  *   Copyright 2020-present, Kingdee, Inc.
  *   All rights reserved.
@@ -2246,6 +2246,7 @@ var getRealDom = function getRealDom(locatorRef, locatorElement) {
   var name = REF_NAME_OBJ[locatorElement === null || locatorElement === void 0 ? void 0 : (_locatorElement$type = locatorElement.type) === null || _locatorElement$type === void 0 ? void 0 : _locatorElement$type.displayName];
   return locatorRef === null || locatorRef === void 0 ? void 0 : locatorRef.current[name];
 };
+var DEFAULT_PLACEMENT = 'top';
 function usePopper(locatorElement, popperElement, props) {
   var _arrowStyle;
   var prefixCls = props.prefixCls,
@@ -2264,7 +2265,7 @@ function usePopper(locatorElement, popperElement, props) {
     _props$trigger = props.trigger,
     trigger = _props$trigger === void 0 ? 'click' : _props$trigger,
     _props$placement = props.placement,
-    placement = _props$placement === void 0 ? 'top' : _props$placement,
+    placement = _props$placement === void 0 ? DEFAULT_PLACEMENT : _props$placement,
     _props$gap = props.gap,
     defaultGap = _props$gap === void 0 ? 4 : _props$gap,
     _props$scrollHidden = props.scrollHidden,
@@ -2361,10 +2362,15 @@ function usePopper(locatorElement, popperElement, props) {
     _useState16 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_6___default()(_useState15, 2),
     align = _useState16[0],
     setAlign = _useState16[1];
-  var _useState17 = Object(react__WEBPACK_IMPORTED_MODULE_18__["useState"])(placement),
+  var _useState17 = Object(react__WEBPACK_IMPORTED_MODULE_18__["useState"])(Placements.includes(placement) ? placement : DEFAULT_PLACEMENT),
     _useState18 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_6___default()(_useState17, 2),
     nextPlacement = _useState18[0],
     setNextPlacement = _useState18[1];
+  Object(react__WEBPACK_IMPORTED_MODULE_18__["useEffect"])(function () {
+    if (nextPlacement !== placement && Placements.includes(placement)) {
+      setNextPlacement(placement);
+    }
+  }, [placement]);
   var alignPopper = Object(react__WEBPACK_IMPORTED_MODULE_18__["useCallback"])(function () {
     var realDom = getRealDom(locatorRef, locatorElement);
     if (realDom && popperRef !== null && popperRef !== void 0 && popperRef.current) {
@@ -2378,6 +2384,10 @@ function usePopper(locatorElement, popperElement, props) {
         right = _realDom$getBoundingC.right,
         height = _realDom$getBoundingC.height,
         width = _realDom$getBoundingC.width;
+      if (height === 0 && width === 0) {
+        hidePopper();
+        return;
+      }
       var _getOffsetPos = getOffsetPos(container),
         containerTop = _getOffsetPos.top,
         containerLeft = _getOffsetPos.left;
@@ -2547,7 +2557,7 @@ function usePopper(locatorElement, popperElement, props) {
       setArrowPos(_arrowPos);
       setNextPlacement(currentPlacement);
     }
-  }, [locatorRef, popperRef, container, trigger, mousePos, autoPlacement, gap, arrowOffset, arrowSize, arrowWidth, align === null || align === void 0 ? void 0 : align.left, align === null || align === void 0 ? void 0 : align.top]);
+  }, [locatorRef, popperRef, container, trigger, mousePos, autoPlacement, gap, arrowOffset, arrowSize, arrowWidth, align === null || align === void 0 ? void 0 : align.left, align === null || align === void 0 ? void 0 : align.top, nextPlacement]);
   Object(react__WEBPACK_IMPORTED_MODULE_18__["useEffect"])(function () {
     if (canAlign) {
       alignPopper();
@@ -2672,13 +2682,9 @@ function usePopper(locatorElement, popperElement, props) {
       }, 10);
       window.addEventListener('resize', alignPopper);
       document.addEventListener('scroll', scrollAlign, true);
-      locatorNode === null || locatorNode === void 0 ? void 0 : locatorNode.addEventListener('DOMSubtreeModified', alignPopper);
-      exist && (popperNode === null || popperNode === void 0 ? void 0 : popperNode.addEventListener('DOMSubtreeModified', alignPopper));
       return function () {
         window.removeEventListener('resize', alignPopper);
         document.removeEventListener('scroll', scrollAlign, true);
-        locatorNode === null || locatorNode === void 0 ? void 0 : locatorNode.removeEventListener('DOMSubtreeModified', alignPopper);
-        exist && (popperNode === null || popperNode === void 0 ? void 0 : popperNode.removeEventListener('DOMSubtreeModified', alignPopper));
       };
     }
   }, [alignPopper, exist, onVisibleChange, popperNode, props.visible, scrollHidden, locatorNode, visible, popperRef]);
@@ -11745,7 +11751,7 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
         if (newText === '') {
           triggerChange(null);
           setViewDate(null);
-        } else if (newText && newText.length === _format.length) {
+        } else if (newText && newText.length >= _format.length) {
           var inputTempDate = Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_22__["parseDate"])(newText, _format);
           if (inputTempDate && (!disabledDate || !disabledDate(inputTempDate))) {
             if (picker !== 'year') {
@@ -11812,6 +11818,9 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
       if (valueText !== text) {
         resetText();
       }
+      if (hoverValue) {
+        onLeave();
+      }
     } else {
       setInnerPicker(undefined);
     }
@@ -12122,8 +12131,6 @@ function usePickerInput(_ref) {
       triggerOpen(true);
     },
     onKeyDown: function onKeyDown(e) {
-      setTyping(true);
-      triggerOpen(true);
       switch (e.which) {
         case _utils_KeyCode__WEBPACK_IMPORTED_MODULE_4__["default"].ENTER:
           {
@@ -12139,8 +12146,9 @@ function usePickerInput(_ref) {
           {
             if (typing && open && !e.shiftKey) {
               setTyping(false);
-              e.preventDefault();
+              // e.preventDefault()
             }
+
             return;
           }
         case _utils_KeyCode__WEBPACK_IMPORTED_MODULE_4__["default"].ESC:
@@ -14264,7 +14272,7 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
     var inputTempDate;
     if (newText === '') {
       triggerChange(Object(_utils__WEBPACK_IMPORTED_MODULE_20__["updateValues"])(selectedValue, null, index), index);
-    } else if (newText && newText.length === _format.length) {
+    } else if (newText && newText.length >= _format.length) {
       inputTempDate = Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_23__["parseDate"])(newText, _format);
       var disabledFunc = index === 0 ? disabledStartDate : disabledEndDate;
       if (inputTempDate && (!disabledFunc || !disabledFunc(inputTempDate))) {
@@ -14482,6 +14490,8 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
       setSelectedValue(dateValue);
       setViewDate(null, 0);
       setViewDate(null, 1);
+      resetStartText();
+      resetEndText();
       setHoverRangedValue([null, null]);
     } else {
       setInnerPicker(undefined);
@@ -15721,10 +15731,12 @@ var setYearOrMonthOfDate = function setYearOrMonthOfDate(date1, date2) {
   var type = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'year';
   var d1 = new Date(date1 || 0);
   var d2 = new Date(date2 || 0);
-  if (type === 'year') {
+  if (type === 'year' && d1.getFullYear() !== d2.getFullYear()) {
+    d1.setDate(1);
     d1.setFullYear(d2.getFullYear());
   }
-  if (type === 'month') {
+  if (type === 'month' && d1.getMonth() !== d2.getMonth()) {
+    d1.setDate(1);
     d1.setMonth(d2.getMonth());
   }
   return d1;