@hi-ui/check-tree-select 5.0.0-experimental.2 → 5.0.0-experimental.3

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @hi-ui/check-tree-select
 
+## 5.0.0-experimental.3
+
+### Minor Changes
+
+- 07a57b9c1: feat(check-tree-select): 支持设置 checkable (5.0)
+
+### Patch Changes
+
+- Updated dependencies [07a57b9c1]
+- Updated dependencies [95d930354]
+  - @hi-ui/tree@5.0.0-experimental.4
+  - @hi-ui/core@5.0.0-experimental.2
+
 ## 5.0.0-experimental.2
 
 ### Minor Changes

package/lib/cjs/CheckTreeSelect.js

@@ -165,6 +165,7 @@ var CheckTreeSelect = /*#__PURE__*/React.forwardRef(function (_a, ref) {
         flattedNode.title = getKeyFields(raw, 'title');
         flattedNode.disabled = (_a = getKeyFields(raw, 'disabled')) !== null && _a !== void 0 ? _a : false;
         flattedNode.isLeaf = (_b = getKeyFields(raw, 'isLeaf')) !== null && _b !== void 0 ? _b : false;
+        flattedNode.checkable = raw.checkable !== false;
         return flattedNode;
       }
     });
@@ -283,17 +284,17 @@ var CheckTreeSelect = /*#__PURE__*/React.forwardRef(function (_a, ref) {
     // 全选操作
     if (!currentAllChecked && !hasCheckedAll) {
       tryChangeValue(flattedData.filter(function (item) {
-        if (!item.disabled) {
-          // 根据 checkedMode 类型过滤出已选项，保证全选操作下 onChange 回调的值是符合 checkedMode 的规则
-          if (checkedMode === 'CHILD') {
-            return !item.children;
-          }
-          if (checkedMode === 'PARENT') {
-            return item.depth === 0;
-          }
-          return true;
+        if (item.disabled || item.checkable === false) {
+          return false;
+        }
+        // 根据 checkedMode 类型过滤出已选项，保证全选操作下 onChange 回调的值是符合 checkedMode 的规则
+        if (checkedMode === 'CHILD') {
+          return !item.children;
+        }
+        if (checkedMode === 'PARENT') {
+          return item.depth === 0;
         }
-        return false;
+        return true;
       }).map(function (_ref) {
         var id = _ref.id;
         return id;

package/lib/cjs/hooks/use-check.js

@@ -78,6 +78,9 @@ var allowCheck = function allowCheck(targetItem) {
   if (targetItem.disabled) {
     return false;
   }
+  if (targetItem.checkable === false) {
+    return false;
+  }
   return true;
 };
 exports.useCheck = useCheck;

package/lib/cjs/utils/index.js

@@ -120,12 +120,21 @@ function fillCheck(checkedIds, depthEntities, nodeEntities, maxDepth, allowCheck
         children = entity.children;
       if (visitedIds.has(id)) return;
       if (typeAssertion.isArrayNonEmpty(children)) {
-        var shouldChecked = !children.some(function (child) {
+        // 可勾选子节点需在 checkedIds；disabled / checkable:false 但有子树时走 visitedIds；
+        // checkable:false 且无子节点（纯展示叶）不阻塞父级全选
+        var childFails = function childFails(child) {
+          if (!allowCheck(child)) {
+            if (typeAssertion.isArrayNonEmpty(child.children)) {
+              return visitedIds.has(child.id) ? !visitedIds.get(child.id) : true;
+            }
+            return false;
+          }
           if (visitedIds.has(child.id)) {
             return !visitedIds.get(child.id);
           }
           return !checkedIdsSet.has(child.id);
-        });
+        };
+        var shouldChecked = !children.some(childFails);
         visitedIds.set(id, shouldChecked);
         if (shouldChecked && allowCheck(entity)) {
           checkedIdsSet.add(id);
@@ -148,12 +157,19 @@ var getAllCheckedStatus = function getAllCheckedStatus(flattedData, values) {
       treeIdsSet["delete"](id);
     }
   });
-  return [hasValue && treeIdsSet.size === 0, hasValue && treeIdsSet.size > 0,
+  var nonCheckableCount = flattedData.filter(function (item) {
+    return item.disabled || item.checkable === false;
+  }).length;
+  var onlyNonCheckableLeft = treeIdsSet.size > 0 && [].concat(treeIdsSet).every(function (id) {
+    var n = flattedData.find(function (item) {
+      return item.id === id;
+    });
+    return n && (n.disabled || n.checkable === false);
+  });
+  return [hasValue && (treeIdsSet.size === 0 || onlyNonCheckableLeft), hasValue && treeIdsSet.size > 0 && !onlyNonCheckableLeft,
   // 该值用来判断剩余未选中的节点是否都是 disabled 的
   // 如果为 true 则表示可选值都已选中
-  treeIdsSet.size === flattedData.filter(function (item) {
-    return item.disabled;
-  }).length];
+  treeIdsSet.size === nonCheckableCount];
 };
 exports.getAllCheckedStatus = getAllCheckedStatus;
 exports.parseCheckDataDirty = parseCheckDataDirty;

package/lib/esm/CheckTreeSelect.js

@@ -152,6 +152,7 @@ var CheckTreeSelect = /*#__PURE__*/forwardRef(function (_a, ref) {
         flattedNode.title = getKeyFields(raw, 'title');
         flattedNode.disabled = (_a = getKeyFields(raw, 'disabled')) !== null && _a !== void 0 ? _a : false;
         flattedNode.isLeaf = (_b = getKeyFields(raw, 'isLeaf')) !== null && _b !== void 0 ? _b : false;
+        flattedNode.checkable = raw.checkable !== false;
         return flattedNode;
       }
     });
@@ -270,17 +271,17 @@ var CheckTreeSelect = /*#__PURE__*/forwardRef(function (_a, ref) {
     // 全选操作
     if (!currentAllChecked && !hasCheckedAll) {
       tryChangeValue(flattedData.filter(function (item) {
-        if (!item.disabled) {
-          // 根据 checkedMode 类型过滤出已选项，保证全选操作下 onChange 回调的值是符合 checkedMode 的规则
-          if (checkedMode === 'CHILD') {
-            return !item.children;
-          }
-          if (checkedMode === 'PARENT') {
-            return item.depth === 0;
-          }
-          return true;
+        if (item.disabled || item.checkable === false) {
+          return false;
+        }
+        // 根据 checkedMode 类型过滤出已选项，保证全选操作下 onChange 回调的值是符合 checkedMode 的规则
+        if (checkedMode === 'CHILD') {
+          return !item.children;
+        }
+        if (checkedMode === 'PARENT') {
+          return item.depth === 0;
         }
-        return false;
+        return true;
       }).map(function (_ref) {
         var id = _ref.id;
         return id;

package/lib/esm/hooks/use-check.js

@@ -73,6 +73,9 @@ var allowCheck = function allowCheck(targetItem) {
   if (targetItem.disabled) {
     return false;
   }
+  if (targetItem.checkable === false) {
+    return false;
+  }
   return true;
 };
 export { useCheck };

package/lib/esm/utils/index.js

@@ -115,12 +115,21 @@ function fillCheck(checkedIds, depthEntities, nodeEntities, maxDepth, allowCheck
         children = entity.children;
       if (visitedIds.has(id)) return;
       if (isArrayNonEmpty(children)) {
-        var shouldChecked = !children.some(function (child) {
+        // 可勾选子节点需在 checkedIds；disabled / checkable:false 但有子树时走 visitedIds；
+        // checkable:false 且无子节点（纯展示叶）不阻塞父级全选
+        var childFails = function childFails(child) {
+          if (!allowCheck(child)) {
+            if (isArrayNonEmpty(child.children)) {
+              return visitedIds.has(child.id) ? !visitedIds.get(child.id) : true;
+            }
+            return false;
+          }
           if (visitedIds.has(child.id)) {
             return !visitedIds.get(child.id);
           }
           return !checkedIdsSet.has(child.id);
-        });
+        };
+        var shouldChecked = !children.some(childFails);
         visitedIds.set(id, shouldChecked);
         if (shouldChecked && allowCheck(entity)) {
           checkedIdsSet.add(id);
@@ -143,11 +152,18 @@ var getAllCheckedStatus = function getAllCheckedStatus(flattedData, values) {
       treeIdsSet["delete"](id);
     }
   });
-  return [hasValue && treeIdsSet.size === 0, hasValue && treeIdsSet.size > 0,
+  var nonCheckableCount = flattedData.filter(function (item) {
+    return item.disabled || item.checkable === false;
+  }).length;
+  var onlyNonCheckableLeft = treeIdsSet.size > 0 && [].concat(treeIdsSet).every(function (id) {
+    var n = flattedData.find(function (item) {
+      return item.id === id;
+    });
+    return n && (n.disabled || n.checkable === false);
+  });
+  return [hasValue && (treeIdsSet.size === 0 || onlyNonCheckableLeft), hasValue && treeIdsSet.size > 0 && !onlyNonCheckableLeft,
   // 该值用来判断剩余未选中的节点是否都是 disabled 的
   // 如果为 true 则表示可选值都已选中
-  treeIdsSet.size === flattedData.filter(function (item) {
-    return item.disabled;
-  }).length];
+  treeIdsSet.size === nonCheckableCount];
 };
 export { getAllCheckedStatus, parseCheckDataDirty, processCheckedIds };

package/lib/types/types.d.ts

@@ -22,6 +22,11 @@ export interface CheckTreeSelectDataItem extends HiBaseDataItem {
      * 是否为叶子节点，当 children 为空数组也表示为叶子结点
      */
     isLeaf?: boolean;
+    /**
+     * 节点是否展示复选框；为 `false` 时不展示复选框，且该节点不可被勾选（常用于仅作分组/展开的节点）
+     * @default true
+     */
+    checkable?: boolean;
 }
 export interface FlattedCheckTreeSelectDataItem extends CheckTreeSelectDataItem {
     /**
@@ -76,5 +81,9 @@ export interface CheckTreeSelectDataSource<T = any> {
     transformResponse?: (response: object) => T;
 }
 export interface CheckTreeSelectItemEventData extends TreeNodeEventData {
+    /**
+     * 节点是否展示复选框（与数据项 `checkable` 一致，由 Tree 扁平化后透传）
+     */
+    checkable?: boolean;
 }
 export type CheckTreeSelectAppearanceEnum = HiBaseAppearanceEnum | 'contained' | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hi-ui/check-tree-select",
-  "version": "5.0.0-experimental.2",
+  "version": "5.0.0-experimental.3",
   "description": "A sub-package for @hi-ui/hiui.",
   "keywords": [],
   "author": "HiUI <mi-hiui@xiaomi.com>",
@@ -54,7 +54,7 @@
     "@hi-ui/picker": "^5.0.0-experimental.2",
     "@hi-ui/popper": "^5.0.0-experimental.1",
     "@hi-ui/tag-input": "^5.0.0-experimental.2",
-    "@hi-ui/tree": "^5.0.0-experimental.2",
+    "@hi-ui/tree": "^5.0.0-experimental.4",
     "@hi-ui/tree-utils": "^5.0.0-experimental.0",
     "@hi-ui/type-assertion": "^5.0.0-experimental.0",
     "@hi-ui/use-check": "^5.0.0-experimental.0",
@@ -65,12 +65,12 @@
     "@hi-ui/use-merge-semantic": "^5.0.0-experimental.0"
   },
   "peerDependencies": {
-    "@hi-ui/core": ">=5.0.0-experimental.1",
+    "@hi-ui/core": ">=5.0.0-experimental.2",
     "react": ">=16.8.6",
     "react-dom": ">=16.8.6"
   },
   "devDependencies": {
-    "@hi-ui/core": "^5.0.0-experimental.1",
+    "@hi-ui/core": "^5.0.0-experimental.2",
     "@hi-ui/core-css": "^5.0.0-experimental.2",
     "react": "^17.0.1",
     "react-dom": "^17.0.1"