@kdcloudjs/kdesign 1.7.28 → 1.7.30

package/dist/kdesign.js

@@ -1,6 +1,6 @@
 /*!
  * 
- *   @kdcloudjs/kdesign v1.7.27
+ *   @kdcloudjs/kdesign v1.7.29
  * 
  *   Copyright 2020-present, Kingdee, Inc.
  *   All rights reserved.
@@ -7193,6 +7193,17 @@ var InternalCheckbox = function InternalCheckbox(props, ref) {
     };
   }, []);
   var getDefaultCheckbox = function getDefaultCheckbox() {
+    var inputProps = {
+      type: 'checkbox',
+      className: inputClassName,
+      onChange: handleChange,
+      checked: selected,
+      disabled: mergedDisabled,
+      name: mergedName
+    };
+    if ((value !== null && value !== void 0 ? value : '') !== '') {
+      inputProps.value = value;
+    }
     return (
       /*#__PURE__*/
       // eslint-disable-next-line
@@ -7202,30 +7213,24 @@ var InternalCheckbox = function InternalCheckbox(props, ref) {
         ref: labelRef
       }, rest), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_6___default.a.createElement("span", {
         className: checkedWrapperClassName
-      }, selected && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_6___default.a.createElement("span", {
+      }, selected ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_6___default.a.createElement("span", {
         className: innerIconClassName
       }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_6___default.a.createElement(_icon__WEBPACK_IMPORTED_MODULE_12__["default"], {
         type: "right-bold",
         className: "".concat(checkboxPrefixCls, "-").concat(mergedCheckboxType, "-inner-icon")
-      })), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_6___default.a.createElement("input", {
+      })) : null, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_6___default.a.createElement("input", _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_0___default()({
         type: "checkbox",
-        className: inputClassName,
-        onChange: handleChange,
-        ref: ref,
-        value: value,
-        checked: selected,
-        disabled: mergedDisabled,
-        name: mergedName
-      })), children && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_6___default.a.createElement("span", {
+        ref: ref
+      }, inputProps))), children ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_6___default.a.createElement("span", {
         className: "".concat(checkboxPrefixCls, "-children")
-      }, children), !isDefaultType() && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_6___default.a.createElement("span", {
+      }, children) : null, !isDefaultType() ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_6___default.a.createElement("span", {
         className: triangleClassName
       }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_6___default.a.createElement("span", {
         className: innerIconClassName
       }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_6___default.a.createElement(_icon__WEBPACK_IMPORTED_MODULE_12__["default"], {
         type: "right-bold",
         className: "".concat(checkboxPrefixCls, "-").concat(mergedCheckboxType, "-inner-icon")
-      }))))
+      }))) : null)
     );
   };
   return getDefaultCheckbox();
