yootd 0.0.44 → 0.0.45

package/dist/areas/types/types.d.ts

@@ -1,40 +1,40 @@
-export interface PageData<T> {
-  content: T[];
-  page: {
-    number: number;
-    size: number;
-    totalElements: number;
-    totalPages: number;
-  };
-}
-type SchoolProps = {
-  level1?: boolean;
-  areaType?: number;
-  areaSubType?: number;
-  style?: React.CSSProperties;
-  showSearch?: boolean;
-  disabled?: boolean;
-  value?: {
-    level1?: number;
-    level2?: number;
-    level3?: number;
-    level4?: number;
-    level5?: number;
-  };
-  onChange?: (record: {
-    level1?: number;
-    level2?: number;
-    level3?: number;
-    level4?: number;
-    level5?: number;
-  }) => void;
-  allowClear?: boolean;
-  placeholder?: string[];
-};
-// 查询位置接口返回的数据类型
-export interface IareaItem {
-  areaId: number;
-  areaLevel: number;
-  areaName: string;
-  areaType: number;
-}
+export interface PageData<T> {
+  content: T[];
+  page: {
+    number: number;
+    size: number;
+    totalElements: number;
+    totalPages: number;
+  };
+}
+type SchoolProps = {
+  level1?: boolean;
+  areaType?: number;
+  areaSubType?: number;
+  style?: React.CSSProperties;
+  showSearch?: boolean;
+  disabled?: boolean;
+  value?: {
+    level1?: number;
+    level2?: number;
+    level3?: number;
+    level4?: number;
+    level5?: number;
+  };
+  onChange?: (record: {
+    level1?: number;
+    level2?: number;
+    level3?: number;
+    level4?: number;
+    level5?: number;
+  }) => void;
+  allowClear?: boolean;
+  placeholder?: string[];
+};
+// 查询位置接口返回的数据类型
+export interface IareaItem {
+  areaId: number;
+  areaLevel: number;
+  areaName: string;
+  areaType: number;
+}

package/dist/areas-treeSelect/index.scss

@@ -1,6 +1,6 @@
-.yot-areastreeselect {
-  .ant-select-tree-treenode {
-    margin-bottom: 0 !important;
-    padding-bottom: calc(var(--ant-padding-xs) / 2) !important;
-  }
-}
+.yot-areastreeselect {
+  .ant-select-tree-treenode {
+    margin-bottom: 0 !important;
+    padding-bottom: calc(var(--ant-padding-xs) / 2) !important;
+  }
+}

package/dist/areas-treeSelect/types/type.d.ts

@@ -1,39 +1,39 @@
-import { TreeSelectProps } from 'antd';
-
-export interface PageData<T> {
-  content: T[];
-  page: {
-    number: number;
-    size: number;
-    totalElements: number;
-    totalPages: number;
-  };
-}
-
-// 查询位置树接口返回的数据类型
-export interface AreasTreeData {
-  areaId: number;
-  areaLevel: number;
-  areaLevel1Id: number;
-  areaName: string;
-  areaSubType: number;
-  areaType: number;
-  children?: AreasTreeData[];
-}
-// 空间树所需数据类型
-export interface AreasTreeOptions {
-  title: string;
-  value: number;
-  key: number;
-  children?: AreasTreeOptions[];
-}
-// 空间树选择器props
-export interface AreasTreeSelectProps extends TreeSelectProps {
-  depth?: number; // 树节点深度，不传表示到第五级
-  areaType?: number; // 筛选楼类型
-  areaSubType?: number; // 筛选楼类型
-  showSearch?: boolean; // 是否开启搜索
-  treeCheckable?: boolean; // 是否开启多选
-  selectable?: boolean; // 是否强制要求选到最底层
-  treeDefaultExpandedLevel?: number; // 默认展开的层级
-}
+import { TreeSelectProps } from 'antd';
+
+export interface PageData<T> {
+  content: T[];
+  page: {
+    number: number;
+    size: number;
+    totalElements: number;
+    totalPages: number;
+  };
+}
+
+// 查询位置树接口返回的数据类型
+export interface AreasTreeData {
+  areaId: number;
+  areaLevel: number;
+  areaLevel1Id: number;
+  areaName: string;
+  areaSubType: number;
+  areaType: number;
+  children?: AreasTreeData[];
+}
+// 空间树所需数据类型
+export interface AreasTreeOptions {
+  title: string;
+  value: number;
+  key: number;
+  children?: AreasTreeOptions[];
+}
+// 空间树选择器props
+export interface AreasTreeSelectProps extends TreeSelectProps {
+  depth?: number; // 树节点深度，不传表示到第五级
+  areaType?: number; // 筛选楼类型
+  areaSubType?: number; // 筛选楼类型
+  showSearch?: boolean; // 是否开启搜索
+  treeCheckable?: boolean; // 是否开启多选
+  selectable?: boolean; // 是否强制要求选到最底层
+  treeDefaultExpandedLevel?: number; // 默认展开的层级
+}

