Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
338a2c50
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,发现更多精彩内容 >>
提交
338a2c50
编写于
8月 13, 2019
作者:
S
Serge Rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Column-specific actions fix (use current column instead of selected column when possible)
Former-commit-id:
6139fd0f
上级
a588fe90
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
38 addition
and
10 deletion
+38
-10
plugins/org.jkiss.dbeaver.ui.editors.data/plugin.xml
plugins/org.jkiss.dbeaver.ui.editors.data/plugin.xml
+3
-1
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetHandlerMain.java
...s/dbeaver/ui/controls/resultset/ResultSetHandlerMain.java
+12
-0
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java
.../jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java
+9
-1
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/spreadsheet/SpreadsheetPresentation.java
...ntrols/resultset/spreadsheet/SpreadsheetPresentation.java
+4
-0
plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/ActionUtils.java
...kiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/ActionUtils.java
+10
-8
未找到文件。
plugins/org.jkiss.dbeaver.ui.editors.data/plugin.xml
浏览文件 @
338a2c50
...
...
@@ -246,7 +246,9 @@
</commandParameter>
</command>
<command
id=
"org.jkiss.dbeaver.core.resultset.grid.toggleLayout"
name=
"%command.org.jkiss.dbeaver.core.resultset.grid.toggleLayout.name"
description=
"%command.org.jkiss.dbeaver.core.resultset.grid.toggleLayout.description"
categoryId=
"org.jkiss.dbeaver.core.rs"
/>
<command
id=
"org.jkiss.dbeaver.core.resultset.grid.copyColumnNames"
name=
"%command.org.jkiss.dbeaver.core.resultset.grid.copyColumnNames.name"
description=
"%command.org.jkiss.dbeaver.core.resultset.grid.copyColumnNames.description"
categoryId=
"org.jkiss.dbeaver.core.rs"
/>
<command
id=
"org.jkiss.dbeaver.core.resultset.grid.copyColumnNames"
name=
"%command.org.jkiss.dbeaver.core.resultset.grid.copyColumnNames.name"
description=
"%command.org.jkiss.dbeaver.core.resultset.grid.copyColumnNames.description"
categoryId=
"org.jkiss.dbeaver.core.rs"
>
<commandParameter
id=
"columns"
name=
"Columns to copy"
optional=
"true"
/>
</command>
<command
id=
"org.jkiss.dbeaver.core.resultset.grid.copyRowNames"
name=
"%command.org.jkiss.dbeaver.core.resultset.grid.copyRowNames.name"
description=
"%command.org.jkiss.dbeaver.core.resultset.grid.copyRowNames.description"
categoryId=
"org.jkiss.dbeaver.core.rs"
/>
<command
id=
"org.jkiss.dbeaver.core.resultset.grid.columnsFitValue"
name=
"%command.org.jkiss.dbeaver.core.resultset.grid.columnsFitValue.name"
description=
"%command.org.jkiss.dbeaver.core.resultset.grid.columnsFitValue.description"
categoryId=
"org.jkiss.dbeaver.core.rs"
/>
<command
id=
"org.jkiss.dbeaver.core.resultset.grid.columnsFitScreen"
name=
"%command.org.jkiss.dbeaver.core.resultset.grid.columnsFitScreen.name"
description=
"%command.org.jkiss.dbeaver.core.resultset.grid.columnsFitScreen.description"
categoryId=
"org.jkiss.dbeaver.core.rs"
/>
...
...
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetHandlerMain.java
浏览文件 @
338a2c50
...
...
@@ -306,8 +306,20 @@ public class ResultSetHandlerMain extends AbstractHandler {
}
case
CMD_COPY_COLUMN_NAMES:
{
StringBuilder
buffer
=
new
StringBuilder
();
String
columnNames
=
event
.
getParameter
(
"columns"
);
IResultSetSelection
selection
=
rsv
.
getSelection
();
List
<
DBDAttributeBinding
>
attrs
=
selection
.
isEmpty
()
?
rsv
.
getModel
().
getVisibleAttributes
()
:
selection
.
getSelectedAttributes
();
if
(!
CommonUtils
.
isEmpty
(
columnNames
)
&&
attrs
.
size
()
==
1
)
{
attrs
=
new
ArrayList
<>();
for
(
String
colName
:
columnNames
.
split
(
","
))
{
for
(
DBDAttributeBinding
attr
:
rsv
.
getModel
().
getVisibleAttributes
())
{
if
(
colName
.
equals
(
attr
.
getName
()))
{
attrs
.
add
(
attr
);
}
}
}
}
ResultSetCopySettings
settings
=
new
ResultSetCopySettings
();
if
(
attrs
.
size
()
>
1
)
{
...
...
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java
浏览文件 @
338a2c50
...
...
@@ -2196,7 +2196,15 @@ public class ResultSetViewer extends Viewer
if
(
attr
==
null
&&
row
!=
null
)
{
manager
.
add
(
ActionUtils
.
makeCommandContribution
(
site
,
ResultSetHandlerMain
.
CMD_COPY_ROW_NAMES
));
}
else
if
(
attr
!=
null
&&
row
==
null
)
{
manager
.
add
(
ActionUtils
.
makeCommandContribution
(
site
,
ResultSetHandlerMain
.
CMD_COPY_COLUMN_NAMES
));
manager
.
add
(
ActionUtils
.
makeCommandContribution
(
site
,
ResultSetHandlerMain
.
CMD_COPY_COLUMN_NAMES
,
SWT
.
PUSH
,
null
,
null
,
null
,
false
,
Collections
.
singletonMap
(
"columns"
,
attr
.
getName
())));
}
else
{
manager
.
add
(
ActionUtils
.
makeCommandContribution
(
site
,
IWorkbenchCommandConstants
.
EDIT_COPY
));
}
...
...
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/spreadsheet/SpreadsheetPresentation.java
浏览文件 @
338a2c50
...
...
@@ -784,6 +784,10 @@ public class SpreadsheetPresentation extends AbstractPresentation implements IRe
if
(
attr
!=
null
&&
row
==
null
)
{
final
List
<
Object
>
selectedColumns
=
spreadsheet
.
getColumnSelection
();
if
(
selectedColumns
.
size
()
==
1
&&
attr
!=
null
)
{
selectedColumns
.
clear
();
selectedColumns
.
add
(
attr
);
}
if
(!
controller
.
isRecordMode
()
&&
!
selectedColumns
.
isEmpty
())
{
{
manager
.
insertBefore
(
IResultSetController
.
MENU_GROUP_ADDITIONS
,
new
Separator
());
...
...
plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/ActionUtils.java
浏览文件 @
338a2c50
...
...
@@ -118,17 +118,18 @@ public class ActionUtils
@Nullable
DBPImage
image
,
@Nullable
String
toolTip
,
boolean
showText
)
{
return
makeCommandContribution
(
serviceLocator
,
commandId
,
CommandContributionItem
.
STYLE_PUSH
,
name
,
image
,
toolTip
,
showText
);
return
makeCommandContribution
(
serviceLocator
,
commandId
,
CommandContributionItem
.
STYLE_PUSH
,
name
,
image
,
toolTip
,
showText
,
null
);
}
public
static
CommandContributionItem
makeCommandContribution
(
@NotNull
IServiceLocator
serviceLocator
,
@NotNull
String
commandId
,
int
style
,
@Nullable
String
name
,
@Nullable
DBPImage
image
,
@Nullable
String
toolTip
,
boolean
showText
)
@NotNull
IServiceLocator
serviceLocator
,
@NotNull
String
commandId
,
int
style
,
@Nullable
String
name
,
@Nullable
DBPImage
image
,
@Nullable
String
toolTip
,
boolean
showText
,
@Nullable
Map
<
String
,
Object
>
parameters
)
{
final
CommandContributionItemParameter
contributionParameters
=
new
CommandContributionItemParameter
(
serviceLocator
,
...
...
@@ -144,6 +145,7 @@ public class ActionUtils
style
,
null
,
false
);
contributionParameters
.
parameters
=
parameters
;
if
(
showText
)
{
contributionParameters
.
mode
=
CommandContributionItem
.
MODE_FORCE_TEXT
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录