uiw 4.15.1 → 4.16.2

package/dist/uiw.js

@@ -322,6 +322,7 @@ __webpack_require__.d(__webpack_exports__, {
   "Calendar": () => (/* reexport */ Calendar),
   "Card": () => (/* reexport */ react_card_esm),
   "Carousel": () => (/* reexport */ react_carousel_esm),
+  "Cascader": () => (/* reexport */ react_cascader_esm),
   "Checkbox": () => (/* reexport */ react_checkbox_esm),
   "CheckboxGroup": () => (/* reexport */ CheckboxGroup),
   "Col": () => (/* reexport */ Col),
@@ -4187,6 +4188,601 @@ function Carousel(props, ref) {
 
 /* harmony default export */ const react_carousel_esm = (/*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_amd_react_default().forwardRef(Carousel));
 
+;// CONCATENATED MODULE: ../react-dropdown/esm/index.js
+
+
+var react_dropdown_esm_excluded = ["prefixCls", "placement", "className", "menu", "children", "disabled"];
+
+
+
+
+function Dropdown(props) {
+  var {
+    prefixCls = 'w-dropdown',
+    placement = 'bottomLeft',
+    className,
+    menu,
+    children,
+    disabled
+  } = props,
+      other = _objectWithoutPropertiesLoose(props, react_dropdown_esm_excluded);
+
+  var cls = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(() => [prefixCls, className].filter(Boolean).join(' ').trim(), [prefixCls, className]);
+  return /*#__PURE__*/(0,jsx_runtime.jsx)(react_overlay_trigger_esm, _extends({
+    isOutside: true,
+    autoAdjustOverflow: true,
+    className: cls,
+    disabled: disabled,
+    placement: placement
+  }, other, {
+    overlay: menu,
+    children: /*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_amd_react_default().cloneElement(children, Object.assign({}, children.props))
+  }));
+}
+
+;// CONCATENATED MODULE: ../react-menu/esm/style/item.css
+// extracted by mini-css-extract-plugin
+/* harmony default export */ const style_item = ({});
+;// CONCATENATED MODULE: ../react-menu/esm/MenuItem.js
+
+
+var MenuItem_excluded = ["prefixCls", "className", "tagName", "children", "disabled", "multiline", "icon", "text", "active", "addonAfter", "isSubMenuItem"];
+
+
+
+
+
+var disabledProps = {
+  href: undefined,
+  onClick: undefined,
+  onMouseDown: undefined,
+  onMouseEnter: undefined,
+  onMouseLeave: undefined,
+  tabIndex: -1
+};
+
+function Internal(props, ref) {
+  var {
+    prefixCls = 'w-menu-item',
+    className,
+    tagName: TagName = 'a',
+    disabled = false,
+    multiline = false,
+    icon,
+    text,
+    active = false,
+    addonAfter,
+    isSubMenuItem
+  } = props,
+      htmlProps = _objectWithoutPropertiesLoose(props, MenuItem_excluded);
+
+  var anchorCls = [prefixCls, active ? 'active' : null, disabled ? 'w-disabled' : null, className].filter(Boolean).join(' ').trim();
+  var tagComp = /*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_amd_react_default().createElement(TagName, _extends({}, htmlProps, disabled ? disabledProps : {}, {
+    className: anchorCls,
+    ref
+  }), /*#__PURE__*/(0,jsx_runtime.jsxs)(external_root_React_commonjs2_react_commonjs_react_amd_react_.Fragment, {
+    children: [/*#__PURE__*/(0,jsx_runtime.jsx)(Icon, {
+      className: prefixCls + "-icon",
+      type: icon
+    }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+      className: [prefixCls && prefixCls + "-text", !multiline && prefixCls + "-multiline"].filter(Boolean).join(' ').trim(),
+      children: text
+    }), addonAfter]
+  }));
+
+  if (isSubMenuItem) {
+    return tagComp;
+  }
+
+  return /*#__PURE__*/(0,jsx_runtime.jsxs)("li", {
+    children: [" ", tagComp, " "]
+  });
+}
+
+var MenuItem = /*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_amd_react_default().forwardRef(Internal);
+MenuItem.displayName = 'uiw.MenuItem';
+
+;// CONCATENATED MODULE: ../react-menu/esm/Divider.js
+
+
+var Divider_excluded = ["prefixCls", "className", "title"];
+
+
+var MenuDivider = /*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_amd_react_default().forwardRef((props, ref) => {
+  var {
+    prefixCls = 'w-menu-divider',
+    className,
+    title
+  } = props,
+      htmlProps = _objectWithoutPropertiesLoose(props, Divider_excluded);
+
+  var cls = [prefixCls, className].filter(Boolean).join(' ').trim();
+
+  if (!title) {
+    return /*#__PURE__*/(0,jsx_runtime.jsx)("li", _extends({}, htmlProps, {
+      ref: ref,
+      className: cls
+    }));
+  }
+
+  return /*#__PURE__*/(0,jsx_runtime.jsx)("li", _extends({}, htmlProps, {
+    ref: ref,
+    className: cls,
+    "data-menu": "divider",
+    children: /*#__PURE__*/(0,jsx_runtime.jsx)("strong", {
+      children: title
+    })
+  }));
+});
+MenuDivider.displayName = 'uiw.MenuDivider';
+
+;// CONCATENATED MODULE: ../react-menu/esm/style/submenu.css
+// extracted by mini-css-extract-plugin
+/* harmony default export */ const submenu = ({});
+;// CONCATENATED MODULE: ../react-menu/esm/SubMenu.js
+
+
+var SubMenu_excluded = ["prefixCls", "className", "disabled", "overlayProps", "children", "collapse", "inlineIndent", "inlineCollapsed"];
+
+
+
+
+
+
+
+
+function checkedMenuItem(node) {
+  var isCheck = false;
+
+  if (node) {
+    // eslint-disable-next-line
+    do {
+      if (!node.dataset.menu) {
+        isCheck = true;
+      }
+
+      if (node.dataset.menu && /^(subitem|divider)$/.test(node.dataset.menu)) {
+        isCheck = false;
+      }
+    } while (!node.dataset.menu && (node = node.parentNode));
+  }
+
+  return isCheck;
+}
+
+function IconView(_ref) {
+  var {
+    prefixCls,
+    collapse,
+    isOpen
+  } = _ref;
+  return (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(() => /*#__PURE__*/(0,jsx_runtime.jsx)(Icon, {
+    type: "caret-right",
+    className: [prefixCls ? prefixCls + "-collapse-icon" : null, !collapse && isOpen ? 'w-open' : null, !collapse && !isOpen ? 'w-close' : null].filter(Boolean).join(' ').trim()
+  }), [prefixCls, collapse, isOpen]);
+}
+
+var SubMenu = /*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_amd_react_default().forwardRef(function (props, ref) {
+  var {
+    prefixCls = 'w-menu-subitem',
+    className,
+    disabled,
+    overlayProps = {},
+    children,
+    collapse = false,
+    inlineIndent
+  } = props,
+      other = _objectWithoutPropertiesLoose(props, SubMenu_excluded);
+
+  var overlayTriggerProps = {};
+  var menuProps = {
+    bordered: true,
+    children,
+    inlineIndent,
+    className: [prefixCls ? prefixCls + "-overlay" : null].filter(Boolean).join(' ').trim()
+  };
+  var popupRef = external_root_React_commonjs2_react_commonjs_react_amd_react_default().useRef(null);
+  var [isOpen, setIsOpen] = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(!!overlayProps.isOpen);
+  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(() => {
+    if (collapse) setIsOpen(false);
+  }, [collapse]);
+
+  function onClick(e) {
+    var target = e.currentTarget;
+    var related = e.relatedTarget || e.nativeEvent.target;
+    if (target.children.length < 1) return;
+
+    if (checkedMenuItem(related)) {
+      if (popupRef.current) {
+        popupRef.current.hide();
+      }
+    }
+  }
+
+  function onExit(node) {
+    node.style.height = node.scrollHeight + "px";
+    setIsOpen(false);
+  }
+
+  function onExiting(node) {
+    node.style.height = '0px';
+  }
+
+  function onEnter(node) {
+    node.style.height = '1px';
+    setIsOpen(true);
+  }
+
+  function onEntering(node) {
+    node.style.height = node.scrollHeight + "px";
+  }
+
+  function onEntered(node) {
+    node.style.height = 'initial';
+  }
+
+  if (!collapse) {
+    delete menuProps.onClick;
+    menuProps.bordered = false;
+    overlayTriggerProps.className = prefixCls + "-collapse";
+    overlayTriggerProps.appear = false;
+    overlayTriggerProps.isOutside = true;
+    overlayTriggerProps.isClickOutside = false;
+    overlayTriggerProps.unmountOnExit = false;
+    overlayTriggerProps.trigger = 'click';
+    overlayTriggerProps.transitionName = "" + prefixCls;
+    overlayTriggerProps.onExit = onExit;
+    overlayTriggerProps.onExiting = onExiting;
+    overlayTriggerProps.onEnter = onEnter;
+    overlayTriggerProps.onEntered = onEntered;
+    overlayTriggerProps.onEntering = onEntering;
+  } else {
+    overlayTriggerProps.className = prefixCls + "-popup";
+    overlayTriggerProps.trigger = 'hover';
+    overlayTriggerProps.usePortal = true;
+    menuProps.onClick = onClick;
+  }
+
+  return /*#__PURE__*/(0,jsx_runtime.jsx)("li", {
+    "data-menu": "subitem",
+    ref: ref,
+    children: /*#__PURE__*/(0,jsx_runtime.jsx)(react_overlay_trigger_esm, _extends({
+      placement: "rightTop",
+      autoAdjustOverflow: true,
+      disabled: disabled,
+      isOpen: isOpen,
+      usePortal: false,
+      isOutside: true
+    }, overlayTriggerProps, overlayProps, {
+      ref: popupRef,
+      overlay: /*#__PURE__*/(0,jsx_runtime.jsx)(esm_Menu, _extends({}, menuProps, {
+        style: !collapse ? {
+          paddingLeft: inlineIndent
+        } : {}
+      })),
+      children: /*#__PURE__*/(0,jsx_runtime.jsx)(MenuItem, _extends({}, other, {
+        ref: null,
+        disabled: disabled,
+        isSubMenuItem: true,
+        addonAfter: /*#__PURE__*/(0,jsx_runtime.jsx)(IconView, {
+          collapse: collapse,
+          prefixCls: prefixCls,
+          isOpen: isOpen
+        }),
+        className: [prefixCls ? prefixCls + "-title" : null, !collapse ? prefixCls + "-collapse-title" : null, className].filter(Boolean).join(' ').trim()
+      }))
+    }))
+  });
+});
+SubMenu.displayName = 'uiw.SubMenu';
+
+;// CONCATENATED MODULE: ../react-menu/esm/style/menu.css
+// extracted by mini-css-extract-plugin
+/* harmony default export */ const menu = ({});
+;// CONCATENATED MODULE: ../react-menu/esm/Menu.js
+
+
+var Menu_excluded = ["prefixCls", "className", "children", "bordered", "theme", "inlineIndent", "inlineCollapsed"];
+
+
+
+
+
+
+var Menu = /*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_amd_react_default().forwardRef((props, ref) => {
+  var {
+    prefixCls = 'w-menu',
+    className,
+    children,
+    bordered,
+    theme = 'light',
+    inlineIndent = 10,
+    inlineCollapsed
+  } = props,
+      htmlProps = _objectWithoutPropertiesLoose(props, Menu_excluded);
+
+  var cls = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(() => [prefixCls, bordered ? 'w-bordered' : null, inlineCollapsed ? prefixCls + "-inline-collapsed" : null, theme ? prefixCls + "-" + theme : null, className].filter(Boolean).join(' ').trim(), [prefixCls, bordered, inlineCollapsed, theme, className]);
+  return /*#__PURE__*/(0,jsx_runtime.jsx)("ul", _extends({}, htmlProps, {
+    ref: ref,
+    className: cls,
+    "data-menu": "menu",
+    children: external_root_React_commonjs2_react_commonjs_react_amd_react_default().Children.map(children, (child, key) => {
+      if (! /*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_amd_react_default().isValidElement(child)) return child;
+      var props = {}; // Sub Menu
+
+      if (child.props.children && child.type === SubMenu) {
+        props.inlineIndent = inlineIndent;
+      }
+
+      return /*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_amd_react_default().cloneElement(child, Object.assign(_extends({}, props), child.props, {
+        key: "" + key
+      }));
+    })
+  }));
+});
+Menu.displayName = 'uiw.Menu';
+Menu.Item = MenuItem;
+Menu.SubMenu = SubMenu;
+Menu.Divider = MenuDivider;
+/* harmony default export */ const esm_Menu = (Menu);
+
+;// CONCATENATED MODULE: ../react-menu/esm/index.js
+
+
+
+
+
+/* harmony default export */ const react_menu_esm = (esm_Menu);
+
+;// CONCATENATED MODULE: ../react-cascader/esm/style/index.css
+// extracted by mini-css-extract-plugin
+/* harmony default export */ const react_cascader_esm_style = ({});
+;// CONCATENATED MODULE: ../react-cascader/esm/index.js
+
+
+
+
+
+
+
+
+
+function Cascader(props) {
+  var {
+    value,
+    onChange,
+    onSearch,
+    allowClear,
+    placeholder,
+    prefixCls = 'w-cascader',
+    className,
+    style = {
+      width: 200
+    },
+    option = [],
+    others
+  } = props;
+  var cls = [prefixCls, className].filter(Boolean).join(' ').trim();
+  var [innerIsOpen, setInnerIsOpen] = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(false);
+  var [selectedValue, setSelectedValue] = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)([]);
+  var [selectIconType, setSelectIconType] = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)('');
+  var [searchText, setSearchText] = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)('');
+  var [searchOn, setSearchOn] = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(false);
+  var [inputValue, setInputValue] = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)('');
+  var [searchOption, setSearchOption] = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)();
+  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(() => {
+    if (onSearch) {
+      var tempOptions = [];
+      iteratorOption(option, opt => {
+        var label = opt.map(m => m.label).join(' / ');
+        tempOptions.push({
+          label,
+          options: opt
+        });
+      });
+      setSearchOption(tempOptions);
+    }
+  }, [onSearch]);
+
+  var iteratorOption = function iteratorOption(options, cb, opts) {
+    if (opts === void 0) {
+      opts = [];
+    }
+
+    options.map(opt => {
+      var optsTemp = [...opts, opt];
+
+      if (opt.children) {
+        iteratorOption(opt.children, cb, optsTemp);
+      } else {
+        cb == null ? void 0 : cb(optsTemp);
+      }
+    });
+  };
+
+  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(() => {
+    if (value) {
+      var valueTemp = [];
+      var optChildren = option;
+      value == null ? void 0 : value.map(item => {
+        var findOpt = optChildren.find(opt => opt.value === item);
+        optChildren = (findOpt == null ? void 0 : findOpt.children) || [];
+        valueTemp.push(_extends({
+          label: item,
+          value: item
+        }, findOpt));
+      });
+      setSelectedValue(valueTemp);
+    }
+  }, [value]);
+
+  function onVisibleChange(isOpen) {
+    setInnerIsOpen(isOpen);
+  }
+
+  function renderSelectIcon(type) {
+    var selectIconType;
+
+    if (type === 'enter' && allowClear && selectedValue.length > 0) {
+      selectIconType = 'close';
+    } else {
+      selectIconType = '';
+    }
+
+    setSelectIconType(selectIconType);
+  }
+
+  var searchItemClick = options => {
+    setSearchText('');
+    setInnerIsOpen(false);
+    handelChange(false, options);
+  };
+
+  var handleItemClick = (optionsItem, level) => {
+    selectedValue.splice(level, selectedValue.length - level, optionsItem);
+    handelChange(true, selectedValue);
+  };
+
+  var handelChange = (isSeleted, selectedValue) => {
+    setSelectedValue([...selectedValue]);
+    var value = selectedValue.map(item => item.value);
+    onChange == null ? void 0 : onChange(isSeleted, value, selectedValue);
+  };
+
+  var onClear = e => {
+    e.stopPropagation();
+    handelChange(false, []);
+  };
+
+  var handelSearch = searchText => {
+    setSearchText(searchText);
+  };
+
+  var inputChange = e => {
+    if (!innerIsOpen) {
+      setInnerIsOpen(!innerIsOpen);
+    }
+
+    var value = e.target.value;
+    onSearch && handelSearch(value);
+  };
+
+  var widths = (style == null ? void 0 : style.width) * 0.5 || undefined;
+
+  var OptionIter = function OptionIter(option, level) {
+    if (level === void 0) {
+      level = 0;
+    }
+
+    if (!option) return;
+    return /*#__PURE__*/(0,jsx_runtime.jsx)(react_menu_esm, {
+      bordered: true,
+      style: {
+        minHeight: 25,
+        minWidth: widths,
+        overflowY: 'scroll',
+        width: widths
+      },
+      children: !option || option.length === 0 ? /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+        style: {
+          color: '#c7c7c7',
+          fontSize: 12
+        },
+        children: '没有数据'
+      }) : option.map((opt, index) => {
+        var _selectedValue$level;
+
+        var active = ((_selectedValue$level = selectedValue[level]) == null ? void 0 : _selectedValue$level.value) === opt.value;
+        return /*#__PURE__*/(0,jsx_runtime.jsx)(react_menu_esm.Item, {
+          active: active,
+          text: opt.label,
+          addonAfter: opt.children ? /*#__PURE__*/(0,jsx_runtime.jsx)(Icon, {
+            type: "right"
+          }) : undefined,
+          onClick: () => handleItemClick(opt, level)
+        }, index);
+      })
+    }, level);
+  };
+
+  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(() => {
+    var inputValue = selectedValue.map(opt => opt.label).join(' / ');
+    setInputValue(inputValue);
+  }, [selectedValue]);
+  return /*#__PURE__*/(0,jsx_runtime.jsx)(Dropdown, _extends({
+    className: cls,
+    trigger: "click",
+    style: _extends({
+      marginTop: 5
+    }, style),
+    overlayStyl: {
+      width: 100
+    }
+  }, others, {
+    onVisibleChange: onVisibleChange,
+    isOpen: innerIsOpen,
+    menu: !searchText ? /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+      style: {
+        display: 'flex'
+      },
+      children: new Array(selectedValue.length + 1).fill(0).map((_, index) => {
+        var _selectedValue;
+
+        var options = index ? (_selectedValue = selectedValue[index - 1]) == null ? void 0 : _selectedValue.children : option;
+        return OptionIter(options, index);
+      }).filter(m => !!m)
+    }) : /*#__PURE__*/(0,jsx_runtime.jsx)(react_menu_esm, {
+      bordered: true,
+      style: {
+        minHeight: 25,
+        minWidth: style == null ? void 0 : style.width,
+        overflowY: 'scroll',
+        width: style == null ? void 0 : style.width
+      },
+      children: !searchOption || searchOption.length === 0 ? /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+        style: {
+          color: '#c7c7c7',
+          fontSize: 12
+        },
+        children: '没有数据'
+      }) : searchOption.filter(opt => opt.label.includes(searchText.trim())).map((opt, index) => {
+        return /*#__PURE__*/(0,jsx_runtime.jsx)(react_menu_esm.Item, {
+          text: opt.label,
+          onClick: () => searchItemClick(opt.options) //
+
+        }, index);
+      })
+    }),
+    children: /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+      onMouseLeave: () => renderSelectIcon('leave'),
+      onMouseOver: () => renderSelectIcon('enter'),
+      children: /*#__PURE__*/(0,jsx_runtime.jsx)(react_input_esm, {
+        value: searchOn ? searchText : inputValue,
+        onChange: inputChange,
+        placeholder: searchOn ? inputValue : placeholder,
+        style: {
+          width: style == null ? void 0 : style.width
+        },
+        onFocus: () => onSearch && setSearchOn(true),
+        onBlur: () => onSearch && setSearchOn(false),
+        readOnly: !onSearch,
+        addonAfter: /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+          style: {
+            width: 'auto'
+          },
+          children: selectIconType === 'close' && /*#__PURE__*/(0,jsx_runtime.jsx)(Icon, {
+            type: selectIconType,
+            onClick: onClear,
+            className: prefixCls + "-close"
+          })
+        })
+      })
+    })
+  }));
+}
+
+/* harmony default export */ const react_cascader_esm = (Cascader);
+
 ;// CONCATENATED MODULE: ../react-radio/esm/RadioAbstract.js
 
 