@@ -7559,7 +7564,7 @@ var getCityId = function getCityId(data) {
   return data;
 };
 var InternalSelect = function InternalSelect(props, ref) {
-  var _classNames3, _classNames5;
+  var _classNames3, _classNames6;
   var _useContext = Object(react__WEBPACK_IMPORTED_MODULE_20__["useContext"])(_config_provider_ConfigContext__WEBPACK_IMPORTED_MODULE_23__["default"]),
     getPrefixCls = _useContext.getPrefixCls,
     prefixCls = _useContext.prefixCls,
@@ -7638,14 +7643,18 @@ var InternalSelect = function InternalSelect(props, ref) {
     _useState6 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_2___default()(_useState5, 2),
     focusd = _useState6[0],
     setFocusd = _useState6[1];
-  var _useState7 = Object(react__WEBPACK_IMPORTED_MODULE_20__["useState"])(null),
+  var _useState7 = Object(react__WEBPACK_IMPORTED_MODULE_20__["useState"])(false),
     _useState8 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_2___default()(_useState7, 2),
-    seletedCity = _useState8[0],
-    setSeletedCity = _useState8[1];
-  var _useState9 = Object(react__WEBPACK_IMPORTED_MODULE_20__["useState"])('domestic'),
+    afterChangeFocus = _useState8[0],
+    setAfterChangeFocus = _useState8[1];
+  var _useState9 = Object(react__WEBPACK_IMPORTED_MODULE_20__["useState"])(null),
     _useState10 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_2___default()(_useState9, 2),
-    tabsValue = _useState10[0],
-    setTabsValue = _useState10[1];
+    seletedCity = _useState10[0],
+    setSeletedCity = _useState10[1];
+  var _useState11 = Object(react__WEBPACK_IMPORTED_MODULE_20__["useState"])('domestic'),
+    _useState12 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_2___default()(_useState11, 2),
+    tabsValue = _useState12[0],
+    setTabsValue = _useState12[1];
   var isDomestic = function isDomestic(type) {
     return type === 'domestic';
   };
@@ -7680,6 +7689,7 @@ var InternalSelect = function InternalSelect(props, ref) {
   var handleBlur = Object(react__WEBPACK_IMPORTED_MODULE_20__["useCallback"])(function (e) {
     e.stopPropagation();
     setFocusd(false);
+    setAfterChangeFocus(false);
     onBlur && onBlur(e);
   }, [onBlur]);
   Object(react__WEBPACK_IMPORTED_MODULE_20__["useEffect"])(function () {
@@ -7733,7 +7743,7 @@ var InternalSelect = function InternalSelect(props, ref) {
       className: "".concat(selectPrefixCls, "-icon-clear"),
       ref: clearRef
     }, clearIcon || /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_20___default.a.createElement(_index__WEBPACK_IMPORTED_MODULE_25__["Icon"], {
-      type: "close-solid"
+      type: "close"
     })), showArrow && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_20___default.a.createElement("span", {
       className: arrowIconCls
     }, suffixIcon || /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_20___default.a.createElement(_index__WEBPACK_IMPORTED_MODULE_25__["Icon"], {
@@ -7765,9 +7775,12 @@ var InternalSelect = function InternalSelect(props, ref) {
     }));
   };
   var handleOption = function handleOption(city) {
+    var _searchRef$current;
     handleVisibleChange(false);
     city.type = tabsValue === 'domestic' ? 'domestic' : 'foreign';
     (city === null || city === void 0 ? void 0 : city.id) !== initValue && (onChange === null || onChange === void 0 ? void 0 : onChange(city === null || city === void 0 ? void 0 : city.id, city));
+    (_searchRef$current = searchRef.current) === null || _searchRef$current === void 0 ? void 0 : _searchRef$current.focus();
+    setAfterChangeFocus(true);
     if (typeof value === 'undefined') {
       setSeletedCity(city);
       setInitValue(city === null || city === void 0 ? void 0 : city.id);
@@ -7780,7 +7793,10 @@ var InternalSelect = function InternalSelect(props, ref) {
     }
     return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_20___default.a.createElement("div", {
       className: "".concat(selectPrefixCls, "-list"),
-      ref: optionsListRef
+      ref: optionsListRef,
+      onMouseDown: function onMouseDown(e) {
+        return e === null || e === void 0 ? void 0 : e.preventDefault();
+      }
     }, data.map(function (item, index) {
       return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_20___default.a.createElement(_option__WEBPACK_IMPORTED_MODULE_27__["default"], {
         key: item.id,
@@ -7848,9 +7864,11 @@ var InternalSelect = function InternalSelect(props, ref) {
     }
   }, [type, tabsValue]);
   var renderSingle = function renderSingle() {
+    var _classNames5;
     var hiddenStyle = !!searchValue || (initValue !== null && initValue !== void 0 ? initValue : '') !== '' ? {
       visibility: 'hidden'
     } : undefined;
+    var itemCls = classnames__WEBPACK_IMPORTED_MODULE_22___default()((_classNames5 = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_classNames5, "".concat(selectPrefixCls, "-content-item"), true), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_classNames5, "".concat(selectPrefixCls, "-content-item-seleted"), afterChangeFocus), _classNames5));
     return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_20___default.a.createElement(react__WEBPACK_IMPORTED_MODULE_20___default.a.Fragment, null, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_20___default.a.createElement("div", {
       className: singleCls,
       ref: selectionRef
@@ -7867,18 +7885,18 @@ var InternalSelect = function InternalSelect(props, ref) {
       onBlur: handleBlur,
       readOnly: !!disabled
     }), !searchValue && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_20___default.a.createElement("span", {
-      className: "".concat(selectPrefixCls, "-content-item"),
+      className: itemCls,
       title: seletedCity === null || seletedCity === void 0 ? void 0 : seletedCity.name
     }, seletedCity === null || seletedCity === void 0 ? void 0 : seletedCity.name)), !searchValue && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_20___default.a.createElement("span", {
       className: "".concat(selectPrefixCls, "-content-info")
     }, _renderCityInfo(seletedCity))), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_20___default.a.createElement("span", {
       className: "".concat(selectPrefixCls, "-placeholder"),
       style: hiddenStyle
-    }, placeholder), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_20___default.a.createElement("span", {
+    }, !disabled ? placeholder : null), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_20___default.a.createElement("span", {
       className: "".concat(selectPrefixCls, "-suffix")
     }, renderSuffix())));
   };
-  var singleCls = classnames__WEBPACK_IMPORTED_MODULE_22___default()(commCls, (_classNames5 = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_classNames5, "".concat(selectPrefixCls, "-disabled"), disabled), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_classNames5, "".concat(selectPrefixCls, "-focused"), !disabled && focusd || optionShow), _classNames5));
+  var singleCls = classnames__WEBPACK_IMPORTED_MODULE_22___default()(commCls, (_classNames6 = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_classNames6, "".concat(selectPrefixCls, "-disabled"), disabled), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_classNames6, "".concat(selectPrefixCls, "-focused"), !disabled && focusd || optionShow), _classNames6));
   Object(react__WEBPACK_IMPORTED_MODULE_20__["useEffect"])(function () {
     if (optionShow && !disabled) {
       var onDropdownVisibleChange = selectProps.onDropdownVisibleChange;
@@ -7916,16 +7934,17 @@ var InternalSelect = function InternalSelect(props, ref) {
     }
     return -1;
   };
-  var _useState11 = Object(react__WEBPACK_IMPORTED_MODULE_20__["useState"])(getActiveIndex(0)),
-    _useState12 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_2___default()(_useState11, 2),
-    activeIndex = _useState12[0],
-    setActiveIndex = _useState12[1];
+  var _useState13 = Object(react__WEBPACK_IMPORTED_MODULE_20__["useState"])(-1),
+    _useState14 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_2___default()(_useState13, 2),
+    activeIndex = _useState14[0],
+    setActiveIndex = _useState14[1];
   var initActiveIndex = function initActiveIndex() {
-    setActiveIndex(getActiveIndex(0));
+    var index = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : undefined;
+    setActiveIndex(index === undefined ? getActiveIndex(0) : index);
   };
   Object(react__WEBPACK_IMPORTED_MODULE_20__["useEffect"])(function () {
-    initActiveIndex();
-  }, [searchValue, tabsValue]);
+    initActiveIndex(searchValue ? undefined : -1);
+  }, [searchValue, tabsValue, curkeyboardList]);
   var onInternalKeyDown = function onInternalKeyDown(e) {
     var which = e.which;
     // open
@@ -7948,11 +7967,11 @@ var InternalSelect = function InternalSelect(props, ref) {
             var item = curkeyboardList[activeIndex];
             if (!item) return;
             handleOption(item);
-            setOptionShow(false);
+            handleVisibleChange(false);
             break;
           }
         case _utils_KeyCode__WEBPACK_IMPORTED_MODULE_29__["default"].ESC:
-          setOptionShow(false);
+          handleVisibleChange(false);
           break;
         default:
           break;
@@ -7984,12 +8003,12 @@ var InternalSelect = function InternalSelect(props, ref) {
       className: selectionCls,
       tabIndex: disabled ? -1 : 0,
       onFocus: function onFocus() {
-        var _searchRef$current;
-        return (_searchRef$current = searchRef.current) === null || _searchRef$current === void 0 ? void 0 : _searchRef$current.focus();
+        var _searchRef$current2;
+        return (_searchRef$current2 = searchRef.current) === null || _searchRef$current2 === void 0 ? void 0 : _searchRef$current2.focus();
       },
       onBlur: function onBlur() {
-        var _searchRef$current2;
-        return (_searchRef$current2 = searchRef.current) === null || _searchRef$current2 === void 0 ? void 0 : _searchRef$current2.blur();
+        var _searchRef$current3;
+        return (_searchRef$current3 = searchRef.current) === null || _searchRef$current3 === void 0 ? void 0 : _searchRef$current3.blur();
       },
       onKeyDown: onInternalKeyDown
     }, renderSingle()));
