@kdcloudjs/kdesign 1.7.28 → 1.7.30

package/lib/grid/row.js

@@ -7,11 +7,10 @@ var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequ
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
-var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
+exports.default = exports.GapContext = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/slicedToArray"));
-var React = _interopRequireWildcard(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _utils = require("../_utils");
 var _configProvider = require("../config-provider");
@@ -33,9 +32,16 @@ function getGap(gutter, width) {
   if (xl && width >= 1920) gap = xl;
   return gap;
 }
+var GapContext = /*#__PURE__*/(0, _react.createContext)({
+  gap: {
+    h: 0,
+    v: 0
+  },
+  winWidth: window.innerWidth
+});
+exports.GapContext = GapContext;
 var Row = function Row(props) {
-  var _context;
-  var _React$useContext = React.useContext(_configProvider.ConfigContext),
+  var _React$useContext = _react.default.useContext(_configProvider.ConfigContext),
     getPrefixCls = _React$useContext.getPrefixCls,
     pkgPrefixCls = _React$useContext.prefixCls,
     userDefaultProps = _React$useContext.compDefaultProps;
@@ -50,10 +56,10 @@ var Row = function Row(props) {
     justify = _getCompProps.justify,
     customPrefixcls = _getCompProps.prefixCls;
   // 浏览器名称
-  var isSogou = (0, _testBrowserType.testBrowserType)(/^sogou/i, 0) || /Trident|MSIE/.test(navigator.userAgent);
+  var isSogouOrIe = (0, _testBrowserType.testBrowserType)(/^sogou/i, 0) || /Trident|MSIE/.test(navigator.userAgent);
   // className前缀
   var prefixCls = getPrefixCls(pkgPrefixCls, 'row', customPrefixcls);
-  var _React$useState = React.useState(window.innerWidth),
+  var _React$useState = _react.default.useState(window.innerWidth),
     _React$useState2 = (0, _slicedToArray2.default)(_React$useState, 2),
     winWidth = _React$useState2[0],
     setWinWidth = _React$useState2[1];
@@ -82,9 +88,10 @@ var Row = function Row(props) {
     }
   }
   var rowStyle = {
-    '--cgap': "".concat(gap.h, "px")
+    'row-gap': "".concat(gap.v, "px"),
+    margin: "0 ".concat(-1 * gap.h / 2, "px")
   };
-  if (gap.v) rowStyle['--rgap'] = "".concat(gap.v, "px");
+  if (gap.v && isSogouOrIe) rowStyle['margin-bottom'] = "".concat(-1 * gap.v, "px");
   var toalign = {
     top: 'flex-start',
     middle: 'center',
@@ -94,22 +101,21 @@ var Row = function Row(props) {
     start: 'flex-start',
     end: 'flex-end'
   };
-  var styleString = (0, _extends2.default)((0, _extends2.default)((0, _extends2.default)({}, style), rowStyle), {
+  var styleString = (0, _extends2.default)((0, _extends2.default)((0, _extends2.default)({}, rowStyle), style), {
     alignItems: toalign[align] || align,
     justifyContent: tojustify[justify] || justify
   });
-  return /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/_react.default.createElement(GapContext.Provider, {
+    value: {
+      gap: gap,
+      winWidth: winWidth
+    }
+  }, /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)(prefixCls, className, {
       nowrap: !wrap
-    }, {
-      'sogou-row': isSogou
     }),
     style: styleString
-  }, (0, _map.default)(_context = React.Children).call(_context, children, function (child) {
-    return /*#__PURE__*/React.cloneElement(child, {
-      winWidth: winWidth
-    });
-  }));
+  }, children));
 };
 Row.displayName = 'Row';
 var _default = Row;

package/lib/select/select.js

