@chaoswise/ui 3.1.13 → 3.1.15

package/lib/Antd5/tree/style/directory.js

@@ -11,9 +11,11 @@ export var genDirectoryStyle = function genDirectoryStyle(_ref) {
     motionDurationMid = _ref.motionDurationMid,
     borderRadius = _ref.borderRadius,
     controlItemBgHover = _ref.controlItemBgHover;
-  return _defineProperty({}, "".concat(treeCls).concat(treeCls, "-directory ").concat(treeNodeCls), _defineProperty(_defineProperty(_defineProperty({}, "".concat(treeCls, "-node-content-wrapper"), _defineProperty(_defineProperty(_defineProperty(_defineProperty({
+  return _defineProperty({}, "".concat(treeCls).concat(treeCls, "-directory ").concat(treeNodeCls), _defineProperty(_defineProperty(_defineProperty({}, "".concat(treeCls, "-node-content-wrapper"), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({
     position: 'static'
-  }, "> *:not(".concat(treeCls, "-drop-indicator)"), {
+  }, "&:has(".concat(treeCls, "-drop-indicator)"), {
+    position: 'relative'
+  }), "> *:not(".concat(treeCls, "-drop-indicator)"), {
     position: 'relative'
   }), '&:hover', {
     background: 'transparent'
@@ -27,11 +29,17 @@ export var genDirectoryStyle = function genDirectoryStyle(_ref) {
     background: controlItemBgHover
   })), "".concat(treeCls, "-switcher, ").concat(treeCls, "-checkbox, ").concat(treeCls, "-draggable-icon"), {
     zIndex: 1
-  }), '&-selected', _defineProperty(_defineProperty({}, "".concat(treeCls, "-switcher, ").concat(treeCls, "-draggable-icon"), {
+  }), '&-selected', _defineProperty(_defineProperty({
+    background: directoryNodeSelectedBg,
+    borderRadius: borderRadius
+  }, "".concat(treeCls, "-switcher, ").concat(treeCls, "-draggable-icon"), {
     color: directoryNodeSelectedColor
   }), "".concat(treeCls, "-node-content-wrapper"), {
     color: directoryNodeSelectedColor,
     background: 'transparent',
+    '&, &:hover': {
+      color: directoryNodeSelectedColor
+    },
     '&:before, &:hover:before': {
       background: directoryNodeSelectedBg
     }

package/lib/Antd5/tree/style/index.js

@@ -64,16 +64,11 @@ export var genBaseStyle = function genBaseStyle(prefixCls, token) {
     nodeHoverBg = token.nodeHoverBg,
     colorTextQuaternary = token.colorTextQuaternary,
     controlItemBgActiveDisabled = token.controlItemBgActiveDisabled;
-  return _defineProperty({}, treeCls, _objectSpread(_objectSpread({}, resetComponent(token)), {}, (_objectSpread4 = {
-    background: token.colorBgContainer,
-    borderRadius: token.borderRadius,
-    transition: "background-color ".concat(token.motionDurationSlow),
-    '&-rtl': {
-      direction: 'rtl'
-    }
-  }, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_objectSpread4, "&".concat(treeCls, "-rtl ").concat(treeCls, "-switcher_close ").concat(treeCls, "-switcher-icon svg"), {
+  return _defineProperty({}, treeCls, _objectSpread(_objectSpread({}, resetComponent(token)), {}, (_objectSpread4 = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_objectSpread4, '--rc-virtual-list-scrollbar-bg', token.colorSplit), "background", token.colorBgContainer), "borderRadius", token.borderRadius), "transition", "background-color ".concat(token.motionDurationSlow)), '&-rtl', {
+    direction: 'rtl'
+  }), "&".concat(treeCls, "-rtl ").concat(treeCls, "-switcher_close ").concat(treeCls, "-switcher-icon svg"), {
     transform: 'rotate(90deg)'
-  }), "&-focused:not(:hover):not(".concat(treeCls, "-active-focused)"), _objectSpread({}, genFocusOutline(token))), "".concat(treeCls, "-list-holder-inner"), {
+  }), "&-focused:not(:hover):not(".concat(treeCls, "-active-focused)"), genFocusOutline(token)), "".concat(treeCls, "-list-holder-inner"), {
     alignItems: 'flex-start'
   }), "&".concat(treeCls, "-block-node"), _defineProperty({}, "".concat(treeCls, "-list-holder-inner"), _defineProperty(_defineProperty({
     alignItems: 'stretch'
@@ -125,7 +120,7 @@ export var genBaseStyle = function genBaseStyle(prefixCls, token) {
     background: token.controlItemBgHover
   }), "&:not(".concat(treeNodeCls, "-disabled).filter-node ").concat(treeCls, "-title"), {
     color: token.colorPrimary,
-    fontWeight: 500
+    fontWeight: token.fontWeightStrong
   }), '&-draggable', _defineProperty(_defineProperty({
     cursor: 'grab'
   }, "".concat(treeCls, "-draggable-icon"), {
@@ -137,7 +132,7 @@ export var genBaseStyle = function genBaseStyle(prefixCls, token) {
     color: colorTextQuaternary
   }), "&".concat(treeNodeCls, "-disabled ").concat(treeCls, "-draggable-icon"), {
     visibility: 'hidden'
-  }))), "".concat(treeCls, "-indent"), {
+  }))), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_objectSpread4, "".concat(treeCls, "-indent"), {
     alignSelf: 'stretch',
     whiteSpace: 'nowrap',
     userSelect: 'none',
@@ -229,7 +224,7 @@ export var genBaseStyle = function genBaseStyle(prefixCls, token) {
     '&:empty': {
       display: 'none'
     }
-  }))), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_objectSpread4, "".concat(treeCls, "-unselectable ").concat(treeCls, "-node-content-wrapper:hover"), {
+  }))), "".concat(treeCls, "-unselectable ").concat(treeCls, "-node-content-wrapper:hover"), {
     backgroundColor: 'transparent'
   }), "".concat(treeNodeCls, ".drop-container > [draggable]"), {
     boxShadow: "0 0 0 2px ".concat(token.colorPrimary)

package/lib/Antd5/tree/utils/iconUtil.js

@@ -37,8 +37,9 @@ var SwitcherIconCom = function SwitcherIconCom(props) {
       var leafIcon = typeof showLeafIcon === 'function' ? showLeafIcon(treeNodeProps) : showLeafIcon;
       var leafCls = "".concat(prefixCls, "-switcher-line-custom-icon");
       if (/*#__PURE__*/React.isValidElement(leafIcon)) {
+        var _leafIcon$props;
         return cloneElement(leafIcon, {
-          className: classNames(leafIcon.props.className || '', leafCls)
+          className: classNames((_leafIcon$props = leafIcon.props) === null || _leafIcon$props === void 0 ? void 0 : _leafIcon$props.className, leafCls)
         });
       }
       return leafIcon;
@@ -52,8 +53,9 @@ var SwitcherIconCom = function SwitcherIconCom(props) {
   var switcherCls = "".concat(prefixCls, "-switcher-icon");
   var switcher = typeof switcherIcon === 'function' ? switcherIcon(treeNodeProps) : switcherIcon;
   if (/*#__PURE__*/React.isValidElement(switcher)) {
+    var _switcher$props;
     return cloneElement(switcher, {
-      className: classNames(switcher.props.className || '', switcherCls)
+      className: classNames((_switcher$props = switcher.props) === null || _switcher$props === void 0 ? void 0 : _switcher$props.className, switcherCls)
     });
   }
   if (switcher !== undefined) {

package/lib/CWSelect/index.js

@@ -314,17 +314,15 @@ var CWSelect = /*#__PURE__*/forwardRef(function (props, ref) {
   }, [allowDrag, maxTagCount, renderTag, moveNode, tagDropdownOverlay, prefixCls, rest.disabled, handlePreventMouseDown, activeKey, allOptions, handleChange, onDeselect, maxTagTextLength, tagLabelRender]);
 
   /**
-   * 计算最终的 value 值
    * 受控模式：使用传入的 value
-   * 非受控模式：根据是否显示复选框或允许拖拽来决定使用 activeKey 还是 value
+   * 非受控模式：根据是否允许拖拽或者是否限制最大标签显示数量来决定使用 activeKey 还是 value
    */
   var finalValue = useMemo(function () {
     if ("value" in props) {
       return value;
     }
-    return allowDrag ? activeKey : value;
-  }, [props, value, allowDrag, activeKey]);
-
+    return allowDrag || maxTagCount ? activeKey : value;
+  }, [value, allowDrag, activeKey, maxTagCount]);
   // 渲染组件
   return wrapCSSVar(/*#__PURE__*/React.createElement(DndProvider, {
     backend: HTML5Backend

package/lib/CWTree/index.js

@@ -1,11 +1,16 @@
 import _Dropdown from "@chaoswise/ui/lib/Dropdown";
-import _Tooltip from "@chaoswise/ui/lib/Tooltip";
 import _TooltipText from "@chaoswise/ui/lib/TooltipText";
 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"],
   _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 _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); }
 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."); }
@@ -23,7 +28,6 @@ import DragSvg from "./assets/Drag";
 import { createTitle, processTreeData } from "./utils";
 import useConfigContext from "../useConfigContext";
 import useStyle from "./index.style";
-import { useIntl } from "../locales";
 var TreeNode = _Tree.TreeNode,
   DirectoryTree = _Tree.DirectoryTree;
 var SubMenu = _Menu.SubMenu;
@@ -92,7 +96,6 @@ function CWTree(_ref) {
     _useState6 = _slicedToArray(_useState5, 2),
     selfSelectedKeys = _useState6[0],
     setSelfSelectedKeys = _useState6[1];
-  var intl = useIntl();
   var memoizedSearchHighlightStyle = useMemo(function () {
     return searchHighlightStyle;
   }, [searchHighlightStyle]);
@@ -181,14 +184,6 @@ function CWTree(_ref) {
       placement: placement
     }, title) : title;
   }, [useTooltipText]);
-  var renderDragIcon = useMemo(function () {
-    if (!draggable) return null;
-    return /*#__PURE__*/React.createElement("span", {
-      className: "cw-tree-treenode-drag-icon"
-    }, /*#__PURE__*/React.createElement(_Tooltip, {
-      title: intl.get("5fe60774-0f08-450f-a9d9-998996485fec").d("拖拽移动")
-    }, /*#__PURE__*/React.createElement(DragSvg, null)));
-  }, [draggable, intl]);
 
   // 创建标题
   var createTitleComponent = useCallback(function (icon, title, key, props) {
@@ -208,13 +203,13 @@ function CWTree(_ref) {
       className: "cw-tree-treenode-content"
     }, /*#__PURE__*/React.createElement("span", {
       className: "cw-tree-treenode-title"
-    }, renderTooltipTitle(title, tooltipPlacement)), renderDragIcon), /*#__PURE__*/React.createElement("span", {
+    }, renderTooltipTitle(title, tooltipPlacement))), /*#__PURE__*/React.createElement("span", {
       className: classnames("cw-tree-treenode-extend", {
         "cw-tree-treenode-extend-show": isExtendVisible
       })
     }, menuRender ? /*#__PURE__*/React.createElement(Fragment, null, menuRender(title, key, props), menuData(title, key, props) && menuDom) : extendType === "menu" ? menuDom : createButton(icon, title, key, props)));
     return titleDom;
-  }, [createMenu, menuData, extendType, showExtendKey, menuRender, createButton, renderTooltipTitle, renderDragIcon, tooltipPlacement]);
+  }, [createMenu, menuData, extendType, showExtendKey, menuRender, createButton, renderTooltipTitle, tooltipPlacement]);
 
   // 搜索高亮逻辑
   var renderHighlightedTitle = useCallback(function (title) {
@@ -304,12 +299,23 @@ function CWTree(_ref) {
 
   // 拖拽配置优化
   var draggableConfig = useMemo(function () {
-    return draggable ? {
-      icon: false,
+    if (!draggable) return false;
+
+    // 默认内部配置
+    var defaultDraggableConfig = {
+      icon: /*#__PURE__*/React.createElement(DragSvg, null),
       nodeDraggable: function nodeDraggable() {
         return true;
       }
-    } : false;
+    };
+
+    // 如果draggable是对象，则合并外部配置和默认配置
+    if (_typeof(draggable) === 'object') {
+      return _objectSpread(_objectSpread({}, defaultDraggableConfig), draggable);
+    }
+
+    // 如果draggable是true，使用默认配置
+    return defaultDraggableConfig;
   }, [draggable]);
 
   // 样式类名配置
@@ -319,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)));
 }