@@ -8010,7 +8029,7 @@ var InternalSelect = function InternalSelect(props, ref) {
   };
   var handleVisibleChange = function handleVisibleChange(visible) {
     if (!visible) {
-      initActiveIndex();
+      initActiveIndex(-1);
     }
     if (visible !== optionShow) {
       props.visible === undefined && setOptionShow(visible);
@@ -18657,21 +18676,27 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_5__);
 /* harmony import */ var core_js_modules_es_object_get_own_property_descriptors_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! core-js/modules/es.object.get-own-property-descriptors.js */ "./node_modules/core-js/modules/es.object.get-own-property-descriptors.js");
 /* harmony import */ var core_js_modules_es_object_get_own_property_descriptors_js__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_get_own_property_descriptors_js__WEBPACK_IMPORTED_MODULE_6__);
-/* harmony import */ var _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! @babel/runtime/helpers/defineProperty */ "./node_modules/@babel/runtime/helpers/defineProperty.js");
-/* harmony import */ var _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_7__);
-/* harmony import */ var core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! core-js/modules/es.regexp.exec.js */ "./node_modules/core-js/modules/es.regexp.exec.js");
-/* harmony import */ var core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_8__);
-/* harmony import */ var core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! core-js/modules/es.number.constructor.js */ "./node_modules/core-js/modules/es.number.constructor.js");
-/* harmony import */ var core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_9__);
-/* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! core-js/modules/es.array.concat.js */ "./node_modules/core-js/modules/es.array.concat.js");
-/* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_10___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_10__);
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! react */ "react");
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_11___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_11__);
-/* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! classnames */ "./node_modules/classnames/index.js");
-/* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_12___default = /*#__PURE__*/__webpack_require__.n(classnames__WEBPACK_IMPORTED_MODULE_12__);
-/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ../_utils */ "./components/_utils/index.ts");
-/* harmony import */ var _config_provider__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ../config-provider */ "./components/config-provider/index.tsx");
-/* harmony import */ var _utils_testBrowserType__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ../_utils/testBrowserType */ "./components/_utils/testBrowserType.ts");
+/* harmony import */ var _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! @babel/runtime/helpers/extends */ "./node_modules/@babel/runtime/helpers/extends.js");
+/* harmony import */ var _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_7__);
+/* harmony import */ var _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! @babel/runtime/helpers/defineProperty */ "./node_modules/@babel/runtime/helpers/defineProperty.js");
+/* harmony import */ var _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8__);
+/* harmony import */ var _babel_runtime_helpers_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! @babel/runtime/helpers/objectWithoutProperties */ "./node_modules/@babel/runtime/helpers/objectWithoutProperties.js");
+/* harmony import */ var _babel_runtime_helpers_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_9__);
+/* harmony import */ var core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! core-js/modules/es.regexp.exec.js */ "./node_modules/core-js/modules/es.regexp.exec.js");
+/* harmony import */ var core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_10___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_10__);
+/* harmony import */ var core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! core-js/modules/es.number.constructor.js */ "./node_modules/core-js/modules/es.number.constructor.js");
+/* harmony import */ var core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_11___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_11__);
+/* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! core-js/modules/es.array.concat.js */ "./node_modules/core-js/modules/es.array.concat.js");
+/* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_12___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_12__);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! react */ "react");
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_13___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_13__);
+/* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! classnames */ "./node_modules/classnames/index.js");
+/* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_14___default = /*#__PURE__*/__webpack_require__.n(classnames__WEBPACK_IMPORTED_MODULE_14__);
+/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ../_utils */ "./components/_utils/index.ts");
+/* harmony import */ var _config_provider__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ../config-provider */ "./components/config-provider/index.tsx");
+/* harmony import */ var _utils_testBrowserType__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! ../_utils/testBrowserType */ "./components/_utils/testBrowserType.ts");
+/* harmony import */ var _row__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! ./row */ "./components/grid/row.tsx");
+
 
 
 
