@kdcloudjs/kdesign 1.6.38 → 1.6.39

package/dist/kdesign.js

@@ -1,6 +1,6 @@
 /*!
  * 
- *   @kdcloudjs/kdesign v1.6.37
+ *   @kdcloudjs/kdesign v1.6.38
  * 
  *   Copyright 2020-present, Kingdee, Inc.
  *   All rights reserved.
@@ -9298,7 +9298,10 @@ function Panel(props) {
     locale = context.locale,
     innerPicker = context.innerPicker,
     setInnerPicker = context.setInnerPicker;
-  var isInInnerPicker = innerPicker !== undefined;
+  var isInnerPicker = innerPicker !== undefined;
+  var isPositionLeft = panelPosition === 'left';
+  var isPositionRight = panelPosition === 'right';
+  var isPositionUnset = typeof panelPosition === 'undefined';
   var _props$picker = props.picker,
     picker = _props$picker === void 0 ? 'date' : _props$picker,
     format = props.format,
@@ -9327,7 +9330,7 @@ function Panel(props) {
     return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_9___default.a.createElement(_panel_quarter_quarter__WEBPACK_IMPORTED_MODULE_13__["default"], props);
   };
   var renderDatePanel = function renderDatePanel() {
-    if (isInInnerPicker) {
+    if (isInnerPicker) {
       if (innerPicker === 'year') {
         return renderYearPanel();
       } else {
@@ -9468,8 +9471,8 @@ function Panel(props) {
         panel = renderYearPanel();
         headerObj = renderYearHeader();
         headerProps = {
-          onSuperPrev: panelPosition === 'right' ? undefined : onSuperPrev,
-          onSuperNext: panelPosition === 'left' ? undefined : onSuperNext
+          onSuperPrev: isPositionRight ? undefined : onSuperPrev,
+          onSuperNext: isPositionLeft ? undefined : onSuperNext
         };
         break;
       }
@@ -9478,8 +9481,8 @@ function Panel(props) {
         panel = renderMonthPanel();
         headerObj = renderMonthHeader();
         headerProps = {
-          onSuperPrev: panelPosition === 'right' ? undefined : onSuperPrev,
-          onSuperNext: panelPosition === 'left' ? undefined : onSuperNext
+          onSuperPrev: isPositionRight ? undefined : onSuperPrev,
+          onSuperNext: isPositionLeft ? undefined : onSuperNext
         };
         break;
       }
@@ -9488,19 +9491,20 @@ function Panel(props) {
         panel = renderQuarterPanel();
         headerObj = renderMonthHeader();
         headerProps = {
-          onSuperPrev: panelPosition === 'right' ? undefined : onSuperPrev,
-          onSuperNext: panelPosition === 'left' ? undefined : onSuperNext
+          onSuperPrev: isPositionRight ? undefined : onSuperPrev,
+          onSuperNext: isPositionLeft ? undefined : onSuperNext
         };
         break;
       }
+    // 时间面板，4个箭头的显隐，在时间范围时需要判断是否在快捷选择面板下
     case 'date':
       {
         headerObj = renderDateHeader();
         headerProps = {
-          onPrev: panelPosition === 'right' || isInInnerPicker ? undefined : onPrev,
-          onNext: panelPosition === 'left' || isInInnerPicker ? undefined : onNext,
-          onSuperPrev: panelPosition === 'right' || innerPicker === 'month' ? undefined : onSuperPrev,
-          onSuperNext: panelPosition === 'left' || innerPicker === 'month' ? undefined : onSuperNext
+          onPrev: isPositionLeft && !isInnerPicker || innerPicker === 'month' || isPositionUnset ? onPrev : undefined,
+          onNext: isPositionRight && !isInnerPicker || innerPicker === 'month' || isPositionUnset ? onNext : undefined,
+          onSuperPrev: isPositionLeft && !isInnerPicker || innerPicker === 'year' || isPositionUnset ? onSuperPrev : undefined,
+          onSuperNext: isPositionRight && !isInnerPicker || innerPicker === 'year' || isPositionUnset ? onSuperNext : undefined
         };
         panel = renderDatePanel();
         break;
@@ -9510,10 +9514,10 @@ function Panel(props) {
         panel = renderDatePanel();
         headerObj = renderDateHeader();
         headerProps = {
-          onPrev: panelPosition === 'right' ? undefined : onPrev,
-          onNext: panelPosition === 'left' ? undefined : onNext,
-          onSuperPrev: panelPosition === 'right' ? undefined : onSuperPrev,
-          onSuperNext: panelPosition === 'left' ? undefined : onSuperNext
+          onPrev: isPositionRight ? undefined : onPrev,
+          onNext: isPositionLeft ? undefined : onNext,
+          onSuperPrev: isPositionRight ? undefined : onSuperPrev,
+          onSuperNext: isPositionLeft ? undefined : onSuperNext
         };
         break;
       }
@@ -12122,16 +12126,18 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
     componentName: 'DatePicker'
   }), locale || {});
   // ref
-  var panelDivRef = react__WEBPACK_IMPORTED_MODULE_12___default.a.useRef(null);
-  var inputDivRef = ref || /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_12___default.a.createRef();
-  var startInputDivRef = react__WEBPACK_IMPORTED_MODULE_12___default.a.useRef(null);
-  var endInputDivRef = react__WEBPACK_IMPORTED_MODULE_12___default.a.useRef(null);
-  var separatorRef = react__WEBPACK_IMPORTED_MODULE_12___default.a.useRef(null);
-  var startInputRef = react__WEBPACK_IMPORTED_MODULE_12___default.a.useRef(null);
-  var endInputRef = react__WEBPACK_IMPORTED_MODULE_12___default.a.useRef(null);
-  var popperRef = popupRef || /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_12___default.a.createRef();
-  var openRecordsRef = react__WEBPACK_IMPORTED_MODULE_12___default.a.useRef({});
-  var mergedDisabled = react__WEBPACK_IMPORTED_MODULE_12___default.a.useMemo(function () {
+  var panelDivRef = Object(react__WEBPACK_IMPORTED_MODULE_12__["useRef"])(null);
+  var defaultRef = Object(react__WEBPACK_IMPORTED_MODULE_12__["useRef"])(null);
+  var inputDivRef = ref || defaultRef;
+  var startInputDivRef = Object(react__WEBPACK_IMPORTED_MODULE_12__["useRef"])(null);
+  var endInputDivRef = Object(react__WEBPACK_IMPORTED_MODULE_12__["useRef"])(null);
+  var separatorRef = Object(react__WEBPACK_IMPORTED_MODULE_12__["useRef"])(null);
+  var startInputRef = Object(react__WEBPACK_IMPORTED_MODULE_12__["useRef"])(null);
+  var endInputRef = Object(react__WEBPACK_IMPORTED_MODULE_12__["useRef"])(null);
+  var defaultPopupRef = Object(react__WEBPACK_IMPORTED_MODULE_12__["useRef"])(null);
+  var popperRef = popupRef || defaultPopupRef;
+  var openRecordsRef = Object(react__WEBPACK_IMPORTED_MODULE_12__["useRef"])({});
+  var mergedDisabled = Object(react__WEBPACK_IMPORTED_MODULE_12__["useMemo"])(function () {
     if (Array.isArray(disabled)) {
       return disabled;
     }
@@ -12281,10 +12287,10 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
     endText = _useTextValueMapping4[0],
     triggerEndTextChange = _useTextValueMapping4[1],
     resetEndText = _useTextValueMapping4[2];
-  var _React$useState = react__WEBPACK_IMPORTED_MODULE_12___default.a.useState([null, null]),
-    _React$useState2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_5___default()(_React$useState, 2),
-    hoverRangedValue = _React$useState2[0],
-    setHoverRangedValue = _React$useState2[1];
+  var _useState = Object(react__WEBPACK_IMPORTED_MODULE_12__["useState"])([null, null]),
+    _useState2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_5___default()(_useState, 2),
+    hoverRangedValue = _useState2[0],
+    setHoverRangedValue = _useState2[1];
   var _useHoverValue = Object(_hooks_use_hover_value__WEBPACK_IMPORTED_MODULE_22__["default"])(startText, {
       format: _format
     }),
@@ -12322,23 +12328,13 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
     _useMergedState10 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_5___default()(_useMergedState9, 2),
     mergedModes = _useMergedState10[0],
     setInnerModes = _useMergedState10[1];
-  var _useState = Object(react__WEBPACK_IMPORTED_MODULE_12__["useState"])(undefined),
-    _useState2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_5___default()(_useState, 2),
-    innerPicker = _useState2[0],
-    setInnerPicker = _useState2[1];
+  var _useState3 = Object(react__WEBPACK_IMPORTED_MODULE_12__["useState"])(undefined),
+    _useState4 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_5___default()(_useState3, 2),
+    innerPicker = _useState4[0],
+    setInnerPicker = _useState4[1];
   Object(react__WEBPACK_IMPORTED_MODULE_12__["useEffect"])(function () {
     setInnerModes([picker, picker]);
   }, [picker]);
-
-  // const triggerModesChange = (modes: [PanelMode, PanelMode], values: RangeValue) => {
-  //   setInnerModes(modes)
-
-  //   if (onPanelChange) {
-  //     onPanelChange(values, modes)
-  //   }
-  // }
-
-  // ========================= Disable Date ==========================
   var _useRangeDisabled = Object(_hooks_use_range_disabled__WEBPACK_IMPORTED_MODULE_26__["default"])({
       picker: picker,
       selectedValue: selectedValue,
@@ -12348,13 +12344,7 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
     _useRangeDisabled2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_5___default()(_useRangeDisabled, 2),
     disabledStartDate = _useRangeDisabled2[0],
     disabledEndDate = _useRangeDisabled2[1];
-
-  // const onResetText = () => {
-  //   resetEndText()
-  //   resetStartText()
-  // }
-
-  var triggerRef = react__WEBPACK_IMPORTED_MODULE_12___default.a.useRef();
+  var triggerRef = Object(react__WEBPACK_IMPORTED_MODULE_12__["useRef"])();
   var triggerOpen = function triggerOpen(newOpen, index) {
     if (newOpen) {
       clearTimeout(triggerRef.current);
@@ -12434,22 +12424,30 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
       triggerOpen(false, sourceIndex);
     }
   };
-  Object(_utils_hooks__WEBPACK_IMPORTED_MODULE_15__["useOnClickOutside"])([popperRef, inputDivRef], function () {
-    setViewDate(null, 0);
-    setViewDate(null, 1);
-    setHoverRangedValue([null, null]);
-  });
+
+  // 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 === 'submit' || type !== 'key' && !needConfirmButton) {
-      triggerChange(values, mergedActivePickerIndex);
-      if (mergedActivePickerIndex === 0) {
-        onStartLeave();
-      } else {
-        onEndLeave();
+    if (type === 'inner') {
+      if (values && values[mergedActivePickerIndex]) {
+        setViewDate(values[mergedActivePickerIndex], mergedActivePickerIndex);
       }
     } else {
-      setSelectedValue(values);
+      if (type === 'submit' || type !== 'key' && !needConfirmButton) {
+        triggerChange(values, mergedActivePickerIndex);
+        if (mergedActivePickerIndex === 0) {
+          onStartLeave();
+        } else {
+          onEndLeave();
+        }
+      } else {
+        setSelectedValue(values);
+      }
     }
   };
   var onDateMouseEnter = function onDateMouseEnter(date) {
@@ -12479,6 +12477,11 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
       if (!endValueTexts.length || endValueTexts[0] === '') {
         triggerEndTextChange('');
       }
+      setViewDate(null, 0);
+      setViewDate(null, 1);
+      setHoverRangedValue([null, null]);
+    } else {
+      setInnerPicker(undefined);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [mergedOpen, startValueTexts, endValueTexts]);
@@ -12560,7 +12563,7 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
       }, renderPanel());
       panels = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_12___default.a.createElement("div", {
         className: classnames__WEBPACK_IMPORTED_MODULE_29___default()("".concat(datePickerPrefixCls, "-container-date"))
-      }, leftPanel, rightPanel);
+      }, leftPanel, innerPicker === undefined ? rightPanel : null);
     } else {
       panels = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_12___default.a.createElement(_context__WEBPACK_IMPORTED_MODULE_17__["default"].Provider, {
         value: {
@@ -12717,7 +12720,7 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
     getPopupContainer: getPopupContainer
   });
 };
-var RangePicker = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_12___default.a.forwardRef(InternalRangePicker);
+var RangePicker = /*#__PURE__*/Object(react__WEBPACK_IMPORTED_MODULE_12__["forwardRef"])(InternalRangePicker);
 RangePicker.displayName = 'RangePicker';
 /* harmony default export */ __webpack_exports__["default"] = (RangePicker);