@chaoswise/ui 2.3.8 → 2.3.9

package/lib/CWTree/index.js

@@ -34,6 +34,7 @@ import DragSvg from "./assets/Drag";
 import { getLocale } from "./locale";
 import "./index.less";
 import { createTitle, KMPMatch } from "../QuickTransfer/utils";
+import { createTree } from "./utils";
 var TreeNode = _Tree.TreeNode,
   DirectoryTree = _Tree.DirectoryTree;
 var SubMenu = _Menu.SubMenu;
@@ -115,40 +116,8 @@ function CWTree(_ref) {
       });
     });
   }
-  var createTree = function createTree(list, searchValue, caseSensitive, isAppend) {
-    return list.reduce(function (t, c) {
-      var children = c.children,
-        title = c.title;
-      var isHit = KMPMatch(caseSensitive ? title.toLowerCase() : title, caseSensitive ? searchValue.toLowerCase() : searchValue) > -1;
-      if (children && children.length) {
-        var res = createTree(children, searchValue, caseSensitive, isAppend);
-        if (isHit) {
-          if (res.length > 0) {
-            return t.concat(_objectSpread(_objectSpread({}, c), {}, {
-              children: res
-            }));
-          } else {
-            return isAppend ? t.concat(_objectSpread({}, c)) : t.concat(_objectSpread(_objectSpread({}, c), {}, {
-              children: undefined
-            }));
-          }
-        } else {
-          if (res.length > 0) {
-            return t.concat(_objectSpread(_objectSpread({}, c), {}, {
-              children: res
-            }));
-          } else {
-            return t;
-          }
-        }
-      }
-      return isHit ? t.concat(c) : t;
-    }, []);
-  };
   var _treeData = useMemo(function () {
-    var addRootTreeData = addRoot(treeData, "/");
-    if (!searchHighlight) return addRootTreeData;
-    return createTree(addRootTreeData, searchValue, caseSensitive, rest.checkable);
+    return createTree(treeData, searchValue, caseSensitive, rest.checkable);
   }, [searchHighlight, treeData, searchValue, rest.checkable, caseSensitive]);
   function buildMenu(array) {
     // 递归构建菜单解构

package/lib/CWTree/utils/index.js

@@ -0,0 +1,48 @@
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+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) { _defineProperty(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 _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+import { KMPMatch } from "../../QuickTransfer/utils";
+import isUndefined from "lodash-es/isUndefined";
+export var createTree = function createTree(list, searchValue, caseSensitive, isAppend) {
+  return list.reduce(function (t, c) {
+    var children = c.children,
+      title = c.title,
+      isLeaf = c.isLeaf;
+    var finalTitle = caseSensitive ? title : title.toLowerCase();
+    var finalSearchValue = caseSensitive ? searchValue : searchValue.toLowerCase();
+    var isHit = KMPMatch(finalTitle, finalSearchValue) > -1;
+    var leafNode = isUndefined(isLeaf) ? !Boolean(Array.isArray(children)) : isLeaf;
+    if (children && children.length) {
+      var res = createTree(children, searchValue, caseSensitive, isAppend);
+      if (isHit) {
+        if (res.length > 0) {
+          return t.concat(_objectSpread(_objectSpread({}, c), {}, {
+            children: res
+          }));
+        } else {
+          return isAppend ? t.concat(_objectSpread(_objectSpread({}, c), {}, {
+            isLeaf: leafNode
+          })) : t.concat(_objectSpread(_objectSpread({}, c), {}, {
+            isLeaf: leafNode,
+            children: undefined
+          }));
+        }
+      } else {
+        if (res.length > 0) {
+          return t.concat(_objectSpread(_objectSpread({}, c), {}, {
+            isLeaf: leafNode,
+            children: res
+          }));
+        } else {
+          return t;
+        }
+      }
+    }
+    return isHit ? t.concat(_objectSpread(_objectSpread({}, c), {}, {
+      isLeaf: leafNode
+    })) : t;
+  }, []);
+};

package/lib/Form/FormItem.js

@@ -39,7 +39,8 @@ var FormItem = function FormItem(_ref) {
         }, labelCol),
         wrapperCol: _objectSpread({
           style: {
-            flex: 1
+            flex: 1,
+            width: 0 // csshack修复flex:1分摊剩余空间有问题
           }
         }, wrapperCol),
         label: !label && label !== '' && !showLabelWidth ? label : /*#__PURE__*/React.createElement(_Tooltip, {

package/lib/QuickTransfer/index.js

@@ -45,6 +45,7 @@ import { getLocale } from "./locale";
 import "./index.less";
 import { isEqual } from "@chaoswise/utils";
 import NoDrag from "./NoDrag";
+import { createTree } from "../CWTree/utils";
 var Search = _Input.Search;
 
 /**
@@ -164,7 +165,6 @@ var QuickTransfer = /*#__PURE__*/forwardRef(function (props, ref) {
     _useState6 = _slicedToArray(_useState5, 2),
     checkedKeys = _useState6[0],
     setCheckedKeys = _useState6[1];
-
   // 列表左侧判断全选状态实际选中的key,重新搜索之后会改变
   var _useState7 = useState([]),
     _useState8 = _slicedToArray(_useState7, 2),
@@ -270,7 +270,7 @@ var QuickTransfer = /*#__PURE__*/forwardRef(function (props, ref) {
       if (type === "tree") {
         //根据父子节点不同的关联关系设置右侧的列表
         if (treeSelect === "leafNode") {
-          setCheckValue(renderLeafNodetree(targetKeys, dataSource));
+          setCheckValue(renderLeafNodetree(targetKeys, createTree(renderTreeData(dataSource), '', undefined, undefined)));
         } else {
           setCheckValue(renderRelationNode(targetKeys, dataSource));
         }
@@ -314,8 +314,10 @@ var QuickTransfer = /*#__PURE__*/forwardRef(function (props, ref) {
     return newCheckedValue;
   };
   var searchCheckedValue = useMemo(function () {
-    return handleRightSearch(saveSearchValueRight);
-  }, [checkValue, saveSearchValueRight]);
+    return type === "tree" ? handleRightSearch(saveSearchValueRight).filter(function (i) {
+      return Boolean(i.isLeaf);
+    }) : handleRightSearch(saveSearchValueRight);
+  }, [checkValue, saveSearchValueRight, type]);
   // type为list下全选框按钮的样式统一处理
   var setListCheckedStyle = function setListCheckedStyle(listCheckedKeys, dataSource) {
     // 设置列表左侧判断全选状态实际选中的key,重新搜索之后会改变
@@ -468,7 +470,8 @@ var QuickTransfer = /*#__PURE__*/forwardRef(function (props, ref) {
     var _e$node$props = e.node.props,
       eventKey = _e$node$props.eventKey,
       children = _e$node$props.children,
-      originTitle = _e$node$props.originTitle;
+      originTitle = _e$node$props.originTitle,
+      record = _e$node$props.record;
     //当前选中的节点和传到右侧列表的的value
     var newCheckKey = [eventKey];
     var newCheckValue = [{
@@ -532,10 +535,7 @@ var QuickTransfer = /*#__PURE__*/forwardRef(function (props, ref) {
         } else if (!children) {
           //当前是叶子节点
           setCheckedKeys([].concat(_toConsumableArray(checkedKeys), [eventKey]));
-          setCheckValue([].concat(_toConsumableArray(checkValue), [{
-            key: eventKey,
-            title: originTitle
-          }]));
+          setCheckValue([].concat(_toConsumableArray(checkValue), [record]));
         }
       } else {
         //取消选中的情况

package/lib/QuickTransfer/utils.js

@@ -220,32 +220,44 @@ export var getBottomKey = function getBottomKey(arr) {
   return keys;
 };
 export var renderLeafNodetree = function renderLeafNodetree(targetKeys, dataSource) {
-  var newArr = [];
-  var finalCheckValue = [];
-  dataSource.map(function (item) {
-    if (item.children) {
-      newArr = newArr.concat(renderLeafNodetree(targetKeys, item.children));
-    } else {
-      newArr.push({
-        key: item.key,
-        title: item.title,
-        disabled: item.disabled
-      });
-    }
-  });
-  targetKeys.forEach(function (item) {
-    var findValue = newArr.find(function (i) {
-      return i.key == item;
-    });
-    findValue && finalCheckValue.push(findValue);
-  });
-  finalCheckValue = finalCheckValue.filter(function (i) {
-    return i.disabled;
-  }).concat(finalCheckValue.filter(function (i) {
-    return !i.disabled;
-  }));
+  // let newArr = []
+  // let finalCheckValue = [];
+  // dataSource.map(item => {
+  //     if (item.children) {
+  //         newArr = newArr.concat(renderLeafNodetree(targetKeys, item.children))
+  //     } else {
+  //         newArr.push({
+  //             key: item.key,
+  //             title: item.title,
+  //             disabled: item.disabled
+  //         })
+  //     }
+  // })
+  // targetKeys.forEach(item => {
+  //     let findValue = newArr.find(i => i.key == item);
+  //     findValue && finalCheckValue.push(findValue);
+  // })
+  // finalCheckValue = finalCheckValue.filter(i => i.disabled).concat(finalCheckValue.filter(i => !i.disabled));
   // return newArr.filter(item=>targetKeys.includes(item.key))
-  return finalCheckValue;
+  // return finalCheckValue
+  var flatDataSource = function flatDataSource(list) {
+    return list.reduce(function (t, c) {
+      var children = c.children;
+      if (Array.isArray(children) && children.length > 0) {
+        return [].concat(_toConsumableArray(t), [c], _toConsumableArray(flatDataSource(children)));
+      } else {
+        return t.concat(c);
+      }
+    }, []);
+  };
+  var data = flatDataSource(dataSource);
+  return targetKeys.reduce(function (t, c) {
+    var item = data.find(function (d) {
+      return d.key === c;
+    });
+    var disabled = item.disabled;
+    return disabled ? [item].concat(_toConsumableArray(t)) : [].concat(_toConsumableArray(t), [item]);
+  }, []);
 };
 //将树和表格扁平化，通用方法
 export var renderRelationNode = function renderRelationNode(targetKeys, dataSource) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chaoswise/ui",
-  "version": "2.3.8",
+  "version": "2.3.9",
   "description": "公共UI库",
   "keywords": [
     "ui",
@@ -140,5 +140,5 @@
     "access": "public"
   },
   "license": "MIT",
-  "gitHead": "5c3d424c7a7595e63664d10264230b8b3132e023"
+  "gitHead": "c591ca92a71137b79ee7cc6fca301705dac1b3a5"
 }