@@ -18680,8 +18705,11 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
+
+var _excluded = ["xs", "sm", "md", "lg", "xl", "flex", "span", "pull", "push", "style", "order", "offset", "children", "className", "prefixCls"];
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_7___default()(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
 
 
 
@@ -18691,12 +18719,12 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 
 var Col = function Col(props) {
-  var _React$useContext = react__WEBPACK_IMPORTED_MODULE_11__["useContext"](_config_provider__WEBPACK_IMPORTED_MODULE_14__["ConfigContext"]),
+  var _React$useContext = react__WEBPACK_IMPORTED_MODULE_13___default.a.useContext(_config_provider__WEBPACK_IMPORTED_MODULE_16__["ConfigContext"]),
     getPrefixCls = _React$useContext.getPrefixCls,
     pkgPrefixCls = _React$useContext.prefixCls,
     userDefaultProps = _React$useContext.compDefaultProps;
   // 属性需要合并一遍用户定义的默认属性
-  var _getCompProps = Object(_utils__WEBPACK_IMPORTED_MODULE_13__["getCompProps"])('Col', userDefaultProps, props),
+  var _getCompProps = Object(_utils__WEBPACK_IMPORTED_MODULE_15__["getCompProps"])('Col', userDefaultProps, props),
     xs = _getCompProps.xs,
     sm = _getCompProps.sm,
     md = _getCompProps.md,
@@ -18709,13 +18737,20 @@ var Col = function Col(props) {
     style = _getCompProps.style,
     order = _getCompProps.order,
     offset = _getCompProps.offset,
-    winWidth = _getCompProps.winWidth,
     children = _getCompProps.children,
     className = _getCompProps.className,
-    customPrefixcls = _getCompProps.prefixCls;
+    customPrefixcls = _getCompProps.prefixCls,
+    others = _babel_runtime_helpers_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_9___default()(_getCompProps, _excluded);
+  var rowGroup = Object(react__WEBPACK_IMPORTED_MODULE_13__["useContext"])(_row__WEBPACK_IMPORTED_MODULE_18__["GapContext"]);
+  var mergedWinWidth = rowGroup.winWidth;
+  var gap = rowGroup.gap;
 
   // 浏览器名称
-  var isSogou = Object(_utils_testBrowserType__WEBPACK_IMPORTED_MODULE_15__["testBrowserType"])(/^sogou/i, 0) || /Trident|MSIE/.test(navigator.userAgent);
+  var isSogouOrIE = Object(_utils_testBrowserType__WEBPACK_IMPORTED_MODULE_17__["testBrowserType"])(/^sogou/i, 0) || /Trident|MSIE/.test(navigator.userAgent);
+  var colGapStyle = {
+    padding: "0 ".concat(gap.h / 2, "px")
+  };
+  if (isSogouOrIE && gap.v) colGapStyle.marginBottom = gap.v;
 
   // className前缀
   var prefixCls = getPrefixCls(pkgPrefixCls, 'col', customPrefixcls);
@@ -18727,23 +18762,23 @@ var Col = function Col(props) {
     offset: offset,
     order: order
   };
-  if (xs && winWidth > 0) {
+  if (xs && mergedWinWidth > 0) {
     if (xs.constructor === Number) base.span = xs;
     if (xs.constructor === Object) base = _objectSpread(_objectSpread({}, base), xs);
   }
-  if (sm && winWidth >= 600) {
+  if (sm && mergedWinWidth >= 600) {
     if (sm.constructor === Number) base.span = sm;
     if (sm.constructor === Object) base = _objectSpread(_objectSpread({}, base), sm);
   }
-  if (md && winWidth >= 1024) {
+  if (md && mergedWinWidth >= 1024) {
     if (md.constructor === Number) base.span = md;
     if (md.constructor === Object) base = _objectSpread(_objectSpread({}, base), md);
   }
-  if (lg && winWidth >= 1280) {
+  if (lg && mergedWinWidth >= 1280) {
     if (lg.constructor === Number) base.span = lg;
     if (lg.constructor === Object) base = _objectSpread(_objectSpread({}, base), lg);
   }
-  if (xl && winWidth >= 1920) {
+  if (xl && mergedWinWidth >= 1920) {
     if (xl.constructor === Number) base.span = xl;
     if (xl.constructor === Object) base = _objectSpread(_objectSpread({}, base), xl);
   }
@@ -18762,20 +18797,18 @@ var Col = function Col(props) {
       }
     }
   }
-  var styleString = _objectSpread({
+  var styleString = _objectSpread(_objectSpread({
     flex: flexstr,
     maxWidth: width,
     order: base.order,
     left: base.push && base.push / columns * 100 + '%',
     right: base.pull && base.pull / columns * 100 + '%',
     marginLeft: base.offset && base.offset / columns * 100 + '%'
-  }, style);
-  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11__["createElement"]("div", {
-    className: classnames__WEBPACK_IMPORTED_MODULE_12___default()(prefixCls, className, {
-      'sogou-col': isSogou
-    }),
+  }, colGapStyle), style);
+  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_13___default.a.createElement("div", _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_7___default()({
+    className: classnames__WEBPACK_IMPORTED_MODULE_14___default()(prefixCls, className),
     style: styleString
-  }, children);
+  }, others), children);
 };
 Col.displayName = 'Col';
 /* harmony default export */ __webpack_exports__["default"] = (Col);
@@ -18807,55 +18840,53 @@ __webpack_require__.r(__webpack_exports__);
 /*!*********************************!*\
   !*** ./components/grid/row.tsx ***!
   \*********************************/
-/*! exports provided: default */
+/*! exports provided: GapContext, default */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! core-js/modules/es.object.keys.js */ "./node_modules/core-js/modules/es.object.keys.js");
-/* harmony import */ var core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var core_js_modules_es_symbol_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! core-js/modules/es.symbol.js */ "./node_modules/core-js/modules/es.symbol.js");
-/* harmony import */ var core_js_modules_es_symbol_js__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_symbol_js__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var core_js_modules_es_array_filter_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! core-js/modules/es.array.filter.js */ "./node_modules/core-js/modules/es.array.filter.js");
-/* harmony import */ var core_js_modules_es_array_filter_js__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_filter_js__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! core-js/modules/es.object.to-string.js */ "./node_modules/core-js/modules/es.object.to-string.js");
-/* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var core_js_modules_es_object_get_own_property_descriptor_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! core-js/modules/es.object.get-own-property-descriptor.js */ "./node_modules/core-js/modules/es.object.get-own-property-descriptor.js");
-/* harmony import */ var core_js_modules_es_object_get_own_property_descriptor_js__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_get_own_property_descriptor_js__WEBPACK_IMPORTED_MODULE_4__);
-/* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! core-js/modules/web.dom-collections.for-each.js */ "./node_modules/core-js/modules/web.dom-collections.for-each.js");
-/* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_5__);
-/* harmony import */ var core_js_modules_es_object_get_own_property_descriptors_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! core-js/modules/es.object.get-own-property-descriptors.js */ "./node_modules/core-js/modules/es.object.get-own-property-descriptors.js");
-/* harmony import */ var core_js_modules_es_object_get_own_property_descriptors_js__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_get_own_property_descriptors_js__WEBPACK_IMPORTED_MODULE_6__);
-/* harmony import */ var _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! @babel/runtime/helpers/defineProperty */ "./node_modules/@babel/runtime/helpers/defineProperty.js");
-/* harmony import */ var _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_7__);
-/* harmony import */ var _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! @babel/runtime/helpers/slicedToArray */ "./node_modules/@babel/runtime/helpers/slicedToArray.js");
-/* harmony import */ var _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_8__);
-/* harmony import */ var core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! core-js/modules/es.regexp.exec.js */ "./node_modules/core-js/modules/es.regexp.exec.js");
-/* harmony import */ var core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_9__);
-/* harmony import */ var core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! core-js/modules/es.number.constructor.js */ "./node_modules/core-js/modules/es.number.constructor.js");
-/* harmony import */ var core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_10___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_10__);
-/* harmony import */ var core_js_modules_es_array_map_js__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! core-js/modules/es.array.map.js */ "./node_modules/core-js/modules/es.array.map.js");
-/* harmony import */ var core_js_modules_es_array_map_js__WEBPACK_IMPORTED_MODULE_11___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_map_js__WEBPACK_IMPORTED_MODULE_11__);
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! react */ "react");
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_12___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_12__);
-/* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! classnames */ "./node_modules/classnames/index.js");
-/* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_13___default = /*#__PURE__*/__webpack_require__.n(classnames__WEBPACK_IMPORTED_MODULE_13__);
-/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ../_utils */ "./components/_utils/index.ts");
-/* harmony import */ var _config_provider__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ../config-provider */ "./components/config-provider/index.tsx");
-/* harmony import */ var lodash_throttle__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! lodash/throttle */ "./node_modules/lodash/throttle.js");
-/* harmony import */ var lodash_throttle__WEBPACK_IMPORTED_MODULE_16___default = /*#__PURE__*/__webpack_require__.n(lodash_throttle__WEBPACK_IMPORTED_MODULE_16__);
-/* harmony import */ var _utils_testBrowserType__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! ../_utils/testBrowserType */ "./components/_utils/testBrowserType.ts");
-
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "GapContext", function() { return GapContext; });
+/* harmony import */ var _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @babel/runtime/helpers/defineProperty */ "./node_modules/@babel/runtime/helpers/defineProperty.js");
+/* harmony import */ var _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @babel/runtime/helpers/slicedToArray */ "./node_modules/@babel/runtime/helpers/slicedToArray.js");
+/* harmony import */ var _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! core-js/modules/es.regexp.exec.js */ "./node_modules/core-js/modules/es.regexp.exec.js");
+/* harmony import */ var core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! core-js/modules/es.number.constructor.js */ "./node_modules/core-js/modules/es.number.constructor.js");
+/* harmony import */ var core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_number_constructor_js__WEBPACK_IMPORTED_MODULE_3__);
+/* harmony import */ var core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! core-js/modules/es.object.keys.js */ "./node_modules/core-js/modules/es.object.keys.js");
+/* harmony import */ var core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_4__);
+/* harmony import */ var core_js_modules_es_symbol_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! core-js/modules/es.symbol.js */ "./node_modules/core-js/modules/es.symbol.js");
+/* harmony import */ var core_js_modules_es_symbol_js__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_symbol_js__WEBPACK_IMPORTED_MODULE_5__);
+/* harmony import */ var core_js_modules_es_array_filter_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! core-js/modules/es.array.filter.js */ "./node_modules/core-js/modules/es.array.filter.js");
+/* harmony import */ var core_js_modules_es_array_filter_js__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_filter_js__WEBPACK_IMPORTED_MODULE_6__);
+/* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! core-js/modules/es.object.to-string.js */ "./node_modules/core-js/modules/es.object.to-string.js");
+/* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_7__);
+/* harmony import */ var core_js_modules_es_object_get_own_property_descriptor_js__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! core-js/modules/es.object.get-own-property-descriptor.js */ "./node_modules/core-js/modules/es.object.get-own-property-descriptor.js");
+/* harmony import */ var core_js_modules_es_object_get_own_property_descriptor_js__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_get_own_property_descriptor_js__WEBPACK_IMPORTED_MODULE_8__);
+/* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! core-js/modules/web.dom-collections.for-each.js */ "./node_modules/core-js/modules/web.dom-collections.for-each.js");
+/* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_9__);
+/* harmony import */ var core_js_modules_es_object_get_own_property_descriptors_js__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! core-js/modules/es.object.get-own-property-descriptors.js */ "./node_modules/core-js/modules/es.object.get-own-property-descriptors.js");
+/* harmony import */ var core_js_modules_es_object_get_own_property_descriptors_js__WEBPACK_IMPORTED_MODULE_10___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_get_own_property_descriptors_js__WEBPACK_IMPORTED_MODULE_10__);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! react */ "react");
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_11___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_11__);
+/* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! classnames */ "./node_modules/classnames/index.js");
+/* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_12___default = /*#__PURE__*/__webpack_require__.n(classnames__WEBPACK_IMPORTED_MODULE_12__);
+/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ../_utils */ "./components/_utils/index.ts");
+/* harmony import */ var _config_provider__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ../config-provider */ "./components/config-provider/index.tsx");
+/* harmony import */ var lodash_throttle__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! lodash/throttle */ "./node_modules/lodash/throttle.js");
+/* harmony import */ var lodash_throttle__WEBPACK_IMPORTED_MODULE_15___default = /*#__PURE__*/__webpack_require__.n(lodash_throttle__WEBPACK_IMPORTED_MODULE_15__);
+/* harmony import */ var _utils_testBrowserType__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ../_utils/testBrowserType */ "./components/_utils/testBrowserType.ts");
 
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 
 
 
 
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_7___default()(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 
 
@@ -18879,13 +18910,20 @@ function getGap(gutter, width) {
   if (xl && width >= 1920) gap = xl;
   return gap;
 }
+var GapContext = /*#__PURE__*/Object(react__WEBPACK_IMPORTED_MODULE_11__["createContext"])({
+  gap: {
+    h: 0,
+    v: 0
+  },
+  winWidth: window.innerWidth
+});
 var Row = function Row(props) {
-  var _React$useContext = react__WEBPACK_IMPORTED_MODULE_12__["useContext"](_config_provider__WEBPACK_IMPORTED_MODULE_15__["ConfigContext"]),
+  var _React$useContext = react__WEBPACK_IMPORTED_MODULE_11___default.a.useContext(_config_provider__WEBPACK_IMPORTED_MODULE_14__["ConfigContext"]),
     getPrefixCls = _React$useContext.getPrefixCls,
     pkgPrefixCls = _React$useContext.prefixCls,
     userDefaultProps = _React$useContext.compDefaultProps;
   // 属性需要合并一遍用户定义的默认属性
-  var _getCompProps = Object(_utils__WEBPACK_IMPORTED_MODULE_14__["getCompProps"])('Row', userDefaultProps, props),
+  var _getCompProps = Object(_utils__WEBPACK_IMPORTED_MODULE_13__["getCompProps"])('Row', userDefaultProps, props),
     style = _getCompProps.style,
     className = _getCompProps.className,
     children = _getCompProps.children,
@@ -18896,15 +18934,15 @@ var Row = function Row(props) {
     customPrefixcls = _getCompProps.prefixCls;
 
   // 浏览器名称
-  var isSogou = Object(_utils_testBrowserType__WEBPACK_IMPORTED_MODULE_17__["testBrowserType"])(/^sogou/i, 0) || /Trident|MSIE/.test(navigator.userAgent);
+  var isSogouOrIe = Object(_utils_testBrowserType__WEBPACK_IMPORTED_MODULE_16__["testBrowserType"])(/^sogou/i, 0) || /Trident|MSIE/.test(navigator.userAgent);
 
   // className前缀
   var prefixCls = getPrefixCls(pkgPrefixCls, 'row', customPrefixcls);
-  var _React$useState = react__WEBPACK_IMPORTED_MODULE_12__["useState"](window.innerWidth),
-    _React$useState2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_8___default()(_React$useState, 2),
+  var _React$useState = react__WEBPACK_IMPORTED_MODULE_11___default.a.useState(window.innerWidth),
+    _React$useState2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_1___default()(_React$useState, 2),
     winWidth = _React$useState2[0],
     setWinWidth = _React$useState2[1];
-  var updateWidth = lodash_throttle__WEBPACK_IMPORTED_MODULE_16___default()(function () {
+  var updateWidth = lodash_throttle__WEBPACK_IMPORTED_MODULE_15___default()(function () {
     return setWinWidth(window.innerWidth);
   }, 500);
   window.addEventListener('resize', updateWidth);
@@ -18929,9 +18967,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',
@@ -18941,22 +18980,21 @@ var Row = function Row(props) {
     start: 'flex-start',
     end: 'flex-end'
   };
-  var styleString = _objectSpread(_objectSpread(_objectSpread({}, style), rowStyle), {}, {
+  var styleString = _objectSpread(_objectSpread(_objectSpread({}, rowStyle), style), {}, {
     alignItems: toalign[align] || align,
     justifyContent: tojustify[justify] || justify
   });
-  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_12__["createElement"]("div", {
-    className: classnames__WEBPACK_IMPORTED_MODULE_13___default()(prefixCls, className, {
+  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11___default.a.createElement(GapContext.Provider, {
+    value: {
+      gap: gap,
+      winWidth: winWidth
+    }
+  }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11___default.a.createElement("div", {
+    className: classnames__WEBPACK_IMPORTED_MODULE_12___default()(prefixCls, className, {
       nowrap: !wrap
-    }, {
-      'sogou-row': isSogou
     }),
     style: styleString
-  }, react__WEBPACK_IMPORTED_MODULE_12__["Children"].map(children, function (child) {
-    return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_12__["cloneElement"](child, {
-      winWidth: winWidth
-    });
-  }));
+  }, children));
 };
 Row.displayName = 'Row';
 /* harmony default export */ __webpack_exports__["default"] = (Row);
@@ -29030,7 +29068,7 @@ var InternalSelect = function InternalSelect(props, ref) {
     var arrowIconCls = classnames__WEBPACK_IMPORTED_MODULE_22___default()((_classNames7 = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(_classNames7, "".concat(selectPrefixCls, "-icon-arrow"), true), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(_classNames7, "".concat(selectPrefixCls, "-icon-arrow-up"), optionShow), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(_classNames7, "".concat(selectPrefixCls, "-icon-arrow-down"), !optionShow), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___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 = classnames__WEBPACK_IMPORTED_MODULE_22___default()(_babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()({}, "".concat(selectPrefixCls, "-icon-clear"), true));
-    return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_19___default.a.createElement(react__WEBPACK_IMPORTED_MODULE_19___default.a.Fragment, null, iconShow && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_19___default.a.createElement("span", {
+    return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_19___default.a.createElement(react__WEBPACK_IMPORTED_MODULE_19___default.a.Fragment, null, iconShow ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_19___default.a.createElement("span", {
       onClick: handleReset,
       onMouseDown: function onMouseDown(e) {
         return e.preventDefault();
@@ -29039,11 +29077,11 @@ var InternalSelect = function InternalSelect(props, ref) {
       ref: clearRef
     }, clearIcon || /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_19___default.a.createElement(_index__WEBPACK_IMPORTED_MODULE_26__["Icon"], {
       type: "close-solid"
-    })), showArrow && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_19___default.a.createElement("span", {
+    })) : null, showArrow ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_19___default.a.createElement("span", {
       className: arrowIconCls
     }, suffixIcon || /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_19___default.a.createElement(_index__WEBPACK_IMPORTED_MODULE_26__["Icon"], {
       type: "arrow-down"
-    })));
+    })) : null);
   };
   var renderOption = function renderOption(child, index) {
     if (child !== null && child !== void 0 && child.props && (child.type.displayName === 'Option' || child.type.name === 'Option')) {
@@ -29143,7 +29181,7 @@ var InternalSelect = function InternalSelect(props, ref) {
       className: dropDownCls,
       style: dropdownStyle,
       ref: dropDownRef
-    }, !dropdownRender && childrenToRender.length > 0 && dropRender(eleOptionList, heightStyle), renderNotContent(), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_19___default.a.createElement("div", null, dropdownRender && dropdownRender(dropRender(childrenToRender, heightStyle))), isMultiple && realChildren.length > 0 && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_19___default.a.createElement("div", {
+    }, !dropdownRender && childrenToRender.length > 0 ? dropRender(eleOptionList, heightStyle) : null, renderNotContent(), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_19___default.a.createElement("div", null, dropdownRender ? dropdownRender(dropRender(childrenToRender, heightStyle)) : null), isMultiple && realChildren.length > 0 ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_19___default.a.createElement("div", {
       className: multipleFooterCls
     }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_19___default.a.createElement(_index__WEBPACK_IMPORTED_MODULE_26__["Checkbox"], {
       style: checkboxStyle,
@@ -29152,7 +29190,7 @@ var InternalSelect = function InternalSelect(props, ref) {
       onChange: handleSelectAll
     }, "\u5168\u9009"), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_19___default.a.createElement("span", {
       className: "".concat(selectPrefixCls, "-multiple-footer-hadSelected")
-    }, "\u5DF2\u9009", /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_19___default.a.createElement("span", null, selectedVal.length), "\u9879"))));
+    }, "\u5DF2\u9009", /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_19___default.a.createElement("span", null, selectedVal.length), "\u9879")) : null));
   };
 
   // 处理多选tag
@@ -29229,10 +29267,10 @@ var InternalSelect = function InternalSelect(props, ref) {
     return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_19___default.a.createElement("div", {
       className: multipleCls,
       ref: selectionRef
-    }, Array.isArray(mulOptions) && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_19___default.a.createElement(react__WEBPACK_IMPORTED_MODULE_19___default.a.Fragment, null, mulOptions.map(function (item, index) {
+    }, Array.isArray(mulOptions) ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_19___default.a.createElement(react__WEBPACK_IMPORTED_MODULE_19___default.a.Fragment, null, mulOptions.map(function (item, index) {
       var label = item.label,
         value = item.value;
-      return (!maxTagCount || index <= maxTagCount - 1) && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_19___default.a.createElement("span", {
+      return !maxTagCount || index <= maxTagCount - 1 ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_19___default.a.createElement("span", {
         key: value,
         className: classnames__WEBPACK_IMPORTED_MODULE_22___default()("".concat(selectPrefixCls, "-selection-tag")),
         onMouseDown: function onMouseDown(e) {
@@ -29254,12 +29292,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__WEBPACK_IMPORTED_MODULE_19___default.a.createElement("span", {
       className: itemCls
     }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_19___default.a.createElement("span", {
       className: "".concat(selectPrefixCls, "-selection-item-content")
-    }, "\u5171", mulOptions.length, "\u9879")) : null), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_19___default.a.createElement("span", {
+    }, "\u5171", mulOptions.length, "\u9879")) : null) : null, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_19___default.a.createElement("span", {
       className: "".concat(selectPrefixCls, "-selection-search"),
       style: {
         width: inputWidth
@@ -29277,7 +29315,7 @@ var InternalSelect = function InternalSelect(props, ref) {
       className: "".concat(selectPrefixCls, "-selection-search-mirror")
     }, searchValue, "\xA0")), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_19___default.a.createElement("span", {
       className: "".concat(selectPrefixCls, "-placeholder")
-    }, !mulOptions.length && !searchValue && placeholder), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_19___default.a.createElement("span", {
+    }, !mulOptions.length && !searchValue ? placeholder : null), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_19___default.a.createElement("span", {
       className: "".concat(selectPrefixCls, "-suffix")
     }, renderSuffix()));
   };