@kdcloudjs/kdesign 1.7.33-stable.12 → 1.7.33-stable.13

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

@@ -6,7 +6,7 @@ import _filterInstanceProperty from "@babel/runtime-corejs3/core-js-stable/insta
 import * as React from 'react';
 import classNames from 'classnames';
 import TimeColumn from './time-column';
-import { formatDate, newDate, setTime as utilSetTime } from '../../utils/date-fns';
+import { formatDate, newDate, setTime as utilSetTime, isValid } from '../../utils/date-fns';
 import Context from '../../context';
 import useStateMemo from '../../hooks/use-state-memo';
 import { leftPad } from '../../utils';
@@ -39,7 +39,9 @@ function TimePanel(props) {
     minutes = _context$minutes === void 0 ? [] : _context$minutes,
     _context$seconds = context.seconds,
     seconds = _context$seconds === void 0 ? [] : _context$seconds,
-    disabledTimePanel = context.disabledTimePanel;
+    disabledTimePanel = context.disabledTimePanel,
+    rangeValue = context.rangeValue,
+    panelPosition = context.panelPosition;
   var picker = props.picker,
     _props$format = props.format,
     format = _props$format === void 0 ? 'HH:mm:ss' : _props$format,
@@ -72,9 +74,22 @@ function TimePanel(props) {
   var hour = originHour;
   // const minute = value ? getMinutes(value) : -1
   // const second = value ? getSeconds(value) : -1
+  var getDefaultDate = function getDefaultDate() {
+    if (panelPosition) {
+      if (rangeValue && rangeValue[0] && isValid(rangeValue[0])) {
+        return rangeValue[0];
+      }
+      if (rangeValue && rangeValue[1] && isValid(rangeValue[1])) {
+        return rangeValue[1];
+      }
+    } else if (value && isValid(value)) {
+      return value;
+    }
+    return newDate();
+  };
   var setTime = function setTime(isPM, newHour, newMinute, newSecond) {
     var _a, _b, _c;
-    var date = value || newDate();
+    var date = getDefaultDate();
     var _hour = newHour > -1 ? newHour : (_a = _findInstanceProperty(rawHours).call(rawHours, function (n) {
       return !n.disabled;
     })) === null || _a === void 0 ? void 0 : _a.value;

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

@@ -30,14 +30,6 @@ function reorderValues(values) {
   }
   return values;
 }
-// 范围时间顺序错误时报错
-function isErrorValues(values) {
-  if (values && values[0] && values[1] && isAfter(values[0], values[1])) {
-    console.error('开始日期在结束日期之后');
-    return true;
-  }
-  return false;
-}
 // 是否可以切换选择器
 function canValueTrigger(value, index, disabled, allowEmpty) {
   if (value) {
@@ -143,17 +135,7 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
   // 原始数据
   var _useMergedState3 = useMergedState(null, {
       value: value,
-      defaultValue: defaultValue,
-      postState: function postState(values) {
-        if (picker === 'time' || picker === 'date' && showTime) {
-          return order ? reorderValues(values) : values;
-        } else {
-          if (isErrorValues(values)) {
-            return [values[0], null];
-          }
-          return values;
-        }
-      }
+      defaultValue: defaultValue
     }),
     _useMergedState4 = _slicedToArray(_useMergedState3, 2),
     dateValue = _useMergedState4[0],
@@ -226,15 +208,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;
@@ -358,12 +332,20 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
       }
     }, 0);
   };
