@chaoswise/ui 3.1.12 → 3.1.14

package/lib/CWTree/index.js

@@ -1,3 +1,4 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 import _Dropdown from "@chaoswise/ui/lib/Dropdown";
 import _Tooltip from "@chaoswise/ui/lib/Tooltip";
 import _TooltipText from "@chaoswise/ui/lib/TooltipText";
@@ -6,6 +7,11 @@ 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"],
   _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; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
 function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -70,8 +76,7 @@ function CWTree(_ref) {
     renderItem = _ref.renderItem,
     _ref$useTooltipText = _ref.useTooltipText,
     useTooltipText = _ref$useTooltipText === void 0 ? true : _ref$useTooltipText,
-    _ref$fieldNames = _ref.fieldNames,
-    fieldNames = _ref$fieldNames === void 0 ? {} : _ref$fieldNames,
+    fieldNames = _ref.fieldNames,
     rest = _objectWithoutProperties(_ref, _excluded);
   var _useConfigContext = useConfigContext(),
     getPrefixCls = _useConfigContext.getPrefixCls;
@@ -320,30 +325,43 @@ function CWTree(_ref) {
   var treeClassName = useMemo(function () {
     return classnames("cw-tree", className);
   }, [className]);
+  var hasChildren = useMemo(function () {
+    if (!children) return false;
+    return true;
+  }, [children]);
+
+  // 根据是否有children来决定渲染配置
+  var treeProps = useMemo(function () {
+    var baseProps = _objectSpread(_objectSpread(_objectSpread({
+      icon: null,
+      switcherIcon: /*#__PURE__*/React.createElement(DownOutlined, null),
+      selectedKeys: selfSelectedKeys,
+      onSelect: selfOnSelect,
+      expandAction: false,
+      multiple: multiple,
+      className: treeClassName,
+      draggable: draggableConfig,
+      onExpand: handleExpand,
+      showIcon: true
+    }, expandedConfig), rest), {}, {
+      onMouseEnter: handleMouseEnter,
+      onMouseLeave: handleMouseLeave
+    });
+
+    // 当使用children时，不需要treeData和titleRender
+    // 当使用treeData时，需要添加数据处理和标题渲染
+    return hasChildren ? baseProps : _objectSpread(_objectSpread({}, baseProps), {}, {
+      treeData: processedTreeData,
+      titleRender: titleRender
+    });
+  }, [hasChildren, selfSelectedKeys, selfOnSelect, multiple, treeClassName, draggableConfig, handleExpand, handleMouseEnter, handleMouseLeave, expandedConfig, rest, processedTreeData, titleRender]);
   return wrapCSSVar(/*#__PURE__*/React.createElement("div", {
     className: wrapperClassName
   }, /*#__PURE__*/React.createElement("div", {
     className: "cw-tree-inner-wrapper"
   }, /*#__PURE__*/React.createElement("div", {
     className: "cw-tree-location-box"
-  }, /*#__PURE__*/React.createElement(DirectoryTree, _extends({
-    icon: null,
-    switcherIcon: /*#__PURE__*/React.createElement(DownOutlined, null),
-    selectedKeys: selfSelectedKeys,
-    onSelect: selfOnSelect,
-    expandAction: false,
-    multiple: multiple,
-    className: treeClassName,
-    draggable: draggableConfig,
-    onExpand: handleExpand
-  }, expandedConfig, {
-    showIcon: true,
-    treeData: processedTreeData,
-    titleRender: titleRender
-  }, rest, {
-    onMouseEnter: handleMouseEnter,
-    onMouseLeave: handleMouseLeave
-  }), children))), extraFooter && /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement(DirectoryTree, treeProps, children))), extraFooter && /*#__PURE__*/React.createElement("div", {
     className: "cw-tree-footer"
   }, extraFooter)));
 }

package/lib/CWTree/utils/index.js

@@ -127,7 +127,7 @@ export var processTreeData = function processTreeData(treeData) {
     key: "key",
     children: "children"
   }, fieldNames);
-  if (!treeData || !Array.isArray(treeData)) {
+  if (!treeData) {
     return [];
   }
   var _processNodes = function processNodes(nodes) {

package/package.json

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