@kdcloudjs/kdesign 1.8.19 → 1.8.21

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

@@ -11,7 +11,7 @@ exports.default = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
 var _react = _interopRequireWildcard(require("react"));
-var _classnames4 = _interopRequireDefault(require("classnames"));
+var _classnames2 = _interopRequireDefault(require("classnames"));
 var _month = _interopRequireDefault(require("./panel/month/month"));
 var _year = _interopRequireDefault(require("./panel/year/year"));
 var _quarter = _interopRequireDefault(require("./panel/quarter/quarter"));
@@ -128,7 +128,7 @@ function Panel(props) {
     var _getYearsPeriod = (0, _dateFns.getYearsPeriod)(viewDate, yearItemNumber),
       startPeriod = _getYearsPeriod.startPeriod,
       endPeriod = _getYearsPeriod.endPeriod;
-    var headerCls = (0, _classnames4.default)("".concat(prefixCls, "-header"), "".concat(prefixCls, "-header-year"));
+    var headerCls = (0, _classnames2.default)("".concat(prefixCls, "-header"), "".concat(prefixCls, "-header-year"));
     return {
       children: _react.default.createElement(_react.default.Fragment, null, startPeriod, " - ", endPeriod),
       className: headerCls
@@ -142,27 +142,31 @@ function Panel(props) {
   };
   var renderMonthHeader = function renderMonthHeader() {
     var year = (0, _dateFns.getYear)(viewDate);
-    var headerCls = (0, _classnames4.default)("".concat(prefixCls, "-header"), "".concat(prefixCls, "-header-month"), "".concat(prefixCls, "-header-text-inner-hover"), (0, _defineProperty2.default)({}, "".concat(prefixCls, "-header-text-inner-active"), isInnerYear));
+    var headerCls = (0, _classnames2.default)("".concat(prefixCls, "-header"), "".concat(prefixCls, "-header-month"), "".concat(prefixCls, "-header-text-inner-hover"));
+    var yearOnly = renderYearHeader();
     return {
-      children: _react.default.createElement("span", {
+      children: isInnerYear ? yearOnly.children : _react.default.createElement("span", {
         onClick: onHeaderYearClick
       }, year + locale.year),
-      className: headerCls
+      className: isInnerYear ? yearOnly.className : headerCls
     };
   };
   var renderDateHeader = function renderDateHeader() {
     var year = (0, _dateFns.getYear)(viewDate);
     var month = (0, _dateFns.getMonth)(viewDate);
-    var headerCls = (0, _classnames4.default)("".concat(prefixCls, "-header"), "".concat(prefixCls, "-header-date"));
+    var headerCls = (0, _classnames2.default)("".concat(prefixCls, "-header"), "".concat(prefixCls, "-header-date"));
+    var yearOnly = renderYearHeader();
+    var yearText = isInnerYear ? yearOnly.children : _react.default.createElement("span", {
+      className: (0, _classnames2.default)("".concat(prefixCls, "-header-text-inner"), "".concat(prefixCls, "-header-text-inner-hover")),
+      onClick: onHeaderYearClick
+    }, year + locale.year);
+    var monthText = isInnerMonth || isInnerYear ? null : _react.default.createElement("span", {
+      className: (0, _classnames2.default)("".concat(prefixCls, "-header-text-inner"), "".concat(prefixCls, "-header-text-inner-hover"), (0, _defineProperty2.default)({}, "".concat(prefixCls, "-header-text-inner-active"), isInnerMonth)),
+      onClick: onHeaderMonthClick
+    }, locale.monthTitle[month]);
     return {
-      children: _react.default.createElement(_react.default.Fragment, null, _react.default.createElement("span", {
-        className: (0, _classnames4.default)("".concat(prefixCls, "-header-text-inner"), "".concat(prefixCls, "-header-text-inner-hover"), (0, _defineProperty2.default)({}, "".concat(prefixCls, "-header-text-inner-active"), isInnerYear)),
-        onClick: onHeaderYearClick
-      }, year + locale.year), _react.default.createElement("span", {
-        className: (0, _classnames4.default)("".concat(prefixCls, "-header-text-inner"), "".concat(prefixCls, "-header-text-inner-hover"), (0, _defineProperty2.default)({}, "".concat(prefixCls, "-header-text-inner-active"), isInnerMonth)),
-        onClick: onHeaderMonthClick
-      }, locale.monthTitle[month])),
-      className: headerCls
+      children: (locale === null || locale === void 0 ? void 0 : locale.monthBeforeYear) ? [monthText, yearText] : [yearText, monthText],
+      className: isInnerYear ? yearOnly.className : headerCls
     };
   };
   var onSuperPrev = function onSuperPrev() {
@@ -241,10 +245,10 @@ function Panel(props) {
       {
         headerObj = renderDateHeader();
         headerProps = {
-          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
+          onPrev: !isInnerPicker && (isPositionLeft || isPositionUnset) ? onPrev : undefined,
+          onNext: !isInnerPicker && (isPositionRight || isPositionUnset) ? onNext : undefined,
+          onSuperPrev: isPositionLeft && !isInnerPicker || isInnerYear || isInnerMonth || isPositionUnset ? onSuperPrev : undefined,
+          onSuperNext: isPositionRight && !isInnerPicker || isInnerYear || isInnerMonth || isPositionUnset ? onSuperNext : undefined
         };
         panel = renderDatePanel();
         break;
@@ -254,10 +258,10 @@ function Panel(props) {
         panel = renderDatePanel();
         headerObj = renderDateHeader();
         headerProps = {
-          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
+          onPrev: !isInnerPicker && (isPositionLeft || isPositionUnset) ? onPrev : undefined,
+          onNext: !isInnerPicker && (isPositionRight || isPositionUnset) ? onNext : undefined,
+          onSuperPrev: isPositionLeft && !isInnerPicker || isInnerYear || isInnerMonth || isPositionUnset ? onSuperPrev : undefined,
+          onSuperNext: isPositionRight && !isInnerPicker || isInnerYear || isInnerMonth || isPositionUnset ? onSuperNext : undefined
         };
         break;
       }
@@ -272,7 +276,7 @@ function Panel(props) {
       }
   }
   var showHeader = !(picker === 'date' && showTime || picker === 'time') || innerPicker !== undefined;
-  var containerCls = (0, _classnames4.default)("".concat(prefixCls, "-warpper"));
+  var containerCls = (0, _classnames2.default)("".concat(prefixCls, "-warpper"));
   return _react.default.createElement("div", {
     className: containerCls
   }, showHeader ? getHeader() : null, panel);

package/lib/date-picker/interface.d.ts

@@ -23,6 +23,7 @@ export interface Locale {
     'DatePicker.rangeWeekPlaceholder': [string, string];
     'DatePicker.rangeQuarterPlaceholder': [string, string];
     'DatePicker.rangeTimePlaceholder': [string, string];
+    'DatePicker.monthBeforeYear': boolean;
 }
 export interface InnerLocale {
     locale: string;
@@ -45,6 +46,7 @@ export interface InnerLocale {
     rangeWeekPlaceholder: [string, string];
     rangeQuarterPlaceholder: [string, string];
     rangeTimePlaceholder: [string, string];
+    monthBeforeYear: boolean;
 }
 export declare type InnerLocaleKey = keyof InnerLocale;
 export declare type PanelMode = 'time' | 'date' | 'week' | 'month' | 'quarter' | 'year' | 'decade';

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

@@ -23,7 +23,8 @@ var locale = {
   'DatePicker.rangeMonthPlaceholder': ['开始月份', '结束月份'],
   'DatePicker.rangeWeekPlaceholder': ['开始周', '结束周'],
   'DatePicker.rangeQuarterPlaceholder': ['开始季度', '结束季度'],
-  'DatePicker.rangeTimePlaceholder': ['开始时间', '结束时间']
+  'DatePicker.rangeTimePlaceholder': ['开始时间', '结束时间'],
+  'DatePicker.monthBeforeYear': false
 };
 var _default = locale;
 exports.default = _default;

package/lib/locale/en-US.d.ts

@@ -19,6 +19,7 @@ declare const locale: {
     'DatePicker.rangeWeekPlaceholder': string[];
     'DatePicker.rangeQuarterPlaceholder': string[];
     'DatePicker.rangeTimePlaceholder': string[];
+    'DatePicker.monthBeforeYear': boolean;
     'global.selectholder': string;
     'global.placeholder': string;
     'global.cancel': string;

package/lib/locale/en-US.js

@@ -25,6 +25,7 @@ var locale = {
   'DatePicker.rangeWeekPlaceholder': ['Start week', 'End week'],
   'DatePicker.rangeQuarterPlaceholder': ['Start quarter', 'End quarter'],
   'DatePicker.rangeTimePlaceholder': ['Start time', 'End time'],
+  'DatePicker.monthBeforeYear': true,
   'global.selectholder': 'Please select',
   'global.placeholder': 'Please enter search content',
   'global.cancel': 'Cancel',

package/lib/locale/locale.d.ts

@@ -146,6 +146,7 @@ declare class LocaleCache {
         'DatePicker.rangeWeekPlaceholder': [string, string];
         'DatePicker.rangeQuarterPlaceholder': [string, string];
         'DatePicker.rangeTimePlaceholder': [string, string];
+        'DatePicker.monthBeforeYear': boolean;
         locale: string;
     } | undefined;
     /**

package/lib/locale/zh-CN.d.ts

@@ -118,6 +118,7 @@ declare const locale: {
     'DatePicker.rangeWeekPlaceholder': [string, string];
     'DatePicker.rangeQuarterPlaceholder': [string, string];
     'DatePicker.rangeTimePlaceholder': [string, string];
+    'DatePicker.monthBeforeYear': boolean;
     locale: string;
 };
 export default locale;

package/lib/popper/index.js

@@ -202,6 +202,7 @@ var Popper = (0, _react.forwardRef)(function (props, ref) {
   var popperRef = ref || popperRefInner;
   var popperInstance = (0, _react.useRef)(null);
   var referenceRefInner = (0, _react.useRef)(null);
+  var onVisibleChangeRef = (0, _react.useRef)(onVisibleChange);
   var referenceRef = (referenceElement === null || referenceElement === void 0 ? void 0 : referenceElement.ref) || referenceRefInner;
   var container = getPopupContainer(getRealDom(referenceRef, referenceElement) || document.body) || document.body;
   var _useMergedState = (0, _hooks.useMergedState)(false, {
@@ -228,6 +229,7 @@ var Popper = (0, _react.forwardRef)(function (props, ref) {
   };
   var changeVisible = function changeVisible(nextOpen) {
     var triggerType = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'unknown';
+    var _a;
     if (visibleInner !== nextOpen) {
       if (nextOpen && (0, _includes.default)(triggerTypeArray).call(triggerTypeArray, triggerType)) {
         onTrigger === null || onTrigger === void 0 ? void 0 : onTrigger(triggerType);
@@ -235,7 +237,7 @@ var Popper = (0, _react.forwardRef)(function (props, ref) {
       if (typeof visible === 'undefined') {
         setVisibleInner(nextOpen);
       }
-      onVisibleChange === null || onVisibleChange === void 0 ? void 0 : onVisibleChange(nextOpen, triggerType);
+      (_a = onVisibleChangeRef.current) === null || _a === void 0 ? void 0 : _a.call(onVisibleChangeRef, nextOpen, triggerType);
     }
     if (!nextOpen && (0, _keys.default)(subPopupRefs.current || {}).length) {
       (0, _values.default)(subPopupRefs.current).forEach(function (d) {
@@ -341,6 +343,9 @@ var Popper = (0, _react.forwardRef)(function (props, ref) {
       triggerNode === null || triggerNode === void 0 ? void 0 : triggerNode[type]('mouseleave', onMouseLeave);
     }
   };
+  (0, _react.useEffect)(function () {
+    onVisibleChangeRef.current = onVisibleChange;
+  }, [onVisibleChange]);
   (0, _react.useEffect)(function () {
     setPlacementInner(getRealPlacement(placement));
   }, [placement]);

package/lib/select/option.js

@@ -54,11 +54,13 @@ var InternalOption = function InternalOption(props, ref) {
   var contentCls = (0, _classnames.default)((0, _defineProperty2.default)({}, "".concat(selectOptionPrefixCls, "-option-content"), true));
   var handleClick = function handleClick(e) {
     e.preventDefault();
+    var newVal = isSelected;
     if (optionProps.disabled || value === undefined) return;
     if (isMultiple) {
-      setSelected(!isSelected);
+      newVal = !isSelected;
+      setSelected(newVal);
     }
-    onChangeSelect && onChangeSelect(value, children, isSelected);
+    onChangeSelect && onChangeSelect(value, children, newVal);
   };
   var handleOnMouseEnter = function handleOnMouseEnter() {
     onChangeActiveIndex && onChangeActiveIndex(index);

package/lib/select/select.js

@@ -843,7 +843,13 @@ var InternalSelect = function InternalSelect(props, ref) {
         if (!item) return;
         var key = ((_a = item.props) === null || _a === void 0 ? void 0 : _a.value) || item.value;
         var label = ((_b = item.props) === null || _b === void 0 ? void 0 : _b.children) || item.label;
-        handleOption(key, label, true);
+        var flag = true;
+        if (isMultiple) {
+          flag = !(mulOptions === null || mulOptions === void 0 ? void 0 : mulOptions.some(function (item) {
+            return item.value === key;
+          }));
+        }
+        handleOption(key, label, flag);
         if (searchValue) {
           setActiveIndex((0, _findIndex.default)(realChildren).call(realChildren, function (child) {
             var _a;

package/lib/tree/tree.js

@@ -75,14 +75,8 @@ var InternalTree = _react.default.forwardRef(function (props, ref) {
     onDrop = TreeProps.onDrop,
     onSelect = TreeProps.onSelect,
     selectedKeysProps = TreeProps.selectedKeys,
-    _TreeProps$setTreeNod = TreeProps.setTreeNodeStyle,
-    setTreeNodeStyle = _TreeProps$setTreeNod === void 0 ? function () {
-      return {};
-    } : _TreeProps$setTreeNod,
-    _TreeProps$setTreeNod2 = TreeProps.setTreeNodeClassName,
-    setTreeNodeClassName = _TreeProps$setTreeNod2 === void 0 ? function () {
-      return '';
-    } : _TreeProps$setTreeNod2,
+    setTreeNodeStyle = TreeProps.setTreeNodeStyle,
+    setTreeNodeClassName = TreeProps.setTreeNodeClassName,
     innerEstimatedItemSize = TreeProps.estimatedItemSize,
     style = TreeProps.style,
     className = TreeProps.className,
@@ -433,8 +427,8 @@ var InternalTree = _react.default.forwardRef(function (props, ref) {
     item.switcherIcon = item.switcherIcon || switcherIcon;
     item.estimatedItemSize = estimatedItemSize;
     item.draggable = draggable;
-    item.className = setTreeNodeClassName((0, _extends2.default)({}, item));
-    item.style = setTreeNodeStyle((0, _extends2.default)({}, item));
+    item.className = (setTreeNodeClassName === null || setTreeNodeClassName === void 0 ? void 0 : setTreeNodeClassName((0, _extends2.default)({}, item))) || (item === null || item === void 0 ? void 0 : item.className);
+    item.style = (setTreeNodeStyle === null || setTreeNodeStyle === void 0 ? void 0 : setTreeNodeStyle((0, _extends2.default)({}, item))) || (item === null || item === void 0 ? void 0 : item.style);
     item.getDragNode = getDragNode;
     item.setDragNode = setDragNode;
     item.dragOver = dragOverNodeKey === item.key && dropPosition === 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kdcloudjs/kdesign",
-  "version": "1.8.19",
+  "version": "1.8.21",
   "description": "KDesign 金蝶前端react 组件库",
   "title": "kdesign",
   "keywords": [
@@ -260,7 +260,8 @@
   },
   "resolutions": {
     "@types/babel__traverse": "7.17.1",
-    "@types/node": "17.0.41"
+    "@types/node": "17.0.41",
+    "cheerio": "1.0.0-rc.12"
   },
   "license": "Apache-2.0"
 }