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(SearchTree): 下拉弹层没有展开时,清空搜索内容不再展开弹层 #584 #585

Merged
merged 188 commits into from
Mar 2, 2022
Merged
Changes from all commits
Commits
Show all changes
188 commits
Select commit Hold shift + click to select a range
8090bca
fix(Form): 修复ref获取不到表单方法
nullptr-z Feb 11, 2022
ddf96b2
fix(Form):使用useLayoutEffect替换useEffect绑定绑定ForwardedRef
nullptr-z Feb 11, 2022
53880a5
refactor:(Form) 修改Ref类型定义
nullptr-z Feb 11, 2022
0c4f0bc
fix(Form): 修复无法重置(initialValue)表单问题
nullptr-z Feb 14, 2022
9a550f2
Merge branch 'master' of github.com:uiwjs/uiw
nullptr-z Feb 14, 2022
9f8cdd9
fix(Form): 类型导出错误
nullptr-z Feb 14, 2022
8639505
feat(search-select):增加多选功能
nullptr-z Feb 16, 2022
6e1b22f
Merge branch 'master' of github.com:uiwjs/uiw
nullptr-z Feb 16, 2022
bfefc27
fix(form):增加设置表单值方法
nullptr-z Feb 16, 2022
94cdab2
feat(form):增加必传表单项标注 #534
nullptr-z Feb 16, 2022
8fc1fec
fix(search-select):增加Tag依赖
nullptr-z Feb 16, 2022
f47944d
fix(form):增加获取异常信息方法
nullptr-z Feb 16, 2022
6f57091
Merge branch 'master' of github.com:uiwjs/uiw
nullptr-z Feb 16, 2022
34cbebc
fix(form):修复afterSubmit回调失效问题
nullptr-z Feb 16, 2022
e206d34
fix(search-select):缺失依赖
nullptr-z Feb 16, 2022
1f87383
refactor(search-select):重命名类型名称
nullptr-z Feb 16, 2022
7221664
style(search-select): 多选select样式
nullptr-z Feb 16, 2022
d6efbbe
style(search-select): 多选select下拉弹层样式
nullptr-z Feb 16, 2022
0cb0a69
fix(Table):data不支持对象内包含布尔类型 #517
nullptr-z Feb 16, 2022
0048c06
style(search-select):规范样式命名
nullptr-z Feb 16, 2022
9dc643f
Merge branch 'master' of github.com:uiwjs/uiw
nullptr-z Feb 16, 2022
e7df400
style(SearchSelect): 规范命名
nullptr-z Feb 16, 2022
dcff5a8
ifx(SearchSelect): 增加value受控支持,多选模式下为数组
nullptr-z Feb 17, 2022
a71d439
Merge branch 'master' of github.com:uiwjs/uiw
nullptr-z Feb 17, 2022
73726b2
fix(SearchSelect): 修复defaultValue支持
nullptr-z Feb 17, 2022
36d7233
fix(Tree):修复autoExpandParent参数时效,无法展开父节点
nullptr-z Feb 17, 2022
d3b5e27
Merge branch 'master' of github.com:uiwjs/uiw
nullptr-z Feb 17, 2022
ae8e87d
feat(SearchSelect): 增加参数控制tag可见数量,多余显示省略
nullptr-z Feb 17, 2022
c05101a
feat(SearchSelect): 增加参数控制tag可见数量,多余显示省略
nullptr-z Feb 17, 2022
ffb06d5
feat(SearchSelect): 增加参数控制tag可见数量,多余显示省略
nullptr-z Feb 17, 2022
5662fb7
fix(SearchSelect): 防止对选择的循序排序
nullptr-z Feb 17, 2022
8852225
fix(SearchSelect): 增加labelInValue,控制value的格式
nullptr-z Feb 17, 2022
4d00d2c
style(SearchSelec): 样式调整与组件库一直
nullptr-z Feb 18, 2022
53c29ea
Merge branch 'master' of github.com:uiwjs/uiw
nullptr-z Feb 18, 2022
77c431f
fix(SearchSelect):存在tag时不显示 placeholder
nullptr-z Feb 18, 2022
0409913
docs(SearchSelect):labelInValue, value参数说明
nullptr-z Feb 18, 2022
0fd2e23
fix(Form): #544 使用转json方式深拷贝状态值导致,某些类型Object变为了字符串,例如Date
nullptr-z Feb 21, 2022
f1cea26
fix(SearchSelect): 修复删除键没有触发更新回调问题
nullptr-z Feb 21, 2022
4d6d5c4
Merge branch 'master' of github.com:uiwjs/uiw
nullptr-z Feb 21, 2022
132a870
SearchTree
nullptr-z Feb 22, 2022
b9363e4
SearchTree
nullptr-z Feb 22, 2022
940fb07
暂存
nullptr-z Feb 22, 2022
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
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions packages/react-search-tree/src/SearchTagInput.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ function SearchTagInput<V extends SearchTagInputOption>(props: SearchTagInputPro

const cls = [prefixCls, className].filter(Boolean).join(' ').trim();
// const isMultiple = useMemo(() => mode === 'multiple', [mode]);
// const [innerIsOpen, setInnerIsOpen] = useState(false);
const [innerIsOpen, setInnerIsOpen] = useState(false);
const [selectedOption, setSelectedOption] = useState<Array<V>>(values);
const optionRef = useRef<Array<V>>();
const [searchValue, searchValueSet] = useState<string>('');
Expand Down Expand Up @@ -89,7 +89,7 @@ function SearchTagInput<V extends SearchTagInputOption>(props: SearchTagInputPro

// 清除选中的值
function resetSelectedValue() {
// setInnerIsOpen(false);
setInnerIsOpen(false);
setSelectedOption([]);
handleInputChange('');
handleSelectChange([]);
Expand All @@ -112,11 +112,13 @@ function SearchTagInput<V extends SearchTagInputOption>(props: SearchTagInputPro
}, [selectedOption, options]);

return (
<Dropdown className={cls} trigger="focus" {...others} menu={<Card>{newContent}</Card>}>
<Dropdown className={cls} trigger="focus" {...others} isOpen={innerIsOpen} menu={<Card>{newContent}</Card>}>
<div
onMouseOver={() => renderSelectIcon('enter')}
onMouseLeave={() => renderSelectIcon('leave')}
onClick={() => inputRef.current?.focus()}
onClick={() => {
if (innerIsOpen) inputRef.current?.focus();
}}
style={{ minWidth: 200, maxWidth: 'none', ...style }}
>
<div className={`${prefixCls}-inner`}>
Expand Down