@chaoswise/ui 3.1.15 → 3.1.16

package/lib/CWTree/index.js

@@ -1,8 +1,10 @@
+import _Empty from "@chaoswise/ui/lib/Empty";
 import _Dropdown from "@chaoswise/ui/lib/Dropdown";
 import _TooltipText from "@chaoswise/ui/lib/TooltipText";
+import _useConfigContext2 from "@chaoswise/ui/lib/useConfigContext";
 import _Menu from "@chaoswise/ui/lib/Menu";
 import _Tree from "@chaoswise/ui/lib/Tree";
-var _excluded = ["children", "treeData", "menuData", "extendType", "onClickMenu", "menuStyle", "menuRender", "extraFooter", "tooltipPlacement", "searchValue", "multiple", "selectedKeys", "defaultSelectedKeys", "onSelect", "searchHighlight", "draggable", "searchHighlightStyle", "className", "caseSensitive", "onExpand", "renderItem", "useTooltipText", "fieldNames"],
+var _excluded = ["children", "treeData", "menuData", "extendType", "onClickMenu", "menuStyle", "menuRender", "extraFooter", "tooltipPlacement", "searchValue", "multiple", "selectedKeys", "defaultSelectedKeys", "onSelect", "searchHighlight", "draggable", "searchHighlightStyle", "className", "caseSensitive", "onExpand", "renderItem", "useTooltipText", "fieldNames", "emptyContent"],
   _excluded2 = ["key", "title", "children"],
   _excluded3 = ["icon", "title", "key"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -26,7 +28,6 @@ import PropTypes from "prop-types";
 import classnames from "classnames";
 import DragSvg from "./assets/Drag";
 import { createTitle, processTreeData } from "./utils";
-import useConfigContext from "../useConfigContext";
 import useStyle from "./index.style";
 var TreeNode = _Tree.TreeNode,
   DirectoryTree = _Tree.DirectoryTree;
@@ -75,8 +76,9 @@ function CWTree(_ref) {
     _ref$useTooltipText = _ref.useTooltipText,
     useTooltipText = _ref$useTooltipText === void 0 ? true : _ref$useTooltipText,
     fieldNames = _ref.fieldNames,
+    emptyContent = _ref.emptyContent,
     rest = _objectWithoutProperties(_ref, _excluded);
-  var _useConfigContext = useConfigContext(),
+  var _useConfigContext = _useConfigContext2(),
     getPrefixCls = _useConfigContext.getPrefixCls;
   var prefixCls = getPrefixCls();
   var _useStyle = useStyle("".concat(prefixCls, "-tree")),
@@ -329,6 +331,13 @@ function CWTree(_ref) {
     if (!children) return false;
     return true;
   }, [children]);
+  // 判断是否为空数据
+  var isEmpty = useMemo(function () {
+    // 如果有children，则不为空
+    if (hasChildren) return false;
+    // 如果没有children，使用processedTreeData判断（经过搜索过滤后的最终数据）
+    return !processedTreeData || processedTreeData.length === 0;
+  }, [hasChildren, processedTreeData]);
 
   // 根据是否有children来决定渲染配置
   var treeProps = useMemo(function () {
@@ -361,7 +370,7 @@ function CWTree(_ref) {
     className: "cw-tree-inner-wrapper"
   }, /*#__PURE__*/React.createElement("div", {
     className: "cw-tree-location-box"
-  }, /*#__PURE__*/React.createElement(DirectoryTree, treeProps, children))), extraFooter && /*#__PURE__*/React.createElement("div", {
+  }, isEmpty ? emptyContent ? emptyContent : /*#__PURE__*/React.createElement(_Empty, null) : /*#__PURE__*/React.createElement(DirectoryTree, treeProps, children))), extraFooter && /*#__PURE__*/React.createElement("div", {
     className: "cw-tree-footer"
   }, extraFooter)));
 }
@@ -458,7 +467,12 @@ CWTree.propTypes = {
    * 自定义渲染整个节点（完全自定义，可获得内部渲染结果作为参考）
    * function(nodeData, internalResult) => ReactNode
    */
-  titleRender: PropTypes.func
+  titleRender: PropTypes.func,
+  /**
+   * 自定义空状态内容，当没有数据或搜索无结果时显示
+   * 可以传入React节点，如果不传则使用默认的Empty组件
+   */
+  emptyContent: PropTypes.node
 };
 CWTree.TreeNode = TreeNode;
 CWTree.DirectoryTree = DirectoryTree;

package/lib/QuickTransfer/index.js

@@ -349,7 +349,7 @@ var QuickTransfer = function QuickTransfer(props) {
   };
   var searchCheckedValue = useMemo(function () {
     return type === "tree" && treeSelect === "leafNode" ? handleRightSearch(saveSearchValueRight).filter(function (i) {
-      return Boolean(i.isLeaf);
+      return i && Boolean(i.isLeaf);
     }) : handleRightSearch(saveSearchValueRight);
   }, [checkValue, saveSearchValueRight, type, treeSelect]);
   // type为list下全选框按钮的样式统一处理
@@ -475,8 +475,7 @@ var QuickTransfer = function QuickTransfer(props) {
     var _e$node = e.node,
       eventKey = _e$node.key,
       children = _e$node.children,
-      originTitle = _e$node.originTitle,
-      record = _e$node.record;
+      originTitle = _e$node.originTitle;
     //当前选中的节点和传到右侧列表的的value
     var newCheckKey = [eventKey];
     var newCheckValue = [{
@@ -541,7 +540,7 @@ var QuickTransfer = function QuickTransfer(props) {
         } else if (!children) {
           //当前是叶子节点
           setCheckedKeys([].concat(_toConsumableArray(checkedKeys), [eventKey]));
-          setCheckValue([].concat(_toConsumableArray(checkValue), [record]));
+          setCheckValue([].concat(_toConsumableArray(checkValue), _toConsumableArray(newCheckValue)));
         }
       } else {
         //取消选中的情况

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@chaoswise/ui",
   "packageName": "chaoswiseUI",
-  "version": "3.1.15",
+  "version": "3.1.16",
   "description": "公共UI库",
   "keywords": [
     "ui",