@@ -4767,7 +5363,7 @@ function DateInputRange(props) {
 ;// CONCATENATED MODULE: ../react-date-input/esm/index.js
 
 
-var react_date_input_esm_excluded = ["prefixCls", "className", "popoverProps", "datePickerProps", "allowClear", "format", "onChange"];
+var react_date_input_esm_excluded = ["prefixCls", "className", "popoverProps", "datePickerProps", "allowClear", "autoClose", "format", "onChange"];
 
 
 
@@ -4784,6 +5380,7 @@ function DateInput(props) {
     popoverProps,
     datePickerProps,
     allowClear = true,
+    autoClose = false,
     format = 'YYYY/MM/DD',
     onChange
   } = props,
@@ -4799,6 +5396,7 @@ function DateInput(props) {
   }, [props.value]);
 
   function handleChange(cdate) {
+    autoClose && setIsOpen(false);
     setDate(cdate);
     onChange && onChange(cdate);
   }
@@ -4811,10 +5409,13 @@ function DateInput(props) {
     });
   }
 
+  var [isOpen, setIsOpen] = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(false);
   return /*#__PURE__*/(0,jsx_runtime.jsx)(Popover, _extends({
     trigger: "focus",
     placement: "bottomLeft",
-    autoAdjustOverflow: true
+    autoAdjustOverflow: true,
+    isOpen: isOpen,
+    onVisibleChange: open => setIsOpen(open)
   }, popoverProps, {
     content: /*#__PURE__*/(0,jsx_runtime.jsx)(DatePicker, _extends({
       date: value && new Date(value) || undefined,
@@ -5026,6 +5627,7 @@ function InternalDescriptions(props, ref) {
         className: prefixCls + "-title",
         children: title
       }), /*#__PURE__*/(0,jsx_runtime.jsx)("tbody", {
+        className: prefixCls + "-tbody",
         children: childs.map((child, index) => /*#__PURE__*/(0,jsx_runtime.jsx)(Row, {
           prefixCls: prefixCls,
           bordered: bordered,
@@ -5138,56 +5740,24 @@ var react_drawer_esm_excluded = ["prefixCls", "className", "style", "placement",
     children: /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
       className: prefixCls + "-wrapper",
       style: styl,
-      children: [(title || icon) && /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
-        className: prefixCls + "-header",
-        children: [iconView, titleView, title && isCloseButtonShown && /*#__PURE__*/(0,jsx_runtime.jsx)(esm, {
-          basic: true,
-          onClick: props.onClose,
-          icon: "close",
-          type: "light"
-        })]
-      }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
-        className: prefixCls + "-body",
-        children: /*#__PURE__*/(0,jsx_runtime.jsx)("div", _extends({}, bodyProps, {
-          className: bodyCls,
-          children: props.children
-        }))
-      }), footerView]
-    })
-  }));
-});
-
-;// CONCATENATED MODULE: ../react-dropdown/esm/index.js
-
-
-var react_dropdown_esm_excluded = ["prefixCls", "placement", "className", "menu", "children", "disabled"];
-
-
-
-
-function Dropdown(props) {
-  var {
-    prefixCls = 'w-dropdown',
-    placement = 'bottomLeft',
-    className,
-    menu,
-    children,
-    disabled
-  } = props,
-      other = _objectWithoutPropertiesLoose(props, react_dropdown_esm_excluded);
-
-  var cls = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(() => [prefixCls, className].filter(Boolean).join(' ').trim(), [prefixCls, className]);
-  return /*#__PURE__*/(0,jsx_runtime.jsx)(react_overlay_trigger_esm, _extends({
-    isOutside: true,
-    autoAdjustOverflow: true,
-    className: cls,
-    disabled: disabled,
-    placement: placement
-  }, other, {
-    overlay: menu,
-    children: /*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_amd_react_default().cloneElement(children, Object.assign({}, children.props))
+      children: [(title || icon) && /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+        className: prefixCls + "-header",
+        children: [iconView, titleView, title && isCloseButtonShown && /*#__PURE__*/(0,jsx_runtime.jsx)(esm, {
+          basic: true,
+          onClick: props.onClose,
+          icon: "close",
+          type: "light"
+        })]
+      }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+        className: prefixCls + "-body",
+        children: /*#__PURE__*/(0,jsx_runtime.jsx)("div", _extends({}, bodyProps, {
+          className: bodyCls,
+          children: props.children
+        }))
+      }), footerView]
+    })
   }));