@@ -421,8 +440,12 @@ CWTree.propTypes = {
   searchHighlightStyle: PropTypes.object,
   /**
    * 是否可拖拽  开启后使用新UE规范
+   * 可以传入布尔值或对象配置：
+   * - true: 使用默认拖拽配置
+   * - false: 禁用拖拽
+   * - object: 自定义拖拽配置，会与默认配置合并
    */
-  draggable: PropTypes.bool,
+  draggable: PropTypes.oneOfType([PropTypes.bool, PropTypes.object]),
   /**
    * 拖拽回调
    */

package/lib/CWTree/index.style.js

@@ -23,15 +23,21 @@ var genCustomCWTreeStyle = function genCustomCWTreeStyle(token) {
         overflowY: "auto",
         ".cw-tree": _defineProperty({
           width: "100%",
-          ".cw-tree-treenode": _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({
+          ".cw-tree-treenode": _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({
             lineHeight: "32px",
             padding: "0 16px",
             whiteSpace: "nowrap",
-            marginBottom: 0,
-            "&::before": {
-              bottom: 0
-            }
-          }, "".concat(treePrefix, "-switcher, ").concat(treePrefix, "-iconEle"), {
+            marginBottom: 0
+          }, "".concat(treePrefix, "-draggable-icon"), {
+            position: "absolute",
+            left: "8px",
+            transform: "translateY(1.2px)",
+            visibility: "hidden",
+            width: "2px",
+            color: token.colorText
+          }), "&::before", {
+            bottom: 0
+          }), "".concat(treePrefix, "-switcher, ").concat(treePrefix, "-iconEle"), {
             width: "12px",
             height: "32px",
             lineHeight: "32px",
@@ -44,7 +50,6 @@ var genCustomCWTreeStyle = function genCustomCWTreeStyle(token) {
             paddingRight: 0,
             minHeight: "32px",
             color: token.colorText,
-            position: "static",
             height: "100%"
           }, "".concat(treePrefix, "-title"), {
             height: "32px",
@@ -66,12 +71,6 @@ var genCustomCWTreeStyle = function genCustomCWTreeStyle(token) {
                 whiteSpace: "nowrap",
                 width: "100%",
                 display: "inline-block"
-              },
-              ".cw-tree-treenode-drag-icon": {
-                position: "absolute",
-                left: "8px",
-                transform: "translateY(1.2px)",
-                visibility: "hidden"
               }
             },
             ".cw-tree-treenode-extend": {
@@ -114,13 +113,9 @@ var genCustomCWTreeStyle = function genCustomCWTreeStyle(token) {
             height: "32px",
             lineHeight: "32px",
             marginTop: 0
-          }), "&:hover", _defineProperty({}, "".concat(treeNodePrefix, "-content-wrapper"), _defineProperty({}, "".concat(treePrefix, "-title"), {
-            ".cw-tree-treenode-content": {
-              ".cw-tree-treenode-drag-icon": {
-                visibility: "visible"
-              }
-            }
-          })))
+          }), "&:hover", _defineProperty({}, "".concat(treePrefix, "-draggable-icon"), {
+            visibility: "visible"
+          }))
         }, "&".concat(treePrefix, "-directory"), _defineProperty({}, "".concat(treePrefix, "-child-tree"), {
           height: "100% !important"
         }))

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.13",
+  "version": "3.1.15",
   "description": "公共UI库",
   "keywords": [
     "ui",