+  var triggerChangeInner = function triggerChangeInner(values) {
+    if (typeof value === 'undefined') {
+      setInnerValue(values);
+    }
+    if (onChange && (!isEqual(getValue(dateValue, 0), getValue(values, 0)) || !isEqual(getValue(dateValue, 1), getValue(values, 1)))) {
+      onChange(values, [values && values[0] ? formatDate(values[0], _format) : '', values && values[1] ? formatDate(values[1], _format) : '']);
+    }
+  };
   var triggerChange = function triggerChange(newValue, sourceIndex) {
     var values = newValue;
     var startValue = getValue(values, 0);
     var endValue = getValue(values, 1);
     if (startValue && endValue && isAfter(startValue, endValue)) {
-      if (picker === 'week' && !isSameWeek(startValue, endValue) || picker === 'quarter' && !isSameQuarter(startValue, endValue) || picker !== 'week' && picker !== 'quarter' && picker !== 'time' && !isSameDay(startValue, endValue)) {
+      if (picker === 'week' && !isSameWeek(startValue, endValue) || picker === 'quarter' && !isSameQuarter(startValue, endValue) || picker === 'time' && !isEqual(startValue, endValue) || picker !== 'week' && picker !== 'quarter' && picker !== 'time' && !isSameDay(startValue, endValue)) {
         if (sourceIndex === 0) {
           values = [startValue, null];
           endValue = null;
@@ -372,8 +354,6 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
           values = [null, endValue];
         }
         openRecordsRef.current = _defineProperty({}, sourceIndex, true);
-      } else if (picker === 'time' && order === true) {
-        values = reorderValues(values);
       }
     }
     setSelectedValue(values);
@@ -389,28 +369,25 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
     var canEndValueTrigger = canValueTrigger(endValue, 1, mergedDisabled, allowEmpty);
     var canTrigger = values === null || canStartValueTrigger && canEndValueTrigger;
     if (canTrigger) {
-      setInnerValue(values);
-      if (onChange && (!isEqual(getValue(dateValue, 0), startValue) || !isEqual(getValue(dateValue, 1), endValue))) {
-        onChange(values, [startStr, endStr]);
+      if (order) {
+        triggerChangeInner(reorderValues(values));
+      } else {
+        triggerChangeInner(values);
       }
     }
+    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') {
@@ -451,12 +428,6 @@ 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);
       setHoverRangedValue([null, null]);

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

@@ -51,7 +51,9 @@ function TimePanel(props) {
     minutes = _context$minutes === void 0 ? [] : _context$minutes,
     _context$seconds = context.seconds,
     seconds = _context$seconds === void 0 ? [] : _context$seconds,
-    disabledTimePanel = context.disabledTimePanel;
+    disabledTimePanel = context.disabledTimePanel,
+    rangeValue = context.rangeValue,
+    panelPosition = context.panelPosition;
   var picker = props.picker,
     _props$format = props.format,
     format = _props$format === void 0 ? 'HH:mm:ss' : _props$format,
@@ -84,9 +86,22 @@ function TimePanel(props) {
   var hour = originHour;
   // const minute = value ? getMinutes(value) : -1
   // const second = value ? getSeconds(value) : -1
+  var getDefaultDate = function getDefaultDate() {
+    if (panelPosition) {
+      if (rangeValue && rangeValue[0] && (0, _dateFns.isValid)(rangeValue[0])) {
+        return rangeValue[0];
+      }
+      if (rangeValue && rangeValue[1] && (0, _dateFns.isValid)(rangeValue[1])) {
+        return rangeValue[1];
+      }
+    } else if (value && (0, _dateFns.isValid)(value)) {
+      return value;
+    }
+    return (0, _dateFns.newDate)();
+  };
   var setTime = function setTime(isPM, newHour, newMinute, newSecond) {
     var _a, _b, _c;
-    var date = value || (0, _dateFns.newDate)();
+    var date = getDefaultDate();
     var _hour = newHour > -1 ? newHour : (_a = (0, _find.default)(rawHours).call(rawHours, function (n) {
       return !n.disabled;
     })) === null || _a === void 0 ? void 0 : _a.value;

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

@@ -42,14 +42,6 @@ function reorderValues(values) {
   }
   return values;
 }
-// 范围时间顺序错误时报错
-function isErrorValues(values) {
-  if (values && values[0] && values[1] && (0, _dateFns.isAfter)(values[0], values[1])) {
-    console.error('开始日期在结束日期之后');
-    return true;
-  }
-  return false;
-}
 // 是否可以切换选择器
 function canValueTrigger(value, index, disabled, allowEmpty) {
   if (value) {
@@ -155,17 +147,7 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
   // 原始数据
   var _useMergedState3 = (0, _hooks.useMergedState)(null, {
       value: value,
-      defaultValue: defaultValue,
-      postState: function postState(values) {
-        if (picker === 'time' || picker === 'date' && showTime) {
-          return order ? reorderValues(values) : values;
-        } else {
-          if (isErrorValues(values)) {
-            return [values[0], null];
-          }
-          return values;
-        }
-      }
+      defaultValue: defaultValue
     }),
     _useMergedState4 = (0, _slicedToArray2.default)(_useMergedState3, 2),
     dateValue = _useMergedState4[0],
@@ -238,15 +220,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;
@@ -370,12 +344,20 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
       }
     }, 0);
   };
+  var triggerChangeInner = function triggerChangeInner(values) {
+    if (typeof value === 'undefined') {
+      setInnerValue(values);
+    }
+    if (onChange && (!(0, _dateFns.isEqual)((0, _utils2.getValue)(dateValue, 0), (0, _utils2.getValue)(values, 0)) || !(0, _dateFns.isEqual)((0, _utils2.getValue)(dateValue, 1), (0, _utils2.getValue)(values, 1)))) {
+      onChange(values, [values && values[0] ? (0, _dateFns.formatDate)(values[0], _format) : '', values && values[1] ? (0, _dateFns.formatDate)(values[1], _format) : '']);
+    }
+  };
   var triggerChange = function triggerChange(newValue, sourceIndex) {
     var values = newValue;
     var startValue = (0, _utils2.getValue)(values, 0);
     var endValue = (0, _utils2.getValue)(values, 1);
     if (startValue && endValue && (0, _dateFns.isAfter)(startValue, endValue)) {
-      if (picker === 'week' && !(0, _isSameWeek.default)(startValue, endValue) || picker === 'quarter' && !(0, _dateFns.isSameQuarter)(startValue, endValue) || picker !== 'week' && picker !== 'quarter' && picker !== 'time' && !(0, _dateFns.isSameDay)(startValue, endValue)) {
+      if (picker === 'week' && !(0, _isSameWeek.default)(startValue, endValue) || picker === 'quarter' && !(0, _dateFns.isSameQuarter)(startValue, endValue) || picker === 'time' && !(0, _dateFns.isEqual)(startValue, endValue) || picker !== 'week' && picker !== 'quarter' && picker !== 'time' && !(0, _dateFns.isSameDay)(startValue, endValue)) {
         if (sourceIndex === 0) {
           values = [startValue, null];
           endValue = null;
@@ -384,8 +366,6 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
           values = [null, endValue];
         }
         openRecordsRef.current = (0, _defineProperty2.default)({}, sourceIndex, true);
-      } else if (picker === 'time' && order === true) {
-        values = reorderValues(values);
       }
     }
     setSelectedValue(values);
@@ -401,28 +381,25 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
     var canEndValueTrigger = canValueTrigger(endValue, 1, mergedDisabled, allowEmpty);
     var canTrigger = values === null || canStartValueTrigger && canEndValueTrigger;
     if (canTrigger) {
-      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]);
+      if (order) {
+        triggerChangeInner(reorderValues(values));
+      } else {
+        triggerChangeInner(values);
       }
     }
+    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') {
@@ -463,12 +440,6 @@ 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);
       setHoverRangedValue([null, null]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kdcloudjs/kdesign",
-  "version": "1.7.33-stable.12",
+  "version": "1.7.33-stable.13",
   "description": "KDesign 金蝶前端react 组件库",
   "title": "kdesign",
   "keywords": [