-}
+});
 
 ;// CONCATENATED MODULE: ../react-empty/esm/style/index.css
 // extracted by mini-css-extract-plugin
@@ -6324,427 +6894,113 @@ function LayoutSider(props) {
   });
 }
 
-;// CONCATENATED MODULE: ../../node_modules/@uiw/react-layout/esm/Content.js
-
-
-var Content_excluded = ["prefixCls", "className", "children"];
-
-
-function LayoutContent(props) {
-  var {
-    prefixCls = 'w-layout-content',
-    className,
-    children
-  } = props,
-      other = _objectWithoutPropertiesLoose(props, Content_excluded);
-
-  return /*#__PURE__*/(0,jsx_runtime.jsx)("main", _extends({
-    className: [prefixCls, className].filter(Boolean).join(' ').trim()
-  }, other, {
-    children: children
-  }));
-}
-
-;// CONCATENATED MODULE: ../../node_modules/@uiw/react-layout/esm/style/index.css
-// extracted by mini-css-extract-plugin
-/* harmony default export */ const react_layout_esm_style = ({});
-;// CONCATENATED MODULE: ../../node_modules/@uiw/react-layout/esm/index.js
-
-
-
-
-
-
-Layout.Header = LayoutHeader;
-Layout.Footer = LayoutFooter;
-Layout.Sider = LayoutSider;
-Layout.Content = LayoutContent;
-
-
-
-
-
-/* harmony default export */ const react_layout_esm = (Layout);
-
-;// CONCATENATED MODULE: ../react-loader/esm/style/index.css
-// extracted by mini-css-extract-plugin
-/* harmony default export */ const react_loader_esm_style = ({});
-;// CONCATENATED MODULE: ../react-loader/esm/index.js
-
-
-var react_loader_esm_excluded = ["prefixCls", "className", "size", "loading", "tip", "vertical", "color", "bgColor", "children", "indicator", "fullscreen"];
-
-
-
-
-/* harmony default export */ const react_loader_esm = (function (props) {
-  if (props === void 0) {
-    props = {};
-  }
-
-  var {
-    prefixCls = 'w-loader',
-    className,
-    size = 'default',
-    loading = true,
-    tip,
-    vertical,
-    color,
-    bgColor,
-    children,
-    indicator,
-    fullscreen = false
-  } = props,
-      otherProps = _objectWithoutPropertiesLoose(props, react_loader_esm_excluded);
-
-  var cls = [prefixCls, className, size ? prefixCls + "-" + size : null].filter(Boolean).join(' ').trim();
-  var indicatorView = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(() => /*#__PURE__*/(0,jsx_runtime.jsx)("svg", {
-    viewBox: "25 25 50 50",
-    children: /*#__PURE__*/(0,jsx_runtime.jsx)("circle", {
-      cx: "50",
-      cy: "50",
-      r: "20",
-      fill: "none",
-      strokeWidth: "5",
-      strokeMiterlimit: "10"
-    })
-  }), []);
-  var tipsView = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(() => /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
-    className: [prefixCls + "-tips", fullscreen ? prefixCls + "-fullscreen" : null].filter(Boolean).join(' ').trim(),
-    style: {
-      color,
-      backgroundColor: bgColor
-    },
-    children: /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
-      className: prefixCls + "-tips-nested",
-      children: [indicator || indicatorView, tip && /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
-        className: [prefixCls + "-text", vertical ? prefixCls + "-vertical" : null].filter(Boolean).join(' ').trim(),
-        children: tip
-      })]
-    })
-  }), [fullscreen, bgColor, prefixCls, vertical, tip]);
-  return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", _extends({
-    className: cls
-  }, otherProps, {
-    children: [(loading || fullscreen) && tipsView, children && /*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_amd_react_default().cloneElement(children, Object.assign({}, children.props, {
-      className: [prefixCls + "-warp", loading ? prefixCls + "-blur" : null].filter(Boolean).join(' ').trim()
-    }))]
-  }));
-});
-
-;// CONCATENATED MODULE: ../react-menu/esm/style/item.css
-// extracted by mini-css-extract-plugin
-/* harmony default export */ const style_item = ({});
-;// CONCATENATED MODULE: ../react-menu/esm/MenuItem.js
-
-
-var MenuItem_excluded = ["prefixCls", "className", "tagName", "children", "disabled", "multiline", "icon", "text", "active", "addonAfter", "isSubMenuItem"];
-
-
-
-
-
-var disabledProps = {
-  href: undefined,
-  onClick: undefined,
-  onMouseDown: undefined,
-  onMouseEnter: undefined,
-  onMouseLeave: undefined,
-  tabIndex: -1
-};
-
-function Internal(props, ref) {
-  var {
-    prefixCls = 'w-menu-item',
-    className,
-    tagName: TagName = 'a',
-    disabled = false,
-    multiline = false,
-    icon,
-    text,
-    active = false,
-    addonAfter,
-    isSubMenuItem
-  } = props,
-      htmlProps = _objectWithoutPropertiesLoose(props, MenuItem_excluded);
-
-  var anchorCls = [prefixCls, active ? 'active' : null, disabled ? 'w-disabled' : null, className].filter(Boolean).join(' ').trim();
-  var tagComp = /*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_amd_react_default().createElement(TagName, _extends({}, htmlProps, disabled ? disabledProps : {}, {
-    className: anchorCls,
-    ref
-  }), /*#__PURE__*/(0,jsx_runtime.jsxs)(external_root_React_commonjs2_react_commonjs_react_amd_react_.Fragment, {
-    children: [/*#__PURE__*/(0,jsx_runtime.jsx)(Icon, {
-      className: prefixCls + "-icon",
-      type: icon
-    }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
-      className: [prefixCls && prefixCls + "-text", !multiline && prefixCls + "-multiline"].filter(Boolean).join(' ').trim(),
-      children: text
-    }), addonAfter]
-  }));
-
-  if (isSubMenuItem) {
-    return tagComp;
-  }
-
-  return /*#__PURE__*/(0,jsx_runtime.jsxs)("li", {
-    children: [" ", tagComp, " "]
-  });
-}
-
-var MenuItem = /*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_amd_react_default().forwardRef(Internal);
-MenuItem.displayName = 'uiw.MenuItem';
-
-;// CONCATENATED MODULE: ../react-menu/esm/Divider.js
-
-
-var Divider_excluded = ["prefixCls", "className", "title"];
-
-
-var MenuDivider = /*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_amd_react_default().forwardRef((props, ref) => {
-  var {
-    prefixCls = 'w-menu-divider',
-    className,
-    title
-  } = props,
-      htmlProps = _objectWithoutPropertiesLoose(props, Divider_excluded);
-
-  var cls = [prefixCls, className].filter(Boolean).join(' ').trim();
-
-  if (!title) {
-    return /*#__PURE__*/(0,jsx_runtime.jsx)("li", _extends({}, htmlProps, {
-      ref: ref,
-      className: cls
-    }));
-  }
-
-  return /*#__PURE__*/(0,jsx_runtime.jsx)("li", _extends({}, htmlProps, {
-    ref: ref,
-    className: cls,
-    "data-menu": "divider",
-    children: /*#__PURE__*/(0,jsx_runtime.jsx)("strong", {
-      children: title
-    })
-  }));
-});
-MenuDivider.displayName = 'uiw.MenuDivider';
-
-;// CONCATENATED MODULE: ../react-menu/esm/style/submenu.css
-// extracted by mini-css-extract-plugin
-/* harmony default export */ const submenu = ({});
-;// CONCATENATED MODULE: ../react-menu/esm/SubMenu.js
-
-
-var SubMenu_excluded = ["prefixCls", "className", "disabled", "overlayProps", "children", "collapse", "inlineIndent", "inlineCollapsed"];
-
-
-
-
-
-
-
-
-function checkedMenuItem(node) {
-  var isCheck = false;
-
-  if (node) {
-    // eslint-disable-next-line
-    do {
-      if (!node.dataset.menu) {
-        isCheck = true;
-      }
-
-      if (node.dataset.menu && /^(subitem|divider)$/.test(node.dataset.menu)) {
-        isCheck = false;
-      }
-    } while (!node.dataset.menu && (node = node.parentNode));
-  }
-
-  return isCheck;
-}
-
-function IconView(_ref) {
-  var {
-    prefixCls,
-    collapse,
-    isOpen
-  } = _ref;
-  return (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(() => /*#__PURE__*/(0,jsx_runtime.jsx)(Icon, {
-    type: "caret-right",
-    className: [prefixCls ? prefixCls + "-collapse-icon" : null, !collapse && isOpen ? 'w-open' : null, !collapse && !isOpen ? 'w-close' : null].filter(Boolean).join(' ').trim()
-  }), [prefixCls, collapse, isOpen]);
-}
+;// CONCATENATED MODULE: ../../node_modules/@uiw/react-layout/esm/Content.js
 
-var SubMenu = /*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_amd_react_default().forwardRef(function (props, ref) {
+
+var Content_excluded = ["prefixCls", "className", "children"];
+
+
+function LayoutContent(props) {
   var {
-    prefixCls = 'w-menu-subitem',
+    prefixCls = 'w-layout-content',
     className,
-    disabled,
-    overlayProps = {},
-    children,
-    collapse = false,
-    inlineIndent
+    children
   } = props,
-      other = _objectWithoutPropertiesLoose(props, SubMenu_excluded);
+      other = _objectWithoutPropertiesLoose(props, Content_excluded);
 
-  var overlayTriggerProps = {};
-  var menuProps = {
-    bordered: true,
-    children,
-    inlineIndent,
-    className: [prefixCls ? prefixCls + "-overlay" : null].filter(Boolean).join(' ').trim()
-  };
-  var popupRef = external_root_React_commonjs2_react_commonjs_react_amd_react_default().useRef(null);
-  var [isOpen, setIsOpen] = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(false);
-  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(() => {
-    setIsOpen(false);
-  }, [collapse]);
+  return /*#__PURE__*/(0,jsx_runtime.jsx)("main", _extends({
+    className: [prefixCls, className].filter(Boolean).join(' ').trim()
+  }, other, {
+    children: children
+  }));
+}
 
