@hi-ui/check-tree-select 4.0.0-beta.29 → 4.0.0-beta.31

package/lib/cjs/CheckTreeSelect.js

@@ -123,11 +123,22 @@ var CheckTreeSelect = /*#__PURE__*/React.forwardRef(function (_a, ref) {
     return node[fieldNames[key] || key];
   }, [fieldNames]);
   var flattedData = React.useMemo(function () {
-    return treeUtils.flattenTree(data, function (node) {
-      node.id = getKeyFields(node.raw, 'id'); // @ts-ignore
-
-      node.title = getKeyFields(node.raw, 'title');
-      return node;
+    return treeUtils.baseFlattenTree({
+      tree: data,
+      childrenFieldName: function childrenFieldName(node) {
+        return getKeyFields(node, 'children');
+      },
+      transform: function transform(node) {
+        var _a, _b;
+
+        var flattedNode = node;
+        var raw = node.raw;
+        flattedNode.id = getKeyFields(raw, 'id');
+        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;
+        return flattedNode;
+      }
     });
   }, [data, getKeyFields]); // TODO: 抽离展开hook
   // TODO: onLoadChildren 和 defaultExpandAll 共存时
@@ -295,8 +306,9 @@ var CheckTreeSelect = /*#__PURE__*/React.forwardRef(function (_a, ref) {
     checkedIds: value,
     onCheck: onSelect,
     // TODO: 支持 fieldNames
-    // 禁用时被选中的样式处理
-    onLoadChildren: onLoadChildren
+    // @ts-ignore
+    onLoadChildren: onLoadChildren,
+    fieldNames: fieldNames
   }, treeProps)) : null);
 });
 

package/lib/esm/CheckTreeSelect.js

@@ -15,7 +15,7 @@ import { useUncontrolledToggle } from '@hi-ui/use-toggle';
 import { Tree } from '@hi-ui/tree';
 import { useUncontrolledState } from '@hi-ui/use-uncontrolled-state';
 import { Picker } from '@hi-ui/picker';
-import { flattenTree } from '@hi-ui/tree-utils';
+import { baseFlattenTree } from '@hi-ui/tree-utils';
 import { isUndef, isArrayNonEmpty } from '@hi-ui/type-assertion';
 import { uniqBy } from '@hi-ui/array-utils';
 import { Highlighter } from '@hi-ui/highlighter';
@@ -90,11 +90,22 @@ var CheckTreeSelect = /*#__PURE__*/forwardRef(function (_a, ref) {
     return node[fieldNames[key] || key];
   }, [fieldNames]);
   var flattedData = useMemo(function () {
-    return flattenTree(data, function (node) {
-      node.id = getKeyFields(node.raw, 'id'); // @ts-ignore
-
-      node.title = getKeyFields(node.raw, 'title');
-      return node;
+    return baseFlattenTree({
+      tree: data,
+      childrenFieldName: function childrenFieldName(node) {
+        return getKeyFields(node, 'children');
+      },
+      transform: function transform(node) {
+        var _a, _b;
+
+        var flattedNode = node;
+        var raw = node.raw;
+        flattedNode.id = getKeyFields(raw, 'id');
+        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;
+        return flattedNode;
+      }
     });
   }, [data, getKeyFields]); // TODO: 抽离展开hook
   // TODO: onLoadChildren 和 defaultExpandAll 共存时
@@ -262,8 +273,9 @@ var CheckTreeSelect = /*#__PURE__*/forwardRef(function (_a, ref) {
     checkedIds: value,
     onCheck: onSelect,
     // TODO: 支持 fieldNames
-    // 禁用时被选中的样式处理
-    onLoadChildren: onLoadChildren
+    // @ts-ignore
+    onLoadChildren: onLoadChildren,
+    fieldNames: fieldNames
   }, treeProps)) : null);
 });
 

package/lib/types/CheckTreeSelect.d.ts

@@ -3,7 +3,6 @@ import { FieldNames, CheckTreeSelectDataItem } from './types';
 import { FlattedTreeNodeData, TreeNodeEventData } from '@hi-ui/tree';
 import { PickerProps } from '@hi-ui/picker';
 import { HiBaseAppearanceEnum } from '@hi-ui/core';
-import { UseDataSource } from '@hi-ui/use-data-source';
 /**
  * TODO: What is CheckTreeSelect
  */
@@ -18,12 +17,13 @@ export interface CheckTreeSelectProps extends Omit<PickerProps, 'data' | 'onChan
      */
     fieldNames?: FieldNames;
     /**
-     * 数据回显模式	string
-     * ALL: 所有被选中节点，不区分父子节点
+     * 多选数据交互时回填、回显模式
      * PARENT: 当所有子节点被选中时将只保留父节点
-     * CHILD: 仅显示子节点
+     * ALL: 所有被选中节点，不区分父子节点（不支持异步数据加载勾选checkbox）
+     * CHILD: 仅显示子节点（不支持异步数据加载勾选checkbox）
+     * SEPARATE：父子完全独立受控
      */
