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

Repair Table ColumnCollapseListener #PL-5097

Browse Source
This commit is contained in:
Gleb Gorelov 2015-04-10 12:43:34 +00:00
parent ea9fba63a8
commit baaa5b1500
4 changed files with 66 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,9 +68,9 @@ import static com.haulmont.bali.util.Preconditions.checkNotNullArgument;
*/
public abstract class WebAbstractTable<T extends com.vaadin.ui.Table & CubaEnhancedTable>
extends
WebAbstractList<T>
WebAbstractList<T>
implements
Table {
Table {
protected Map<Object, Column> columns = new HashMap<>();
protected List<Table.Column> columnsOrder = new ArrayList<>();
@ -174,7 +174,7 @@ public abstract class WebAbstractTable<T extends com.vaadin.ui.Table & CubaEnhan
.setViewName("_local")
.buildDatasource();
((DatasourceImplementation)fieldDatasource).valid();
((DatasourceImplementation) fieldDatasource).valid();
fieldDatasource.setItem(item);
fieldDatasources.put(item, fieldDatasource);
@ -517,15 +517,15 @@ public abstract class WebAbstractTable<T extends com.vaadin.ui.Table & CubaEnhan
});
// vaadin7
// component.addColumnCollapseListener(new com.haulmont.cuba.web.toolkit.ui.Table.CollapseListener() {
// @Override
// public void columnCollapsed(Object columnId, boolean collapsed) {
// final Column collapsedColumn = getColumn(columnId.toString());
// for (ColumnCollapseListener listener : columnCollapseListeners) {
// listener.columnCollapsed(collapsedColumn, collapsed);
// }
// }
// });
component.addColumnCollapseListener(new CubaEnhancedTable.CollapseListener() {
@Override
public void columnCollapsed(Object columnId, boolean collapsed) {
final Column collapsedColumn = getColumn(columnId.toString());
for (ColumnCollapseListener listener : columnCollapseListeners) {
listener.columnCollapsed(collapsedColumn, collapsed);
}
}
});
component.setSelectable(true);
component.setTableFieldFactory(new WebTableFieldFactory());
@ -547,6 +547,7 @@ public abstract class WebAbstractTable<T extends com.vaadin.ui.Table & CubaEnhan
component.setCellStyleGenerator(createStyleGenerator());
}
protected StyleGeneratorAdapter createStyleGenerator() {
return new StyleGeneratorAdapter();
}
@ -648,7 +649,7 @@ public abstract class WebAbstractTable<T extends com.vaadin.ui.Table & CubaEnhan
}
} /*else if (propertyPath.getRange().isEnum()) {
// TODO (abramov)
} */else if (!propertyPath.getRange().isEnum()) {
} */ else if (!propertyPath.getRange().isEnum()) {
throw new UnsupportedOperationException();
}
}
@ -892,7 +893,7 @@ public abstract class WebAbstractTable<T extends com.vaadin.ui.Table & CubaEnhan
String propertyPath = column.getId().toString();
if (security.isEntityAttrReadPermitted(metaClass, propertyPath)) {
result.add((MetaPropertyPath)column.getId());
result.add((MetaPropertyPath) column.getId());
}
}
}
@ -1531,10 +1532,10 @@ public abstract class WebAbstractTable<T extends com.vaadin.ui.Table & CubaEnhan
Column columnConf = columns.get(columnId);
Item item = component.getItem(itemId);
Entity entity = ((ItemWrapper)item).getItem();
Entity entity = ((ItemWrapper) item).getItem();
Datasource fieldDatasource = getItemDatasource(entity);
AbstractFieldFactory factory = (AbstractFieldFactory)component.getTableFieldFactory();
AbstractFieldFactory factory = (AbstractFieldFactory) component.getTableFieldFactory();
com.haulmont.cuba.gui.components.Component columnComponent =
factory.createField(fieldDatasource, fieldPropertyId, columnConf.getXmlDescriptor());
@ -1746,7 +1747,7 @@ public abstract class WebAbstractTable<T extends com.vaadin.ui.Table & CubaEnhan
Column columnConf = columns.get(propertyId);
Item item = container.getItem(itemId);
Entity entity = ((ItemWrapper)item).getItem();
Entity entity = ((ItemWrapper) item).getItem();
Datasource fieldDatasource = getItemDatasource(entity);
com.haulmont.cuba.gui.components.Component columnComponent =

8
modules/web/src/com/haulmont/cuba/web/toolkit/ui/CubaEnhancedTable.java
View File

@ -51,4 +51,12 @@ public interface CubaEnhancedTable extends AggregationContainer {
boolean isShowTotalAggregation();
void setShowTotalAggregation(boolean showTotalAggregation);
void addColumnCollapseListener(CollapseListener listener);
void removeColumnCollapseListener(CollapseListener listener);
interface CollapseListener {
void columnCollapsed(Object columnId, boolean collapsed);
}
}

20
modules/web/src/com/haulmont/cuba/web/toolkit/ui/CubaTable.java
View File

@ -46,6 +46,8 @@ public class CubaTable extends com.vaadin.ui.Table implements TableContainer, Cu
protected boolean aggregatable = false;
protected List<CollapseListener> columnCollapseListeners = new ArrayList<>();
@Override
protected CubaTableState getState() {
return (CubaTableState) super.getState();
@ -263,6 +265,24 @@ public class CubaTable extends com.vaadin.ui.Table implements TableContainer, Cu
}
}
public void addColumnCollapseListener(CollapseListener listener) {
columnCollapseListeners.add(listener);
}
public void removeColumnCollapseListener(CollapseListener listener) {
columnCollapseListeners.remove(listener);
}
@Override
public void setColumnCollapsed(Object propertyId, boolean collapsed) throws IllegalStateException {
if (isColumnCollapsed(propertyId) != collapsed) {
for (CollapseListener listener : columnCollapseListeners) {
listener.columnCollapsed(propertyId, collapsed);
}
}
super.setColumnCollapsed(propertyId, collapsed);
}
@Override
protected void paintActions(PaintTarget target, Set<Action> actionSet) throws PaintException {
super.paintActions(target, actionSet);

20
modules/web/src/com/haulmont/cuba/web/toolkit/ui/CubaTreeTable.java
View File

@ -50,6 +50,8 @@ public class CubaTreeTable extends com.vaadin.ui.TreeTable implements TreeTableC
protected boolean aggregatable = false;
protected List<CollapseListener> columnCollapseListeners = new ArrayList<>();
@Override
protected CubaTreeTableState getState() {
return (CubaTreeTableState) super.getState();
@ -207,6 +209,24 @@ public class CubaTreeTable extends com.vaadin.ui.TreeTable implements TreeTableC
}
}
public void addColumnCollapseListener(CollapseListener listener) {
columnCollapseListeners.add(listener);
}
public void removeColumnCollapseListener(CollapseListener listener) {
columnCollapseListeners.remove(listener);
}
@Override
public void setColumnCollapsed(Object propertyId, boolean collapsed) throws IllegalStateException {
if (isColumnCollapsed(propertyId) != collapsed) {
for (CollapseListener listener : columnCollapseListeners) {
listener.columnCollapsed(propertyId, collapsed);
}
}
super.setColumnCollapsed(propertyId, collapsed);
}
@Override
protected void paintActions(PaintTarget target, Set<Action> actionSet) throws PaintException {
super.paintActions(target, actionSet);