Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(Tree): 修复autoExpandParent为true时openKeys失效问题 #582 #588

Merged
merged 292 commits into from Mar 2, 2022
Merged
Changes from all commits
Commits
Show all changes
292 commits
Select commit Hold shift + click to select a range
455485c
feat(SearhTree): 增加带搜索的树形选择控件
nullptr-z Feb 23, 2022
d0151c1
revert: 撤销package.json更改
nullptr-z Feb 23, 2022
6e69398
Merge branch 'master' of github.com:uiwjs/uiw
nullptr-z Feb 23, 2022
755d771
docs(SearchTree): 单词拼写错误
nullptr-z Feb 23, 2022
41ead8f
feat(SearchTree): 增加搜索功能,隐藏不匹配节点
nullptr-z Feb 24, 2022
63c45d6
docs(Searchtree): 文档修改
nullptr-z Feb 24, 2022
c8b6a39
fix(SerachTree):删除冗余代码
nullptr-z Feb 24, 2022
0cd6309
合并冲突
nullptr-z Feb 24, 2022
167ff03
fix(SearchTree): 文件名更变
nullptr-z Feb 24, 2022
25e9e16
fix(SearchTree): 样式调整
nullptr-z Feb 24, 2022
e996e3a
Merge branch 'master' of github.com:uiwjs/uiw
nullptr-z Feb 25, 2022
bc0d1ee
fix(SearchTree): 子节点全部选中父节点没有自动勾选问题
nullptr-z Feb 25, 2022
d59d150
docs(SearchTree): 增加Form中使用实例文档
nullptr-z Feb 25, 2022
3f97691
Merge branch 'master' of github.com:uiwjs/uiw
nullptr-z Feb 25, 2022
cfd8948
Merge branch 'master' of github.com:uiwjs/uiw
nullptr-z Feb 25, 2022
e80c0de
fix(SerachTree): 修复不受Form控制问题
nullptr-z Feb 25, 2022
0ceca27
Merge branch 'master' of github.com:uiwjs/uiw
nullptr-z Feb 25, 2022
97b7f38
chore: update workflows config.
jaywcjlove Feb 25, 2022
6c5d448
chore: update workflows config.
jaywcjlove Feb 25, 2022
88ef628
fix(Form): 类型导出错误
nullptr-z Feb 14, 2022
c0af739
docs(List): 文档描述错误
nullptr-z Feb 25, 2022
d632684
feat(DateInputRange):增加时间区间选择组件 #536
nullptr-z Feb 28, 2022
e2e91fc
fix(Form): 类型导出错误
nullptr-z Feb 14, 2022
d5302c2
docs(List): 文档描述错误
nullptr-z Feb 25, 2022
40d587a
feat(DateInputRange):增加时间区间选择组件 #536
nullptr-z Feb 28, 2022
8719e72
fix(DateInputRange):规范命名
nullptr-z Feb 28, 2022
b7ae22c
fix(DateInputRange):解决冲突
nullptr-z Feb 28, 2022
23259a0
docs(DateInputRange): 增加接口文档
nullptr-z Feb 28, 2022
883f15d
fix(SearchSelect): 修复 value不存在下拉列表中会报错问题 #565
nullptr-z Feb 28, 2022
68a6808
chore: update workflows config.
jaywcjlove Feb 25, 2022
da54b4f
chore: update workflows config.
jaywcjlove Feb 25, 2022
77559f0
fix(SearchSelect): 修复 value不存在下拉列表中会报错问题 #565
nullptr-z Feb 28, 2022
2a9f4d0
fix: 合并冲突
nullptr-z Feb 28, 2022
2247bdd
合并冲突
nullptr-z Feb 28, 2022
7042ed8
style(TimePicker): 使用鼠标时弹窗出现横向滚动条
nullptr-z Mar 1, 2022
30d153a
fix(Tree):修复子节点无法控制超过2级上层节点状态 #572
nullptr-z Mar 1, 2022
5cfcad5
chore: update workflows config.
jaywcjlove Feb 25, 2022
5f24175
chore: update workflows config.
jaywcjlove Feb 25, 2022
51a674e
chore: update workflows config.
jaywcjlove Feb 25, 2022
0a52985
chore: update workflows config.
jaywcjlove Feb 25, 2022
5675283
fix(Tree):修复子节点无法控制超过2级上层节点状态 #572
nullptr-z Mar 1, 2022
2de25fa
Merge branch 'master' of github.com:nullptr-z/uiw
nullptr-z Mar 1, 2022
6f6215a
style(Notify): 修复 英文字符和符号不会换行问题 #575
nullptr-z Mar 1, 2022
7be7ad2
chore: update workflows config.
jaywcjlove Feb 25, 2022
baed5ff
chore: update workflows config.
jaywcjlove Feb 25, 2022
2247d79
chore: update workflows config.
jaywcjlove Feb 25, 2022
6d31295
chore: update workflows config.
jaywcjlove Feb 25, 2022
b4a4616
chore: update workflows config.
jaywcjlove Feb 25, 2022
0477629
chore: update workflows config.
jaywcjlove Feb 25, 2022
c470a49
chore: update workflows config.
jaywcjlove Feb 25, 2022
b3727ae
chore: update workflows config.
jaywcjlove Feb 25, 2022
867e61c
style(Notify): 修复 英文字符和符号不会换行问题 #575
nullptr-z Mar 1, 2022
55a31b8
Merge branch 'master' of github.com:nullptr-z/uiw
nullptr-z Mar 1, 2022
30eabb3
fix(SearchTree): 通过清除按钮删除内容后,没有重置搜索选项 #563
nullptr-z Mar 1, 2022
da5c56d
released-v4.13.2
actions-user Mar 1, 2022
ad3d190
chore: update workflows config.
jaywcjlove Feb 25, 2022
5097b30
chore: update workflows config.
jaywcjlove Feb 25, 2022
9061015
chore: update workflows config.
jaywcjlove Feb 25, 2022
5d6a108
chore: update workflows config.
jaywcjlove Feb 25, 2022
48cb40f
chore: update workflows config.
jaywcjlove Feb 25, 2022
997d29c
chore: update workflows config.
jaywcjlove Feb 25, 2022
5bdb5e8
chore: update workflows config.
jaywcjlove Feb 25, 2022
13e39c4
chore: update workflows config.
jaywcjlove Feb 25, 2022
a0e59a4
chore: update workflows config.
jaywcjlove Feb 25, 2022
2f7ab20
chore: update workflows config.
jaywcjlove Feb 25, 2022
4bb42ea
chore: update workflows config.
jaywcjlove Feb 25, 2022
47dff78
chore: update workflows config.
jaywcjlove Feb 25, 2022
06f15dc
chore: update workflows config.
jaywcjlove Feb 25, 2022
b3869ae
chore: update workflows config.
jaywcjlove Feb 25, 2022
68a3578
chore: update workflows config.
jaywcjlove Feb 25, 2022
bd313f8
chore: update workflows config.
jaywcjlove Feb 25, 2022
b38ea46
fix(SearchTree): 通过清除按钮删除内容后,没有重置搜索选项 #563
nullptr-z Mar 1, 2022
cb791dd
Merge branch 'master' of github.com:nullptr-z/uiw
nullptr-z Mar 1, 2022
b518003
fix(Form): 修复onChange回调函数中even类型错误 #577
nullptr-z Mar 1, 2022
556ebc0
chore: update workflows config.
jaywcjlove Feb 25, 2022
5198c5d
chore: update workflows config.
jaywcjlove Feb 25, 2022
df5cbb1
chore: update workflows config.
jaywcjlove Feb 25, 2022
62c5043
chore: update workflows config.
jaywcjlove Feb 25, 2022
955a7b7
chore: update workflows config.
jaywcjlove Feb 25, 2022
b147707
chore: update workflows config.
jaywcjlove Feb 25, 2022
509c348
chore: update workflows config.
jaywcjlove Feb 25, 2022
78ccdfa
chore: update workflows config.
jaywcjlove Feb 25, 2022
b173756
chore: update workflows config.
jaywcjlove Feb 25, 2022
864bbc6
chore: update workflows config.
jaywcjlove Feb 25, 2022
c836fa9
chore: update workflows config.
jaywcjlove Feb 25, 2022
13303e4
chore: update workflows config.
jaywcjlove Feb 25, 2022
08f9c71
chore: update workflows config.
jaywcjlove Feb 25, 2022
318a216
chore: update workflows config.
jaywcjlove Feb 25, 2022
eccca0f
chore: update workflows config.
jaywcjlove Feb 25, 2022
04a2b9f
released-v4.13.2
actions-user Mar 1, 2022
7e09401
chore: update workflows config.
jaywcjlove Feb 25, 2022
e9a90d6
Merge branch 'master' of github.com:nullptr-z/uiw
nullptr-z Mar 1, 2022
f0d40a0
fix(Form): 修复onChange回调函数中even类型错误 #577
nullptr-z Mar 1, 2022
d6dcdd8
Merge branch 'master' of github.com:nullptr-z/uiw
nullptr-z Mar 1, 2022
172ee5d
fix(SearchTree): 下拉弹层没有展开时,清空搜索内容不再展开弹层 #584
nullptr-z Mar 2, 2022
668ecb9
released-v4.13.3
actions-user Mar 1, 2022
f42e96f
chore: update workflows config.
jaywcjlove Feb 25, 2022
43908e3
chore: update workflows config.
jaywcjlove Feb 25, 2022
0269df3
chore: update workflows config.
jaywcjlove Feb 25, 2022
ec3f98c
chore: update workflows config.
jaywcjlove Feb 25, 2022
0ec8dab
chore: update workflows config.
jaywcjlove Feb 25, 2022
02bbdbb
chore: update workflows config.
jaywcjlove Feb 25, 2022
e039165
chore: update workflows config.
jaywcjlove Feb 25, 2022
3913e3b
chore: update workflows config.
jaywcjlove Feb 25, 2022
13f6f52
chore: update workflows config.
jaywcjlove Feb 25, 2022
621792d
chore: update workflows config.
jaywcjlove Feb 25, 2022
d3b8627
chore: update workflows config.
jaywcjlove Feb 25, 2022
44be2ea
chore: update workflows config.
jaywcjlove Feb 25, 2022
a607e83
chore: update workflows config.
jaywcjlove Feb 25, 2022
3b57eca
chore: update workflows config.
jaywcjlove Feb 25, 2022
700701f
chore: update workflows config.
jaywcjlove Feb 25, 2022
1b44fb4
chore: update workflows config.
jaywcjlove Feb 25, 2022
3aa0f20
chore: update workflows config.
jaywcjlove Feb 25, 2022
54e661b
chore: update workflows config.
jaywcjlove Feb 25, 2022
ab0d43c
chore: update workflows config.
jaywcjlove Feb 25, 2022
341d5f3
chore: update workflows config.
jaywcjlove Feb 25, 2022
8811aa3
chore: update workflows config.
jaywcjlove Feb 25, 2022
2ca3680
chore: update workflows config.
jaywcjlove Feb 25, 2022
8d9b2fd
chore: update workflows config.
jaywcjlove Feb 25, 2022
66b593a
chore: update workflows config.
jaywcjlove Feb 25, 2022
4015afa
chore: update workflows config.
jaywcjlove Feb 25, 2022
cb18d71
chore: update workflows config.
jaywcjlove Feb 25, 2022
2b18781
chore: update workflows config.
jaywcjlove Feb 25, 2022
c0a12ca
chore: update workflows config.
jaywcjlove Feb 25, 2022
02c8e51
chore: update workflows config.
jaywcjlove Feb 25, 2022
10d20af
chore: update workflows config.
jaywcjlove Feb 25, 2022
a02d89d
chore: update workflows config.
jaywcjlove Feb 25, 2022
05aed95
chore: update workflows config.
jaywcjlove Feb 25, 2022
12f069c
chore: update workflows config.
jaywcjlove Feb 25, 2022
7731202
chore: update workflows config.
jaywcjlove Feb 25, 2022
42e2311
chore: update workflows config.
jaywcjlove Feb 25, 2022
18917f5
chore: update workflows config.
jaywcjlove Feb 25, 2022
ce73c9e
chore: update workflows config.
jaywcjlove Feb 25, 2022
83d3128
chore: update workflows config.
jaywcjlove Feb 25, 2022
bb9e116
chore: update workflows config.
jaywcjlove Feb 25, 2022
cb11014
chore: update workflows config.
jaywcjlove Feb 25, 2022
cb5aeaa
chore: update workflows config.
jaywcjlove Feb 25, 2022
6cc8def
chore: update workflows config.
jaywcjlove Feb 25, 2022
6af7ce2
chore: update workflows config.
jaywcjlove Feb 25, 2022
0a7df15
chore: update workflows config.
jaywcjlove Feb 25, 2022
5784efc
chore: update workflows config.
jaywcjlove Feb 25, 2022
70227cf
chore: update workflows config.
jaywcjlove Feb 25, 2022
1e55276
chore: update workflows config.
jaywcjlove Feb 25, 2022
774ab6d
chore: update workflows config.
jaywcjlove Feb 25, 2022
f4a5f39
fix(SearchTree): 下拉弹层没有展开时,清空搜索内容不再展开弹层 #584
nullptr-z Mar 2, 2022
9b25d71
Merge branch 'master' of github.com:nullptr-z/uiw
nullptr-z Mar 2, 2022
6df8597
chore: update workflows config.
jaywcjlove Feb 25, 2022
c4f43e2
chore: update workflows config.
jaywcjlove Feb 25, 2022
29d1b21
chore: update workflows config.
jaywcjlove Feb 25, 2022
cdcf5f7
chore: update workflows config.
jaywcjlove Feb 25, 2022
7519aa1
chore: update workflows config.
jaywcjlove Feb 25, 2022
6aa6228
chore: update workflows config.
jaywcjlove Feb 25, 2022
efbede2
chore: update workflows config.
jaywcjlove Feb 25, 2022
95a7008
chore: update workflows config.
jaywcjlove Feb 25, 2022
29f1b4e
chore: update workflows config.
jaywcjlove Feb 25, 2022
c41d811
chore: update workflows config.
jaywcjlove Feb 25, 2022
953ae4e
chore: update workflows config.
jaywcjlove Feb 25, 2022
662f10b
chore: update workflows config.
jaywcjlove Feb 25, 2022
292c741
chore: update workflows config.
jaywcjlove Feb 25, 2022
3433cdb
chore: update workflows config.
jaywcjlove Feb 25, 2022
0f66289
chore: update workflows config.
jaywcjlove Feb 25, 2022
0cccfc3
chore: update workflows config.
jaywcjlove Feb 25, 2022
58f0f09
chore: update workflows config.
jaywcjlove Feb 25, 2022
8d8cff1
chore: update workflows config.
jaywcjlove Feb 25, 2022
b28907a
chore: update workflows config.
jaywcjlove Feb 25, 2022
81fabc8
chore: update workflows config.
jaywcjlove Feb 25, 2022
09856e1
chore: update workflows config.
jaywcjlove Feb 25, 2022
c44007c
chore: update workflows config.
jaywcjlove Feb 25, 2022
40fb50c
chore: update workflows config.
jaywcjlove Feb 25, 2022
0203f99
chore: update workflows config.
jaywcjlove Feb 25, 2022
1f12e11
chore: update workflows config.
jaywcjlove Feb 25, 2022
e29a391
chore: update workflows config.
jaywcjlove Feb 25, 2022
4d5212d
chore: update workflows config.
jaywcjlove Feb 25, 2022
7fd10f3
chore: update workflows config.
jaywcjlove Feb 25, 2022
bf3a579
chore: update workflows config.
jaywcjlove Feb 25, 2022
906f0d5
chore: update workflows config.
jaywcjlove Feb 25, 2022
89fa6ed
chore: update workflows config.
jaywcjlove Feb 25, 2022
31274d4
chore: update workflows config.
jaywcjlove Feb 25, 2022
1eabe75
chore: update workflows config.
jaywcjlove Feb 25, 2022
e02449f
chore: update workflows config.
jaywcjlove Feb 25, 2022
66f8c22
chore: update workflows config.
jaywcjlove Feb 25, 2022
efb5e7b
chore: update workflows config.
jaywcjlove Feb 25, 2022
dc194a9
chore: update workflows config.
jaywcjlove Feb 25, 2022
44ea10a
chore: update workflows config.
jaywcjlove Feb 25, 2022
23ad09d
chore: update workflows config.
jaywcjlove Feb 25, 2022
73ba217
chore: update workflows config.
jaywcjlove Feb 25, 2022
73318c0
chore: update workflows config.
jaywcjlove Feb 25, 2022
e702e38
chore: update workflows config.
jaywcjlove Feb 25, 2022
1dbcccc
chore: update workflows config.
jaywcjlove Feb 25, 2022
69ef9ef
chore: update workflows config.
jaywcjlove Feb 25, 2022
d84db71
chore: update workflows config.
jaywcjlove Feb 25, 2022
ddea919
chore: update workflows config.
jaywcjlove Feb 25, 2022
4f6f90f
chore: update workflows config.
jaywcjlove Feb 25, 2022
5cefbaa
chore: update workflows config.
jaywcjlove Feb 25, 2022
b424685
chore: update workflows config.
jaywcjlove Feb 25, 2022
52eec42
chore: update workflows config.
jaywcjlove Feb 25, 2022
e187b82
chore: update workflows config.
jaywcjlove Feb 25, 2022
1f2d320
chore: update workflows config.
jaywcjlove Feb 25, 2022
00055e7
chore: update workflows config.
jaywcjlove Feb 25, 2022
670e56a
chore: update workflows config.
jaywcjlove Feb 25, 2022
1d0bd70
chore: update workflows config.
jaywcjlove Feb 25, 2022
a51890c
chore: update workflows config.
jaywcjlove Feb 25, 2022
555d312
chore: update workflows config.
jaywcjlove Feb 25, 2022
98ba677
chore: update workflows config.
jaywcjlove Feb 25, 2022
03ce6f4
chore: update workflows config.
jaywcjlove Feb 25, 2022
f538c6b
chore: update workflows config.
jaywcjlove Feb 25, 2022
b504c9e
chore: update workflows config.
jaywcjlove Feb 25, 2022
197f530
chore: update workflows config.
jaywcjlove Feb 25, 2022
c937954
chore: update workflows config.
jaywcjlove Feb 25, 2022
77b429d
chore: update workflows config.
jaywcjlove Feb 25, 2022
326fda1
chore: update workflows config.
jaywcjlove Feb 25, 2022
287fc74
chore: update workflows config.
jaywcjlove Feb 25, 2022
c70f378
chore: update workflows config.
jaywcjlove Feb 25, 2022
1103dc7
chore: update workflows config.
jaywcjlove Feb 25, 2022
0a45a6e
chore: update workflows config.
jaywcjlove Feb 25, 2022
c7f0096
chore: update workflows config.
jaywcjlove Feb 25, 2022
e280983
chore: update workflows config.
jaywcjlove Feb 25, 2022
290a580
chore: update workflows config.
jaywcjlove Feb 25, 2022
ba086b7
chore: update workflows config.
jaywcjlove Feb 25, 2022
307c148
chore: update workflows config.
jaywcjlove Feb 25, 2022
6eb3e2d
chore: update workflows config.
jaywcjlove Feb 25, 2022
f37ced2
chore: update workflows config.
jaywcjlove Feb 25, 2022
0a2df93
chore: update workflows config.
jaywcjlove Feb 25, 2022
5b227d9
chore: update workflows config.
jaywcjlove Feb 25, 2022
1fdf2ed
chore: update workflows config.
jaywcjlove Feb 25, 2022
450743a
chore: update workflows config.
jaywcjlove Feb 25, 2022
6633f99
chore: update workflows config.
jaywcjlove Feb 25, 2022
ec35012
chore: update workflows config.
jaywcjlove Feb 25, 2022
5ae35df
chore: update workflows config.
jaywcjlove Feb 25, 2022
1b907b7
chore: update workflows config.
jaywcjlove Feb 25, 2022
9337c8e
chore: update workflows config.
jaywcjlove Feb 25, 2022
ae6642b
chore: update workflows config.
jaywcjlove Feb 25, 2022
c9e598b
chore: update workflows config.
jaywcjlove Feb 25, 2022
e64903d
chore: update workflows config.
jaywcjlove Feb 25, 2022
a66e7ef
chore: update workflows config.
jaywcjlove Feb 25, 2022
c2d11ef
chore: update workflows config.
jaywcjlove Feb 25, 2022
6b63275
chore: update workflows config.
jaywcjlove Feb 25, 2022
96392d2
chore: update workflows config.
jaywcjlove Feb 25, 2022
02cfd12
chore: update workflows config.
jaywcjlove Feb 25, 2022
74cac65
chore: update workflows config.
jaywcjlove Feb 25, 2022
9571d9a
chore: update workflows config.
jaywcjlove Feb 25, 2022
82a07a3
chore: update workflows config.
jaywcjlove Feb 25, 2022
077c009
fix(SearchTree): 增加下拉选项为空时展示内容 #584
nullptr-z Mar 2, 2022
64ec979
Merge branch 'master' of github.com:nullptr-z/uiw
nullptr-z Mar 2, 2022
f762fe6
fix(SearchTree): 删除调试代码
nullptr-z Mar 2, 2022
847bb01
docs(SearchTree): 文档整理
nullptr-z Mar 2, 2022
03a8026
fix:处理冲突
nullptr-z Mar 2, 2022
092182e
fix(Tree): 修复autoExpandParent为true时openKeys失效问题
nullptr-z Mar 2, 2022
d8c8252
fix(Tree): 添加selectedKeys空值处理
nullptr-z Mar 2, 2022
7793b38
Merge branch 'master' of github.com:uiwjs/uiw
nullptr-z Mar 2, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/react-tree/src/index.tsx
Expand Up @@ -144,18 +144,18 @@ export default function Tree(props: TreeProps) {
const [curSelectedKeys, setCurSelectedKeys] = useState(selectedKeys);

useEffect(() => {
setCurSelectedKeys(props.selectedKeys!);
setCurSelectedKeys(props.selectedKeys || []);
}, [JSON.stringify(props.selectedKeys)]);

// useEffect(() => setCurOpenKeys(openKeys), [openKeys]);
// useEffect(() => setCurSelectedKeys(selectedKeys), [selectedKeys]);

useEffect(() => {
let arrOpenKeys: TreeData['key'][] = [];
let arrOpenKeys: TreeData['key'][] = curOpenKeys;
if (defaultExpandAll) {
arrOpenKeys = getChildKeys(data);
} else if (autoExpandParent) {
arrOpenKeys = getChildKeys(data, undefined, 1);
arrOpenKeys.push(...getChildKeys(data, undefined, 1));
}
setCurOpenKeys(arrOpenKeys);
}, []);
Expand Down