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

PL-8212 Table loses internal style names after setStylename call

Browse Source
This commit is contained in:
Yuriy Artamonov 2016-11-28 16:58:24 +04:00
parent fef6f0cc4c
commit a469240885
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -94,6 +94,9 @@ public abstract class WebAbstractTable<T extends com.vaadin.ui.Table & CubaEnhan
private static final String CUSTOM_STYLE_NAME_PREFIX = "cs ";
// Style names used by table itself
protected List<String> internalStyles = new ArrayList<>();
protected Map<Object, Column> columns = new HashMap<>();
protected List<Table.Column> columnsOrder = new ArrayList<>();
@ -498,8 +501,14 @@ public abstract class WebAbstractTable<T extends com.vaadin.ui.Table & CubaEnhan
if (!topPanelVisible) {
componentComposition.removeStyleName(HAS_TOP_PANEL_STYLENAME);
internalStyles.remove(HAS_TOP_PANEL_STYLENAME);
} else {
componentComposition.addStyleName(HAS_TOP_PANEL_STYLENAME);
if (!internalStyles.contains(HAS_TOP_PANEL_STYLENAME)) {
internalStyles.add(HAS_TOP_PANEL_STYLENAME);
}
}
}
}
@ -661,10 +670,13 @@ public abstract class WebAbstractTable<T extends com.vaadin.ui.Table & CubaEnhan
setEditable(false);
componentComposition = new CssLayout();
componentComposition.setStyleName("c-table-composition");
componentComposition.addStyleName("c-table-composition");
componentComposition.addComponent(component);
componentComposition.setWidthUndefined();
// default added style
internalStyles.add("c-table-composition");
// todo artamonov adjust component size relative to composition size
component.setSizeFull();
@ -1171,6 +1183,15 @@ public abstract class WebAbstractTable<T extends com.vaadin.ui.Table & CubaEnhan
tableValidators.add(validator);
}
@Override
public void setStyleName(String name) {
super.setStyleName(name);
for (String internalStyle : internalStyles) {
componentComposition.addStyleName(internalStyle);
}
}
public void validate() throws ValidationException {
if (tableValidators != null) {
for (com.haulmont.cuba.gui.components.Field.Validator tableValidator : tableValidators) {