test/cuba
1
0
Fork 0
mirror of https://gitee.com/jmix/cuba.git synced 2024-11-30 18:27:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change single selection behavior for Table and Tree #PL-4752

Browse Source
This commit is contained in:
Gleb Gorelov 2015-09-29 13:03:38 +00:00
parent 952f45b4b5
commit bb78cb0726
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib.gradle
View File

@ -3,7 +3,7 @@
* Use is subject to license terms, see http://www.cuba-platform.com/license for details.
*/
project.ext.vaadinVersion = '7.5.6.cuba.3'
project.ext.vaadinVersion = '7.5.6.cuba.4'
project.ext.vaadinShared = [group: 'com.vaadin', name: 'vaadin-shared', version: vaadinVersion]
project.ext.vaadinServer = [group: 'com.vaadin', name: 'vaadin-server', version: vaadinVersion]

11
modules/web-toolkit/src/com/haulmont/cuba/web/toolkit/ui/client/grouptable/CubaGroupTableWidget.java
View File

@ -394,6 +394,7 @@ public class CubaGroupTableWidget extends CubaScrollTableWidget {
protected String groupKey;
protected boolean expanded;
protected Boolean hasCells;
protected Element expander;
public CubaGroupTableGroupRow(UIDL uidl, char[] aligns) {
super(uidl, aligns);
@ -578,11 +579,11 @@ public class CubaGroupTableWidget extends CubaScrollTableWidget {
container.setInnerHTML("");
Element groupDiv = DOM.createDiv();
groupDiv.setInnerHTML(" ");
expander = DOM.createDiv();
expander.setInnerHTML(" ");
groupDiv.setClassName(CLASSNAME + "-group-cell-expander");
DOM.appendChild(container, groupDiv);
expander.setClassName(CLASSNAME + "-group-cell-expander");
DOM.appendChild(container, expander);
Element contentDiv = DOM.createDiv();
contentDiv.setInnerHTML(containerInnerHTML);
@ -602,7 +603,7 @@ public class CubaGroupTableWidget extends CubaScrollTableWidget {
}
setRowFocus(this);
if (!isSingleSelectMode()) {
if (event.getEventTarget().cast() != expander) {
deselectAll();
sendSelectedRows(false);
}

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

@ -483,7 +483,6 @@ public abstract class WebAbstractTable<T extends com.vaadin.ui.Table & CubaEnhan
protected void initComponent(final T component) {
component.setMultiSelect(false);
component.setNullSelectionAllowed(false);
component.setImmediate(true);
component.setValidationVisible(false);
component.setShowBufferedSourceException(false);
@ -1342,7 +1341,6 @@ public abstract class WebAbstractTable<T extends com.vaadin.ui.Table & CubaEnhan
@Override
public void setMultiSelect(boolean multiselect) {
component.setNullSelectionAllowed(multiselect);
super.setMultiSelect(multiselect);
}