@kdcloudjs/kdesign 1.7.55 → 1.7.57

package/dist/kdesign.js

@@ -1,6 +1,6 @@
 /*!
  * 
- *   @kdcloudjs/kdesign v1.7.54
+ *   @kdcloudjs/kdesign v1.7.56
  * 
  *   Copyright 2020-present, Kingdee, Inc.
  *   All rights reserved.
@@ -9615,7 +9615,7 @@ var ColorPickerPanel = function ColorPickerPanel(props) {
       setColTypeArr(formatArr);
     }
     setClickedColorIndex(index);
-    onChange && onChange(formatValue, colTypeArr);
+    onChange && onChange(formatValue, formatArr);
   };
   var handleTypeChange = function handleTypeChange(selectValue, option) {
     setCurrentColorType(option.label);
@@ -11812,6 +11812,9 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
       if (valueText !== text) {
         resetText();
       }
+      if (hoverValue) {
+        onLeave();
+      }
     } else {
       setInnerPicker(undefined);
     }
@@ -14263,15 +14266,7 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
   var _onTextChange = function onTextChange(newText, index) {
     var inputTempDate;
     if (newText === '') {
-      if (index === 0 && selectedValue && selectedValue.length === 2) {
-        inputTempDate = selectedValue[1];
-      } else if (index === 1 && selectedValue && selectedValue.length === 2) {
-        inputTempDate = selectedValue[0];
-      }
-      if (inputTempDate) {
-        triggerChange(Object(_utils__WEBPACK_IMPORTED_MODULE_20__["updateValues"])(selectedValue, inputTempDate, index), index);
-        setViewDate(inputTempDate, index);
-      }
+      triggerChange(Object(_utils__WEBPACK_IMPORTED_MODULE_20__["updateValues"])(selectedValue, null, index), index);
     } 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;
@@ -14428,30 +14423,26 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
     var canEndValueTrigger = canValueTrigger(endValue, 1, mergedDisabled, allowEmpty);
     var canTrigger = values === null || canStartValueTrigger && canEndValueTrigger;
     if (canTrigger) {
-      setInnerValue(values);
+      if (typeof value === 'undefined') {
+        setInnerValue(values);
+      }
       if (onChange && (!Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_23__["isEqual"])(Object(_utils__WEBPACK_IMPORTED_MODULE_20__["getValue"])(dateValue, 0), startValue) || !Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_23__["isEqual"])(Object(_utils__WEBPACK_IMPORTED_MODULE_20__["getValue"])(dateValue, 1), endValue))) {
         onChange(values, [startStr, endStr]);
       }
     }
+    var curValue = Object(_utils__WEBPACK_IMPORTED_MODULE_20__["getValue"])(values, sourceIndex);
     var nextOpenIndex = null;
     if (sourceIndex === 0 && !mergedDisabled[1]) {
       nextOpenIndex = 1;
     } else if (sourceIndex === 1 && !mergedDisabled[0]) {
       nextOpenIndex = 0;
     }
-    if (nextOpenIndex !== null && nextOpenIndex !== mergedActivePickerIndex && (!openRecordsRef.current[nextOpenIndex] || !Object(_utils__WEBPACK_IMPORTED_MODULE_20__["getValue"])(values, nextOpenIndex)) && Object(_utils__WEBPACK_IMPORTED_MODULE_20__["getValue"])(values, sourceIndex)) {
+    if (nextOpenIndex !== null && nextOpenIndex !== mergedActivePickerIndex && (!openRecordsRef.current[nextOpenIndex] || !Object(_utils__WEBPACK_IMPORTED_MODULE_20__["getValue"])(values, nextOpenIndex)) && curValue) {
       triggerOpenAndFocus(nextOpenIndex);
-    } else {
+    } else if (curValue) {
       triggerOpen(false, sourceIndex);
     }
   };
-
-  // useOnClickOutside([popperRef, inputDivRef], () => {
-  //   setViewDate(null, 0)
-  //   setViewDate(null, 1)
-  //   setHoverRangedValue([null, null])
-  // })
-
   var onSelect = function onSelect(date, type) {
     var values = Object(_utils__WEBPACK_IMPORTED_MODULE_20__["updateValues"])(selectedValue, date, mergedActivePickerIndex);
     if (type === 'inner') {
@@ -14492,14 +14483,10 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
   Object(react__WEBPACK_IMPORTED_MODULE_12__["useEffect"])(function () {
     if (!mergedOpen) {
       setSelectedValue(dateValue);
-      if (!startValueTexts.length || startValueTexts[0] === '') {
-        triggerStartTextChange('');
-      }
-      if (!endValueTexts.length || endValueTexts[0] === '') {
-        triggerEndTextChange('');
-      }
       setViewDate(null, 0);
       setViewDate(null, 1);
+      resetStartText();
+      resetEndText();
       setHoverRangedValue([null, null]);
     } else {
       setInnerPicker(undefined);
@@ -15739,10 +15726,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;
@@ -28458,7 +28447,7 @@ var InternalRadio = function InternalRadio(props, ref) {
       className: classString,
       style: style,
       ref: mergedRef
-    }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5___default.a.createElement("input", _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_0___default()({
+    }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5___default.a.createElement("input", _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_0___default()({}, restProps, {
       type: "radio",
       className: "".concat(radioPrefixCls, "-input"),
       checked: isChecked,
@@ -28466,7 +28455,7 @@ var InternalRadio = function InternalRadio(props, ref) {
       value: value,
       name: context === null || context === void 0 ? void 0 : context.name,
       disabled: mergedDisabled
-    }, restProps)), children !== undefined ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5___default.a.createElement("span", {
+    })), children !== undefined ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5___default.a.createElement("span", {
       className: "".concat(radioPrefixCls, "-text")
     }, children) : null)
   );