uiw 4.17.0 → 4.18.0

package/dist/uiw.css

@@ -2043,7 +2043,6 @@ sup.w-badge-count {
   padding-left: 4px;
   margin-right: 5px;
   font-size: 14px;
-  line-height: 14px;
 }
 
 .w-collapse {
@@ -3895,7 +3894,6 @@ a.w-list-item:hover:not(.w-disabled) {
   box-shadow: 0 0 0 0 rgba(19, 124, 189, 0), 0 0 0 0 rgba(19, 124, 189, 0), inset 0 0 0 1px rgba(16, 22, 26, 0.15), inset 0 1px 1px rgba(16, 22, 26, 0.2);
   box-sizing: border-box;
   background: #fff;
-  min-height: 30px;
   margin: 0 !important;
   padding: 3px 10px 3px 10px;
   vertical-align: middle;
@@ -3925,6 +3923,20 @@ a.w-list-item:hover:not(.w-disabled) {
   cursor: not-allowed;
   resize: none;
 }
+.w-search-select-inner-inner-small {
+  height: 20px;
+}
+.w-search-select-inner-inner-large {
+  height: 30px;
+}
+.w-search-select-inner .w-input-small .w-input-inner {
+  height: 16px;
+  font-size: 10px;
+  padding: 0px;
+}
+.w-search-select-inner .w-input-large .w-input-inner {
+  height: 28px;
+}
 .w-search-select-multiple-colse {
   left: 7px;
   font-size: 15px;
@@ -5119,6 +5131,20 @@ a.w-list-item:hover:not(.w-disabled) {
   display: flex;
   align-content: center;
 }
+.w-search-tree-inner-inner-small {
+  height: 20px;
+}
+.w-search-tree-inner-inner-large {
+  height: 30px;
+}
+.w-search-tree-inner .w-input-small .w-input-inner {
+  height: 16px;
+  font-size: 10px;
+  padding: 0px;
+}
+.w-search-tree-inner .w-input-large .w-input-inner {
+  height: 28px;
+}
 
 .w-transfer {
   display: flex;

package/dist/uiw.js

@@ -371,6 +371,7 @@ __webpack_require__.d(__webpack_exports__, {
   "Progress": () => (/* reexport */ react_progress_esm),
   "Radio": () => (/* reexport */ Radio),
   "RadioAbstract": () => (/* reexport */ RadioAbstract),
+  "RadioButton": () => (/* reexport */ esm_RadioButton),
   "RadioGroup": () => (/* reexport */ RadioGroup),
   "Rate": () => (/* reexport */ Rate),
   "Row": () => (/* reexport */ Row_Row),
@@ -4552,6 +4553,7 @@ function Cascader(props) {
     value,
     onChange,
     onSearch,
+    size,
     disabled,
     allowClear,
     placeholder,
@@ -4561,7 +4563,8 @@ function Cascader(props) {
       width: 200
     },
     option = [],
-    others
+    others,
+    inputProps
   } = props;
   var cls = [prefixCls, className].filter(Boolean).join(' ').trim();
   var [innerIsOpen, setInnerIsOpen] = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(false);
@@ -4713,9 +4716,9 @@ function Cascader(props) {
   return /*#__PURE__*/(0,jsx_runtime.jsx)(Dropdown, _extends({
     className: cls,
     trigger: "click",
-    style: _extends({
+    style: {
       marginTop: 5
-    }, style),
+    },
     overlayStyl: {
       width: 100
     },
@@ -4758,14 +4761,13 @@ function Cascader(props) {
     children: /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
       onMouseLeave: () => renderSelectIcon('leave'),
       onMouseOver: () => renderSelectIcon('enter'),
-      children: /*#__PURE__*/(0,jsx_runtime.jsx)(react_input_esm, {
+      children: /*#__PURE__*/(0,jsx_runtime.jsx)(react_input_esm, _extends({}, inputProps, {
         value: searchOn ? searchText : inputValue,
         onChange: inputChange,
+        size: size,
         disabled: disabled,
         placeholder: searchOn ? inputValue : placeholder,
-        style: {
-          width: style == null ? void 0 : style.width
-        },
+        style: style,
         onFocus: () => onSearch && setSearchOn(true),
         onBlur: () => onSearch && setSearchOn(false),
         readOnly: !onSearch,
@@ -4779,7 +4781,7 @@ function Cascader(props) {
             className: prefixCls + "-close"
           })
         })
-      })
+      }))
     })
   }));
 }
@@ -4877,6 +4879,7 @@ var RadioGroup_excluded = ["prefixCls", "className", "name", "value", "onChange"
 
 
 
+
 /* harmony default export */ const RadioGroup = (/*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_amd_react_default().forwardRef((props, ref) => {
   var {
     prefixCls = 'w-radio-group',
@@ -4891,18 +4894,88 @@ var RadioGroup_excluded = ["prefixCls", "className", "name", "value", "onChange"
   return /*#__PURE__*/(0,jsx_runtime.jsx)("div", _extends({}, other, {
     ref: ref,
     className: [prefixCls, className].filter(Boolean).join(' ').trim(),
-    children: external_root_React_commonjs2_react_commonjs_react_amd_react_default().Children.toArray(children).map(child => {
-      if (!child) return;
-      if (! /*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_amd_react_default().isValidElement(child)) return child;
-      return /*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_amd_react_default().cloneElement(child, _extends({}, child.props || {}, {
-        checked: child.props.value === value,
-        name,
-        onChange
-      }));
+    children: /*#__PURE__*/(0,jsx_runtime.jsx)(react_button_group_esm, {
+      children: external_root_React_commonjs2_react_commonjs_react_amd_react_default().Children.toArray(children).map(child => {
+        if (!child) return;
+        if (! /*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_amd_react_default().isValidElement(child)) return child;
+        return /*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_amd_react_default().cloneElement(child, _extends({}, child.props || {}, {
+          checked: child.props.value === value,
+          name,
+          onChange
+        }));
+      })
     })
   }));
 }));
 
+;// CONCATENATED MODULE: ../react-radio/esm/RadioButton.js
+
+
+var RadioButton_excluded = ["prefixCls", "type", "disabled", "value", "className", "style", "children", "size", "checked", "onChange"];
+
+
+/**
+ * Constructs a type by picking all properties from `HTMLInputProps` and then removing `size`.
+ * Omit: https://www.typescriptlang.org/docs/handbook/utility-types.html#omittk
+ */
+
+
+var RadioButton = /*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_amd_react_default().forwardRef((props, ref) => {
+  var {
+    prefixCls = 'w-radio',
+    type = 'button',
+    disabled = false,
+    value = '',
+    className,
+    style,
+    children,
+    size = 'small',
+    checked: prChecked = false,
+    onChange
+  } = props,
+      other = _objectWithoutPropertiesLoose(props, RadioButton_excluded);
+
+  var [checked, setChecked] = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(prChecked);
+  var [prevChecked, setPrevChecked] = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)();
+
+  if (prChecked !== prevChecked) {
+    setPrevChecked(prChecked);
+  }
+
+  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(() => {
+    if (prChecked !== prevChecked) {
+      setChecked(prChecked);
+    }
+  }, [prevChecked]);
+  var cls = [prefixCls, className, disabled ? 'disabled' : null, size ? prefixCls + "-" + size : null].filter(Boolean).join(' ').trim();
+  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(() => {
+    if (checked !== props.checked) {
+      setChecked(!!props.checked);
+    }
+  }, [props.checked]);
+  console.log('props.checked', props.checked);
+
+  function handleChange(e) {
+    e.persist();
+    setChecked(!checked);
+    onChange && onChange(value);
+  }
+
+  var label = children || value;
+  return /*#__PURE__*/(0,jsx_runtime.jsx)(esm, _extends({}, _extends({}, other, {
+    className: cls,
+    style,
+    disabled,
+    value
+  }), {
+    type: checked ? 'primary' : 'light',
+    ref: ref,
+    onClick: handleChange,
+    children: label
+  }));
+});
+/* harmony default export */ const esm_RadioButton = (RadioButton);
+
 ;// CONCATENATED MODULE: ../react-radio/esm/index.js
 
 
@@ -4910,6 +4983,8 @@ var RadioGroup_excluded = ["prefixCls", "className", "name", "value", "onChange"
 
 
 
+
+
 ;// CONCATENATED MODULE: ../react-checkbox/esm/style/group.css
 // extracted by mini-css-extract-plugin
 /* harmony default export */ const style_group = ({});
@@ -8243,6 +8318,11 @@ var react_search_select_esm_excluded = ["allowClear", "disabled", "valueAmount",
 
 
 
+var TagSize = {
+  large: 25,
+  default: 20,
+  small: 17
+};
 function SearchSelect(props) {
   var _style$width;
 
@@ -8473,7 +8553,7 @@ function SearchSelect(props) {
         maxWidth: 'none'
       }, style),
       children: isMultiple ? /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
-        className: prefixCls + "-inner",
+        className: [prefixCls + "-inner", prefixCls + "-" + size].filter(Boolean).join(' ').trim(),
         children: [/*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
           style: {
             display: 'flex',
@@ -8483,12 +8563,11 @@ function SearchSelect(props) {
           children: [isMultiple && selectedValue.slice(0, maxTagCount).map((item, index) => {
             return /*#__PURE__*/(0,jsx_runtime.jsx)(react_tag_esm, _extends({
               style: _extends({
-                height: 20,
+                height: TagSize[size],
                 margin: 1,
                 display: 'flex',
                 alignItems: 'center'
               }, tagProps.style),
-              className: prefixCls + "-tag",
               color: "#393E48"
             }, tagProps, {
               closable: true,
@@ -9716,9 +9795,9 @@ function TableTr(props) {
 
             if (keyName.fixed) {
               if (keyName.fixed === 'right') {
-                objs.className = objs.className + " " + prefixCls + "-fixed-right";
+                objs.className = prefixCls + "-fixed-right";
               } else {
-                objs.className = objs.className + " " + prefixCls + "-fixed-true";
+                objs.className = prefixCls + "-fixed-true";
               }
             }
 
@@ -9729,7 +9808,7 @@ function TableTr(props) {
                 children: objs.children
               }),
               key: colNum,
-              className: prefixCls + "-tr-children-" + (keyName.align || 'left') + "  " + (keyName.className || '') + " " + (objs.className || ''),
+              className: [prefixCls + '-tr-children-' + (keyName.align || 'left'), keyName.className, objs.className].filter(it => it).join(' ').trim(),
               onClick: evn => onCell(trData, {
                 rowNum,
                 colNum,
@@ -9804,54 +9883,55 @@ function Table(props) {
     }
   };
 
-  var deepClumnsLocation = (params, fistIndex, leftOrRight, isReverse) => {
+  var deepClumnsLocation = (params, fistIndex) => {
     var initialValue = 0,
-        lastIndex = isReverse ? 0 : params.length - 1,
+        headerIndex = 0,
         deepParams = [];
-    params.forEach(() => {
-      var abs = Math.abs(lastIndex);
-      var i = "" + fistIndex + abs;
+    params.forEach((_, index) => {
+      var i = "" + fistIndex + headerIndex;
 
-      if (isReverse) {
-        lastIndex += 1;
-      } else {
-        lastIndex -= 1;
-      }
-
-      if (typeof params[abs] === 'number') {
-        initialValue = params[abs] + initialValue;
-        deepParams.push(params[abs]);
+      if (typeof params[index] === 'number') {
+        initialValue = params[index] + initialValue;
+        deepParams.push(params[index]);
         return;
       }
 
       if (finalLocationWidth.current[i]) {
-        finalLocationWidth.current[i][leftOrRight] = initialValue;
+        finalLocationWidth.current[i].left = initialValue;
         initialValue = finalLocationWidth.current[i].width + initialValue;
+
+        if (Array.isArray(params[index].children)) {
+          deepParams.push(...params[index].children);
+        } else {
+          deepParams.push(finalLocationWidth.current[i].width);
+        }
       }
 
-      if (Array.isArray(params[abs].children)) {
-        deepParams.push(...params[abs].children);
-        return;
+      headerIndex += 1;
+    });
+    initialValue = 0, headerIndex = header[fistIndex].length - 1;
+
+    for (var _index = params.length - 1; _index >= 0; _index--) {
+      var i = "" + fistIndex + headerIndex;
+
+      if (typeof params[_index] === 'number') {
+        initialValue = params[_index] + initialValue;
+        continue;
       }
 
       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);
-        }
+        finalLocationWidth.current[i].right = initialValue;
+        initialValue = finalLocationWidth.current[i].width + initialValue;
       }
-    });
-    if (deepParams.filter(it => typeof it !== 'number').length) deepClumnsLocation(deepParams, fistIndex + 1, leftOrRight, isReverse);
+
+      headerIndex -= 1;
+    }
+
+    if (deepParams.filter(it => typeof it !== 'number').length) deepClumnsLocation(deepParams, fistIndex + 1);
   };
 
   var computed = () => {
-    deepClumnsLocation(columns, 0, 'left', true);
-    deepClumnsLocation(columns, 0, 'right', false);
+    deepClumnsLocation(columns, 0);
     return finalLocationWidth.current;
   };
 
@@ -10772,6 +10852,11 @@ function TreeChecked(_ref) {
 
 
 
+var SearchTagInput_TagSize = {
+  large: 25,
+  default: 20,
+  small: 17
+};
 
 function SearchTagInput(props) {
   var {
@@ -10784,6 +10869,7 @@ function SearchTagInput(props) {
     className,
     style,
     placeholder,
+    tagProps = {},
     content,
     options,
     values,
@@ -10904,11 +10990,11 @@ function SearchTagInput(props) {
         return (_inputRef$current2 = inputRef.current) == null ? void 0 : _inputRef$current2.focus();
       },
       style: _extends({
-        minWidth: 200,
+        minWidth: (style == null ? void 0 : style.width) || 200,
         maxWidth: 'none'
       }, style),
       children: /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
-        className: prefixCls + "-inner",
+        className: [prefixCls + "-inner", prefixCls + "-" + size].filter(Boolean).join(' ').trim(),
         children: [/*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
           style: {
             display: 'flex',
@@ -10916,23 +11002,24 @@ function SearchTagInput(props) {
             width: '100%'
           },
           children: [selectedOption.map((item, index) => {
-            return /*#__PURE__*/(0,jsx_runtime.jsx)(react_tag_esm, {
+            return /*#__PURE__*/(0,jsx_runtime.jsx)(react_tag_esm, _extends({
               style: {
-                height: 20,
+                height: SearchTagInput_TagSize[size],
                 margin: 1,
                 display: 'flex',
                 alignItems: 'center'
               },
               className: prefixCls + "-tag",
               closable: true,
+              color: "#393E48"
+            }, tagProps, {
               disabled: disabled,
-              color: "#393E48",
               onClose: e => {
                 e.stopPropagation();
                 removeSelectItem(index);
               },
               children: item.label
-            }, index);
+            }), index);
           }), /*#__PURE__*/(0,jsx_runtime.jsx)(react_input_esm, {
             ref: inputRef,
             style: {},