@chaoswise/ui 3.1.1 → 3.1.2

package/lib/CWColorPicker/index.js

@@ -4,6 +4,7 @@ import _Button from "@chaoswise/ui/lib/Button";
 import _Space from "@chaoswise/ui/lib/Space";
 import _Tabs from "@chaoswise/ui/lib/Tabs";
 import _Input from "@chaoswise/ui/lib/Input";
+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 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; }
@@ -30,7 +31,11 @@ var ColorPicker = function ColorPicker(_ref) {
     onChange = _ref$onChange === void 0 ? function () {} : _ref$onChange,
     showGradient = _ref.showGradient,
     defaultValue = _ref.defaultValue,
-    colorRender = _ref.colorRender;
+    colorRender = _ref.colorRender,
+    _ref$dropdownProps = _ref.dropdownProps,
+    dropdownProps = _ref$dropdownProps === void 0 ? {
+      trigger: ["click"]
+    } : _ref$dropdownProps;
   var intl = useIntl();
   var _useConfigContext = useConfigContext(),
     getPrefixCls = _useConfigContext.getPrefixCls;
@@ -244,10 +249,9 @@ var ColorPicker = function ColorPicker(_ref) {
       e.preventDefault();
       e.stopPropagation();
     }
-  }, /*#__PURE__*/React.createElement(_Dropdown, {
-    trigger: ["click"],
+  }, /*#__PURE__*/React.createElement(_Dropdown, _extends({}, dropdownProps, {
     overlay: menu
-  }, colorRender ? colorRender() : /*#__PURE__*/React.createElement(_Button, null, /*#__PURE__*/React.createElement(_Space, null, /*#__PURE__*/React.createElement("div", {
+  }), colorRender ? colorRender() : /*#__PURE__*/React.createElement(_Button, null, /*#__PURE__*/React.createElement(_Space, null, /*#__PURE__*/React.createElement("div", {
     className: "".concat(prefixCls, "-select-value"),
     style: {
       background: colorType === "single" ? colorInfo.color : gradientColorValue

package/lib/CWTree/index.js

@@ -177,7 +177,7 @@ function CWTree(_ref) {
       className: "cw-tree-treenode-title"
     }, useTooltipText ? /*#__PURE__*/React.createElement(_TooltipText, {
       placement: tooltipPlacement ? tooltipPlacement : "bottomLeft"
-    }, title) : title), draggable && _showExtend === key && /*#__PURE__*/React.createElement("span", {
+    }, title) : title), draggable && /*#__PURE__*/React.createElement("span", {
       className: "cw-tree-treenode-drag-icon"
     }, /*#__PURE__*/React.createElement(_Tooltip, {
       title: intl.get("5fe60774-0f08-450f-a9d9-998996485fec").d("拖拽移动")
@@ -264,14 +264,20 @@ function CWTree(_ref) {
     }
     return {};
   }, [searchValue, expandedKeys]);
-  var onMouseEnter = function onMouseEnter(e, a) {
+  var handleMouseEnter = function handleMouseEnter(e) {
+    if (rest.onMouseEnter) {
+      rest.onMouseEnter(e);
+    }
     // 显示扩展部分
     if (e.node.key === _showExtend) {
       return;
     }
     setShowExtend(e.node.key);
   };
-  var onMouseLeave = function onMouseLeave() {
+  var handleMouseLeave = function handleMouseLeave(e) {
+    if (rest.onMouseLeave) {
+      rest.onMouseLeave(e); // 传递参数给外部的 onMouseLeave
+    }
     setShowExtend("");
   };
   return wrapCSSVar(/*#__PURE__*/React.createElement("div", {
@@ -288,8 +294,6 @@ function CWTree(_ref) {
     expandAction: false,
     multiple: multiple,
     className: classnames("cw-tree", className),
-    onMouseEnter: onMouseEnter,
-    onMouseLeave: onMouseLeave,
     draggable: draggable ? {
       icon: false,
       nodeDraggable: function nodeDraggable() {
@@ -297,7 +301,10 @@ function CWTree(_ref) {
       }
     } : false,
     onExpand: _onExpand
-  }, expandedConfig, rest), children ? children : innerTreeNode))), /*#__PURE__*/React.createElement("div", {
+  }, expandedConfig, rest, {
+    onMouseEnter: handleMouseEnter,
+    onMouseLeave: handleMouseLeave
+  }), children ? children : innerTreeNode))), /*#__PURE__*/React.createElement("div", {
     className: "cw-tree-footer"
   }, extraFooter)));
 }

package/package.json

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