diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md
index 0cb4941de6ffa2a35092b1838f9192f97667f9cf..4919e2b3538eb6ac71073bd6393e82da817025ce 100644
--- a/CHANGELOG.zh_CN.md
+++ b/CHANGELOG.zh_CN.md
@@ -11,8 +11,9 @@
- 新增修改密码界面
- 新增部门管理示例界面
- 新增 WebSocket 示例和服务脚本
-- BasicTree 组件新增 `renderIcon` 属性用于控制层级图标显示
-- BasicTree->actionItem 新增 show 属性,用于动态控制按钮显示
+- Tree 组件新增 `renderIcon` 属性用于控制层级图标显示
+- Tree->actionItem 新增 show 属性,用于动态控制按钮显示
+- Tree 新增工具栏/title/搜索功能
### ⚡ Performance Improvements
diff --git a/package.json b/package.json
index eea2a2483b5b23457e4ad95ab503d948b7b4fcce..7958c76f6eef46be4aa844880550dccfd3d5d610 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
"dependencies": {
"@iconify/iconify": "^2.0.0-rc.6",
"@vueuse/core": "^4.3.1",
- "@zxcvbn-ts/core": "^0.2.0",
+ "@zxcvbn-ts/core": "^0.3.0",
"ant-design-vue": "2.0.1",
"apexcharts": "^3.25.0",
"axios": "^0.21.1",
diff --git a/src/components/StrengthMeter/src/index.vue b/src/components/StrengthMeter/src/index.vue
index 1f98e37261e7c4e94f3dc49f72586c71521bd6da..91e09a8ca0622feb208acd3e3bedabada4633e07 100644
--- a/src/components/StrengthMeter/src/index.vue
+++ b/src/components/StrengthMeter/src/index.vue
@@ -23,7 +23,8 @@
import { Input } from 'ant-design-vue';
- import zxcvbn from '@zxcvbn-ts/core';
+ // @ts-ignore
+ import { zxcvbn } from '@zxcvbn-ts/core';
import { useDesign } from '/@/hooks/web/useDesign';
import { propTypes } from '/@/utils/propTypes';
diff --git a/src/components/Tree/src/TreeHeader.vue b/src/components/Tree/src/TreeHeader.vue
new file mode 100644
index 0000000000000000000000000000000000000000..db3bde74c18863273c5c8a776b2d6686501c1d46
--- /dev/null
+++ b/src/components/Tree/src/TreeHeader.vue
@@ -0,0 +1,110 @@
+
+
+
{{ title }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/Tree/src/enum.ts b/src/components/Tree/src/enum.ts
new file mode 100644
index 0000000000000000000000000000000000000000..4691fac10e3fb5f0558e7c673419826db4e97d1b
--- /dev/null
+++ b/src/components/Tree/src/enum.ts
@@ -0,0 +1,8 @@
+export enum ToolbarEnum {
+ SELECT_ALL,
+ UN_SELECT_ALL,
+ EXPAND_ALL,
+ UN_EXPAND_ALL,
+ CHECK_STRICTLY,
+ CHECK_UN_STRICTLY,
+}
diff --git a/src/components/Tree/src/index.vue b/src/components/Tree/src/index.vue
index 194fb4de01f093155188d012620dd0464325739f..41f1abf1dca96fdf88a99aa25fddc1ffa8604169 100644
--- a/src/components/Tree/src/index.vue
+++ b/src/components/Tree/src/index.vue
@@ -1,23 +1,16 @@