@kdcloudjs/kdesign 1.7.55 → 1.7.57

package/es/color-picker/color-picker-panel.js

@@ -76,7 +76,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);

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

@@ -217,6 +217,9 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
       if (valueText !== text) {
         resetText();
       }
+      if (hoverValue) {
+        onLeave();
+      }
     } else {
       setInnerPicker(undefined);
     }

package/es/date-picker/range-picker.js

@@ -228,15 +228,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(updateValues(selectedValue, inputTempDate, index), index);
-        setViewDate(inputTempDate, index);
-      }
+      triggerChange(updateValues(selectedValue, null, index), index);
     } else if (newText && newText.length === _format.length) {
       inputTempDate = parseDate(newText, _format);
       var disabledFunc = index === 0 ? disabledStartDate : disabledEndDate;
@@ -391,28 +383,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 && (!isEqual(getValue(dateValue, 0), startValue) || !isEqual(getValue(dateValue, 1), endValue))) {
         onChange(values, [startStr, endStr]);
       }
     }
+    var curValue = 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] || !getValue(values, nextOpenIndex)) && getValue(values, sourceIndex)) {
+    if (nextOpenIndex !== null && nextOpenIndex !== mergedActivePickerIndex && (!openRecordsRef.current[nextOpenIndex] || !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 = updateValues(selectedValue, date, mergedActivePickerIndex);
     if (type === 'inner') {
@@ -453,14 +443,10 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
   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);

package/es/date-picker/utils/date-fns.js

@@ -273,10 +273,12 @@ export 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;

package/es/radio/radio.js

@@ -91,7 +91,7 @@ var InternalRadio = function InternalRadio(props, ref) {
       className: classString,
       style: style,
       ref: mergedRef
-    }, /*#__PURE__*/React.createElement("input", _extends({
+    }, /*#__PURE__*/React.createElement("input", _extends({}, restProps, {
       type: "radio",
       className: "".concat(radioPrefixCls, "-input"),
       checked: isChecked,
@@ -99,7 +99,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.createElement("span", {
+    })), children !== undefined ? /*#__PURE__*/React.createElement("span", {
       className: "".concat(radioPrefixCls, "-text")
     }, children) : null)
   );

package/es/radio/style/index.css

@@ -126,7 +126,6 @@
   color: var(--kd-c-radio-color-font, var(--kd-g-color-text-primary, #212121));
   font-size: var(--kd-c-radio-font-size, var(--kd-g-font-size-small, 12px));
   max-width: var(--kd-c-radio-default-label-max-width);
-  overflow: hidden;
   min-height: var(--kd-c-radio-square-sizing-width-height, 14px);
 }
 .kd-radio::before {

package/es/radio/style/index.less

@@ -23,7 +23,7 @@
   color: @radio-font-color;
   font-size: @radio-font-size;
   max-width: @radio-default-label-max-width;
-  overflow: hidden;
+  // overflow: hidden;
   min-height: @radio-circle-size;
 
   &::before {

package/lib/color-picker/color-picker-panel.js

@@ -89,7 +89,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);

package/lib/date-picker/date-picker.js

@@ -229,6 +229,9 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
       if (valueText !== text) {
         resetText();
       }
+      if (hoverValue) {
+        onLeave();
+      }
     } else {
       setInnerPicker(undefined);
     }

package/lib/date-picker/range-picker.js

@@ -240,15 +240,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((0, _utils2.updateValues)(selectedValue, inputTempDate, index), index);
-        setViewDate(inputTempDate, index);
-      }
+      triggerChange((0, _utils2.updateValues)(selectedValue, null, index), index);
     } else if (newText && newText.length === _format.length) {
       inputTempDate = (0, _dateFns.parseDate)(newText, _format);
       var disabledFunc = index === 0 ? disabledStartDate : disabledEndDate;
@@ -403,28 +395,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 && (!(0, _dateFns.isEqual)((0, _utils2.getValue)(dateValue, 0), startValue) || !(0, _dateFns.isEqual)((0, _utils2.getValue)(dateValue, 1), endValue))) {
         onChange(values, [startStr, endStr]);
       }
     }
+    var curValue = (0, _utils2.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] || !(0, _utils2.getValue)(values, nextOpenIndex)) && (0, _utils2.getValue)(values, sourceIndex)) {
+    if (nextOpenIndex !== null && nextOpenIndex !== mergedActivePickerIndex && (!openRecordsRef.current[nextOpenIndex] || !(0, _utils2.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 = (0, _utils2.updateValues)(selectedValue, date, mergedActivePickerIndex);
     if (type === 'inner') {
@@ -465,14 +455,10 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
   (0, _react.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);

package/lib/date-picker/utils/date-fns.js

@@ -477,10 +477,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;

package/lib/radio/radio.js

@@ -103,7 +103,7 @@ var InternalRadio = function InternalRadio(props, ref) {
       className: classString,
       style: style,
       ref: mergedRef
-    }, /*#__PURE__*/_react.default.createElement("input", (0, _extends2.default)({
+    }, /*#__PURE__*/_react.default.createElement("input", (0, _extends2.default)({}, restProps, {
       type: "radio",
       className: "".concat(radioPrefixCls, "-input"),
       checked: isChecked,
@@ -111,7 +111,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.default.createElement("span", {
+    })), children !== undefined ? /*#__PURE__*/_react.default.createElement("span", {
       className: "".concat(radioPrefixCls, "-text")
     }, children) : null)
   );

package/lib/radio/style/index.css

@@ -126,7 +126,6 @@
   color: var(--kd-c-radio-color-font, var(--kd-g-color-text-primary, #212121));
   font-size: var(--kd-c-radio-font-size, var(--kd-g-font-size-small, 12px));
   max-width: var(--kd-c-radio-default-label-max-width);
-  overflow: hidden;
   min-height: var(--kd-c-radio-square-sizing-width-height, 14px);
 }
 .kd-radio::before {

package/lib/radio/style/index.less

@@ -23,7 +23,7 @@
   color: @radio-font-color;
   font-size: @radio-font-size;
   max-width: @radio-default-label-max-width;
-  overflow: hidden;
+  // overflow: hidden;
   min-height: @radio-circle-size;
 
   &::before {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kdcloudjs/kdesign",
-  "version": "1.7.55",
+  "version": "1.7.57",
   "description": "KDesign 金蝶前端react 组件库",
   "title": "kdesign",
   "keywords": [