Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
a70d8761
V
vscode
项目概览
xxadev
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
a70d8761
编写于
9月 26, 2018
作者:
J
Joao Moreno
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
working filter demo
上级
6fee1f6e
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
43 addition
and
18 deletion
+43
-18
src/vs/base/browser/ui/tree/treeModel.ts
src/vs/base/browser/ui/tree/treeModel.ts
+41
-16
test/tree/public/index.html
test/tree/public/index.html
+2
-2
未找到文件。
src/vs/base/browser/ui/tree/treeModel.ts
浏览文件 @
a70d8761
...
...
@@ -24,7 +24,6 @@ export interface ITreeNode<T, TFilterData = void> {
readonly
collapsible
:
boolean
;
readonly
collapsed
:
boolean
;
readonly
revealedCount
:
number
;
readonly
visible
:
boolean
;
readonly
filterData
:
TFilterData
|
undefined
;
}
...
...
@@ -34,14 +33,16 @@ interface IMutableTreeNode<T, TFilterData> extends ITreeNode<T, TFilterData> {
collapsible
:
boolean
;
collapsed
:
boolean
;
revealedCount
:
number
;
visible
:
boolean
;
filterData
:
TFilterData
|
undefined
;
// internal state
visible
:
boolean
|
undefined
;
}
export
const
enum
Visibility
{
Hidden
,
Visible
,
//
Recurse // TODO@joao come up with a better name
Recurse
// TODO@joao come up with a better name
}
export
interface
IFilterResult
<
TFilterData
>
{
...
...
@@ -82,6 +83,14 @@ function treeNodeToElement<T>(node: IMutableTreeNode<T, any>): ITreeElement<T> {
return
{
element
,
children
,
collapsed
};
}
function
getVisibleState
(
visibility
:
Visibility
):
boolean
|
undefined
{
switch
(
visibility
)
{
case
Visibility
.
Hidden
:
return
false
;
case
Visibility
.
Visible
:
return
true
;
case
Visibility
.
Recurse
:
return
undefined
;
}
}
export
function
getNodeLocation
<
T
>
(
node
:
ITreeNode
<
T
,
any
>
):
number
[]
{
const
location
=
[];
...
...
@@ -232,7 +241,7 @@ export class TreeModel<T, TFilterData = void> {
const
{
element
,
collapsible
,
collapsed
}
=
treeElement
;
const
node
:
IMutableTreeNode
<
T
,
TFilterData
>
=
{
parent
,
element
,
children
:
[],
depth
,
collapsible
:
!!
collapsible
,
collapsed
:
!!
collapsed
,
revealedCount
:
1
,
visible
:
true
,
filterData
:
undefined
};
this
.
filterNod
e
(
node
);
this
.
updateNodeFilterStat
e
(
node
);
if
(
revealed
&&
node
.
visible
)
{
treeListElements
.
push
(
node
);
...
...
@@ -242,7 +251,14 @@ export class TreeModel<T, TFilterData = void> {
node
.
children
=
Iterator
.
collect
(
Iterator
.
map
(
children
,
el
=>
this
.
createTreeNode
(
el
,
node
,
revealed
&&
!
treeElement
.
collapsed
,
treeListElements
)));
node
.
collapsible
=
node
.
collapsible
||
node
.
children
.
length
>
0
;
if
(
!
collapsed
)
{
if
(
typeof
node
.
visible
===
'
undefined
'
&&
node
.
children
.
length
===
0
)
{
node
.
visible
=
false
;
treeListElements
.
pop
();
}
else
{
node
.
visible
=
true
;
}
if
(
node
.
visible
&&
!
collapsed
)
{
node
.
revealedCount
+=
getRevealedCount
(
node
.
children
);
}
...
...
@@ -260,10 +276,10 @@ export class TreeModel<T, TFilterData = void> {
const
recurse
=
(
node
:
IMutableTreeNode
<
T
,
TFilterData
>
):
number
=>
{
if
(
!
first
||
filterFirst
)
{
this
.
filterNod
e
(
node
);
this
.
updateNodeFilterStat
e
(
node
);
}
if
(
!
node
.
visibl
e
)
{
if
(
node
.
visible
===
fals
e
)
{
return
0
;
}
...
...
@@ -271,12 +287,21 @@ export class TreeModel<T, TFilterData = void> {
result
.
push
(
node
);
node
.
revealedCount
=
1
;
let
childrenRevealedCount
=
0
;
if
(
!
node
.
collapsed
)
{
for
(
const
child
of
node
.
children
)
{
node
.
r
evealedCount
+=
recurse
(
child
);
childrenR
evealedCount
+=
recurse
(
child
);
}
}
if
(
typeof
node
.
visible
===
'
undefined
'
&&
childrenRevealedCount
===
0
)
{
node
.
visible
=
false
;
result
.
pop
();
return
0
;
}
node
.
revealedCount
+=
childrenRevealedCount
;
return
node
.
revealedCount
;
};
...
...
@@ -298,17 +323,17 @@ export class TreeModel<T, TFilterData = void> {
return
result
;
}
private
filterNod
e
(
node
:
IMutableTreeNode
<
T
,
TFilterData
>
):
void
{
const
visibility
=
this
.
filter
?
this
.
filter
.
filter
(
node
.
element
)
:
Visibility
.
Visible
;
private
updateNodeFilterStat
e
(
node
:
IMutableTreeNode
<
T
,
TFilterData
>
):
void
{
const
result
=
this
.
filter
?
this
.
filter
.
filter
(
node
.
element
)
:
Visibility
.
Visible
;
if
(
typeof
visibility
===
'
boolean
'
)
{
node
.
visible
=
visibility
;
if
(
typeof
result
===
'
boolean
'
)
{
node
.
visible
=
result
;
node
.
filterData
=
undefined
;
}
else
if
(
isFilterResult
<
TFilterData
>
(
visibility
))
{
node
.
visible
=
visibility
.
visibility
===
Visibility
.
Visible
;
node
.
filterData
=
visibility
.
data
;
}
else
if
(
isFilterResult
<
TFilterData
>
(
result
))
{
node
.
visible
=
getVisibleState
(
result
.
visibility
)
;
node
.
filterData
=
result
.
data
;
}
else
{
node
.
visible
=
visibility
===
Visibility
.
Visible
;
node
.
visible
=
getVisibleState
(
result
)
;
node
.
filterData
=
undefined
;
}
}
...
...
test/tree/public/index.html
浏览文件 @
a70d8761
...
...
@@ -28,7 +28,7 @@
<script>
require
.
config
({
baseUrl
:
'
/static
'
});
require
([
'
vs/base/browser/ui/tree/tree
'
,
'
vs/base/
common/iterator
'
],
({
Tree
},
{
iter
})
=>
{
require
([
'
vs/base/browser/ui/tree/tree
'
,
'
vs/base/
browser/ui/tree/treeModel
'
,
'
vs/base/common/iterator
'
],
({
Tree
},
{
Visibility
},
{
iter
})
=>
{
const
delegate
=
{
getHeight
()
{
return
22
;
},
getTemplateId
()
{
return
'
template
'
;
}
...
...
@@ -63,7 +63,7 @@
tree
.
refilter
();
}
filter
(
el
)
{
return
this
.
pattern
?
this
.
pattern
.
test
(
el
)
:
tru
e
;
return
(
this
.
pattern
?
this
.
pattern
.
test
(
el
)
:
true
)
?
Visibility
.
Visible
:
Visibility
.
Recurs
e
;
}
}
});
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录