Browse Source

REPORT-66457 原数据集管理优化

【问题原因】跟产品确定了在搜索过程中做数据集的编辑、删除、粘贴时,需要中断搜索,展示原数据集树
【改动思路】编辑、删除、粘贴处添加跳出搜索的逻辑
【review建议】无
feature/x
Yvan 3 years ago
parent
commit
68a134524b
  1. 12
      designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java

12
designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java

@ -385,6 +385,10 @@ public class TableDataTreePane extends BasicTableDataTreePane {
*/
@Override
public void dgEdit(final AbstractTableDataPane<?> tableDataPane, String originalName, boolean isUpdate) {
// 编辑时如果正在搜索,跳回原树
if (TableDataTreeSearchManager.getInstance().isInSearchMode()) {
TableDataTreeSearchManager.getInstance().outOfSearchMode();
}
tableDataPane.addStoreProcedureWorkerListener(new StoreProcedureWorkerListener() {
public void fireDoneAction() {
if (tableDataTree.getSelectionPath() == null) {
@ -1031,6 +1035,10 @@ public class TableDataTreePane extends BasicTableDataTreePane {
@Override
public void doOk() {
Object[] selectedValues = checkBoxList.getSelectedValues();
// 删除时如果正在搜索,跳回原树
if (TableDataTreeSearchManager.getInstance().isInSearchMode()) {
TableDataTreeSearchManager.getInstance().outOfSearchMode();
}
for (Object toRemove : selectedValues) {
doRemove((NameObject) toRemove);
}
@ -1092,6 +1100,10 @@ public class TableDataTreePane extends BasicTableDataTreePane {
@Override
public void actionPerformed(ActionEvent e) {
// 粘贴时如果正在搜索,跳回原树
if (TableDataTreeSearchManager.getInstance().isInSearchMode()) {
TableDataTreeSearchManager.getInstance().outOfSearchMode();
}
Map<String, AbstractTableDataWrapper> dataWrapperMap = TableDataTreeClipboard.getInstance().takeFromClip();
for (Map.Entry<String, AbstractTableDataWrapper> dataWrapperEntry : dataWrapperMap.entrySet()) {
// 处理数据集名称

Loading…
Cancel
Save