package/dist/department/types/types.d.ts

@@ -1,23 +1,23 @@
-export interface PageData<T> {
-  content: T[];
-  page: {
-    number: number;
-    size: number;
-    totalElements: number;
-    totalPages: number;
-  };
-}
-// 查询部门返回的数据类型
-export interface IDepartmentItem {
-  deptId: number; // 部门ID
-  deptName: string; // 部门名称
-  deptLevel: number; // 部门级别(1,2,3,4...)
-  children?: DeptListResponse[]; // 子部门
-}
-// 树组件填充的数据接口
-export interface ITreeData {
-  title: string;
-  value: number;
-  children?: ITreeData[];
-}
-export type DepartmentProps = TreeSelectProps;
+export interface PageData<T> {
+  content: T[];
+  page: {
+    number: number;
+    size: number;
+    totalElements: number;
+    totalPages: number;
+  };
+}
+// 查询部门返回的数据类型
+export interface IDepartmentItem {
+  deptId: number; // 部门ID
+  deptName: string; // 部门名称
+  deptLevel: number; // 部门级别(1,2,3,4...)
+  children?: DeptListResponse[]; // 子部门
+}
+// 树组件填充的数据接口
+export interface ITreeData {
+  title: string;
+  value: number;
+  children?: ITreeData[];
+}
+export type DepartmentProps = TreeSelectProps;

package/dist/job-title/types/types.d.ts

@@ -1,17 +1,17 @@
-import { SelectProps } from 'yootd';
-
-export interface PageData<T> {
-  content: T[];
-  page: {
-    number: number;
-    size: number;
-    totalElements: number;
-    totalPages: number;
-  };
-}
-// 查询职务返回的数据类型
-export interface IjobTitleItem {
-  titleId: number;
-  titleName: string;
-}
-export type JobTitleProps = SelectProps;
+import { SelectProps } from 'yootd';
+
+export interface PageData<T> {
+  content: T[];
+  page: {
+    number: number;
+    size: number;
+    totalElements: number;
+    totalPages: number;
+  };
+}
+// 查询职务返回的数据类型
+export interface IjobTitleItem {
+  titleId: number;
+  titleName: string;
+}
+export type JobTitleProps = SelectProps;

package/dist/role/types/types.d.ts

@@ -1,22 +1,22 @@
-import { SelectProps } from 'yootd';
-
-export interface PageData<T> {
-  content: T[];
-  page: {
-    number: number;
-    size: number;
-    totalElements: number;
-    totalPages: number;
-  };
-}
-// 查询职务返回的数据类型
-export interface IjobTitleItem {
-  titleId: number;
-  titleName: string;
-}
-// 查询角色返回的数据类型
-export interface IRoleItem {
-  roleId: number;
-  roleName: string;
-}
-export type RoleProps = SelectProps;
+import { SelectProps } from 'yootd';
+
+export interface PageData<T> {
+  content: T[];
+  page: {
+    number: number;
+    size: number;
+    totalElements: number;
+    totalPages: number;
+  };
+}
+// 查询职务返回的数据类型
+export interface IjobTitleItem {
+  titleId: number;
+  titleName: string;
+}
+// 查询角色返回的数据类型
+export interface IRoleItem {
+  roleId: number;
+  roleName: string;
+}
+export type RoleProps = SelectProps;

