Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[SSE] Fix Bug 52634

Browse source
This commit is contained in:
Julia Radzhabova 2022-07-26 23:14:11 +03:00
parent 3d6a2fd0be
commit 3536d0cf71
3 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/spreadsheeteditor/main/app/template/PivotSettingsAdvanced.template
View file

@ -45,12 +45,12 @@
</tr> </tr>
<tr> <tr>
<td class="padding-small"> <td class="padding-small">
<label class="header"><%= scope.textHeaders %></label> <div id="pivot-adv-chk-show-headers"></div>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="padding-small"> <td class="padding-small">
<div id="pivot-adv-chk-show-headers"></div> <div id="pivot-adv-chk-autofit-col-width"></div>
</td> </td>
</tr> </tr>
</table> </table>

12
apps/spreadsheeteditor/main/app/view/PivotSettingsAdvanced.js
View file

@ -148,6 +148,11 @@ define([ 'text!spreadsheeteditor/main/app/template/PivotSettingsAdvanced.temp
labelText: this.textShowHeaders labelText: this.textShowHeaders
}); });
this.chAutofitColWidth = new Common.UI.CheckBox({
el: $('#pivot-adv-chk-autofit-col-width'),
labelText: this.textAutofitColWidth
});
this.txtDataRange = new Common.UI.InputFieldBtn({ this.txtDataRange = new Common.UI.InputFieldBtn({
el : $('#pivot-adv-txt-range'), el : $('#pivot-adv-txt-range'),
name : 'range', name : 'range',
@ -183,7 +188,7 @@ define([ 'text!spreadsheeteditor/main/app/template/PivotSettingsAdvanced.temp
getFocusedComponents: function() { getFocusedComponents: function() {
return [ return [
this.inputName, this.chRows, this.chCols, this.radioDown, this.radioOver, this.numWrap, this.chHeaders, // 0 tab this.inputName, this.chRows, this.chCols, this.radioDown, this.radioOver, this.numWrap, this.chHeaders, this.chAutofitColWidth, // 0 tab
this.txtDataRange, // 1 tab this.txtDataRange, // 1 tab
this.inputAltTitle, this.textareaAltDescription // 2 tab this.inputAltTitle, this.textareaAltDescription // 2 tab
]; ];
@ -234,6 +239,7 @@ define([ 'text!spreadsheeteditor/main/app/template/PivotSettingsAdvanced.temp
this.numWrap.setValue(props.asc_getPageWrap()); this.numWrap.setValue(props.asc_getPageWrap());
this.chHeaders.setValue(props.asc_getShowHeaders(), true); this.chHeaders.setValue(props.asc_getShowHeaders(), true);
this.chAutofitColWidth.setValue(props.asc_getUseAutoFormatting(), true);
var value = props.asc_getDataRef(); var value = props.asc_getDataRef();
this.txtDataRange.setValue((value) ? value : ''); this.txtDataRange.setValue((value) ? value : '');
@ -260,6 +266,7 @@ define([ 'text!spreadsheeteditor/main/app/template/PivotSettingsAdvanced.temp
props.asc_setPageOverThenDown(this.radioOver.getValue()); props.asc_setPageOverThenDown(this.radioOver.getValue());
props.asc_setPageWrap(this.numWrap.getNumberValue()); props.asc_setPageWrap(this.numWrap.getNumberValue());
props.asc_setShowHeaders(this.chHeaders.getValue() == 'checked'); props.asc_setShowHeaders(this.chHeaders.getValue() == 'checked');
props.asc_setUseAutoFormatting(this.chAutofitColWidth.getValue() == 'checked');
props.asc_setDataRef(this.txtDataRange.getValue()); props.asc_setDataRef(this.txtDataRange.getValue());
if (this.isAltTitleChanged) if (this.isAltTitleChanged)
@ -340,7 +347,8 @@ define([ 'text!spreadsheeteditor/main/app/template/PivotSettingsAdvanced.temp
textWrapCol: 'Report filter fields per column', textWrapCol: 'Report filter fields per column',
textWrapRow: 'Report filter fields per row', textWrapRow: 'Report filter fields per row',
textHeaders: 'Field Headers', textHeaders: 'Field Headers',
textShowHeaders: 'Show field headers for rows and columns' textShowHeaders: 'Show field headers for rows and columns',
textAutofitColWidth: 'Autofit column widths on update'
}, SSE.Views.PivotSettingsAdvanced || {})) }, SSE.Views.PivotSettingsAdvanced || {}))
}); });

1
apps/spreadsheeteditor/main/locale/en.json
View file

@ -2735,6 +2735,7 @@
"SSE.Views.PivotSettingsAdvanced.textWrapRow": "Report filter fields per row", "SSE.Views.PivotSettingsAdvanced.textWrapRow": "Report filter fields per row",
"SSE.Views.PivotSettingsAdvanced.txtEmpty": "This field is required", "SSE.Views.PivotSettingsAdvanced.txtEmpty": "This field is required",
"SSE.Views.PivotSettingsAdvanced.txtName": "Name", "SSE.Views.PivotSettingsAdvanced.txtName": "Name",
"SSE.Views.PivotSettingsAdvanced.textAutofitColWidth": "Autofit column widths on update",
"SSE.Views.PivotTable.capBlankRows": "Blank Rows", "SSE.Views.PivotTable.capBlankRows": "Blank Rows",
"SSE.Views.PivotTable.capGrandTotals": "Grand Totals", "SSE.Views.PivotTable.capGrandTotals": "Grand Totals",
"SSE.Views.PivotTable.capLayout": "Report Layout", "SSE.Views.PivotTable.capLayout": "Report Layout",