Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
970d80cf
D
dbeaver
项目概览
suliangchun
/
dbeaver
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
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,发现更多精彩内容 >>
提交
970d80cf
编写于
8月 08, 2019
作者:
S
Serge Rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Filter panel: table pack fix
Former-commit-id:
4b87095e
上级
b8abd8fc
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
21 addition
and
17 deletion
+21
-17
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/valuefilter/FilterValueEditDialog.java
...controls/resultset/valuefilter/FilterValueEditDialog.java
+1
-1
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/valuefilter/FilterValueEditPopup.java
.../controls/resultset/valuefilter/FilterValueEditPopup.java
+3
-6
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/valuefilter/GenericFilterValueEdit.java
...ontrols/resultset/valuefilter/GenericFilterValueEdit.java
+17
-10
未找到文件。
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/valuefilter/FilterValueEditDialog.java
浏览文件 @
970d80cf
...
...
@@ -169,7 +169,7 @@ public class FilterValueEditDialog extends BaseDialog{
handler
.
addFilterTextbox
(
composite
);
handler
.
filterPattern
=
null
;
handler
.
loadValues
();
handler
.
loadValues
(
null
);
columnController
.
createColumns
(
true
);
}
...
...
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/valuefilter/FilterValueEditPopup.java
浏览文件 @
970d80cf
...
...
@@ -99,7 +99,7 @@ public class FilterValueEditPopup extends Dialog {
public
void
widgetSelected
(
SelectionEvent
e
)
{
EditDictionaryPage
editDictionaryPage
=
new
EditDictionaryPage
(((
DBSEntityAssociation
)
descReferrer
).
getAssociatedEntity
());
if
(
editDictionaryPage
.
edit
(
parent
.
getShell
()))
{
filter
.
loadValues
();
filter
.
loadValues
(
null
);
}
}
});
...
...
@@ -178,11 +178,8 @@ public class FilterValueEditPopup extends Dialog {
table
.
setFocus
();
}
filter
.
filterPattern
=
null
;
filter
.
loadValues
();
// Resize the column to fit the contents
UIUtils
.
asyncExec
(()
->
{
UIUtils
.
packColumns
(
table
,
true
);
filter
.
loadValues
(()
->
{
UIUtils
.
asyncExec
(()
->
UIUtils
.
packColumns
(
table
,
false
));
});
return
tableComposite
;
...
...
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/valuefilter/GenericFilterValueEdit.java
浏览文件 @
970d80cf
...
...
@@ -18,6 +18,8 @@ package org.jkiss.dbeaver.ui.controls.resultset.valuefilter;
import
org.eclipse.core.runtime.IStatus
;
import
org.eclipse.core.runtime.Status
;
import
org.eclipse.core.runtime.jobs.IJobChangeEvent
;
import
org.eclipse.core.runtime.jobs.JobChangeAdapter
;
import
org.eclipse.jface.action.Action
;
import
org.eclipse.jface.action.MenuManager
;
import
org.eclipse.jface.action.Separator
;
...
...
@@ -157,13 +159,13 @@ class GenericFilterValueEdit {
if
(
filterPattern
.
isEmpty
())
{
filterPattern
=
null
;
}
loadValues
();
loadValues
(
null
);
});
return
valueFilterText
;
}
void
loadValues
()
{
void
loadValues
(
Runnable
onFinish
)
{
if
(
loadJob
!=
null
)
{
loadJob
.
schedule
(
200
);
return
;
...
...
@@ -171,16 +173,16 @@ class GenericFilterValueEdit {
// Load values
final
DBSEntityReferrer
enumerableConstraint
=
ReferenceValueEditor
.
getEnumerableConstraint
(
attr
);
if
(
enumerableConstraint
!=
null
)
{
loadConstraintEnum
(
enumerableConstraint
);
loadConstraintEnum
(
enumerableConstraint
,
onFinish
);
}
else
if
(
attr
.
getEntityAttribute
()
instanceof
DBSAttributeEnumerable
)
{
loadAttributeEnum
((
DBSAttributeEnumerable
)
attr
.
getEntityAttribute
());
loadAttributeEnum
((
DBSAttributeEnumerable
)
attr
.
getEntityAttribute
()
,
onFinish
);
}
else
{
loadMultiValueList
(
Collections
.
emptyList
(),
isCheckedTable
);
}
}
private
void
loadConstraintEnum
(
final
DBSEntityReferrer
refConstraint
)
{
loadJob
=
new
KeyLoadJob
(
"Load constraint '"
+
refConstraint
.
getName
()
+
"' values"
)
{
private
void
loadConstraintEnum
(
final
DBSEntityReferrer
refConstraint
,
Runnable
onFinish
)
{
loadJob
=
new
KeyLoadJob
(
"Load constraint '"
+
refConstraint
.
getName
()
+
"' values"
,
onFinish
)
{
@Override
List
<
DBDLabelValuePair
>
readEnumeration
(
DBRProgressMonitor
monitor
)
throws
DBException
{
final
DBSEntityAttribute
tableColumn
=
attr
.
getEntityAttribute
();
...
...
@@ -221,11 +223,11 @@ class GenericFilterValueEdit {
loadJob
.
schedule
();
}
private
void
loadAttributeEnum
(
final
DBSAttributeEnumerable
attributeEnumerable
)
{
private
void
loadAttributeEnum
(
final
DBSAttributeEnumerable
attributeEnumerable
,
Runnable
onFinish
)
{
if
(
tableViewer
.
getTable
().
getColumns
().
length
>
1
)
tableViewer
.
getTable
().
getColumn
(
1
).
setText
(
"Count"
);
loadJob
=
new
KeyLoadJob
(
"Load '"
+
attr
.
getName
()
+
"' values"
)
{
loadJob
=
new
KeyLoadJob
(
"Load '"
+
attr
.
getName
()
+
"' values"
,
onFinish
)
{
private
List
<
DBDLabelValuePair
>
result
;
...
...
@@ -383,8 +385,10 @@ class GenericFilterValueEdit {
}
private
abstract
class
KeyLoadJob
extends
AbstractJob
{
KeyLoadJob
(
String
name
)
{
private
final
Runnable
onFinish
;
KeyLoadJob
(
String
name
,
Runnable
onFinish
)
{
super
(
name
);
this
.
onFinish
=
onFinish
;
}
@Override
...
...
@@ -400,7 +404,10 @@ class GenericFilterValueEdit {
}
else
{
populateValues
(
valueEnumeration
);
}
}
catch
(
DBException
e
)
{
if
(
onFinish
!=
null
)
{
onFinish
.
run
();
}
}
catch
(
Throwable
e
)
{
populateValues
(
Collections
.
emptyList
());
return
GeneralUtils
.
makeExceptionStatus
(
e
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录