@@ -468,7 +468,7 @@ var InternalSelect = function InternalSelect(props, ref) {
     var arrowIconCls = (0, _classnames.default)((_classNames7 = {}, (0, _defineProperty2.default)(_classNames7, "".concat(selectPrefixCls, "-icon-arrow"), true), (0, _defineProperty2.default)(_classNames7, "".concat(selectPrefixCls, "-icon-arrow-up"), optionShow), (0, _defineProperty2.default)(_classNames7, "".concat(selectPrefixCls, "-icon-arrow-down"), !optionShow), (0, _defineProperty2.default)(_classNames7, "".concat(selectPrefixCls, "-icon-arrow-focus"), optionShow), _classNames7));
     var iconShow = allowClear && !disabled && ((isMultiple ? mulOptions.length > 0 : (singleVal !== null && singleVal !== void 0 ? singleVal : '') !== '') || searchValue);
     var clearIconCls = (0, _classnames.default)((0, _defineProperty2.default)({}, "".concat(selectPrefixCls, "-icon-clear"), true));
-    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, iconShow && /*#__PURE__*/_react.default.createElement("span", {
+    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, iconShow ? /*#__PURE__*/_react.default.createElement("span", {
       onClick: handleReset,
       onMouseDown: function onMouseDown(e) {
         return e.preventDefault();
@@ -477,11 +477,11 @@ var InternalSelect = function InternalSelect(props, ref) {
       ref: clearRef
     }, clearIcon || /*#__PURE__*/_react.default.createElement(_index.Icon, {
       type: "close-solid"
-    })), showArrow && /*#__PURE__*/_react.default.createElement("span", {
+    })) : null, showArrow ? /*#__PURE__*/_react.default.createElement("span", {
       className: arrowIconCls
     }, suffixIcon || /*#__PURE__*/_react.default.createElement(_index.Icon, {
       type: "arrow-down"
-    })));
+    })) : null);
   };
   var renderOption = function renderOption(child, index) {
     if ((child === null || child === void 0 ? void 0 : child.props) && (child.type.displayName === 'Option' || child.type.name === 'Option')) {
@@ -580,7 +580,7 @@ var InternalSelect = function InternalSelect(props, ref) {
       className: dropDownCls,
       style: dropdownStyle,
       ref: dropDownRef
-    }, !dropdownRender && childrenToRender.length > 0 && dropRender(eleOptionList, heightStyle), renderNotContent(), /*#__PURE__*/_react.default.createElement("div", null, dropdownRender && dropdownRender(dropRender(childrenToRender, heightStyle))), isMultiple && realChildren.length > 0 && /*#__PURE__*/_react.default.createElement("div", {
+    }, !dropdownRender && childrenToRender.length > 0 ? dropRender(eleOptionList, heightStyle) : null, renderNotContent(), /*#__PURE__*/_react.default.createElement("div", null, dropdownRender ? dropdownRender(dropRender(childrenToRender, heightStyle)) : null), isMultiple && realChildren.length > 0 ? /*#__PURE__*/_react.default.createElement("div", {
       className: multipleFooterCls
     }, /*#__PURE__*/_react.default.createElement(_index.Checkbox, {
       style: checkboxStyle,
@@ -589,7 +589,7 @@ var InternalSelect = function InternalSelect(props, ref) {
       onChange: handleSelectAll
     }, "\u5168\u9009"), /*#__PURE__*/_react.default.createElement("span", {
       className: "".concat(selectPrefixCls, "-multiple-footer-hadSelected")
-    }, "\u5DF2\u9009", /*#__PURE__*/_react.default.createElement("span", null, selectedVal.length), "\u9879"))));
+    }, "\u5DF2\u9009", /*#__PURE__*/_react.default.createElement("span", null, selectedVal.length), "\u9879")) : null));
   };
   // 处理多选tag
   var handleMaxTagHolder = (0, _react.useCallback)(function () {
@@ -664,10 +664,10 @@ var InternalSelect = function InternalSelect(props, ref) {
     return /*#__PURE__*/_react.default.createElement("div", {
       className: multipleCls,
       ref: selectionRef
-    }, Array.isArray(mulOptions) && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (0, _map.default)(mulOptions).call(mulOptions, function (item, index) {
+    }, Array.isArray(mulOptions) ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (0, _map.default)(mulOptions).call(mulOptions, function (item, index) {
       var label = item.label,
         value = item.value;
-      return (!maxTagCount || index <= maxTagCount - 1) && /*#__PURE__*/_react.default.createElement("span", {
+      return !maxTagCount || index <= maxTagCount - 1 ? /*#__PURE__*/_react.default.createElement("span", {
         key: value,
         className: (0, _classnames.default)("".concat(selectPrefixCls, "-selection-tag")),
         onMouseDown: function onMouseDown(e) {
@@ -689,12 +689,12 @@ var InternalSelect = function InternalSelect(props, ref) {
           return handleRemove(e, value);
         },
         "data-tag": value
-      }, label));
+      }, label)) : null;
     }), maxTagCount && mulOptions.length > maxTagCount ? maxTagPlaceholder ? handleMaxTagHolder() : /*#__PURE__*/_react.default.createElement("span", {
       className: itemCls
     }, /*#__PURE__*/_react.default.createElement("span", {
       className: "".concat(selectPrefixCls, "-selection-item-content")
-    }, "\u5171", mulOptions.length, "\u9879")) : null), /*#__PURE__*/_react.default.createElement("span", {
+    }, "\u5171", mulOptions.length, "\u9879")) : null) : null, /*#__PURE__*/_react.default.createElement("span", {
       className: "".concat(selectPrefixCls, "-selection-search"),
       style: {
         width: inputWidth
@@ -712,7 +712,7 @@ var InternalSelect = function InternalSelect(props, ref) {
       className: "".concat(selectPrefixCls, "-selection-search-mirror")
     }, searchValue, "\xA0")), /*#__PURE__*/_react.default.createElement("span", {
       className: "".concat(selectPrefixCls, "-placeholder")
-    }, !mulOptions.length && !searchValue && placeholder), /*#__PURE__*/_react.default.createElement("span", {
+    }, !mulOptions.length && !searchValue ? placeholder : null), /*#__PURE__*/_react.default.createElement("span", {
       className: "".concat(selectPrefixCls, "-suffix")
     }, renderSuffix()));
   };

package/lib/select/style/index.css

