Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
9a7d16ca
D
dbeaver
项目概览
suliangchun
/
dbeaver
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dbeaver
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
9a7d16ca
编写于
8月 08, 2019
作者:
S
Serge Rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#6216 Data viewer: filter menu redesign
上级
33f58afc
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
18 addition
and
8 deletion
+18
-8
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java
.../jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java
+18
-8
未找到文件。
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java
浏览文件 @
9a7d16ca
...
...
@@ -2620,6 +2620,8 @@ public class ResultSetViewer extends Viewer
filtersMenu
.
add
(
ActionUtils
.
makeCommandContribution
(
site
,
ResultSetHandlerMain
.
CMD_FILTER_MENU_DISTINCT
));
if
(
row
!=
null
)
{
filtersMenu
.
add
(
new
Separator
());
//filtersMenu.add(new FilterByListAction(operator, type, attribute));
DBCLogicalOperator
[]
operators
=
attribute
.
getValueHandler
().
getSupportedOperators
(
attribute
);
...
...
@@ -2629,15 +2631,22 @@ public class ResultSetViewer extends Viewer
// Value filters are available only if certain cell is selected
continue
;
}
filtersMenu
.
add
(
new
Separator
());
MenuManager
subMenu
=
null
;
//filtersMenu.add(new Separator());
if
(
type
.
getValue
(
this
,
attribute
,
DBCLogicalOperator
.
EQUALS
,
true
)
==
null
)
{
// Null cell value - no operators can be applied
continue
;
}
for
(
DBCLogicalOperator
operator
:
operators
)
{
if
(
operator
.
getArgumentCount
()
>
0
)
{
filtersMenu
.
add
(
new
FilterByAttributeAction
(
operator
,
type
,
attribute
));
if
(
subMenu
==
null
)
{
subMenu
=
new
MenuManager
(
type
.
title
,
type
.
icon
,
type
.
name
());
}
subMenu
.
add
(
new
FilterByAttributeAction
(
operator
,
type
,
attribute
));
}
}
if
(
subMenu
!=
null
)
{
filtersMenu
.
add
(
subMenu
);
}
}
filtersMenu
.
add
(
new
Separator
());
...
...
@@ -4059,7 +4068,7 @@ public class ResultSetViewer extends Viewer
}
private
enum
FilterByAttributeType
{
CLIPBOARD
(
UIIcon
.
FILTER_CLIPBOARD
)
{
CLIPBOARD
(
"Clipboard"
,
UIIcon
.
FILTER_CLIPBOARD
)
{
@Override
Object
getValue
(
@NotNull
ResultSetViewer
viewer
,
@NotNull
DBDAttributeBinding
attribute
,
@NotNull
DBCLogicalOperator
operator
,
boolean
useDefault
)
{
...
...
@@ -4071,7 +4080,7 @@ public class ResultSetViewer extends Viewer
}
}
},
VALUE
(
UIIcon
.
FILTER_VALUE
)
{
VALUE
(
"Cell value"
,
UIIcon
.
FILTER_VALUE
)
{
@Override
Object
getValue
(
@NotNull
ResultSetViewer
viewer
,
@NotNull
DBDAttributeBinding
attribute
,
@NotNull
DBCLogicalOperator
operator
,
boolean
useDefault
)
{
...
...
@@ -4086,7 +4095,7 @@ public class ResultSetViewer extends Viewer
return
cellValue
;
}
},
INPUT
(
UIIcon
.
FILTER_INPUT
)
{
INPUT
(
"Input ... "
,
UIIcon
.
FILTER_INPUT
)
{
@Override
Object
getValue
(
@NotNull
ResultSetViewer
viewer
,
@NotNull
DBDAttributeBinding
attribute
,
@NotNull
DBCLogicalOperator
operator
,
boolean
useDefault
)
{
...
...
@@ -4115,7 +4124,7 @@ public class ResultSetViewer extends Viewer
}
}
},
NONE
(
UIIcon
.
FILTER_VALUE
)
{
NONE
(
"None"
,
UIIcon
.
FILTER_VALUE
)
{
@Override
Object
getValue
(
@NotNull
ResultSetViewer
viewer
,
@NotNull
DBDAttributeBinding
attribute
,
@NotNull
DBCLogicalOperator
operator
,
boolean
useDefault
)
{
...
...
@@ -4123,10 +4132,11 @@ public class ResultSetViewer extends Viewer
}
};
final
String
title
;
final
ImageDescriptor
icon
;
FilterByAttributeType
(
DBPImage
icon
)
{
FilterByAttributeType
(
String
title
,
DBPImage
icon
)
{
this
.
title
=
title
;
this
.
icon
=
DBeaverIcons
.
getImageDescriptor
(
icon
);
}
@Nullable
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录