package/dist/teacher/types/types.d.ts

@@ -1,33 +1,33 @@
-import { SelectProps } from 'yootd';
-
-export interface PageData<T> {
-  content: T[];
-  page: {
-    number: number;
-    size: number;
-    totalElements: number;
-    totalPages: number;
-  };
-}
-// 查询老师返回的数据类型
-export interface IteacherItem {
-  [key: string]: string | number;
-  userId: number; // 老师ID
-  personalName: string; // 老师姓名
-  personalMobile?: string; // 手机号
-  uniqueNumber?: string; // 工号
-  nationName?: string; // 民族
-  gender?: number; // 性别
-  personalEmail?: string; // 邮箱
-}
-type LabelOptions =
-  | 'personalName'
-  | 'uniqueNumber'
-  | 'personalMobile'
-  | 'nationName'
-  | 'genderName'
-  | 'personalEmail';
-export type TeacherProps = SelectProps & {
-  label?: LabelOptions[];
-  connectors?: string;
-};
+import { SelectProps } from 'yootd';
+
+export interface PageData<T> {
+  content: T[];
+  page: {
+    number: number;
+    size: number;
+    totalElements: number;
+    totalPages: number;
+  };
+}
+// 查询老师返回的数据类型
+export interface IteacherItem {
+  [key: string]: string | number;
+  userId: number; // 老师ID
+  personalName: string; // 老师姓名
+  personalMobile?: string; // 手机号
+  uniqueNumber?: string; // 工号
+  nationName?: string; // 民族
+  gender?: number; // 性别
+  personalEmail?: string; // 邮箱
+}
+type LabelOptions =
+  | 'personalName'
+  | 'uniqueNumber'
+  | 'personalMobile'
+  | 'nationName'
+  | 'genderName'
+  | 'personalEmail';
+export type TeacherProps = SelectProps & {
+  label?: LabelOptions[];
+  connectors?: string;
+};

package/dist/tree/index copy.d.ts

@@ -0,0 +1,27 @@
+import type { TreeDataNode as AntTreeDataNode, TreeProps as AntTreeProps } from 'antd';
+import React from 'react';
+import './index.scss';
+export type { AntTreeNode, AntTreeNodeCheckedEvent, AntTreeNodeExpandedEvent, AntTreeNodeMouseEvent, AntTreeNodeProps, AntTreeNodeSelectedEvent, AntdTreeNodeAttribute, DirectoryTreeExpandAction, DirectoryTreeProps, EventDataNode, } from 'antd/es/tree';
+export type TreeProps = AntTreeProps & {
+    showChildNumbers?: boolean;
+    placeholder?: string;
+    showSearch?: boolean;
+    type?: string;
+    depth?: number;
+    notRequireSchool?: boolean;
+    areaType?: number;
+    areaSubType?: number;
+    requireLastLevel?: boolean;
+};
+export type TreeDataNode = AntTreeDataNode;
+export declare const Tree: React.ForwardRefExoticComponent<AntTreeProps<AntTreeDataNode> & {
+    showChildNumbers?: boolean | undefined;
+    placeholder?: string | undefined;
+    showSearch?: boolean | undefined;
+    type?: string | undefined;
+    depth?: number | undefined;
+    notRequireSchool?: boolean | undefined;
+    areaType?: number | undefined;
+    areaSubType?: number | undefined;
+    requireLastLevel?: boolean | undefined;
+} & React.RefAttributes<any>>;

package/dist/tree/index copy.js