@@ -280,6 +280,14 @@
 .kd-select-icon-clear {
   opacity: 0;
   z-index: 1;
+  top: 0;
+  bottom: 0;
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-align: center;
+      -ms-flex-align: center;
+          align-items: center;
   position: absolute;
   background: #fff;
   -webkit-transition: opacity 0.15s ease;
@@ -299,6 +307,15 @@
   text-overflow: ellipsis;
   right: 28px;
   left: 0;
+  top: 0;
+  bottom: 0;
+  z-index: -1;
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-align: center;
+      -ms-flex-align: center;
+          align-items: center;
 }
 .kd-select-borderless {
   border: none;
@@ -433,18 +450,32 @@
   max-height: calc(var(--kd-c-select-sizing-height-small, 24px) * 3 - 10px);
   font-size: var(--kd-c-select-font-size-small, 12px);
 }
+.kd-select-size-small .kd-select-selection-item {
+  min-height: calc(var(--kd-c-select-sizing-height-small, 24px) - 4px);
+  line-height: calc(var(--kd-c-select-sizing-height-small, 24px) - 4px);
+}
 .kd-select-size-middle {
   min-height: var(--kd-c-select-sizing-height-middle, 30px);
   max-height: calc(var(--kd-c-select-sizing-height-middle, 30px) * 3 - 10px);
   font-size: var(--kd-c-select-font-size-middle, 14px);
 }
+.kd-select-size-middle .kd-select-selection-item {
+  min-height: calc(var(--kd-c-select-sizing-height-middle, 30px) - 4px);
+  line-height: calc(var(--kd-c-select-sizing-height-middle, 30px) - 4px);
+}
 .kd-select-size-large {
   min-height: var(--kd-c-select-sizing-height-large, 36px);
   max-height: calc(var(--kd-c-select-sizing-height-large, 36px) * 3 - 10px);
   font-size: var(--kd-c-select-font-size-large, 16px);
 }
+.kd-select-size-large .kd-select-selection-item {
+  min-height: calc(var(--kd-c-select-sizing-height-large, 36px) - 4px);
+  line-height: calc(var(--kd-c-select-sizing-height-large, 36px) - 4px);
+}
 .kd-select-suffix {
   right: 0;
+  top: 0;
+  bottom: 0;
   position: absolute;
   display: -webkit-box;
   display: -ms-flexbox;
@@ -467,6 +498,14 @@
   right: 28px;
   left: 0;
   height: 100%;
+  top: 0;
+  bottom: 0;
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-align: center;
+      -ms-flex-align: center;
+          align-items: center;
 }
 .kd-select .kd-select-single .kd-select-selection-search-input {
   outline: 0;
@@ -525,9 +564,6 @@
           align-items: center;
   vertical-align: middle;
   max-width: 100%;
-  height: 20px;
-  line-height: 20px;
-  margin: 2px 8px 2px 0;
   cursor: default;
   -webkit-user-select: none;
      -moz-user-select: none;

package/lib/select/style/index.less

@@ -46,6 +46,10 @@
     &-clear {
       opacity: 0;
       z-index: 1;
+      top: 0;
+      bottom: 0;
+      display: flex;
+      align-items: center;
       position: absolute;
       background: #fff;
       transition: opacity 0.15s ease;
@@ -66,6 +70,11 @@
     text-overflow: ellipsis;
     right: 28px;
     left: 0;
+    top: 0;
+    bottom: 0;
+    z-index: -1;
+    display: flex;
+    align-items: center;
   }
 
   &-borderless {
@@ -220,6 +229,8 @@
 
   &-suffix {
     right: 0;
+    top: 0;
+    bottom: 0;
     position: absolute;
     display: flex;
     flex: 0;
@@ -235,6 +246,10 @@
         right: 28px;
         left: 0;
         height: 100%;
+        top: 0;
+        bottom: 0;
+        display: flex;
+        align-items: center;
         &-input {
           outline: 0;
           border-radius: 0;
@@ -289,9 +304,6 @@
     align-items: center;
     vertical-align: middle;
     max-width: 100%;
-    height: 20px;
-    line-height: 20px;
-    margin: 2px 8px 2px 0;
     cursor: default;
     user-select: none;
     &-small {

package/lib/select/style/mixin.less

@@ -19,6 +19,11 @@
   min-height: @height;
   max-height: calc(@maxHeight * 3 - 10px);
   font-size: @fontSize;
+
+  .@{select-prefix-cls}-selection-item {
+    min-height: calc(@height - 4px);
+    line-height: calc(@height - 4px);
+  }
 }
 
 .over() {
@@ -52,7 +57,6 @@
   }
 }
 
-
 @keyframes SlideUpIn {
   0% {
     transform: scaleY(0.8);
@@ -77,4 +81,4 @@
     transform-origin: 100% 100%;
     opacity: 0;
   }
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kdcloudjs/kdesign",
-  "version": "1.7.28",
+  "version": "1.7.30",
   "description": "KDesign 金蝶前端react 组件库",
   "title": "kdesign",
   "keywords": [