@kdcloudjs/kdesign 1.7.23 → 1.7.24

package/lib/input-number/inputNumber.js

@@ -61,7 +61,8 @@ var InternalInputNumber = function InternalInputNumber(props, ref) {
     suffix = inputNumberProps.suffix,
     formatter = inputNumberProps.formatter,
     className = inputNumberProps.className,
-    others = __rest(inputNumberProps, ["value", "defaultValue", "mustInScope", "decimalLength", "mustInPrecisionScope", "digitLength", "onChange", "symbol", "zeroShow", "showDecimalTailZero", "code", "roundMethod", "mask", "stepOption", "min", "minMark", "max", "maxMark", "numberMode", "prefix", "suffix", "formatter", "className"]);
+    onKeyDown = inputNumberProps.onKeyDown,
+    others = __rest(inputNumberProps, ["value", "defaultValue", "mustInScope", "decimalLength", "mustInPrecisionScope", "digitLength", "onChange", "symbol", "zeroShow", "showDecimalTailZero", "code", "roundMethod", "mask", "stepOption", "min", "minMark", "max", "maxMark", "numberMode", "prefix", "suffix", "formatter", "className", "onKeyDown"]);
   var initVal = value === undefined ? defaultValue : value;
   var _useState = (0, _react.useState)((0, _numberUtil.serialization)(initVal !== undefined ? initVal + '' : '')),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -185,12 +186,13 @@ var InternalInputNumber = function InternalInputNumber(props, ref) {
     return resultNumerical;
   };
   var handleStepChang = function handleStepChang(type) {
+    var _a, _b;
     var step = stepOption.step === undefined ? 1 : parseFloat(stepOption.step);
     if (typeof step !== 'number') {
       (0, _devwarning.default)(true, 'inputNumber', "stepOption.step\u5FC5\u987B\u4E3A\u4E00\u4E2A\u6570\u503C");
       return false;
     }
-    var startingNumber = parseFloat(inputNumberRef.current.value) || 0;
+    var startingNumber = parseFloat((_b = (_a = inputNumberRef.current) === null || _a === void 0 ? void 0 : _a.input) === null || _b === void 0 ? void 0 : _b.value) || 0;
     var calculationResults = new _big.default(startingNumber)[type](step).valueOf();
     var legalNumber = verifiValue(calculationResults);
     if (legalNumber === false) {
@@ -205,6 +207,7 @@ var InternalInputNumber = function InternalInputNumber(props, ref) {
   };
   var handleKeyDown = function handleKeyDown(event) {
     var _context11;
+    onKeyDown === null || onKeyDown === void 0 ? void 0 : onKeyDown(event);
     if (!stepOption || props.disabled || props.readOnly) {
       return;
     }

package/lib/radio/style/index.css

@@ -127,6 +127,7 @@
   font-size: var(--kd-c-radio-font-size, var(--kd-g-font-size-small, 12px));
   max-width: var(--kd-c-radio-default-label-max-width);
   overflow: hidden;
+  min-height: var(--kd-c-radio-square-sizing-width-height, 14px);
 }
 .kd-radio::before {
   position: absolute;

package/lib/radio/style/index.less

@@ -24,6 +24,7 @@
   font-size: @radio-font-size;
   max-width: @radio-default-label-max-width;
   overflow: hidden;
+  min-height: @radio-circle-size;
 
   &::before {
     position: absolute;

package/lib/search/search.js

@@ -71,7 +71,8 @@ var InternalSearch = function InternalSearch(props, ref) {
     onSearch && (onSearch === null || onSearch === void 0 ? void 0 : onSearch(event));
   }, [onSearch]);
   var handlePressEnter = (0, _react.useCallback)(function (_, event) {
-    onPressEnter && (onPressEnter === null || onPressEnter === void 0 ? void 0 : onPressEnter(searchRef.current.value, event));
+    var _a, _b;
+    onPressEnter && (onPressEnter === null || onPressEnter === void 0 ? void 0 : onPressEnter((_b = (_a = searchRef.current) === null || _a === void 0 ? void 0 : _a.input) === null || _b === void 0 ? void 0 : _b.value, event));
   }, [onPressEnter, searchRef]);
   var handleFocus = (0, _react.useCallback)(function (event) {
     setFocused(true);

package/lib/select/select.js

@@ -34,7 +34,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof _WeakMap !== "functi
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && _Object$getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? _Object$getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 var INPUT_MIN_WIDTH = 4; // 输入框最小宽度
 var InternalSelect = function InternalSelect(props, ref) {
-  var _context, _classNames6, _classNames12;
+  var _context, _classNames6, _classNames12, _context5;
   var _useContext = (0, _react.useContext)(_ConfigContext.default),
     getPrefixCls = _useContext.getPrefixCls,
     prefixCls = _useContext.prefixCls,
@@ -806,6 +806,7 @@ var InternalSelect = function InternalSelect(props, ref) {
         offset = 1;
       } else if (which === _KeyCode.default.ENTER) {
         var item = filledOptions[activeIndex];
+        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);
@@ -881,7 +882,7 @@ var InternalSelect = function InternalSelect(props, ref) {
     }
   };
   var popperProps = (0, _extends2.default)((0, _extends2.default)({}, selectProps), {
-    prefixCls: selectPrefixCls,
+    prefixCls: (0, _concat.default)(_context5 = "".concat(selectPrefixCls, "-dropdown-panel")).call(_context5, isMultiple ? " ".concat(selectPrefixCls, "-multiple-dropdown-panel") : ''),
     placement: 'bottomLeft',
     popperStyle: catchStyle(),
     defaultVisible: optionShow,

package/lib/select/style/index.css

@@ -359,7 +359,7 @@
   z-index: var(--kd-c-select-z-index, var(--kd-g-z-index-popper, 1050));
   -webkit-box-sizing: border-box;
           box-sizing: border-box;
-  padding: 8px 0;
+  padding: var(--kd-c-select-dropdown-spacing-padding-vertical, 8px) 0;
   margin: 0;
   overflow: auto;
   font-size: var(--kd-c-select-dropdown-font-size, 12px);
@@ -382,6 +382,9 @@
 .kd-select-dropdown-search-hidden {
   display: none;
 }
+.kd-select-multiple-dropdown-panel .kd-select-dropdown {
+  padding-bottom: 0;
+}
 .kd-select-item {
   position: relative;
   display: block;
@@ -648,8 +651,8 @@
           align-items: center;
   width: 100%;
   padding: 0 12px;
-  height: 32px;
-  line-height: 32px;
+  height: 40px;
+  line-height: 40px;
   border-top: 1px solid #d9d9d9;
   -webkit-box-sizing: border-box;
           box-sizing: border-box;

package/lib/select/style/index.less

@@ -132,10 +132,10 @@
     left: 0;
     z-index: @select-z-index;
     box-sizing: border-box;
-    padding: 8px 0; // update
+    padding: @select-dropdown-padding-vertical 0;
     margin: 0;
     overflow: auto;
-    font-size: @select-list-font-size; // update
+    font-size: @select-list-font-size;
     font-variant: initial;
     background-color: @select-dropdown-bg;
     border-radius: @select-g-radius-border;
@@ -159,6 +159,12 @@
     }
   }
 
+  &-multiple-dropdown-panel {
+    .@{select-prefix-cls}-dropdown {
+      padding-bottom: 0;
+    }
+  }
+
   // 下拉列表选项
   &-item {
     .item();
@@ -404,8 +410,8 @@
       align-items: center;
       width: 100%;
       padding: 0 12px;
-      height: 32px;
-      line-height: 32px;
+      height: 40px;
+      line-height: 40px;
       border-top: 1px solid #d9d9d9;
       box-sizing: border-box;
 

package/lib/select/style/token.less

@@ -2,7 +2,6 @@
 
 @select-custom-prefix: ~'--@{kd-prefix}-c-select';
 
-
 // color
 @select-dropdown-bg: var(~'@{select-custom-prefix}-dropdown-color-background', @color-background);
 @select-disabled-option-bg: var(~'@{select-custom-prefix}-item-color-background-disabled', #fff);
@@ -45,6 +44,7 @@
 // spacing
 @select-bordered: var(~'@{select-custom-prefix}-bordered-spacing-padding-left', 8px);
 @select-wrapper-padding: var(~'@{select-custom-prefix}-wrapper-spacing-padding', 1px 28px 1px 0);
+@select-dropdown-padding-vertical: var(~'@{select-custom-prefix}-dropdown-spacing-padding-vertical', 8px);
 
 // radius
 @select-g-radius-border: var(~'@{select-custom-prefix}-radius-border', @radius-border);

package/lib/style/core/motion/slide.less

@@ -31,12 +31,15 @@
 .slide-motion(topLeft, kdSlideDown, kd-cascader-menus);
 .slide-motion(bottomLeft, kdSlideUp, kd-cascader-menus);
 
-.slide-motion(topLeft, kdSlideDown, kd-select);
-.slide-motion(bottomLeft, kdSlideUp, kd-select);
+.slide-motion(topLeft, kdSlideDown, kd-select-dropdown-panel);
+.slide-motion(bottomLeft, kdSlideUp, kd-select-dropdown-panel);
 
 .slide-motion(topLeft, kdSlideDown, kd-date-picker-panel);
 .slide-motion(bottomLeft, kdSlideUp, kd-date-picker-panel);
 
+.slide-motion(topLeft, kdSlideDown, kd-city-picker-dropdown);
+.slide-motion(bottomLeft, kdSlideUp, kd-city-picker-dropdown);
+
 @keyframes kdSlideCenterIn {
   0% {
     opacity: 0;

package/lib/style/index.css

@@ -1361,7 +1361,7 @@
   -webkit-animation-timing-function: cubic-bezier(0.4, 0, 1, 0.6);
           animation-timing-function: cubic-bezier(0.4, 0, 1, 0.6);
 }
-.kd-select.topLeft-active {
+.kd-select-dropdown-panel.topLeft-active {
   -webkit-animation-name: kdSlideDownIn;
           animation-name: kdSlideDownIn;
   -webkit-animation-duration: calc(0.3s - 0.1s);
@@ -1369,7 +1369,7 @@
   -webkit-animation-timing-function: cubic-bezier(0, 0.4, 0.4, 1);
           animation-timing-function: cubic-bezier(0, 0.4, 0.4, 1);
 }
-.kd-select.topLeft.hidden {
+.kd-select-dropdown-panel.topLeft.hidden {
   -webkit-animation-name: kdSlideDownOut;
           animation-name: kdSlideDownOut;
   -webkit-animation-duration: 0.1s;
@@ -1377,7 +1377,7 @@
   -webkit-animation-timing-function: cubic-bezier(0.4, 0, 1, 0.6);
           animation-timing-function: cubic-bezier(0.4, 0, 1, 0.6);
 }
-.kd-select.bottomLeft-active {
+.kd-select-dropdown-panel.bottomLeft-active {
   -webkit-animation-name: kdSlideUpIn;
           animation-name: kdSlideUpIn;
   -webkit-animation-duration: calc(0.3s - 0.1s);
@@ -1385,7 +1385,7 @@
   -webkit-animation-timing-function: cubic-bezier(0, 0.4, 0.4, 1);
           animation-timing-function: cubic-bezier(0, 0.4, 0.4, 1);
 }
-.kd-select.bottomLeft.hidden {
+.kd-select-dropdown-panel.bottomLeft.hidden {
   -webkit-animation-name: kdSlideUpOut;
           animation-name: kdSlideUpOut;
   -webkit-animation-duration: 0.1s;
@@ -1425,6 +1425,38 @@
   -webkit-animation-timing-function: cubic-bezier(0.4, 0, 1, 0.6);
           animation-timing-function: cubic-bezier(0.4, 0, 1, 0.6);
 }
+.kd-city-picker-dropdown.topLeft-active {
+  -webkit-animation-name: kdSlideDownIn;
+          animation-name: kdSlideDownIn;
+  -webkit-animation-duration: calc(0.3s - 0.1s);
+          animation-duration: calc(0.3s - 0.1s);
+  -webkit-animation-timing-function: cubic-bezier(0, 0.4, 0.4, 1);
+          animation-timing-function: cubic-bezier(0, 0.4, 0.4, 1);
+}
+.kd-city-picker-dropdown.topLeft.hidden {
+  -webkit-animation-name: kdSlideDownOut;
+          animation-name: kdSlideDownOut;
+  -webkit-animation-duration: 0.1s;
+          animation-duration: 0.1s;
+  -webkit-animation-timing-function: cubic-bezier(0.4, 0, 1, 0.6);
+          animation-timing-function: cubic-bezier(0.4, 0, 1, 0.6);
+}
+.kd-city-picker-dropdown.bottomLeft-active {
+  -webkit-animation-name: kdSlideUpIn;
+          animation-name: kdSlideUpIn;
+  -webkit-animation-duration: calc(0.3s - 0.1s);
+          animation-duration: calc(0.3s - 0.1s);
+  -webkit-animation-timing-function: cubic-bezier(0, 0.4, 0.4, 1);
+          animation-timing-function: cubic-bezier(0, 0.4, 0.4, 1);
+}
+.kd-city-picker-dropdown.bottomLeft.hidden {
+  -webkit-animation-name: kdSlideUpOut;
+          animation-name: kdSlideUpOut;
+  -webkit-animation-duration: 0.1s;
+          animation-duration: 0.1s;
+  -webkit-animation-timing-function: cubic-bezier(0.4, 0, 1, 0.6);
+          animation-timing-function: cubic-bezier(0.4, 0, 1, 0.6);
+}
 @-webkit-keyframes kdSlideCenterIn {
   0% {
     opacity: 0;

package/lib/table/api.js

@@ -84,7 +84,7 @@ function getApi(pipelineRef) {
    * @returns
    */
   function ensureColumnVisible(code) {
-    var _a, _b;
+    var _a, _b, _c, _d;
     var pipeline = pipelineRef.current;
     var tableBodyContainer = (_a = pipeline.ref) === null || _a === void 0 ? void 0 : _a.current.domHelper.tableBody;
     var tableScroll = (_b = pipeline.ref) === null || _b === void 0 ? void 0 : _b.current.domHelper.stickyScroll;
@@ -100,14 +100,30 @@ function getApi(pipelineRef) {
     var colLeft = (0, _slice.default)(columnNodes).call(columnNodes, 0, index).reduce(function (acc, col) {
       return acc + col.width;
     }, 0);
+    var lockColumnLeft = 0;
+    var lockColumnRight = 0;
+    for (var i = 0; i < columnNodes.length; i++) {
+      if ((_c = columnNodes[i]) === null || _c === void 0 ? void 0 : _c.lock) {
+        lockColumnLeft += columnNodes[i].width;
+      } else {
+        break;
+      }
+    }
+    for (var _i = columnNodes.length - 1; _i >= 0; _i--) {
+      if ((_d = columnNodes[_i]) === null || _d === void 0 ? void 0 : _d.lock) {
+        lockColumnRight += columnNodes[_i].width;
+      } else {
+        break;
+      }
+    }
     var colLeftPixel = colLeft; // 目标列前面列宽总和
     var colRightPixel = colLeftPixel + column.width;
     var viewportWidth = tableBodyContainer.clientWidth; // 表体容器的宽度
     var scrollPosition = tableScroll.scrollLeft; // 滚动条滚动的距离
     var vScrollLeft = scrollPosition;
     var vScrollRight = scrollPosition + viewportWidth;
-    var pxLeft = colLeftPixel;
-    var pxRight = colRightPixel - viewportWidth;
+    var pxLeft = colLeftPixel - lockColumnLeft;
+    var pxRight = colRightPixel - viewportWidth + lockColumnRight;
     var colBeforeViewport = vScrollLeft > colLeftPixel; // 滚动距离大于目标列前面列宽总和，说明目标列在视口之前
     var colPastViewport = vScrollRight < colRightPixel; // 目标列是视口之后
     var colToSmallForViewport = viewportWidth < column.width;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kdcloudjs/kdesign",
-  "version": "1.7.23",
+  "version": "1.7.24",
   "description": "KDesign 金蝶前端react 组件库",
   "title": "kdesign",
   "keywords": [
@@ -78,7 +78,7 @@
     "@babel/runtime-corejs3": "^7.11.2",
     "@babel/standalone": "^7.14.3",
     "@kdcloudjs/kdesign-icons": "^1.0.0",
-    "@kdcloudjs/table": "1.1.6-canary.2",
+    "@kdcloudjs/table": "1.2.0-canary.1",
     "@popperjs/core": "^2.5.4",
     "@types/js-cookie": "^3.0.3",
     "async-validator": "^3.5.1",