@@ -0,0 +1,231 @@
+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); }
+var _excluded = ["className", "treeData", "placeholder", "showChildNumbers", "showIcon", "showSearch", "type", "titleRender"];
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+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(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _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."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+import { Tree as AntTree } from 'antd';
+import React, { forwardRef, useCallback, useEffect, useMemo, useState } from 'react';
+import { Input } from "./..";
+import "./index.scss";
+import { useBem } from "../hooks/useBem";
+import { BedIcon } from "./components/BedIcon";
+import { CampusIcon } from "./components/CampusIcon";
+import { DeptIcon } from "./components/DeptIcon";
+import { FloorIcon } from "./components/FloorIcon";
+import { RoomIcon } from "./components/RoomIcon";
+import { SchoolIcon } from "./components/SchoolIcon";
+import { TierlIcon } from "./components/TierlIcon";
+var Search = Input.Search;
+var dataList = [];
+var generateList = function generateList(data) {
+  for (var i = 0; i < data.length; i++) {
+    var node = data[i];
+    var key = node.key,
+      title = node.title;
+    dataList.push({
+      key: key,
+      title: title
+    });
+    if (node.children) {
+      generateList(node.children);
+    }
+  }
+};
+var getParentKey = function getParentKey(key, tree) {
+  var parentKey;
+  for (var i = 0; i < tree.length; i++) {
+    var node = tree[i];
+    if (node.children) {
+      if (node.children.some(function (item) {
+        return item.key === key;
+      })) {
+        parentKey = node.key;
+      } else if (getParentKey(key, node.children)) {
+        parentKey = getParentKey(key, node.children);
+      }
+    }
+  }
+  return parentKey;
+};
+export var Tree = /*#__PURE__*/forwardRef(function (_ref, ref) {
+  var className = _ref.className,
+    treeData = _ref.treeData,
+    _ref$placeholder = _ref.placeholder,
+    placeholder = _ref$placeholder === void 0 ? '请输入...' : _ref$placeholder,
+    _ref$showChildNumbers = _ref.showChildNumbers,
+    showChildNumbers = _ref$showChildNumbers === void 0 ? false : _ref$showChildNumbers,
+    _ref$showIcon = _ref.showIcon,
+    showIcon = _ref$showIcon === void 0 ? false : _ref$showIcon,
+    _ref$showSearch = _ref.showSearch,
+    showSearch = _ref$showSearch === void 0 ? false : _ref$showSearch,
+    type = _ref.type,
+    titleRender = _ref.titleRender,
+    props = _objectWithoutProperties(_ref, _excluded);
+  var mb = useBem('tree');
+  var _useState = useState([]),
+    _useState2 = _slicedToArray(_useState, 2),
+    expandedKeys = _useState2[0],
+    setExpandedKeys = _useState2[1];
+  var _useState3 = useState(''),
+    _useState4 = _slicedToArray(_useState3, 2),
+    searchValue = _useState4[0],
+    setSearchValue = _useState4[1];
+  var _useState5 = useState(true),
+    _useState6 = _slicedToArray(_useState5, 2),
+    autoExpandParent = _useState6[0],
+    setAutoExpandParent = _useState6[1];
+  var _useState7 = useState([]),
+    _useState8 = _slicedToArray(_useState7, 2),
+    defaultData = _useState8[0],
+    setDefaultData = _useState8[1];
+  var getSpaceIcon = useCallback(function (currentLevel, selected) {
+    var icons = [SchoolIcon, CampusIcon, FloorIcon, TierlIcon, RoomIcon, BedIcon];
+    var IconComponent = icons[currentLevel];
+    return IconComponent ? /*#__PURE__*/React.createElement(IconComponent, {
+      className: "".concat(mb.e('icon'), " ").concat(selected ? mb.is('selected') : '')
+    }) : null;
+  }, []);
+  var getDeptIcon = useCallback(function (selected) {
+    return /*#__PURE__*/React.createElement(DeptIcon, {
+      className: "".concat(mb.e('icon'), " ").concat(selected ? mb.is('selected') : '')
+    });
+  }, []);
+  var formatTreeData = function formatTreeData(treeData) {
+    var currentLevel = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+    return treeData === null || treeData === void 0 ? void 0 : treeData.map(function (t) {
+      if (t.children == null) {
+        return _objectSpread(_objectSpread({}, t), {}, {
+          icon: t.icon != null ? t.icon : function (_ref2) {
+            var selected = _ref2.selected;
+            return type === 'dept' ? getDeptIcon(selected) : type === 'area' ? getSpaceIcon(currentLevel, selected) : null;
+          }
+        });
+      } else {
+        var _t$children;
+        var _title;
+        if (typeof t.title === 'function') {
+          _title = t.title(t);
+        } else {
+          _title = t.title;
+        }
+        return _objectSpread(_objectSpread({}, t), {}, {
+          title: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", null, _title), showChildNumbers ? /*#__PURE__*/React.createElement("span", {
+            style: {
+              marginLeft: 10
+            }
+          }, "(", (_t$children = t.children) === null || _t$children === void 0 ? void 0 : _t$children.length, ")") : null),
+          icon: t.icon != null ? t.icon : function (_ref3) {
+            var selected = _ref3.selected;
+            return type === 'dept' ? getDeptIcon(selected) : type === 'area' ? getSpaceIcon(currentLevel, selected) : null;
+          },
+          children: t.children != null ? formatTreeData(t.children, currentLevel + 1) : []
+        });
+      }
+    });
+  };
+  var onExpand = function onExpand(newExpandedKeys) {
+    setExpandedKeys(newExpandedKeys);
+    setAutoExpandParent(false);
+  };
+  var onChange = function onChange(e) {
+    var value = e.target.value;
+    var newExpandedKeys = dataList.map(function (item) {
+      if (item.title.indexOf(value) > -1) {
+        return getParentKey(item.key, defaultData);
+      }
+      return null;
+    }).filter(function (item, i, self) {
+      return !!(item && self.indexOf(item) === i);
+    });
+    setExpandedKeys(newExpandedKeys);
+    setSearchValue(value);
+    setAutoExpandParent(true);
+  };
+  var _treeData = useMemo(function () {
+    if (showSearch !== true) {
+      return defaultData;
+    }
+    var loop = function loop(data) {
+      return data.map(function (item) {
+        var strTitle = item.title;
+        var index = strTitle.indexOf(searchValue);
+        var beforeStr = strTitle.substring(0, index);
+        var afterStr = strTitle.slice(index + searchValue.length);
+        var title = index > -1 ? /*#__PURE__*/React.createElement("span", {
+          key: item.key
+        }, beforeStr, /*#__PURE__*/React.createElement("span", {
+          style: {
+            color: 'var(--ant-color-primary)'
+          }
+        }, searchValue), afterStr) : /*#__PURE__*/React.createElement("span", {
+          key: item.key
+        }, strTitle);
+        if (item.children) {
+          return {
+            title: title,
+            key: item.key,
+            children: loop(item.children)
+          };
+        }
+        return {
+          title: title,
+          key: item.key
+        };
+      });
+    };
+    return loop(defaultData);
+  }, [searchValue, defaultData]);
+  useEffect(function () {
+    if (treeData != null) {
+      setDefaultData(treeData);
+      generateList(treeData);
+    }
+  }, [treeData]);
+  useEffect(function () {
+    // 递归展开所有节点
+    var expandAllNodes = function expandAllNodes(nodes) {
+      nodes.forEach(function (node) {
+        setExpandedKeys(function (prevKeys) {
+          return [].concat(_toConsumableArray(prevKeys), [node.key]);
+        });
+        //@ts-ignore
+        if (node.children && (node.areaLevel <= 1 || node.deptLevel <= 1)) {
+          expandAllNodes(node.children);
+        }
+      });
+    };
+    if (treeData != null && treeData.length > 0) {
+      expandAllNodes(treeData);
+    }
+  }, [treeData]);
+  return /*#__PURE__*/React.createElement("div", null, showSearch ? /*#__PURE__*/React.createElement(Search, {
+    style: {
+      marginBottom: 8
+    },
+    placeholder: placeholder,
+    onChange: onChange
+  }) : null, /*#__PURE__*/React.createElement(AntTree, _extends({
+    ref: ref,
+    onExpand: onExpand,
+    expandedKeys: expandedKeys,
+    autoExpandParent: autoExpandParent,
+    className: "".concat(mb, " ").concat(className),
+    treeData: titleRender ? _treeData : formatTreeData(_treeData),
+    showIcon: showIcon
+  }, props)));
+});