-    checkedMode?: 'ALL' | 'PARENT' | 'CHILD';
+    checkedMode?: 'ALL' | 'PARENT' | 'CHILD' | 'SEPARATE';
     /**
      * 数据选择类型
      */
@@ -87,13 +87,8 @@ export interface CheckTreeSelectProps extends Omit<PickerProps, 'data' | 'onChan
      */
     onLoadChildren?: (node: TreeNodeEventData) => void | Promise<CheckTreeSelectDataItem[] | void>;
     /**
-     * 从远端获取数据，初始时是否自动加载
+     * 异步加载数据。暂不对外暴露
      */
-    autoload?: boolean;
-    /**
-     * 异步加载数据
-     */
-    dataSource?: UseDataSource<CheckTreeSelectDataItem[]>;
     /**
      * 没有选项时的提示
      */

package/lib/types/types.d.ts

@@ -1,13 +1,14 @@
+import { HiBaseDataItem } from '@hi-ui/core';
 import React from 'react';
-export interface CheckTreeSelectDataItem {
+export interface CheckTreeSelectDataItem extends HiBaseDataItem {
     /**
      * 节点唯一 id
      */
-    id: React.ReactText;
+    id?: React.ReactText;
     /**
      * 节点标题
      */
-    title: React.ReactNode;
+    title?: React.ReactNode;
     /**
      * 子级数据
      */
@@ -16,6 +17,28 @@ export interface CheckTreeSelectDataItem {
      * 是否禁用
      */
     disabled?: boolean;
+    /**
+     * 是否为叶子节点
+     */
+    isLeaf?: boolean;
+}
+export interface FlattedCheckTreeSelectDataItem extends CheckTreeSelectDataItem {
+    /**
+     * 该节点的子节点列表
+     */
+    children?: FlattedCheckTreeSelectDataItem[];
+    /**
+     * 关联用户传入的原始节点
+     */
+    raw: CheckTreeSelectDataItem;
+    /**
+     * 该节点的层级，从 0（顶层）开始
+     */
+    depth: number;
+    /**
+     * 该节点的父节点
+     */
+    parent?: FlattedCheckTreeSelectDataItem;
 }
 export interface CheckTreeSelectDataSource<T = any> {
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hi-ui/check-tree-select",
-  "version": "4.0.0-beta.29",
+  "version": "4.0.0-beta.31",
   "description": "A sub-package for @hi-ui/hiui.",
   "keywords": [],
   "author": "HIUI <mi-hiui@xiaomi.com>",
@@ -48,18 +48,18 @@
     "@hi-ui/core": "^4.0.0-beta.8",
     "@hi-ui/core-css": "^4.0.0-beta.5",
     "@hi-ui/env": "^4.0.0-beta.0",
-    "@hi-ui/func-utils": "^4.0.0-beta.11",
-    "@hi-ui/highlighter": "^4.0.0-beta.8",
+    "@hi-ui/func-utils": "^4.0.0-beta.12",
+    "@hi-ui/highlighter": "^4.0.0-beta.9",
     "@hi-ui/icons": "^4.0.0-beta.10",
-    "@hi-ui/locale-context": "^4.0.0-beta.17",
-    "@hi-ui/picker": "^4.0.0-beta.22",
-    "@hi-ui/popper": "^4.0.0-beta.12",
-    "@hi-ui/tag-input": "^4.0.0-beta.17",
-    "@hi-ui/tree": "^4.0.0-beta.27",
+    "@hi-ui/locale-context": "^4.0.0-beta.18",
+    "@hi-ui/picker": "^4.0.0-beta.23",
+    "@hi-ui/popper": "^4.0.0-beta.13",
+    "@hi-ui/tag-input": "^4.0.0-beta.18",
+    "@hi-ui/tree": "^4.0.0-beta.29",
     "@hi-ui/tree-utils": "^4.0.0-beta.4",
     "@hi-ui/type-assertion": "^4.0.0-beta.4",
     "@hi-ui/use-data-source": "^4.0.0-beta.5",
-    "@hi-ui/use-search-mode": "^4.0.0-beta.16",
+    "@hi-ui/use-search-mode": "^4.0.0-beta.18",
     "@hi-ui/use-toggle": "^4.0.0-beta.4",
     "@hi-ui/use-uncontrolled-state": "^4.0.0-beta.4"
   },
@@ -72,5 +72,5 @@
     "react": "^17.0.1",
     "react-dom": "^17.0.1"
   },
-  "gitHead": "b967631f11b4382d5d5a2581984979f2b6b4d369"
+  "gitHead": "7f47840510e6dfce429eeed1591c154e321cd14f"
 }