-  function onClick(e) {
-    var target = e.currentTarget;
-    var related = e.relatedTarget || e.nativeEvent.target;
-    if (target.children.length < 1) return;
+;// CONCATENATED MODULE: ../../node_modules/@uiw/react-layout/esm/style/index.css
+// extracted by mini-css-extract-plugin
+/* harmony default export */ const react_layout_esm_style = ({});
+;// CONCATENATED MODULE: ../../node_modules/@uiw/react-layout/esm/index.js
 
-    if (checkedMenuItem(related)) {
-      if (popupRef.current) {
-        popupRef.current.hide();
-      }
-    }
-  }
 
-  function onExit(node) {
-    node.style.height = node.scrollHeight + "px";
-    setIsOpen(false);
-  }
 
-  function onExiting(node) {
-    node.style.height = '0px';
-  }
 
-  function onEnter(node) {
-    node.style.height = '1px';
-    setIsOpen(true);
-  }
 
-  function onEntering(node) {
-    node.style.height = node.scrollHeight + "px";
-  }
 
-  function onEntered(node) {
-    node.style.height = 'initial';
-  }
+Layout.Header = LayoutHeader;
+Layout.Footer = LayoutFooter;
+Layout.Sider = LayoutSider;
+Layout.Content = LayoutContent;
 