package/dist/tree/index.d.ts

@@ -1,4 +1,5 @@
 import type { TreeDataNode as AntTreeDataNode, TreeProps as AntTreeProps } from 'antd';
+import { Tree as AntTree } from 'antd';
 import React from 'react';
 import './index.scss';
 export type { AntTreeNode, AntTreeNodeCheckedEvent, AntTreeNodeExpandedEvent, AntTreeNodeMouseEvent, AntTreeNodeProps, AntTreeNodeSelectedEvent, AntdTreeNodeAttribute, DirectoryTreeExpandAction, DirectoryTreeProps, EventDataNode, } from 'antd/es/tree';
@@ -14,7 +15,7 @@ export type TreeProps = AntTreeProps & {
     requireLastLevel?: boolean;
 };
 export type TreeDataNode = AntTreeDataNode;
-export declare const Tree: React.ForwardRefExoticComponent<AntTreeProps<AntTreeDataNode> & {
+export declare const TreeInternal: React.ForwardRefExoticComponent<AntTreeProps<AntTreeDataNode> & {
     showChildNumbers?: boolean | undefined;
     placeholder?: string | undefined;
     showSearch?: boolean | undefined;
@@ -25,3 +26,7 @@ export declare const Tree: React.ForwardRefExoticComponent<AntTreeProps<AntTreeD
     areaSubType?: number | undefined;
     requireLastLevel?: boolean | undefined;
 } & React.RefAttributes<any>>;
+type CompoundedComponent = typeof TreeInternal & {
+    AntdTree: typeof AntTree;
+};
+export declare const Tree: CompoundedComponent;

package/dist/tree/index.js

@@ -62,7 +62,7 @@ var getParentKey = function getParentKey(key, tree) {
   }
   return parentKey;
 };
