uiw 4.14.1 → 4.14.2

package/dist/uiw.css

@@ -4627,9 +4627,14 @@ a.w-list-item:hover:not(.w-disabled) {
   text-overflow: ellipsis;
   word-break: keep-all;
 }
-.w-table-has-children {
-  display: flex;
-  align-items: center;
+.w-table-tr-children-center {
+  text-align: center;
+}
+.w-table-tr-children-left {
+  text-align: left;
+}
+.w-table-tr-children-right {
+  text-align: right;
 }
 .w-table-bordered > table tr > th,
 .w-table-bordered > table tr > td,

package/dist/uiw.js

@@ -8894,9 +8894,9 @@ function TheadComponent(props) {
           thProps.className = (thProps.className || '') + " " + prefixCls + "-ellipsis";
         }
 
-        return /*#__PURE__*/(0,jsx_runtime.jsx)("th", _extends({
-          onClick: evn => onCellHead(item, colNum, rowNum, evn)
-        }, thProps, {
+        return /*#__PURE__*/(0,jsx_runtime.jsx)("th", _extends({}, thProps, {
+          className: prefixCls + "-tr-children-" + ((item == null ? void 0 : item.align) || 'left') + " " + (className || ''),
+          onClick: evn => onCellHead(item, colNum, rowNum, evn),
           children: titleNode
         }), colNum);
       })
@@ -9059,7 +9059,7 @@ function getAllColumnsKeys(data, keys) {
     if (data[i].children) {
       keys = keys.concat(getAllColumnsKeys(data[i].children || []));
     } else if (data[i].key) {
-      keys.push(data[i].key);
+      keys.push(data[i]);
     }
   }
 
@@ -9120,7 +9120,11 @@ function TableTr(props) {
     indentSize,
     childrenColumnName
   } = props;
+  var [isOpacity, setIsOpacity] = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(false);
   var [expandIndex, setExpandIndex] = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)([]);
+  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(() => {
+    setIsOpacity(!!(data != null && data.find(it => it[childrenColumnName])));
+  }, [data]);
   var IconDom = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(() => {
     return (key, isOpacity) => {
       var flag = expandIndex.includes(key);
@@ -9129,7 +9133,9 @@ function TableTr(props) {
         style: {
           marginRight: 10,
           opacity: isOpacity ? 1 : 0,
-          marginLeft: hierarchy * indentSize
+          marginLeft: hierarchy * indentSize,
+          float: 'left',
+          marginTop: 3.24
         },
         onClick: () => {
           setExpandIndex(flag ? expandIndex.filter(it => it !== key) : [...expandIndex, key]);
@@ -9149,11 +9155,11 @@ function TableTr(props) {
         children: [/*#__PURE__*/(0,jsx_runtime.jsx)("tr", {
           children: keys.map((keyName, colNum) => {
             var objs = {
-              children: trData[keyName]
+              children: trData[keyName.key]
             };
 
-            if (render[keyName]) {
-              var child = render[keyName](trData[keyName], keyName, trData, rowNum, colNum);
+            if (render[keyName.key]) {
+              var child = render[keyName.key](trData[keyName.key], keyName.key, trData, rowNum, colNum);
 
               if ( /*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_amd_react_default().isValidElement(child)) {
                 objs.children = child;
@@ -9171,25 +9177,30 @@ function TableTr(props) {
               }
             }
 
-            if (ellipsis && ellipsis[keyName]) {
+            if (ellipsis && ellipsis[keyName.key]) {
               objs.className = prefixCls + "-ellipsis";
             }
 
             var isHasChildren = Array.isArray(trData[childrenColumnName]);
 
-            if (colNum === 0 && (hierarchy || isHasChildren)) {
-              objs.className = objs.className + " " + prefixCls + "-has-children";
+            if (colNum === 0 && (isOpacity || hierarchy || isHasChildren)) {
               objs.children = /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
-                children: [IconDom(key, isHasChildren), objs.children]
+                children: [IconDom(key, isHasChildren), /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+                  style: {
+                    paddingLeft: hierarchy * indentSize
+                  }
+                }), objs.children]
               });
             }
 
             return /*#__PURE__*/(0,external_root_React_commonjs2_react_commonjs_react_amd_react_.createElement)("td", _extends({}, objs, {
-              key: colNum,
+              key: colNum // style={keyName?.style}
+              ,
+              className: objs.className + " " + prefixCls + "-tr-children-" + ((keyName == null ? void 0 : keyName.align) || 'left') + "  " + (keyName.className || ''),
               onClick: evn => onCell(trData, {
                 rowNum,
                 colNum,
-                keyName
+                keyName: keyName.key
               }, evn)
             }));
           })
@@ -9294,7 +9305,10 @@ function Table(props) {
     var selfColumns = [];
 
     if (expandable != null && expandable.expandedRowRender) {
-      keys = ['uiw-expanded', ...keys];
+      keys = [{
+        key: 'uiw-expanded',
+        align: 'center'
+      }, ...keys];
       selfColumns = [{
         title: '',
         key: 'uiw-expanded',
@@ -9778,6 +9792,9 @@ function TreeNode(props) {
           children: [/*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
             className: prefixCls + "-label",
             children: [/*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+              style: {
+                display: noChild ? 'none' : 'auto'
+              },
               className: prefixCls + "-switcher",
               onClick: evn => onItemClick(item, evn),
               children: /*#__PURE__*/(0,jsx_runtime.jsx)(Icon, {
@@ -9858,7 +9875,10 @@ var getChildKeys = function getChildKeys(childs, result, depth) {
   }
 
   childs.forEach(item => {
-    result.push(item.key);
+    if (!item.hideNode) {
+      result.push(item.key);
+    }
+
     if (typeof depth === 'number' && !(depth - 1)) return;
 
     if (item.children && item.children.length > 0) {
@@ -10513,7 +10533,7 @@ function Transfer(props) {
   var {
     placeholder,
     options,
-    value,
+    value = [],
     showSearch = false,
     selectedAll = false,
     bodyStyle,
@@ -10536,11 +10556,11 @@ function Transfer(props) {
     right: CheckedStatus.UnChecked
   });
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(() => {
-    leftSelectedKeySet([]);
-    rightSelectedKeySet([]);
-    rightOpionSet(value || []);
-    value == null ? void 0 : value.forEach(selectd => selectOption.set(selectd.key, selectd.label));
-    hiddenNode(child => !!(value != null && value.find(selectd => child.key === selectd.key)));
+    if (value) {
+      rightOpionSet(value || []);
+      value == null ? void 0 : value.forEach(selectd => selectOption.set(selectd.key, selectd.label));
+      hiddenNode(child => !!(value != null && value.find(selectd => child.key === selectd.key)));
+    }
   }, [JSON.stringify(value)]);
 
   var hiddenNode = callBackfn => {
@@ -10581,7 +10601,7 @@ function Transfer(props) {
 
     var iteratorParent = child => {
       if (child.parent) {
-        var selectCount = child.parent.children.filter(child => !selectOption.get(child.key)).length;
+        var selectCount = child.parent.children.filter(child => !selectOption.get(child.key) && !child.hideNode).length;
         addOrDel(child.parent.key, child.parent.label, selectCount === 0);
         iteratorParent(child.parent);
       }
@@ -10611,22 +10631,22 @@ function Transfer(props) {
   };
 
   var transferClick = transferType => {
-    var selectOptionTemp = selectOption;
-
     if (transferType === 'left') {
       leftSelectOption.forEach((value, key) => {
-        selectOptionTemp.set(key, value);
+        selectOption.set(key, value);
       });
+      leftSelectOptionSet(new Map());
+      leftSelectedKeySet([]);
     } else {
       rightSelectedKeys.forEach(key => {
         selectOption.delete(key);
       });
+      rightSelectedKeySet([]);
     }
 
-    selectOptionSet(selectOptionTemp); // leftSelectOptionSet(selectOptionTemp);
-
+    selectOptionSet(selectOption);
     var option = [];
-    selectOptionTemp.forEach((label, key) => option.push({
+    selectOption.forEach((label, key) => option.push({
       key,
       label
     }));
@@ -10671,22 +10691,23 @@ function Transfer(props) {
 
           if ((_child$children3 = child.children) != null && _child$children3.length) {
             selectedOptionsRecursion(child.children);
-          } else {
-            if (!child.hideNode) {
-              selectOption.set(child.key, child.label);
-              keys.push(child.key);
-            }
+          }
+
+          if (!child.hideNode) {
+            leftSelectOption.set(child.key, child.label);
+            keys.push(child.key);
           }
         });
       };
 
       selectedOptionsRecursion(selectedOptions);
+      leftSelectOptionSet(leftSelectOption);
       leftSelectedKeySet(keys);
     } else {
       leftSelectedKeySet([]);
+      leftSelectOptionSet(new Map());
     }
 
-    selectOptionSet(selectOption);
     selectAllCheckedSet(selectAllChecked);
   };
 
@@ -10695,16 +10716,12 @@ function Transfer(props) {
     selectAllChecked.right = isChecked ? 1 : 0;
 
     if (isChecked) {
-      var keys = rightOpions.map(child => {
-        selectOption.delete(child.key);
-        return child.key;
-      });
+      var keys = rightOpions.map(child => child.key);
       rightSelectedKeySet(keys);
     } else {
       rightSelectedKeySet([]);
     }
 
-    selectOptionSet(selectOption);
     selectAllCheckedSet(selectAllChecked);
   };
 
@@ -10726,16 +10743,16 @@ function Transfer(props) {
     }, style),
     children: [/*#__PURE__*/(0,jsx_runtime.jsxs)(react_card_esm, {
       bodyStyle: {
-        padding: 5
+        padding: '5px 9px'
       },
       title: /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
         children: [selectedAll && /*#__PURE__*/(0,jsx_runtime.jsx)(react_checkbox_esm, {
           indeterminate: leftSelectedKeys.length < selectedOptionsShowCount.current && !!leftSelectedKeys.length,
           checked: leftSelectedKeys.length >= selectedOptionsShowCount.current && !!leftSelectedKeys.length,
           onChange: selectAllLeftChange
-        }), /*#__PURE__*/(0,jsx_runtime.jsxs)("span", {
+        }), /*#__PURE__*/(0,jsx_runtime.jsxs)("label", {
           style: {
-            marginLeft: 10
+            marginLeft: 3
           },
           children: [leftSelectedKeys.length, "/", selectedOptionsShowCount.current]
         })]
@@ -10760,17 +10777,19 @@ function Transfer(props) {
       children: [/*#__PURE__*/(0,jsx_runtime.jsx)(Arrow, {
         click: () => transferClick('left'),
         style: {
-          transform: 'rotate(-90deg)'
+          transform: 'rotate(-90deg)',
+          background: leftSelectedKeys.length > 0 ? '#393E48' : 'none'
         }
       }), /*#__PURE__*/(0,jsx_runtime.jsx)(Arrow, {
         click: () => transferClick('right'),
         style: {
-          transform: 'rotate(90deg)'
+          transform: 'rotate(90deg)',
+          background: rightSelectedKeys.length > 0 ? '#393E48' : 'none'
         }
       })]
     }), /*#__PURE__*/(0,jsx_runtime.jsxs)(react_card_esm, {
       bodyStyle: {
-        padding: 5
+        padding: '5px 9px'
       },
       className: prefixCls + "-card",
       title: /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
@@ -10778,9 +10797,9 @@ function Transfer(props) {
           indeterminate: rightSelectedKeys.length < rightOpions.length && !!rightSelectedKeys.length,
           checked: rightSelectedKeys.length === rightOpions.length && !!rightSelectedKeys.length,
           onChange: selectAllRightChange
-        }), /*#__PURE__*/(0,jsx_runtime.jsxs)("span", {
+        }), /*#__PURE__*/(0,jsx_runtime.jsxs)("label", {
           style: {
-            marginLeft: 10
+            marginLeft: 3
           },
           children: [rightSelectedKeys.length, "/", rightOpions.length]
         })]