test/cuba
1
0
Fork 0
mirror of https://gitee.com/jmix/cuba.git synced 2024-12-03 03:38:33 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

PL-7925 Support consistent state of Column "collapsed" property

Browse Source
This commit is contained in:
Daniil Tsarev 2017-03-29 13:56:50 +04:00
parent 997be5bddb
commit fd0b598965
2 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
modules/desktop/src/com/haulmont/cuba/desktop/gui/components/DesktopAbstractTable.java
View File

@ -221,6 +221,28 @@ public abstract class DesktopAbstractTable<C extends JXTable, E extends Entity>
}
);
ColumnControlButton columnControlButton = new ColumnControlButton(impl) {
@Override
protected ColumnVisibilityAction createColumnVisibilityAction(TableColumn column) {
ColumnVisibilityAction columnVisibilityAction = super.createColumnVisibilityAction(column);
columnVisibilityAction.addPropertyChangeListener(evt -> {
ColumnVisibilityAction action = (ColumnVisibilityAction) evt.getSource();
String columnName = action.getActionCommand();
boolean collapsed = !((boolean) evt.getNewValue());
Column col = getColumn(columnName);
if (col != null) {
col.setCollapsed(collapsed);
}
});
return columnVisibilityAction;
}
};
impl.setColumnControl(columnControlButton);
impl.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), "enter");
impl.getActionMap().put("enter", new AbstractAction() {
@Override
@ -820,7 +842,7 @@ public abstract class DesktopAbstractTable<C extends JXTable, E extends Entity>
focused = impl.isFocusOwner();
selectionBackup.set(selectedItems);
JViewport viewport = (JViewport)impl.getParent();
JViewport viewport = (JViewport) impl.getParent();
Point scrollPoint = viewport.getViewPosition();
scrollRowIndex = impl.rowAtPoint(scrollPoint);
}
@ -973,7 +995,7 @@ public abstract class DesktopAbstractTable<C extends JXTable, E extends Entity>
if (component instanceof Flushable) {
((Flushable) component).flushValue();
} else if (component instanceof java.awt.Container) {
for(Component child : ((java.awt.Container) component).getComponents()){
for (Component child : ((java.awt.Container) component).getComponents()) {
flush(child);
}
}
@ -1751,7 +1773,7 @@ public abstract class DesktopAbstractTable<C extends JXTable, E extends Entity>
impl.setEnabled(isEnabledWithParent());
if (buttonsPanel != null) {
((DesktopButtonsPanel)buttonsPanel).setParentEnabled(isEnabledWithParent());
((DesktopButtonsPanel) buttonsPanel).setParentEnabled(isEnabledWithParent());
}
}
@ -2333,12 +2355,12 @@ public abstract class DesktopAbstractTable<C extends JXTable, E extends Entity>
}
@Override
public void setColumnHeaderVisible(boolean visible){
public void setColumnHeaderVisible(boolean visible) {
columnHeaderVisible = visible;
}
@Override
public boolean isColumnHeaderVisible(){
public boolean isColumnHeaderVisible() {
return columnHeaderVisible;
}
@ -2497,7 +2519,7 @@ public abstract class DesktopAbstractTable<C extends JXTable, E extends Entity>
setLineWrap(true);
setWrapStyleWord(true);
setOpaque(true);
setBorder(new EmptyBorder(0,0,0,0));
setBorder(new EmptyBorder(0, 0, 0, 0));
}
@Override

9
modules/web/src/com/haulmont/cuba/web/gui/components/WebAbstractTable.java
View File

@ -695,6 +695,8 @@ public abstract class WebAbstractTable<T extends com.vaadin.ui.Table & CubaEnhan
component.setSizeFull();
component.setCellStyleGenerator(createStyleGenerator());
component.addColumnCollapseListener(this::handleColumnCollapsed);
}
protected WebTableFieldFactory createFieldFactory() {
@ -2932,4 +2934,11 @@ public abstract class WebAbstractTable<T extends com.vaadin.ui.Table & CubaEnhan
public void removeLookupValueChangeListener(LookupSelectionChangeListener listener) {
getEventRouter().removeListener(LookupSelectionChangeListener.class, listener);
}
protected void handleColumnCollapsed(com.vaadin.ui.Table.ColumnCollapseEvent event) {
Object propertyId = event.getPropertyId();
boolean columnCollapsed = component.isColumnCollapsed(propertyId);
columns.get(propertyId).setCollapsed(columnCollapsed);
}
}