-export var Tree = /*#__PURE__*/forwardRef(function (_ref, ref) {
+export var TreeInternal = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var className = _ref.className,
     treeData = _ref.treeData,
     _ref$placeholder = _ref.placeholder,
@@ -110,9 +110,9 @@ export var Tree = /*#__PURE__*/forwardRef(function (_ref, ref) {
     return treeData === null || treeData === void 0 ? void 0 : treeData.map(function (t) {
       if (t.children == null) {
         return _objectSpread(_objectSpread({}, t), {}, {
-          icon: function icon(_ref2) {
+          icon: t.icon != null ? t.icon : function (_ref2) {
             var selected = _ref2.selected;
-            return type === 'dept' ? getDeptIcon(selected) : getSpaceIcon(currentLevel, selected);
+            return type === 'dept' ? getDeptIcon(selected) : type === 'area' ? getSpaceIcon(currentLevel, selected) : null;
           }
         });
       } else {
@@ -129,9 +129,9 @@ export var Tree = /*#__PURE__*/forwardRef(function (_ref, ref) {
               marginLeft: 10
             }
           }, "(", (_t$children = t.children) === null || _t$children === void 0 ? void 0 : _t$children.length, ")") : null),
-          icon: function icon(_ref3) {
+          icon: t.icon != null ? t.icon : function (_ref3) {
             var selected = _ref3.selected;
-            return type === 'dept' ? getDeptIcon(selected) : getSpaceIcon(currentLevel, selected);
+            return type === 'dept' ? getDeptIcon(selected) : type === 'area' ? getSpaceIcon(currentLevel, selected) : null;
           },
           children: t.children != null ? formatTreeData(t.children, currentLevel + 1) : []
         });
@@ -157,6 +157,9 @@ export var Tree = /*#__PURE__*/forwardRef(function (_ref, ref) {
     setAutoExpandParent(true);
   };
   var _treeData = useMemo(function () {
+    if (showSearch !== true) {
+      return defaultData;
+    }
     var loop = function loop(data) {
       return data.map(function (item) {
         var strTitle = item.title;
@@ -225,4 +228,5 @@ export var Tree = /*#__PURE__*/forwardRef(function (_ref, ref) {
     treeData: titleRender ? _treeData : formatTreeData(_treeData),
     showIcon: showIcon
   }, props)));
-});
+});
+export var Tree = TreeInternal;

package/package.json

@@ -1,101 +1,101 @@
-{
-  "name": "yootd",
-  "version": "0.0.44",
-  "description": "A react library developed with dumi",
-  "license": "MIT",
-  "module": "dist/index.js",
-  "types": "dist/index.d.ts",
-  "files": [
-    "dist"
-  ],
-  "scripts": {
-    "build": "father build",
-    "build:watch": "father dev",
-    "dev": "dumi dev",
-    "docs:build": "dumi build",
-    "docs:preview": "dumi preview",
-    "doctor": "father doctor",
-    "lint": "npm run lint:es && npm run lint:css",
-    "lint:css": "stylelint \"{src,test}/**/*.{css,less}\"",
-    "lint:es": "eslint \"{src,test}/**/*.{js,jsx,ts,tsx}\"",
-    "prepare": "husky install && dumi setup",
-    "prepublishOnly": "father doctor && npm run build",
-    "start": "npm run dev"
-  },
-  "commitlint": {
-    "extends": [
-      "@commitlint/config-conventional"
-    ]
-  },
-  "lint-staged": {
-    "*.{md,json}": [
-      "prettier --write --no-error-on-unmatched-pattern"
-    ],
-    "*.{css,less}": [
-      "stylelint --fix",
-      "prettier --write"
-    ],
-    "*.{js,jsx}": [
-      "eslint --fix",
-      "prettier --write"
-    ],
-    "*.{ts,tsx}": [
-      "eslint --fix",
-      "prettier --parser=typescript --write"
-    ]
-  },
-  "devDependencies": {
-    "@commitlint/cli": "^17.1.2",
-    "@commitlint/config-conventional": "^17.1.0",
-    "@dnd-kit/core": "^6.1.0",
-    "@dnd-kit/modifiers": "^7.0.0",
-    "@dnd-kit/sortable": "^8.0.0",
-    "@dnd-kit/utilities": "^3.2.2",
-    "@tanstack/react-query": "^5.59.15",
-    "@types/lodash": "^4.17.12",
-    "@types/react": "^18.0.0",
-    "@types/react-dom": "^18.0.0",
-    "@umijs/lint": "^4.0.0",
-    "@vladmandic/face-api": "^1.7.14",
-    "antd": "^5.21.4",
-    "axios": "^1.7.7",
-    "dayjs": "^1.11.13",
-    "dumi": "^2.3.0",
-    "dumi-theme-antd": "^0.4.2",
-    "eslint": "^8.23.0",
-    "father": "^4.1.0",
-    "husky": "^8.0.1",
-    "lint-staged": "^13.0.3",
-    "lodash": "^4.17.21",
-    "nanoid": "^5.0.8",
-    "prettier": "^2.7.1",
-    "prettier-plugin-organize-imports": "^3.0.0",
-    "prettier-plugin-packagejson": "^2.2.18",
-    "react": "^18.0.0",
-    "react-dom": "^18.0.0",
-    "sass": "^1.80.0",
-    "stylelint": "^14.9.1",
-    "yootd-webrtc-sdk": "^1.0.1"
-  },
-  "peerDependencies": {
-    "@dnd-kit/core": ">=6.1.0",
-    "@dnd-kit/modifiers": ">=7.0.0",
-    "@dnd-kit/sortable": ">=8.0.0",
-    "@dnd-kit/utilities": ">=3.2.2",
-    "@tanstack/react-query": ">=5.59.15",
-    "@vladmandic/face-api": "^1.7.14",
-    "@xyflow/react": ">=12.3.3",
-    "antd": ">=5.21.4",
-    "axios": ">=1.7.7",
-    "dayjs": ">=1.11.13",
-    "lodash": ">=4.17.21",
-    "nanoid": ">=5.0.8",
-    "react": ">=16.9.0",
-    "react-dom": ">=16.9.0",
-    "yootd-webrtc-sdk": "^1.0.1"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "authors": []
-}
+{
+  "name": "yootd",
+  "version": "0.0.45",
+  "description": "A react library developed with dumi",
+  "license": "MIT",
+  "module": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "files": [
+    "dist"
+  ],
+  "scripts": {
+    "build": "father build",
+    "build:watch": "father dev",
+    "dev": "dumi dev",
+    "docs:build": "dumi build",
+    "docs:preview": "dumi preview",
+    "doctor": "father doctor",
+    "lint": "npm run lint:es && npm run lint:css",
+    "lint:css": "stylelint \"{src,test}/**/*.{css,less}\"",
+    "lint:es": "eslint \"{src,test}/**/*.{js,jsx,ts,tsx}\"",
+    "prepare": "husky install && dumi setup",
+    "prepublishOnly": "father doctor && npm run build",
+    "start": "npm run dev"
+  },
+  "commitlint": {
+    "extends": [
+      "@commitlint/config-conventional"
+    ]
+  },
+  "lint-staged": {
+    "*.{md,json}": [
+      "prettier --write --no-error-on-unmatched-pattern"
+    ],
+    "*.{css,less}": [
+      "stylelint --fix",
+      "prettier --write"
+    ],
+    "*.{js,jsx}": [
+      "eslint --fix",
+      "prettier --write"
+    ],
+    "*.{ts,tsx}": [
+      "eslint --fix",
+      "prettier --parser=typescript --write"
+    ]
+  },
+  "devDependencies": {
+    "@commitlint/cli": "^17.1.2",
+    "@commitlint/config-conventional": "^17.1.0",
+    "@dnd-kit/core": "^6.1.0",
+    "@dnd-kit/modifiers": "^7.0.0",
+    "@dnd-kit/sortable": "^8.0.0",
+    "@dnd-kit/utilities": "^3.2.2",
+    "@tanstack/react-query": "^5.59.15",
+    "@types/lodash": "^4.17.12",
+    "@types/react": "^18.0.0",
+    "@types/react-dom": "^18.0.0",
+    "@umijs/lint": "^4.0.0",
+    "@vladmandic/face-api": "^1.7.14",
+    "antd": "^5.21.4",
+    "axios": "^1.7.7",
+    "dayjs": "^1.11.13",
+    "dumi": "^2.3.0",
+    "dumi-theme-antd": "^0.4.2",
+    "eslint": "^8.23.0",
+    "father": "^4.1.0",
+    "husky": "^8.0.1",
+    "lint-staged": "^13.0.3",
+    "lodash": "^4.17.21",
+    "nanoid": "^5.0.8",
+    "prettier": "^2.7.1",
+    "prettier-plugin-organize-imports": "^3.0.0",
+    "prettier-plugin-packagejson": "^2.2.18",
+    "react": "^18.0.0",
+    "react-dom": "^18.0.0",
+    "sass": "^1.80.0",
+    "stylelint": "^14.9.1",
+    "yootd-webrtc-sdk": "^1.0.1"
+  },
+  "peerDependencies": {
+    "@dnd-kit/core": ">=6.1.0",
+    "@dnd-kit/modifiers": ">=7.0.0",
+    "@dnd-kit/sortable": ">=8.0.0",
+    "@dnd-kit/utilities": ">=3.2.2",
+    "@tanstack/react-query": ">=5.59.15",
+    "@vladmandic/face-api": "^1.7.14",
+    "@xyflow/react": ">=12.3.3",
+    "antd": ">=5.21.4",
+    "axios": ">=1.7.7",
+    "dayjs": ">=1.11.13",
+    "lodash": ">=4.17.21",
+    "nanoid": ">=5.0.8",
+    "react": ">=16.9.0",
+    "react-dom": ">=16.9.0",
+    "yootd-webrtc-sdk": "^1.0.1"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "authors": []
+}