@kdcloudjs/kdesign 1.8.27 → 1.8.28

package/es/rate/rate.js

@@ -39,7 +39,7 @@ var Rate = function Rate(props) {
     _React$useState2 = _slicedToArray(_React$useState, 2),
     selectedValue = _React$useState2[0],
     setSelectedValue = _React$useState2[1];
-  var _React$useState3 = React.useState(0),
+  var _React$useState3 = React.useState([0]),
     _React$useState4 = _slicedToArray(_React$useState3, 2),
     activeNumber = _React$useState4[0],
     setActiveNumber = _React$useState4[1];
@@ -50,14 +50,16 @@ var Rate = function Rate(props) {
   }, [value, selectedValue]);
   var handleClick = React.useCallback(function (value) {
     setSelectedValue(value);
+    onlyActiveCurrent && setActiveNumber([value]);
     onChange && onChange(value);
-  }, [onChange]);
+  }, [onChange, onlyActiveCurrent]);
   var handleMouseEnter = React.useCallback(function (value) {
-    setActiveNumber(value);
+    var tempValue = onlyActiveCurrent ? selectedValue === value ? [value] : [selectedValue, value] : [value];
+    setActiveNumber(tempValue);
     onHoverChange && onHoverChange(value);
-  }, [onHoverChange]);
+  }, [onHoverChange, onlyActiveCurrent, selectedValue]);
   var handleMouseLeave = function handleMouseLeave() {
-    setActiveNumber(0);
+    setActiveNumber([0]);
   };
   var handleFocus = React.useCallback(function () {
     onFocus && onFocus();
@@ -79,12 +81,17 @@ var Rate = function Rate(props) {
     }, icon);
   };
   var getFirstIconStatus = function getFirstIconStatus(value, index, onlyActiveCurrent, secondIconStatus) {
+    var tempValue = typeof value === 'number' ? [value] : value;
+    if (onlyActiveCurrent) {
+      return tempValue.indexOf(index) !== -1;
+    }
+    var realValue = tempValue[0];
     var half = 0.5;
-    var isInteger = _Number$isInteger(value);
-    value = transferValue(value, index);
-    var isActiveAllLeft = value >= index || value === index - half;
-    var isActiveCurrent = value === index;
-    var isActiveFirst = value === index - half;
+    var isInteger = _Number$isInteger(realValue);
+    var tValue = transferValue(realValue, index);
+    var isActiveAllLeft = tValue >= index || tValue === index - half;
+    var isActiveCurrent = tValue === index;
+    var isActiveFirst = tValue === index - half;
     var mark;
     if (secondIconStatus) {
       mark = true;
@@ -105,21 +112,23 @@ var Rate = function Rate(props) {
       return Math.round(value);
     }
   };
-  var getSecondIconStatus = function getSecondIconStatus(value, index, onlyActiveCurrent) {
+  var getSecondIconStatus = React.useCallback(function (value, index, onlyActiveCurrent) {
+    var tempValue = typeof value === 'number' ? [value] : value;
     if (!onlyActiveCurrent) {
-      return value >= index;
+      return tempValue[0] >= index;
     } else {
-      return value === index;
+      var indexArr = activeNumber[0] === 0 && activeNumber.length === 1 ? tempValue : activeNumber;
+      return indexArr.indexOf(index) !== -1;
     }
-  };
+  }, [activeNumber]);
   var getIconStyle = function getIconStyle(isActive) {
     if (isActive) return {
       color: color
     };
   };
-  var isSelected = function isSelected(selectActive, mouseActive) {
-    return activeNumber !== 0 ? mouseActive : selectActive;
-  };
+  var isSelected = React.useCallback(function (selectActive, mouseActive) {
+    return activeNumber[0] !== 0 ? mouseActive : selectActive;
+  }, [activeNumber]);
   var getIconClassName = function getIconClassName(name, isActive) {
     var _context, _classnames;
     return classnames((_classnames = {}, _defineProperty(_classnames, _concatInstanceProperty(_context = "".concat(prefixCls, "-icon-")).call(_context, name), true), _defineProperty(_classnames, "".concat(prefixCls, "-icon-selected"), isActive), _classnames));

package/es/tree/style/index.css

@@ -296,6 +296,9 @@
 .kd-tree-node-title-wrap-selected .kd-tree-node-icon {
   color: var(--kd-c-tree-node-color-text-checked, var(--kd-g-color-theme, #5582f3));
 }
+.kd-tree-node-title-wrap .kd-checkbox-default-disabled .kd-checkbox-default-indeterminate::before {
+  background-color: var(--kd-c-tree-node-color-disabled, var(--kd-g-color-disabled, #b2b2b2));
+}
 .kd-tree-node-title {
   white-space: nowrap;
 }

package/es/tree/style/index.less

@@ -130,6 +130,12 @@
     &-selected {
       .node-selected();
     }
+
+    .@{kd-prefix}-checkbox-default-disabled {
+      .@{kd-prefix}-checkbox-default-indeterminate::before {
+        background-color: @tree-node-disabled-color;
+      }
+    }
   }
   &-title {
     white-space: nowrap;

package/es/tree/treeNode.js

@@ -208,8 +208,8 @@ var TreeNode = React.forwardRef(function (props) {
       className: classNames("".concat(treeNodePrefixCls, "-drag-line-top"))
     }), checkable ? React.createElement(Checkbox, {
       onChange: handleOnchange,
-      checked: !disabled && checked,
-      indeterminate: !disabled && indeterminate,
+      checked: checked,
+      indeterminate: indeterminate,
       disabled: disabled,
       onClick: function onClick(e) {
         return e.stopPropagation();

package/lib/rate/rate.js

@@ -52,7 +52,7 @@ var Rate = function Rate(props) {
     _React$useState2 = (0, _slicedToArray2.default)(_React$useState, 2),
     selectedValue = _React$useState2[0],
     setSelectedValue = _React$useState2[1];
-  var _React$useState3 = React.useState(0),
+  var _React$useState3 = React.useState([0]),
     _React$useState4 = (0, _slicedToArray2.default)(_React$useState3, 2),
     activeNumber = _React$useState4[0],
     setActiveNumber = _React$useState4[1];
@@ -63,14 +63,16 @@ var Rate = function Rate(props) {
   }, [value, selectedValue]);
   var handleClick = React.useCallback(function (value) {
     setSelectedValue(value);
+    onlyActiveCurrent && setActiveNumber([value]);
     onChange && onChange(value);
-  }, [onChange]);
+  }, [onChange, onlyActiveCurrent]);
   var handleMouseEnter = React.useCallback(function (value) {
-    setActiveNumber(value);
+    var tempValue = onlyActiveCurrent ? selectedValue === value ? [value] : [selectedValue, value] : [value];
+    setActiveNumber(tempValue);
     onHoverChange && onHoverChange(value);
-  }, [onHoverChange]);
+  }, [onHoverChange, onlyActiveCurrent, selectedValue]);
   var handleMouseLeave = function handleMouseLeave() {
-    setActiveNumber(0);
+    setActiveNumber([0]);
   };
   var handleFocus = React.useCallback(function () {
     onFocus && onFocus();
@@ -92,12 +94,17 @@ var Rate = function Rate(props) {
     }, icon);
   };
   var getFirstIconStatus = function getFirstIconStatus(value, index, onlyActiveCurrent, secondIconStatus) {
+    var tempValue = typeof value === 'number' ? [value] : value;
+    if (onlyActiveCurrent) {
+      return tempValue.indexOf(index) !== -1;
+    }
+    var realValue = tempValue[0];
     var half = 0.5;
-    var isInteger = (0, _isInteger.default)(value);
-    value = transferValue(value, index);
-    var isActiveAllLeft = value >= index || value === index - half;
-    var isActiveCurrent = value === index;
-    var isActiveFirst = value === index - half;
+    var isInteger = (0, _isInteger.default)(realValue);
+    var tValue = transferValue(realValue, index);
+    var isActiveAllLeft = tValue >= index || tValue === index - half;
+    var isActiveCurrent = tValue === index;
+    var isActiveFirst = tValue === index - half;
     var mark;
     if (secondIconStatus) {
       mark = true;
@@ -118,21 +125,23 @@ var Rate = function Rate(props) {
       return Math.round(value);
     }
   };
-  var getSecondIconStatus = function getSecondIconStatus(value, index, onlyActiveCurrent) {
+  var getSecondIconStatus = React.useCallback(function (value, index, onlyActiveCurrent) {
+    var tempValue = typeof value === 'number' ? [value] : value;
     if (!onlyActiveCurrent) {
-      return value >= index;
+      return tempValue[0] >= index;
     } else {
-      return value === index;
+      var indexArr = activeNumber[0] === 0 && activeNumber.length === 1 ? tempValue : activeNumber;
+      return indexArr.indexOf(index) !== -1;
     }
-  };
+  }, [activeNumber]);
   var getIconStyle = function getIconStyle(isActive) {
     if (isActive) return {
       color: color
     };
   };
-  var isSelected = function isSelected(selectActive, mouseActive) {
-    return activeNumber !== 0 ? mouseActive : selectActive;
-  };
+  var isSelected = React.useCallback(function (selectActive, mouseActive) {
+    return activeNumber[0] !== 0 ? mouseActive : selectActive;
+  }, [activeNumber]);
   var getIconClassName = function getIconClassName(name, isActive) {
     var _context, _classnames;
     return (0, _classnames3.default)((_classnames = {}, (0, _defineProperty2.default)(_classnames, (0, _concat.default)(_context = "".concat(prefixCls, "-icon-")).call(_context, name), true), (0, _defineProperty2.default)(_classnames, "".concat(prefixCls, "-icon-selected"), isActive), _classnames));

package/lib/tree/style/index.css

@@ -296,6 +296,9 @@
 .kd-tree-node-title-wrap-selected .kd-tree-node-icon {
   color: var(--kd-c-tree-node-color-text-checked, var(--kd-g-color-theme, #5582f3));
 }
+.kd-tree-node-title-wrap .kd-checkbox-default-disabled .kd-checkbox-default-indeterminate::before {
+  background-color: var(--kd-c-tree-node-color-disabled, var(--kd-g-color-disabled, #b2b2b2));
+}
 .kd-tree-node-title {
   white-space: nowrap;
 }

package/lib/tree/style/index.less

@@ -130,6 +130,12 @@
     &-selected {
       .node-selected();
     }
+
+    .@{kd-prefix}-checkbox-default-disabled {
+      .@{kd-prefix}-checkbox-default-indeterminate::before {
+        background-color: @tree-node-disabled-color;
+      }
+    }
   }
   &-title {
     white-space: nowrap;

package/lib/tree/treeNode.js

@@ -220,8 +220,8 @@ var TreeNode = _react.default.forwardRef(function (props) {
       className: (0, _classnames.default)("".concat(treeNodePrefixCls, "-drag-line-top"))
     }), checkable ? _react.default.createElement(_checkbox.default, {
       onChange: handleOnchange,
-      checked: !disabled && checked,
-      indeterminate: !disabled && indeterminate,
+      checked: checked,
+      indeterminate: indeterminate,
       disabled: disabled,
       onClick: function onClick(e) {
         return e.stopPropagation();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kdcloudjs/kdesign",
-  "version": "1.8.27",
+  "version": "1.8.28",
   "description": "KDesign 金蝶前端react 组件库",
   "title": "kdesign",
   "keywords": [