-  if (!collapse) {
-    delete menuProps.onClick;
-    menuProps.bordered = false;
-    overlayTriggerProps.className = prefixCls + "-collapse";
-    overlayTriggerProps.appear = false;
-    overlayTriggerProps.isOutside = true;
-    overlayTriggerProps.isClickOutside = false;
-    overlayTriggerProps.unmountOnExit = false;
-    overlayTriggerProps.trigger = 'click';
-    overlayTriggerProps.transitionName = "" + prefixCls;
-    overlayTriggerProps.onExit = onExit;
-    overlayTriggerProps.onExiting = onExiting;
-    overlayTriggerProps.onEnter = onEnter;
-    overlayTriggerProps.onEntered = onEntered;
-    overlayTriggerProps.onEntering = onEntering;
-  } else {
-    overlayTriggerProps.className = prefixCls + "-popup";
-    overlayTriggerProps.trigger = 'hover';
-    overlayTriggerProps.usePortal = true;
-    menuProps.onClick = onClick;
-  }
 
-  return /*#__PURE__*/(0,jsx_runtime.jsx)("li", {
-    "data-menu": "subitem",
-    ref: ref,
-    children: /*#__PURE__*/(0,jsx_runtime.jsx)(react_overlay_trigger_esm, _extends({
-      placement: "rightTop",
-      autoAdjustOverflow: true,
-      disabled: disabled,
-      isOpen: isOpen,
-      usePortal: false,
-      isOutside: true
-    }, overlayTriggerProps, overlayProps, {
-      ref: popupRef,
-      overlay: /*#__PURE__*/(0,jsx_runtime.jsx)(esm_Menu, _extends({}, menuProps, {
-        style: !collapse ? {
-          paddingLeft: inlineIndent
-        } : {}
-      })),
-      children: /*#__PURE__*/(0,jsx_runtime.jsx)(MenuItem, _extends({}, other, {
-        ref: null,
-        disabled: disabled,
-        isSubMenuItem: true,
-        addonAfter: /*#__PURE__*/(0,jsx_runtime.jsx)(IconView, {
-          collapse: collapse,
-          prefixCls: prefixCls,
-          isOpen: isOpen
-        }),
-        className: [prefixCls ? prefixCls + "-title" : null, !collapse ? prefixCls + "-collapse-title" : null, className].filter(Boolean).join(' ').trim()
-      }))
-    }))
-  });
-});
-SubMenu.displayName = 'uiw.SubMenu';
 
