diff --git a/apps/common/main/resources/less/combo-dataview.less b/apps/common/main/resources/less/combo-dataview.less index 60932e41e..1bf3cc528 100644 --- a/apps/common/main/resources/less/combo-dataview.less +++ b/apps/common/main/resources/less/combo-dataview.less @@ -352,7 +352,6 @@ .combo-template(60px); top: -4px; - padding-right: 12px; position: absolute; .more-container & { diff --git a/apps/spreadsheeteditor/main/app/view/PivotTable.js b/apps/spreadsheeteditor/main/app/view/PivotTable.js index 450d5b2a1..7249ceb19 100644 --- a/apps/spreadsheeteditor/main/app/view/PivotTable.js +++ b/apps/spreadsheeteditor/main/app/view/PivotTable.js @@ -89,7 +89,7 @@ define([ '' + '' + '' + - '
' + + '
' + '
' + ''; @@ -274,11 +274,14 @@ define([ this.pivotStyles = new Common.UI.ComboDataView({ cls : 'combo-pivot-template', + style : 'min-wdith: 91px; max-width: 505px;', enableKeyEvents : true, itemWidth : 61, itemHeight : 49, menuMaxHeight : 300, groups : new Common.UI.DataViewGroupStore(), + autoWidth : true, + lock : [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit, _set.pivotLock, _set['FormatCells'], _set['PivotTables']], beforeOpenHandler: function(e) { var cmp = this,