@kdcloudjs/kdesign 1.7.49 → 1.7.50

package/dist/kdesign.js

@@ -1,6 +1,6 @@
 /*!
  * 
- *   @kdcloudjs/kdesign v1.7.48
+ *   @kdcloudjs/kdesign v1.7.49
  * 
  *   Copyright 2020-present, Kingdee, Inc.
  *   All rights reserved.
@@ -2547,7 +2547,7 @@ function usePopper(locatorElement, popperElement, props) {
       setArrowPos(_arrowPos);
       setNextPlacement(currentPlacement);
     }
-  }, [locatorRef, popperRef, container, trigger, mousePos, autoPlacement, gap, arrowOffset, arrowSize, arrowWidth]);
+  }, [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]);
   Object(react__WEBPACK_IMPORTED_MODULE_18__["useEffect"])(function () {
     if (canAlign) {
       alignPopper();
@@ -3551,7 +3551,8 @@ var InternalAnchor = function InternalAnchor(props, ref) {
     getScrollContainer().addEventListener('scroll', handleScroll);
     handleScroll();
     return function () {
-      return getScrollContainer().removeEventListener('scroll', handleScroll);
+      var _getScrollContainer;
+      return (_getScrollContainer = getScrollContainer()) === null || _getScrollContainer === void 0 ? void 0 : _getScrollContainer.removeEventListener('scroll', handleScroll);
     };
   }, [handleScroll, getScrollContainer]);
   Object(react__WEBPACK_IMPORTED_MODULE_20__["useEffect"])(function () {
@@ -11286,6 +11287,8 @@ function Panel(props) {
     innerPicker = context.innerPicker,
     setInnerPicker = context.setInnerPicker;
   var isInnerPicker = innerPicker !== undefined;
+  var isInnerYear = innerPicker === 'year';
+  var isInnerMonth = innerPicker === 'month';
   var isPositionLeft = panelPosition === 'left';
   var isPositionRight = panelPosition === 'right';
   var isPositionUnset = typeof panelPosition === 'undefined';
@@ -11311,14 +11314,20 @@ function Panel(props) {
     }));
   };
   var renderMonthPanel = function renderMonthPanel() {
+    if (isInnerYear) {
+      return renderYearPanel();
+    }
     return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_9___default.a.createElement(_panel_month_month__WEBPACK_IMPORTED_MODULE_11__["default"], props);
   };
   var renderQuarterPanel = function renderQuarterPanel() {
+    if (isInnerYear) {
+      return renderYearPanel();
+    }
     return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_9___default.a.createElement(_panel_quarter_quarter__WEBPACK_IMPORTED_MODULE_13__["default"], props);
   };
   var renderDatePanel = function renderDatePanel() {
     if (isInnerPicker) {
-      if (innerPicker === 'year') {
+      if (isInnerYear) {
         return renderYearPanel();
       } else {
         return renderMonthPanel();
@@ -11377,35 +11386,32 @@ function Panel(props) {
       className: headerCls
     };
   };
+  var onHeaderYearClick = function onHeaderYearClick() {
+    setInnerPicker('year');
+  };
+  var onHeaderMonthClick = function onHeaderMonthClick() {
+    setInnerPicker('month');
+  };
   var renderMonthHeader = function renderMonthHeader() {
     var year = Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_18__["getYear"])(viewDate);
-    var headerCls = classnames__WEBPACK_IMPORTED_MODULE_10___default()("".concat(prefixCls, "-header"), "".concat(prefixCls, "-header-month"));
+    var headerCls = classnames__WEBPACK_IMPORTED_MODULE_10___default()("".concat(prefixCls, "-header"), "".concat(prefixCls, "-header-month"), "".concat(prefixCls, "-header-text-inner-hover"), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_7___default()({}, "".concat(prefixCls, "-header-text-inner-active"), isInnerYear));
     return {
-      children: /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_9___default.a.createElement(react__WEBPACK_IMPORTED_MODULE_9___default.a.Fragment, null, year + locale.year),
+      children: /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_9___default.a.createElement("span", {
+        onClick: onHeaderYearClick
+      }, year + locale.year),
       className: headerCls
     };
   };
-  var onHeaderYearClick = function onHeaderYearClick() {
-    if (picker === 'date') {
-      setInnerPicker('year');
-    }
-  };
-  var onHeaderMonthClick = function onHeaderMonthClick() {
-    if (picker === 'date') {
-      setInnerPicker('month');
-    }
-  };
   var renderDateHeader = function renderDateHeader() {
-    var _classnames, _classnames2;
     var year = Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_18__["getYear"])(viewDate);
     var month = Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_18__["getMonth"])(viewDate) + 1;
     var headerCls = classnames__WEBPACK_IMPORTED_MODULE_10___default()("".concat(prefixCls, "-header"), "".concat(prefixCls, "-header-date"));
     return {
       children: /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_9___default.a.createElement(react__WEBPACK_IMPORTED_MODULE_9___default.a.Fragment, null, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_9___default.a.createElement("span", {
-        className: classnames__WEBPACK_IMPORTED_MODULE_10___default()("".concat(prefixCls, "-header-text-inner"), (_classnames = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_7___default()(_classnames, "".concat(prefixCls, "-header-text-inner-active"), innerPicker === 'year'), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_7___default()(_classnames, "".concat(prefixCls, "-header-text-inner-hover"), picker === 'date'), _classnames)),
+        className: classnames__WEBPACK_IMPORTED_MODULE_10___default()("".concat(prefixCls, "-header-text-inner"), "".concat(prefixCls, "-header-text-inner-hover"), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_7___default()({}, "".concat(prefixCls, "-header-text-inner-active"), isInnerYear)),
         onClick: onHeaderYearClick
       }, year + locale.year), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_9___default.a.createElement("span", {
-        className: classnames__WEBPACK_IMPORTED_MODULE_10___default()("".concat(prefixCls, "-header-text-inner"), (_classnames2 = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_7___default()(_classnames2, "".concat(prefixCls, "-header-text-inner-active"), innerPicker === 'month'), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_7___default()(_classnames2, "".concat(prefixCls, "-header-text-inner-hover"), picker === 'date'), _classnames2)),
+        className: classnames__WEBPACK_IMPORTED_MODULE_10___default()("".concat(prefixCls, "-header-text-inner"), "".concat(prefixCls, "-header-text-inner-hover"), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_7___default()({}, "".concat(prefixCls, "-header-text-inner-active"), isInnerMonth)),
         onClick: onHeaderMonthClick
       }, month + locale.month)),
       className: headerCls
@@ -11413,7 +11419,7 @@ function Panel(props) {
   };
   var onSuperPrev = function onSuperPrev() {
     var date;
-    if (picker === 'year' || innerPicker === 'year') {
+    if (picker === 'year' || isInnerYear) {
       var _props$yearItemNumber3 = props.yearItemNumber,
         yearItemNumber = _props$yearItemNumber3 === void 0 ? _utils_date_fns__WEBPACK_IMPORTED_MODULE_18__["DEFAULT_YEAR_ITEM_NUMBER"] : _props$yearItemNumber3;
       date = Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_18__["addYears"])(viewDate, 0 - yearItemNumber);
@@ -11424,7 +11430,7 @@ function Panel(props) {
   };
   var onSuperNext = function onSuperNext() {
     var date;
-    if (picker === 'year' || innerPicker === 'year') {
+    if (picker === 'year' || isInnerYear) {
       var _props$yearItemNumber4 = props.yearItemNumber,
         yearItemNumber = _props$yearItemNumber4 === void 0 ? _utils_date_fns__WEBPACK_IMPORTED_MODULE_18__["DEFAULT_YEAR_ITEM_NUMBER"] : _props$yearItemNumber4;
       var _viewDate = viewDate;
@@ -11468,8 +11474,8 @@ function Panel(props) {
         panel = renderMonthPanel();
         headerObj = renderMonthHeader();
         headerProps = {
-          onSuperPrev: isPositionRight ? undefined : onSuperPrev,
-          onSuperNext: isPositionLeft ? undefined : onSuperNext
+          onSuperPrev: !isPositionRight || innerPicker ? onSuperPrev : undefined,
+          onSuperNext: !isPositionLeft || innerPicker ? onSuperNext : undefined
         };
         break;
       }
@@ -11478,8 +11484,8 @@ function Panel(props) {
         panel = renderQuarterPanel();
         headerObj = renderMonthHeader();
         headerProps = {
-          onSuperPrev: isPositionRight ? undefined : onSuperPrev,
-          onSuperNext: isPositionLeft ? undefined : onSuperNext
+          onSuperPrev: !isPositionRight || innerPicker ? onSuperPrev : undefined,
+          onSuperNext: !isPositionLeft || innerPicker ? onSuperNext : undefined
         };
         break;
       }
@@ -11488,10 +11494,10 @@ function Panel(props) {
       {
         headerObj = renderDateHeader();
         headerProps = {
-          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
+          onPrev: isPositionLeft && !isInnerPicker || isInnerMonth || isPositionUnset ? onPrev : undefined,
+          onNext: isPositionRight && !isInnerPicker || isInnerMonth || isPositionUnset ? onNext : undefined,
+          onSuperPrev: isPositionLeft && !isInnerPicker || isInnerYear || isPositionUnset ? onSuperPrev : undefined,
+          onSuperNext: isPositionRight && !isInnerPicker || isInnerYear || isPositionUnset ? onSuperNext : undefined
         };
         panel = renderDatePanel();
         break;
@@ -11501,10 +11507,10 @@ function Panel(props) {
         panel = renderDatePanel();
         headerObj = renderDateHeader();
         headerProps = {
-          onPrev: isPositionRight ? undefined : onPrev,
-          onNext: isPositionLeft ? undefined : onNext,
-          onSuperPrev: isPositionRight ? undefined : onSuperPrev,
-          onSuperNext: isPositionLeft ? undefined : onSuperNext
+          onPrev: isPositionLeft && !isInnerPicker || isInnerMonth || isPositionUnset ? onPrev : undefined,
+          onNext: isPositionRight && !isInnerPicker || isInnerMonth || isPositionUnset ? onNext : undefined,
+          onSuperPrev: isPositionLeft && !isInnerPicker || isInnerYear || isPositionUnset ? onSuperPrev : undefined,
+          onSuperNext: isPositionRight && !isInnerPicker || isInnerYear || isPositionUnset ? onSuperNext : undefined
         };
         break;
       }
@@ -40436,7 +40442,7 @@ var InternalUpload = function InternalUpload(props, ref) {
       handleRemove: handleRemove,
       disabled: disabled,
       onPreview: onPreview
-    }), file, setFileList) : /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_22___default.a.createElement(Item, {
+    }), file, fileList) : /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_22___default.a.createElement(Item, {
       key: file.uid,
       file: file,
       prefixCls: prefixCls,