-;// CONCATENATED MODULE: ../react-menu/esm/style/menu.css
-// extracted by mini-css-extract-plugin
-/* harmony default export */ const menu = ({});
-;// CONCATENATED MODULE: ../react-menu/esm/Menu.js
 
 
-var Menu_excluded = ["prefixCls", "className", "children", "bordered", "theme", "inlineIndent", "inlineCollapsed"];
+/* harmony default export */ const react_layout_esm = (Layout);
+
+;// CONCATENATED MODULE: ../react-loader/esm/style/index.css
+// extracted by mini-css-extract-plugin
+/* harmony default export */ const react_loader_esm_style = ({});
+;// CONCATENATED MODULE: ../react-loader/esm/index.js
 
 
+var react_loader_esm_excluded = ["prefixCls", "className", "size", "loading", "tip", "vertical", "color", "bgColor", "children", "indicator", "fullscreen"];
 
 
 
 
-var Menu = /*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_amd_react_default().forwardRef((props, ref) => {
+/* harmony default export */ const react_loader_esm = (function (props) {
+  if (props === void 0) {
+    props = {};
+  }
+
   var {
-    prefixCls = 'w-menu',
+    prefixCls = 'w-loader',
     className,
+    size = 'default',
+    loading = true,
+    tip,
+    vertical,
+    color,
+    bgColor,
     children,
-    bordered,
-    theme = 'light',
-    inlineIndent = 10,
-    inlineCollapsed
+    indicator,
+    fullscreen = false
   } = props,
-      htmlProps = _objectWithoutPropertiesLoose(props, Menu_excluded);
-
-  var cls = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(() => [prefixCls, bordered ? 'w-bordered' : null, inlineCollapsed ? prefixCls + "-inline-collapsed" : null, theme ? prefixCls + "-" + theme : null, className].filter(Boolean).join(' ').trim(), [prefixCls, bordered, inlineCollapsed, theme, className]);
-  return /*#__PURE__*/(0,jsx_runtime.jsx)("ul", _extends({}, htmlProps, {
-    ref: ref,
-    className: cls,
-    "data-menu": "menu",
-    children: external_root_React_commonjs2_react_commonjs_react_amd_react_default().Children.map(children, (child, key) => {
-      if (! /*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_amd_react_default().isValidElement(child)) return child;
-      var props = {}; // Sub Menu
-
-      if (child.props.children && child.type === SubMenu) {
-        props.inlineIndent = inlineIndent;
-      }
+      otherProps = _objectWithoutPropertiesLoose(props, react_loader_esm_excluded);
 
-      return /*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_amd_react_default().cloneElement(child, Object.assign(_extends({}, props), child.props, {
-        key: "" + key
-      }));
+  var cls = [prefixCls, className, size ? prefixCls + "-" + size : null].filter(Boolean).join(' ').trim();
+  var indicatorView = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(() => /*#__PURE__*/(0,jsx_runtime.jsx)("svg", {
+    viewBox: "25 25 50 50",
+    children: /*#__PURE__*/(0,jsx_runtime.jsx)("circle", {
+      cx: "50",
+      cy: "50",
+      r: "20",
+      fill: "none",
+      strokeWidth: "5",
+      strokeMiterlimit: "10"
+    })
+  }), []);
+  var tipsView = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(() => /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+    className: [prefixCls + "-tips", fullscreen ? prefixCls + "-fullscreen" : null].filter(Boolean).join(' ').trim(),
+    style: {
+      color,
+      backgroundColor: bgColor
+    },
+    children: /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+      className: prefixCls + "-tips-nested",
+      children: [indicator || indicatorView, tip && /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+        className: [prefixCls + "-text", vertical ? prefixCls + "-vertical" : null].filter(Boolean).join(' ').trim(),
+        children: tip
+      })]
     })
+  }), [fullscreen, bgColor, prefixCls, vertical, tip]);
+  return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", _extends({
+    className: cls
+  }, otherProps, {
+    children: [(loading || fullscreen) && tipsView, children && /*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_amd_react_default().cloneElement(children, Object.assign({}, children.props, {
+      className: [prefixCls + "-warp", loading ? prefixCls + "-blur" : null].filter(Boolean).join(' ').trim()
+    }))]
   }));
 });
-Menu.displayName = 'uiw.Menu';
-Menu.Item = MenuItem;
-Menu.SubMenu = SubMenu;
-Menu.Divider = MenuDivider;
-/* harmony default export */ const esm_Menu = (Menu);
-
-;// CONCATENATED MODULE: ../react-menu/esm/index.js
-
-
-
-
-
-/* harmony default export */ const react_menu_esm = (esm_Menu);
 
 ;// CONCATENATED MODULE: ../react-message/esm/style/index.css
 // extracted by mini-css-extract-plugin
@@ -8263,6 +8519,7 @@ function SearchSelect(props) {
             placeholder: selectedValue.length ? '' : placeholder
           })]
         }), !disabled && (selectIconType === 'close' || selectIconType === 'loading' && loading) && /*#__PURE__*/(0,jsx_runtime.jsx)(Icon, {
+          className: prefixCls + "-multiple-colse",
           type: selectIconType,
           spin: loading && selectIconType === 'loading',
           onClick: resetSelectedValue
@@ -8277,6 +8534,8 @@ function SearchSelect(props) {
         placeholder: placeholder,
         addonAfter: !disabled && (selectIconType === 'close' || selectIconType === 'loading' && loading) && /*#__PURE__*/(0,jsx_runtime.jsx)(Icon, {
           type: selectIconType,
+          className: prefixCls + "-singe-colse",
+          color: "#393e48",
           spin: loading && selectIconType === 'loading',
           onClick: resetSelectedValue
         })
@@ -9214,7 +9473,7 @@ class ThComponent extends external_root_React_commonjs2_react_commonjs_react_amd
     var rect = external_root_ReactDOM_commonjs2_react_dom_commonjs_react_dom_amd_react_dom_default().findDOMNode(this);
     this.props.updateLocation({
       width: rect.getBoundingClientRect().width
-    }, this.props.colNum);
+    }, "" + this.props.rowNum + this.props.colNum, this.props.item.key, this.props.item.colSpan);
   }
 
   render() {
@@ -9244,7 +9503,7 @@ class ThComponent extends external_root_React_commonjs2_react_commonjs_react_amd
     }
 
     return /*#__PURE__*/(0,jsx_runtime.jsx)("th", _extends({}, thProps, {
-      style: _extends({}, thProps.style, locationFixed(fixed, locationWidth, colNum)),
+      style: _extends({}, thProps.style, locationFixed(fixed, locationWidth, "" + rowNum + colNum)),
       className: prefixCls + "-tr-children-" + ((item == null ? void 0 : item.align) || 'left') + " " + (item.className || '') + " " + cls,
       onClick: evn => onCellHead == null ? void 0 : onCellHead(item, colNum, rowNum, evn),
       children: titleNode
@@ -9368,7 +9627,8 @@ function TableTr(props) {
     hierarchy,
     indentSize,
     childrenColumnName,
-    locationWidth
+    locationWidth,
+    header
   } = props;
   var [isOpacity, setIsOpacity] = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(false);
   var [childrenIndex, setChildrenIndex] = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(0);
@@ -9396,6 +9656,15 @@ function TableTr(props) {
     };
   }, [expandIndex]);
 
+  var getIndex = key => {
+    var j = 0;
+    var i = header.findIndex(it => {
+      j = it.findIndex(item => item.key === key);
+      return j > -1;
+    });
+    return "" + i + j;
+  };
+
   if (!Array.isArray(data) || !data.length) {
     return null;
   }
@@ -9450,7 +9719,7 @@ function TableTr(props) {
             }
 
             return /*#__PURE__*/(0,external_root_React_commonjs2_react_commonjs_react_amd_react_.createElement)("td", _extends({}, objs, {
-              style: _extends({}, locationFixed(keyName.fixed, locationWidth, colNum)),
+              style: keyName.fixed ? _extends({}, locationFixed(keyName.fixed, locationWidth, "" + getIndex(keyName.key || 'undefined'))) : {},
               children: /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
                 className: ellipsis && ellipsis[keyName.key] ? prefixCls + "-ellipsis" : undefined,
                 children: objs.children
@@ -9514,34 +9783,71 @@ function Table(props) {
   var [locationWidth, setLocationWidth] = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)({});
   var finalLocationWidth = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)({});
 
-  var updateLocation = (params, index) => {
+  var updateLocation = function updateLocation(params, index, key, colSpan) {
+    if (colSpan === void 0) {
+      colSpan = 0;
+    }
+
     finalLocationWidth.current = _extends({}, finalLocationWidth.current, {
-      [index]: _extends({}, finalLocationWidth.current[index], params)
+      [index]: _extends({}, finalLocationWidth.current[index], params, {
+        key: key,
+        colSpan
+      })
     });
 
-    if (index === columns.length - 1) {
+    if (index === "" + (header.length - 1) + (header[header.length - 1].length - 1)) {
       setLocationWidth(computed());
     }
   };
 
-  var computed = () => {
-    var left = 0,
-        right = 0;
+  var deepClumnsLocation = (params, fistIndex, leftOrRight, isReverse) => {
+    var initialValue = 0,
+        lastIndex = isReverse ? 0 : params.length - 1,
+        deepParams = [];
+    params.forEach(() => {
+      var abs = Math.abs(lastIndex);
+      var i = "" + fistIndex + abs;
 
-    for (var _index = 0; _index < columns.length; _index++) {
-      if (finalLocationWidth.current[_index]) {
-        finalLocationWidth.current[_index].left = left;
-        left = finalLocationWidth.current[_index].width + left;
+      if (isReverse) {
+        lastIndex += 1;
+      } else {
+        lastIndex -= 1;
       }
-    }
 
-    for (var _index2 = columns.length - 1; _index2 > -1; _index2--) {
-      if (finalLocationWidth.current[_index2]) {
-        finalLocationWidth.current[_index2].right = right;
-        right = finalLocationWidth.current[_index2].width + right;
+      if (typeof params[abs] === 'number') {
+        initialValue = params[abs] + initialValue;
+        deepParams.push(params[abs]);
+        return;
       }
-    }
 
+      if (finalLocationWidth.current[i]) {
+        finalLocationWidth.current[i][leftOrRight] = initialValue;
+        initialValue = finalLocationWidth.current[i].width + initialValue;
+      }
+
+      if (Array.isArray(params[abs].children)) {
+        deepParams.push(...params[abs].children);
+        return;
+      }
+
+      if (finalLocationWidth.current[i]) {
+        deepParams.push(finalLocationWidth.current[i].width);
+      } else {
+        var parent = header.find(it => it.find(it => it.key === params[abs].key)) || [];
+        var sub = parent.findIndex(it => it.key === params[abs].key);
+
+        if (finalLocationWidth.current["" + i[0] + sub]) {
+          // 合并单元格
+          deepParams.push(finalLocationWidth.current["" + i[0] + sub].width);
+        }
+      }
+    });
+    if (deepParams.filter(it => typeof it !== 'number').length) deepClumnsLocation(deepParams, fistIndex + 1, leftOrRight, isReverse);
+  };
+
+  var computed = () => {
+    deepClumnsLocation(columns, 0, 'left', true);
+    deepClumnsLocation(columns, 0, 'right', false);
     return finalLocationWidth.current;
   };
 
@@ -9715,6 +10021,7 @@ function Table(props) {
             rowKey: rowKey,
             locationWidth: locationWidth,
             data: data,
+            header: header,
             keys: self.keys,
             render: render,
             ellipsis: ellipsis,
@@ -9722,7 +10029,7 @@ function Table(props) {
             onCell: onCell,
             hierarchy: 0,
             isExpandedDom: isExpandedDom,
-            indentSize: (expandable == null ? void 0 : expandable.indentSize) || 16,
+            indentSize: typeof (expandable == null ? void 0 : expandable.indentSize) === 'number' ? expandable == null ? void 0 : expandable.indentSize : 16,
             childrenColumnName: (expandable == null ? void 0 : expandable.childrenColumnName) || 'children'
           })
         }), data && data.length === 0 && empty && /*#__PURE__*/(0,jsx_runtime.jsx)("tbody", {
@@ -9782,6 +10089,7 @@ var react_tabs_esm_excluded = ["prefixCls", "className", "children", "type", "ac
 
 
 Tabs.Pane = Pane;
+var labelWidth = 0;
 function Tabs(props) {
   var _flowNav$nav;
 
@@ -9827,12 +10135,16 @@ function Tabs(props) {
       flowNavSet(_extends({}, flowNav));
     }
   }, []);
-  var divNavRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useCallback)((node, key) => {
+  var divNavRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useCallback)((node, key, itemKey) => {
     if (node !== null) {
       node.addEventListener('click', e => {
         activeItem.current = node;
       });
       divNavWidthChange(node.getBoundingClientRect().width, key);
+
+      if (itemKey === props.activeKey && type === 'line' && labelWidth === 0) {
+        activeItem.current = node;
+      }
     }
   }, []);
 
@@ -9871,6 +10183,7 @@ function Tabs(props) {
 
   function calcSlideStyle() {
     if (activeItem.current && type === 'line') {
+      labelWidth = activeItem.current.clientWidth;
       setSlideStyle({
         width: activeItem.current.clientWidth,
         left: activeItem.current.offsetLeft
@@ -9948,7 +10261,7 @@ function Tabs(props) {
       }
 
       return /*#__PURE__*/(0,jsx_runtime.jsx)("div", _extends({
-        ref: _ref => divNavRef(_ref, key)
+        ref: _ref => divNavRef(_ref, key, item.key)
       }, divProps), key);
     });
   }