@kdcloudjs/kdesign 1.8.10 → 1.8.12

package/lib/popper/index.js

@@ -8,18 +8,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.popperPlacementMap = exports.default = exports.Triggers = exports.Popper = exports.Placements = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
+var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/slicedToArray"));
 var _filter = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/filter"));
-var _flat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/flat"));
 var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
-var _keys = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/keys"));
 var _includes = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/includes"));
+var _keys = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/keys"));
 var _values = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/values"));
 var _startsWith = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/starts-with"));
 var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
-var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/slicedToArray"));
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/toConsumableArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _core = require("@popperjs/core");
 var _type = require("../_utils/type");
@@ -73,29 +71,16 @@ var popperPlacementMap = {
   rightBottom: 'right-end'
 };
 exports.popperPlacementMap = popperPlacementMap;
-var placementFlip = {
-  bottom: 'top',
-  top: 'bottom',
-  right: 'left',
-  left: 'right'
-};
 var getRealPlacement = function getRealPlacement(key) {
   return popperPlacementMap[key] ? popperPlacementMap[key] : 'top';
 };
-var getFallbackPlacements = function getFallbackPlacements(key) {
-  var _context, _context2, _context3, _context4;
-  var prefix = key.split('-')[0];
-  var suffix = ['']; // , '-start', '-end']
-  return (0, _toConsumableArray2.default)((0, _filter.default)(_context = (0, _flat.default)(_context2 = (0, _map.default)(_context3 = (0, _toConsumableArray2.default)((0, _filter.default)(_context4 = (0, _keys.default)(placementFlip)).call(_context4, function (r) {
-    var _context5;
-    return (0, _includes.default)(_context5 = [prefix, placementFlip[prefix]]).call(_context5, r);
-  }))).call(_context3, function (d) {
-    return (0, _map.default)(suffix).call(suffix, function (o) {
-      return d + o;
-    });
-  })).call(_context2)).call(_context, function (f) {
-    return f !== key;
-  }));
+var getFallbackPlacementList = function getFallbackPlacementList(arr) {
+  var _context;
+  return (0, _filter.default)(_context = (0, _map.default)(arr).call(arr, function (d) {
+    return popperPlacementMap[d] ? popperPlacementMap[d] : '';
+  })).call(_context, function (d) {
+    return d;
+  });
 };
 var getRealDom = function getRealDom(locatorRef) {
   var locatorElement = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : undefined;
@@ -118,7 +103,7 @@ var getElement = function getElement(element) {
   return typeof element === 'function' ? element() : element;
 };
 var Popper = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
-  var _context8, _context9, _context10;
+  var _context4, _context5, _context6;
   var _a;
   var _React$useContext = _react.default.useContext(_configProvider.ConfigContext),
     getPrefixCls = _React$useContext.getPrefixCls,
@@ -144,8 +129,10 @@ var Popper = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     visible = props.visible,
     _props$arrowSize = props.arrowSize,
     arrowSize = _props$arrowSize === void 0 ? 4.25 : _props$arrowSize,
+    _props$arrowOffset = props.arrowOffset,
+    arrowOffset = _props$arrowOffset === void 0 ? 12 : _props$arrowOffset,
     _props$gap = props.gap,
-    defaultGap = _props$gap === void 0 ? 4 : _props$gap,
+    defaultGap = _props$gap === void 0 ? 8 : _props$gap,
     _props$scrollHidden = props.scrollHidden,
     scrollHidden = _props$scrollHidden === void 0 ? false : _props$scrollHidden,
     _props$mouseEnterDela = props.mouseEnterDelay,
@@ -156,6 +143,7 @@ var Popper = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     defaultVisible = _props$defaultVisible === void 0 ? false : _props$defaultVisible,
     _props$autoPlacement = props.autoPlacement,
     autoPlacement = _props$autoPlacement === void 0 ? true : _props$autoPlacement,
+    autoPlacementList = props.autoPlacementList,
     _props$clickToClose = props.clickToClose,
     clickToClose = _props$clickToClose === void 0 ? true : _props$clickToClose,
     _props$getTriggerElem = props.getTriggerElement,
@@ -168,13 +156,34 @@ var Popper = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     } : _props$getPopupContai,
     onTransitionEnd = props.onTransitionEnd,
     onAnimationEnd = props.onAnimationEnd,
-    children = props.children;
+    children = props.children,
+    customerModifiers = props.customerModifiers;
   var popperPrefixCls = getPrefixCls(pkgPrefixCls, 'popper');
   var referencePrefixCls = "".concat(popperPrefixCls, "-reference");
   var child = getElement(children);
   var childrenInner = /*#__PURE__*/(0, _react.isValidElement)(child) && !(0, _reactNode.isFragment)(child) ? child : /*#__PURE__*/_react.default.createElement("span", null, child);
   var popperElement = getElement(tip);
   var referenceElement = _react.Children.only(childrenInner);
+  var arrowOffsetInner = arrowSize + arrowOffset;
+  var getArrowOffset = function getArrowOffset(popperSize, referenceSize, arr) {
+    var boundary = arrowOffsetInner * 2;
+    var offset;
+    if (referenceSize < boundary || popperSize < boundary) {
+      var o = Math.min(referenceSize, popperSize) / 2;
+      if (arr[1] === 'start') {
+        offset = o;
+      } else {
+        offset = Math.max(popperSize - o, 0);
+      }
+    } else {
+      if (arr[1] === 'start') {
+        offset = arrowOffsetInner;
+      } else {
+        offset = popperSize - arrowOffsetInner;
+      }
+    }
+    return offset;
+  };
   var id = (0, _useId.default)();
   var parentContext = (0, _react.useContext)(TriggerContext);
   var subPopupRefs = (0, _react.useRef)({});
@@ -216,7 +225,7 @@ var Popper = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     }
   };
   var changeVisible = function changeVisible(nextOpen) {
-    var triggerType = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+    var triggerType = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'unknown';
     if (visibleInner !== nextOpen) {
       if (nextOpen && (0, _includes.default)(triggerTypeArray).call(triggerTypeArray, triggerType)) {
         onTrigger === null || onTrigger === void 0 ? void 0 : onTrigger(triggerType);
@@ -224,18 +233,18 @@ var Popper = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       if (typeof visible === 'undefined') {
         setVisibleInner(nextOpen);
       }
-      onVisibleChange === null || onVisibleChange === void 0 ? void 0 : onVisibleChange(nextOpen);
+      onVisibleChange === null || onVisibleChange === void 0 ? void 0 : onVisibleChange(nextOpen, triggerType);
     }
     if (!nextOpen && (0, _keys.default)(subPopupRefs.current || {}).length) {
       (0, _values.default)(subPopupRefs.current).forEach(function (d) {
         if (typeof (d === null || d === void 0 ? void 0 : d.triggerOpen) === 'function' && (d === null || d === void 0 ? void 0 : d.visible)) {
-          d === null || d === void 0 ? void 0 : d.triggerOpen(false);
+          d === null || d === void 0 ? void 0 : d.triggerOpen(false, 'parentHidden');
         }
       });
     }
   };
   var triggerOpen = function triggerOpen(nextOpen) {
-    var triggerType = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+    var triggerType = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'unknown';
     var delay = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
     clearDelay();
     if (!disabled) {
@@ -277,52 +286,40 @@ var Popper = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     var delay = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : undefined;
     triggerOpen(nextOpen, triggerType, delay);
   };
-  var onClick = function onClick(e) {
-    var _a, _b;
+  var onClick = function onClick() {
     onTriggerInner(!visibleInner, 'click');
-    (_b = (_a = referenceElement === null || referenceElement === void 0 ? void 0 : referenceElement.props) === null || _a === void 0 ? void 0 : _a.onClick) === null || _b === void 0 ? void 0 : _b.call(_a, e);
   };
-  var onFocus = function onFocus(e) {
-    var _a, _b;
+  var onFocus = function onFocus() {
     onTriggerInner(true, 'focus');
-    (_b = (_a = referenceElement === null || referenceElement === void 0 ? void 0 : referenceElement.props) === null || _a === void 0 ? void 0 : _a.onFocus) === null || _b === void 0 ? void 0 : _b.call(_a, e);
   };
-  var onBlur = function onBlur(e) {
-    var _a, _b;
+  var onBlur = function onBlur() {
     onTriggerInner(false, 'focus');
-    (_b = (_a = referenceElement === null || referenceElement === void 0 ? void 0 : referenceElement.props) === null || _a === void 0 ? void 0 : _a.onBlur) === null || _b === void 0 ? void 0 : _b.call(_a, e);
   };
   var onContextMenu = function onContextMenu(e) {
-    var _a, _b;
     e.preventDefault();
     var clientWidth = 0;
     var clientHeight = 0;
     if (arrow) {
       if ((0, _startsWith.default)(placementInner).call(placementInner, 'top') || (0, _startsWith.default)(placementInner).call(placementInner, 'bottom')) {
-        var _context6;
-        if (!(0, _includes.default)(_context6 = ['top', 'bottom']).call(_context6, placementInner)) {
+        var _context2;
+        if (!(0, _includes.default)(_context2 = ['top', 'bottom']).call(_context2, placementInner)) {
           clientWidth = 6 * arrowSize;
         }
       } else {
-        var _context7;
-        if (!(0, _includes.default)(_context7 = ['right', 'left']).call(_context7, placementInner)) {
+        var _context3;
+        if (!(0, _includes.default)(_context3 = ['right', 'left']).call(_context3, placementInner)) {
           clientHeight = 6 * arrowSize;
         }
       }
     }
     virtualElement.getBoundingClientRect = generateGetBoundingClientRect(e.clientX, e.clientY, clientWidth, clientHeight);
     onTriggerInner(!visibleInner, 'contextMenu');
-    (_b = (_a = referenceElement === null || referenceElement === void 0 ? void 0 : referenceElement.props) === null || _a === void 0 ? void 0 : _a.onContextMenu) === null || _b === void 0 ? void 0 : _b.call(_a, e);
   };
-  var onMouseOver = function onMouseOver(e) {
-    var _a, _b;
+  var onMouseOver = function onMouseOver() {
     onTriggerInner(true, 'hover', mouseEnterDelay);
-    (_b = (_a = referenceElement === null || referenceElement === void 0 ? void 0 : referenceElement.props) === null || _a === void 0 ? void 0 : _a.onMouseOver) === null || _b === void 0 ? void 0 : _b.call(_a, e);
   };
-  var onMouseLeave = function onMouseLeave(e) {
-    var _a, _b;
+  var onMouseLeave = function onMouseLeave() {
     onTriggerInner(false, 'hover', mouseLeaveDelay);
-    (_b = (_a = referenceElement === null || referenceElement === void 0 ? void 0 : referenceElement.props) === null || _a === void 0 ? void 0 : _a.onMouseLeave) === null || _b === void 0 ? void 0 : _b.call(_a, e);
   };
   var onPopperAnimationEnd = function onPopperAnimationEnd(e) {
     onAnimationEnd === null || onAnimationEnd === void 0 ? void 0 : onAnimationEnd(e);
@@ -380,7 +377,9 @@ var Popper = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
           triggerOpen(false, 'clickOutside', 0);
         }
       }
-    }, 10);
+    }, 10, {
+      leading: true
+    });
     if (visibleInner) {
       document.addEventListener('click', clickHandle, true);
     }
@@ -403,14 +402,14 @@ var Popper = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       visible: visibleInner
     };
   });
-  var popperModifiers = [{
+  var defaultModifiers = [{
     name: 'offset',
     options: {
       offset: [0, defaultGap + (arrow ? 5 : 0)]
     }
   }, {
     name: 'preventOverflow',
-    enabled: autoPlacement,
+    enabled: autoPlacement && !(0, _includes.default)(placementInner).call(placementInner, '-'),
     options: {
       mainAxis: true
     }
@@ -418,7 +417,51 @@ var Popper = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     name: 'flip',
     enabled: autoPlacement,
     options: {
-      fallbackPlacements: autoPlacement ? getFallbackPlacements(placementInner) : undefined
+      fallbackPlacements: Array.isArray(autoPlacementList) ? getFallbackPlacementList(autoPlacementList) : undefined
+    }
+  }, {
+    name: 'applyArrowOffset',
+    enabled: true,
+    phase: 'write',
+    fn: function fn(data) {
+      var _data$state = data.state,
+        arrow = _data$state.elements.arrow,
+        placement = _data$state.placement,
+        _data$state$rects = _data$state.rects,
+        popper = _data$state$rects.popper,
+        reference = _data$state$rects.reference;
+      if (arrow) {
+        var arr = placement.split('-');
+        var offset;
+        if (arr.length === 2) {
+          switch (arr[0]) {
+            case 'bottom':
+              offset = getArrowOffset(popper.width, reference.width, arr);
+              if (offset) {
+                arrow.style.transform = "translate(".concat(offset, "px, 0px)");
+              }
+              break;
+            case 'left':
+              offset = getArrowOffset(popper.height, reference.height, arr);
+              if (offset) {
+                arrow.style.transform = "translate(0px, ".concat(offset, "px)");
+              }
+              break;
+            case 'right':
+              offset = getArrowOffset(popper.height, reference.height, arr);
+              if (offset) {
+                arrow.style.transform = "translate(0px, ".concat(offset, "px)");
+              }
+              break;
+            default:
+              offset = getArrowOffset(popper.width, reference.width, arr);
+              if (offset) {
+                arrow.style.transform = "translate(".concat(offset, "px, 0px)");
+              }
+              break;
+          }
+        }
+      }
     }
   }, {
     name: 'onUpdate',
@@ -432,6 +475,7 @@ var Popper = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       }
     }
   }];
+  var popperModifiers = typeof customerModifiers === 'function' ? customerModifiers(defaultModifiers) : defaultModifiers;
   var popperOptionsInner = {
     placement: placementInner,
     modifiers: popperModifiers,
@@ -483,7 +527,7 @@ var Popper = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     })
   };
   var popperProps = {
-    className: (0, _classnames3.default)([(0, _concat.default)(_context8 = "".concat(popperPrefixCls, "-")).call(_context8, placementInner)], (0, _defineProperty2.default)({}, (0, _concat.default)(_context9 = "".concat(popperPrefixCls, "-")).call(_context9, placementInner, "-out"), !visibleInner), (0, _defineProperty2.default)({}, (0, _concat.default)(_context10 = "".concat(popperPrefixCls, "-")).call(_context10, placementInner, "-in"), visibleInner), prefixCls, popperClassName, className),
+    className: (0, _classnames3.default)([(0, _concat.default)(_context4 = "".concat(popperPrefixCls, "-")).call(_context4, placementInner)], (0, _defineProperty2.default)({}, (0, _concat.default)(_context5 = "".concat(popperPrefixCls, "-")).call(_context5, placementInner, "-out"), !visibleInner), (0, _defineProperty2.default)({}, (0, _concat.default)(_context6 = "".concat(popperPrefixCls, "-")).call(_context6, placementInner, "-in"), visibleInner), prefixCls, popperClassName, className),
     style: (0, _extends2.default)((0, _extends2.default)({}, popperStyle), style),
     onMouseOver: trigger === 'hover' ? function () {
       return onTriggerInner(true, 'hover', mouseEnterDelay);

package/lib/tree/utils/treeUtils.js

@@ -627,7 +627,7 @@ var getInitExpandedKeys = function getInitExpandedKeys(data, expandedKeys, defau
   var isInit = arguments.length > 10 ? arguments[10] : undefined;
   var searchStatus = arguments.length > 11 ? arguments[11] : undefined;
   var expandOnFilterNode = arguments.length > 12 ? arguments[12] : undefined;
-  var keys = (expandedKeys === null || expandedKeys === void 0 ? void 0 : (0, _concat.default)(expandedKeys).call(expandedKeys, expandScrollkeys)) || (defaultExpandedKeys === null || defaultExpandedKeys === void 0 ? void 0 : (0, _concat.default)(defaultExpandedKeys).call(defaultExpandedKeys, expandScrollkeys)) || [];
+  var keys = (expandedKeys === null || expandedKeys === void 0 ? void 0 : (0, _concat.default)(expandedKeys).call(expandedKeys, expandScrollkeys)) || (defaultExpandedKeys === null || defaultExpandedKeys === void 0 ? void 0 : (0, _concat.default)(defaultExpandedKeys).call(defaultExpandedKeys, expandScrollkeys)) || expandScrollkeys;
   if (isInit) {
     if (defaultExpandAll) {
       keys = getAllNodeKeys(data);

package/lib/tree-select/tree-select.js

@@ -343,7 +343,8 @@ var InternalTreeSelect = function InternalTreeSelect(props, ref) {
       filterTreeNode: defFilterTreeNode,
       onSelect: handleSelect,
       onExpand: handleExpand,
-      height: listHeight
+      height: listHeight,
+      scrollToKey: Array.isArray(initValue) ? initValue[0] : initValue
     };
     if (isMultiple) {
       treeProps.checkable = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kdcloudjs/kdesign",
-  "version": "1.8.10",
+  "version": "1.8.12",
   "description": "KDesign 金蝶前端react 组件库",
   "title": "kdesign",
   "keywords": [
@@ -59,10 +59,9 @@
     "test:coverage": "npm run test -- --coverage",
     "test:update": "jest --cache=false -u",
     "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0 && node scripts/filter-changelog.js",
-    "pub": "npm run test:all && cross-env PUB_ENV=pub np --no-publish --no-tests --no-cleanup && npm run build && cross-env PUB_ENV=pub np --no-cleanup --yolo",
+    "pub": "npm run test:all && cross-env PUB_ENV=pub np --no-publish --no-tests --no-cleanup && npm run build && npm publish",
     "pub:beta": "npm run test:all && npm run build && cross-env PUB_ENV=pub np --no-cleanup --anyBranch --no-tests --tag=beta",
     "pub:usePopper": "npm run test:all && npm run build && cross-env PUB_ENV=pub np --no-cleanup --anyBranch --no-tests --tag=usePopper",
-    "prepublishOnly": "node scripts/guard.js",
     "new": "node scripts/create-component.js",
     "token": "node scripts/generate-token.js",
     "preinstall": "npx force-resolutions"
@@ -83,7 +82,6 @@
     "@popperjs/core": "^2.11.8",
     "@types/js-cookie": "^3.0.3",
     "async-validator": "^3.5.1",
-    "axios": "^0.21.1",
     "big.js": "^6.0.2",
     "classnames": "^2.2.6",
     "color": "^4.2.3",
@@ -148,6 +146,7 @@
     "core-js": "^3.19.1",
     "cross-env": "^7.0.2",
     "css-loader": "^4.2.1",
+    "cssnano": "4.x",
     "cz-customizable": "^6.3.0",
     "dekko": "^0.2.1",
     "enzyme": "^3.11.0",
@@ -214,6 +213,7 @@
     "stylelint-config-prettier": "^8.0.2",
     "stylelint-config-standard": "^20.0.0",
     "stylelint-declaration-block-no-ignored-properties": "^2.3.0",
+    "terser-webpack-plugin": "4.x",
     "through2": "^4.0.2",
     "ts-jest": "^26.4.0",
     "typescript": "~3.9.2",